diff -Nru abiword-2.6.2/abiword/abiword.desktop abiword-2.6.8repack2/abiword/abiword.desktop --- abiword-2.6.2/abiword/abiword.desktop 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/abiword/abiword.desktop 2009-07-15 16:56:23.000000000 +0100 @@ -1,17 +1,16 @@ [Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=AbiWord Exec=abiword Icon=abiword_48 Terminal=false Type=Application Categories=Application;Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base; StartupNotify=true +Encoding=UTF-8 X-Desktop-File-Install-Version=0.9 MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1; +Name=AbiWord GenericName=Word Processor -Comment=AbiWord Word Processor +Comment=Compose, edit, and view documents Name[de]=Textverarbeitung Comment[de]=AbiWord Textverarbeitung Name[nb]=Tekstbehandling @@ -34,4 +33,3 @@ Comment[pl]=Edytor tekstu AbiWord Name[ja]=AbiWord ワードプロセッサ Comment[ja]=AbiWord ワードプロセッサ -GenericName[en_US]=Word Processor diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/ac-helpers/abi-thread.m4 /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/ac-helpers/abi-thread.m4 --- abiword-2.6.2/abiword/ac-helpers/abi-thread.m4 2008-04-06 16:59:30.000000000 +0100 +++ abiword-2.6.8repack2/abiword/ac-helpers/abi-thread.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -# start: abi/ac-helpers/abi-thread.m4 -# -# Copyright (C) 2002 Francis James Franklin -# Copyright (C) 2002 AbiSource, Inc -# -# This file is free software; you may copy and/or distribute it with -# or without modifications, as long as this notice is preserved. -# This software is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even -# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. -# -# The above license applies to THIS FILE ONLY, the abiword code -# itself may be copied and distributed under the terms of the GNU -# GPL, see COPYING for more details -# -# This file detects which of the AbiWord platforms we are currently -# building on. The detection logic in question is mostly by Jeff -# Hostetler, and is taken from the original AbiWord build system. -# -# Usage: ABI_THREAD - -AC_DEFUN([ABI_THREAD],[ - -AC_ARG_ENABLE(threads,[ --enable-threads use (posix) threads],[ - if test "x$enableval" = "xno"; then - abi_threads=no - else - abi_threads=yes - fi -],[ abi_threads=check -]) - -if test $abi_threads != no; then - AC_CHECK_HEADER(pthread.h,[ - AC_CHECK_FUNC(pthread_create,[ - abi_pthread_libs="" - AC_CHECK_FUNC(pthread_yield,abi_pthread_yield=yes,abi_pthread_yield=no) - ],[ AC_CHECK_LIB(pthread,pthread_exit,[ - abi_pthread_libs="-lpthread" - AC_CHECK_LIB(pthread,pthread_yield,[ - abi_pthread_yield=yes - ],[ abi_pthread_yield=no - ]) - ],[ AC_MSG_ERROR([* * * posix threads broken? * * *]) - ]) - ]) - ],[ if test $abi_threads = yes; then - AC_MSG_ERROR([* * * only posix threads supported currently * * *]) - fi - abi_threads=no - ]) -fi - -if test $abi_threads != no; then - THREAD_CFLAGS="-DHAVE_THREADS=1 -DHAVE_POSIX_THREADS=1" - THREAD_LIBS="$abi_pthread_libs" - if test "x$abi_pthread_yield" = "xyes"; then - THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_PTHREAD_YIELD=1" - fi - abi_threads=yes -else - THREAD_CFLAGS="" - THREAD_LIBS="" -fi -AM_CONDITIONAL(HAVE_THREADS, test $abi_threads = yes) -AC_SUBST(THREAD_CFLAGS) -AC_SUBST(THREAD_LIBS) - -]) -# -# end: abi/ac-helpers/abi-thread.m4 -# diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/ac-helpers/depcomp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/ac-helpers/depcomp --- abiword-2.6.2/abiword/ac-helpers/depcomp 2008-04-06 17:01:32.000000000 +0100 +++ abiword-2.6.8repack2/abiword/ac-helpers/depcomp 2009-07-15 16:56:23.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2006-10-15.18 +scriptversion=2007-03-29.01 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -215,34 +215,39 @@ # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u "$@" -Wc,-M else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u "$@" -M fi stat=$? - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - if test $stat -eq 0; then : else - rm -f "$tmpdepfile" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then - outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/ac-helpers/install-sh /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/ac-helpers/install-sh --- abiword-2.6.2/abiword/ac-helpers/install-sh 2008-04-06 17:01:32.000000000 +0100 +++ abiword-2.6.8repack2/abiword/ac-helpers/install-sh 2009-07-15 16:56:23.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-10-14.15 +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} if test -z "$doit"; then doit_exec=exec else @@ -58,34 +58,49 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' -posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 +chgrpcmd= chmodcmd=$chmodprog chowncmd= -chgrpcmd= -stripcmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" +stripcmd= + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -95,65 +110,55 @@ In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) shift - continue;; + -c) ;; + + -C) copy_on_change=true;; - -d) dir_arg=true - shift - continue;; + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - shift - shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - continue;; + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; @@ -165,21 +170,22 @@ *) break;; esac + shift done -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dstarg"; then + if test -n "$dst_arg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" + set fnord "$@" "$dst_arg" shift # fnord fi shift # arg - dstarg=$arg + dst_arg=$arg done fi @@ -224,7 +230,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src ;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -242,22 +248,22 @@ exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dstarg + dst=$dst_arg # Protect names starting with `-'. case $dst in - -*) dst=./$dst ;; + -*) dst=./$dst;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -378,26 +384,19 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; esac - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac + eval "$initialize_posix_glob" oIFS=$IFS IFS=/ - $posix_glob && set -f + $posix_glob set -f set fnord $dstdir shift - $posix_glob && set +f + $posix_glob set +f IFS=$oIFS prefixes= @@ -459,41 +458,54 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ - || { - echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - } || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 trap '' 0 fi diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/aclocal.m4 /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/aclocal.m4 --- abiword-2.6.2/abiword/aclocal.m4 2008-04-06 22:24:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword/aclocal.m4 2009-07-15 16:56:23.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,10 +11,13 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +[m4_warning([this file was generated for autoconf 2.63. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # @@ -84,16 +87,14 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -137,9 +138,9 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -174,7 +175,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,7 +190,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -203,10 +204,12 @@ # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.2])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -456,19 +459,28 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 4 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do +[# Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +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. @@ -478,7 +490,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -526,13 +538,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -637,16 +649,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -799,13 +812,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -822,7 +835,7 @@ # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- @@ -918,7 +931,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) @@ -1039,7 +1052,6 @@ m4_include([ac-helpers/abi-popt.m4]) m4_include([ac-helpers/abi-scandir-select.m4]) m4_include([ac-helpers/abi-spell.m4]) -m4_include([ac-helpers/abi-thread.m4]) m4_include([ac-helpers/abi-types.m4]) m4_include([ac-helpers/abi-wv.m4]) m4_include([ac-helpers/abi-xft.m4]) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/configure /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/configure --- abiword-2.6.2/abiword/configure 2008-04-06 22:26:22.000000000 +0100 +++ abiword-2.6.8repack2/abiword/configure 2009-07-15 16:56:23.000000000 +0100 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for abiword 2.6.2. +# Generated by GNU Autoconf 2.63 for abiword 2.6.8. # # Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -17,7 +17,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -39,17 +39,45 @@ 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=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -65,8 +93,6 @@ # 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. @@ -89,7 +115,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -102,17 +128,10 @@ PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -134,7 +153,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -160,7 +179,7 @@ as_have_required=no fi - if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } @@ -242,7 +261,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -263,7 +282,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -343,10 +362,10 @@ 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+"$@"} + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi @@ -415,9 +434,10 @@ 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 + echo Please tell bug-autoconf@gnu.org about your system, + echo including any error possibly output before this message. + echo This can help us improve future autoconf versions. + echo Configuration will now proceed without shell functions. } @@ -453,7 +473,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_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 @@ -481,7 +501,6 @@ *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -494,19 +513,22 @@ rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -531,10 +553,10 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -574,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='abiword' PACKAGE_TARNAME='abiword' -PACKAGE_VERSION='2.6.2' -PACKAGE_STRING='abiword 2.6.2' +PACKAGE_VERSION='2.6.8' +PACKAGE_STRING='abiword 2.6.8' PACKAGE_BUGREPORT='http://www.abisource.com/' ac_unique_file="src/af/ev/xp/ev_Menu.h" @@ -615,3863 +637,1573 @@ # include #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 -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 -am__isrc -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 -ABIWORD_SERIES -ABIWORD_DATADIR -ABIWORD_GLADEDIR -ABIWORD_HEADERSDIR -ABIWORD_LIBDIR -ABIWORD_PLUGINSDIR -CXX -CXXFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CXX -EXEEXT -OBJEXT -DEPDIR -am__include -am__quote -AMDEP_TRUE -AMDEP_FALSE -AMDEPBACKSLASH -CXXDEPMODE -am__fastdepCXX_TRUE -am__fastdepCXX_FALSE -CC -CFLAGS -ac_ct_CC -CCDEPMODE -am__fastdepCC_TRUE -am__fastdepCC_FALSE -CPP -LN_S -RANLIB -INSIDE_GNOME_COMMON_TRUE -INSIDE_GNOME_COMMON_FALSE -ABI_EPATH_DYLIB_TRUE -ABI_EPATH_DYLIB_FALSE -EPATH_WV_BUILD_FLAGS -ABI_MACSDK_ROOT -PLATFORM -BE_PLATFORM -OS_NAME -WARNING_CFLAGS -GREP -EGREP -ABITYPES_CFLAGS -WITH_LIBABIWORD_TRUE -WITH_LIBABIWORD_FALSE -PKG_CONFIG -HILDON_CFLAGS -HILDON_LIBS -EMBEDDED_HILDON_TRUE -EMBEDDED_HILDON_FALSE -ENABLE_STATUSBAR_TRUE -ENABLE_STATUSBAR_FALSE -EMBEDDED_CFLAGS -EMBEDDED_LIBS -ENABLE_PRINT_TRUE -ENABLE_PRINT_FALSE -BUILD_TTFTOOL_TRUE -BUILD_TTFTOOL_FALSE -GLIB_CFLAGS -GLIB_LIBS -GMODULE_CFLAGS -GMODULE_LIBS -GTHREAD_CFLAGS -GTHREAD_LIBS -THREAD_CFLAGS -THREAD_LIBS -HAVE_THREADS_TRUE -HAVE_THREADS_FALSE -GTK_CFLAGS -GTK_LIBS -PANGOFT2_CFLAGS -PANGOFT2_LIBS -XMKMF -X_CFLAGS -X_PRE_LIBS -X_LIBS -X_EXTRA_LIBS -GNOMEPRINT_CFLAGS -GNOMEPRINT_LIBS -FREETYPE_CFLAGS -FREETYPE_LIBS -BINRELOC_CFLAGS -BINRELOC_LIBS -WITH_UNIX_TRUE -WITH_UNIX_FALSE -WITH_MACOSX_TRUE -WITH_MACOSX_FALSE -WITH_COCOA_TRUE -WITH_COCOA_FALSE -WITH_QNX_TRUE -WITH_QNX_FALSE -WITH_WIN32_TRUE -WITH_WIN32_FALSE -WITH_BINRELOC_TRUE -WITH_BINRELOC_FALSE -OBJCXX -OBJCXXFLAGS -OBJCXXDEPMODE -ABI_FE -ABI_BE -LIBICONV_PEERDIR -ICONV_INCLUDES -ICONV_LIBS -GUCHARMAP_CFLAGS -GUCHARMAP_LIBS -WITH_GUCHARMAP_TRUE -WITH_GUCHARMAP_FALSE -XFT_CFLAGS -XFT_LIBS -WITH_XFT_TRUE -WITH_XFT_FALSE -GSF_CFLAGS -GSF_LIBS -GSF_HTTP_CFLAGS -GSF_HTTP_LIBS -GOFFICE_CFLAGS -GOFFICE_LIBS -goffice_datadir -goffice_libdir -goffice_icondir -goffice_localedir -goffice_plugindir -goffice_gladedir -WITH_SYSTEM_GOFFICE_TRUE -WITH_SYSTEM_GOFFICE_FALSE -GNOMEVFS_CFLAGS -GNOMEVFS_LIBS -WITH_GNOMEVFS_TRUE -WITH_GNOMEVFS_FALSE -GNOMEUI_CFLAGS -GNOMEUI_LIBS -WITH_GNOMEUI_TRUE -WITH_GNOMEUI_FALSE -ABI_BUILD_SHARED_TRUE -ABI_BUILD_SHARED_FALSE -ABI_BUILD_STATIC_TRUE -ABI_BUILD_STATIC_FALSE -ENABLE_SPELL_TRUE -ENABLE_SPELL_FALSE -SPELL_CFLAGS -SPELL_LIBS -WITH_ENCHANT_TRUE -WITH_ENCHANT_FALSE -WITH_ISPELL_TRUE -WITH_ISPELL_FALSE -FRIBIDI_CFLAGS -FRIBIDI_LIBS -_abi_ots_CFLAGS -_abi_ots_LIBS -abi_magickpp_config -_abi_openwriter_CFLAGS -_abi_openwriter_LIBS -_abi_sdw_CFLAGS -_abi_sdw_LIBS -_abi_wordperfect_CFLAGS -_abi_wordperfect_LIBS -BUILD_IN_PLUGINS_TRUE -BUILD_IN_PLUGINS_FALSE -PLUGIN_CFLAGS -PLUGIN_LIBS -PLUGIN_LIST -PLUGIN_DEFS -WITH_RESOURCE_MANAGER_TRUE -WITH_RESOURCE_MANAGER_FALSE -DEBUG_TRUE -DEBUG_FALSE -SCRIPT_TRUE -SCRIPT_FALSE -ABI_FEATURE_DEFS -OPTIMIZE_CFLAGS -PROFILE_CFLAGS -LIBJPEG_LIBS -DEBUG_CFLAGS -SCRIPT_CFLAGS -SCRIPT_LIBS -PLATFORM_CFLAGS -PLATFORM_LIBS -XSUBPPDIR -BIGENDIAN_TRUE -BIGENDIAN_FALSE -ABI_XML_CONFIG -HAVE_EXPAT_TRUE -HAVE_EXPAT_FALSE -XML_CFLAGS -XML_LIBS -EXPAT_PEERDIR -WV_CFLAGS -WV_LIBS -ZLIB_CFLAGS -ZLIB_LIBS -LIBPNG_CFLAGS -LIBPNG_LIBS -LIBPNG_PEERDIR -LIBPOPT_PEERDIR -LIBPOPT_CFLAGS -LIBPOPT_LIBS -LIBJPEG_CFLAGS -WITH_LIBJPEG_TRUE -WITH_LIBJPEG_FALSE -ALLOCA -ABI_SCANDIR_SELECT_QUALIFIER -PEERDIRS -PEERS -VALGRIND -CROSS_COMPILING_TRUE -CROSS_COMPILING_FALSE -ABIWORD_REQUIRED_PKGS +ac_subst_vars='LTLIBOBJS LIBOBJS -LTLIBOBJS' -ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias -CXX -CXXFLAGS -LDFLAGS -LIBS -CPPFLAGS -CCC -CC -CFLAGS -CPP -PKG_CONFIG -HILDON_CFLAGS -HILDON_LIBS -GLIB_CFLAGS -GLIB_LIBS -GMODULE_CFLAGS -GMODULE_LIBS -GTHREAD_CFLAGS -GTHREAD_LIBS -GTK_CFLAGS -GTK_LIBS -PANGOFT2_CFLAGS -PANGOFT2_LIBS -XMKMF -GNOMEPRINT_CFLAGS -GNOMEPRINT_LIBS -FREETYPE_CFLAGS -FREETYPE_LIBS -GUCHARMAP_CFLAGS -GUCHARMAP_LIBS -XFT_CFLAGS -XFT_LIBS -GSF_CFLAGS -GSF_LIBS -GSF_HTTP_CFLAGS -GSF_HTTP_LIBS -GOFFICE_CFLAGS -GOFFICE_LIBS -GNOMEVFS_CFLAGS -GNOMEVFS_LIBS -GNOMEUI_CFLAGS -GNOMEUI_LIBS -SPELL_CFLAGS -SPELL_LIBS -FRIBIDI_CFLAGS -FRIBIDI_LIBS -_abi_ots_CFLAGS -_abi_ots_LIBS -_abi_openwriter_CFLAGS -_abi_openwriter_LIBS -_abi_sdw_CFLAGS -_abi_sdw_LIBS -_abi_wordperfect_CFLAGS -_abi_wordperfect_LIBS -WV_CFLAGS -WV_LIBS +ABIWORD_REQUIRED_PKGS +CROSS_COMPILING_FALSE +CROSS_COMPILING_TRUE +VALGRIND +PEERS +PEERDIRS +ABI_SCANDIR_SELECT_QUALIFIER +ALLOCA +WITH_LIBJPEG_FALSE +WITH_LIBJPEG_TRUE +LIBJPEG_CFLAGS +LIBPOPT_LIBS +LIBPOPT_CFLAGS +LIBPOPT_PEERDIR +LIBPNG_PEERDIR +LIBPNG_LIBS LIBPNG_CFLAGS -LIBPNG_LIBS' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_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 - ac_prev= - continue - fi - - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute directory names. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures abiword 2.6.2 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/abiword] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -X features: - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of abiword 2.6.2:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --disable-cocoa don't use Cocoa API (MacOSX builds only) - --enable-libabiword Build libabiword - --enable-embedded=generic|hildon|poky Include embedded features - --enable-printing Include printing capabilities - --disable-exports Do not export any symbols - --enable-binreloc compile with binary relocation support - (default=disable) - --enable-binreloc-threads compile binary relocation with threads support - (default=yes) - --enable-threads use (posix) threads - --disable-gucharmap Turn off gucharmap - --enable-gnomevfs Turn on gnomevfs - --enable-gnomeui Enable use of GnomeProgram - --disable-shared don't build shared AbiWord (UNIX/GTK builds only) - --enable-static build static AbiWord (UNIX/GTK builds only) - --disable-spellcheck Disable spell-checking capabilities - --enable-profile Turn on profile - --enable-extra-optimization Turn on extra optimizations - --enable-debug Turn on debugging - --enable-symbols Debugging symbols, but not debug-specific code - --enable-peer-config Enable automatic configuration of peer directories (on by default) - --enable-scripting Enable the perl scripting interface - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --without-epath hardcode relative install path in libwv (MacOS X only) - --with-fink add /sw/... to CPP/LDFLAGS (Mac OS X) - --with-darwinports add /opt/local/... to CPP/LDFLAGS (Mac OS X) - --with-abiportssdk=SDK_ROOT add /opt/abi/... to CPP/LDFLAGS and SDK usage (Mac OS X only) - --with-x use the X Window System - --with-libiconv=DIR use libiconv in DIR - --with-builtin-plugins (experimental) compile-in a selection of plugins - --with-ImageMagick=DIR Use ImageMagick in DIR - --with-libxml2 force use of libxml2 - --with-expat force use of expat - --with-zlib=DIR use zlib in DIR - --with-libpng=DIR use libpng in DIR - --with-popt=DIR use popt in DIR - --with-libjpeg-prefix=PFX Prefix where libjpeg is installed (optional) - -Some influential environment variables: - CXX C++ compiler command - CXXFLAGS C++ compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CC C compiler command - CFLAGS C compiler flags - CPP C preprocessor - PKG_CONFIG path to pkg-config utility - HILDON_CFLAGS - C compiler flags for HILDON, overriding pkg-config - HILDON_LIBS linker flags for HILDON, overriding pkg-config - GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config - GLIB_LIBS linker flags for GLIB, overriding pkg-config - GMODULE_CFLAGS - C compiler flags for GMODULE, overriding pkg-config - GMODULE_LIBS - linker flags for GMODULE, overriding pkg-config - GTHREAD_CFLAGS - C compiler flags for GTHREAD, overriding pkg-config - GTHREAD_LIBS - linker flags for GTHREAD, overriding pkg-config - GTK_CFLAGS C compiler flags for GTK, overriding pkg-config - GTK_LIBS linker flags for GTK, overriding pkg-config - PANGOFT2_CFLAGS - C compiler flags for PANGOFT2, overriding pkg-config - PANGOFT2_LIBS - linker flags for PANGOFT2, overriding pkg-config - XMKMF Path to xmkmf, Makefile generator for X Window System - GNOMEPRINT_CFLAGS - C compiler flags for GNOMEPRINT, overriding pkg-config - GNOMEPRINT_LIBS - linker flags for GNOMEPRINT, overriding pkg-config - FREETYPE_CFLAGS - C compiler flags for FREETYPE, overriding pkg-config - FREETYPE_LIBS - linker flags for FREETYPE, overriding pkg-config - GUCHARMAP_CFLAGS - C compiler flags for GUCHARMAP, overriding pkg-config - GUCHARMAP_LIBS - linker flags for GUCHARMAP, overriding pkg-config - XFT_CFLAGS C compiler flags for XFT, overriding pkg-config - XFT_LIBS linker flags for XFT, overriding pkg-config - GSF_CFLAGS C compiler flags for GSF, overriding pkg-config - GSF_LIBS linker flags for GSF, overriding pkg-config - GSF_HTTP_CFLAGS - C compiler flags for GSF_HTTP, overriding pkg-config - GSF_HTTP_LIBS - linker flags for GSF_HTTP, overriding pkg-config - GOFFICE_CFLAGS - C compiler flags for GOFFICE, overriding pkg-config - GOFFICE_LIBS - linker flags for GOFFICE, overriding pkg-config - GNOMEVFS_CFLAGS - C compiler flags for GNOMEVFS, overriding pkg-config - GNOMEVFS_LIBS - linker flags for GNOMEVFS, overriding pkg-config - GNOMEUI_CFLAGS - C compiler flags for GNOMEUI, overriding pkg-config - GNOMEUI_LIBS - linker flags for GNOMEUI, overriding pkg-config - SPELL_CFLAGS - C compiler flags for SPELL, overriding pkg-config - SPELL_LIBS linker flags for SPELL, overriding pkg-config - FRIBIDI_CFLAGS - C compiler flags for FRIBIDI, overriding pkg-config - FRIBIDI_LIBS - linker flags for FRIBIDI, overriding pkg-config - _abi_ots_CFLAGS - C compiler flags for _abi_ots, overriding pkg-config - _abi_ots_LIBS - linker flags for _abi_ots, overriding pkg-config - _abi_openwriter_CFLAGS - C compiler flags for _abi_openwriter, overriding pkg-config - _abi_openwriter_LIBS - linker flags for _abi_openwriter, overriding pkg-config - _abi_sdw_CFLAGS - C compiler flags for _abi_sdw, overriding pkg-config - _abi_sdw_LIBS - linker flags for _abi_sdw, overriding pkg-config - _abi_wordperfect_CFLAGS - C compiler flags for _abi_wordperfect, overriding pkg-config - _abi_wordperfect_LIBS - linker flags for _abi_wordperfect, overriding pkg-config - WV_CFLAGS C compiler flags for WV, overriding pkg-config - WV_LIBS linker flags for WV, overriding pkg-config - LIBPNG_CFLAGS - C compiler flags for LIBPNG, overriding pkg-config - LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to . -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -abiword configure 2.6.2 -generated by GNU Autoconf 2.61 - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by abiword $as_me 2.6.2, which was -generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" -else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" -fi -shift -for ac_site_file -do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -ac_aux_dir= -for ac_dir in ac-helpers "$srcdir"/ac-helpers; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ac-helpers \"$srcdir\"/ac-helpers" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in ac-helpers \"$srcdir\"/ac-helpers" >&2;} - { (exit 1); exit 1; }; } -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -am__api_version='1.10' - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ 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 -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi - - test "$2" = conftest.file - ) -then - # Ok. - : -else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } -fi -{ 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" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - 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 -f conftest.sed - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done -done -IFS=$as_save_IFS - -fi - - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" - fi -fi -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -echo "${ECHO_T}$MKDIR_P" >&6; } - -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - -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; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_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; } -else - { 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 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 '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -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 \$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; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE='abiword' - VERSION='2.6.2' - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -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; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_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; } -else - { 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; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="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 -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; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - 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 - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - - - - - -ABIWORD_SERIES="2.6" - -cat >>confdefs.h <<_ACEOF -#define ABIWORD_SERIES "${ABIWORD_SERIES}" -_ACEOF - -ABIWORD_DATADIR="${datadir}/${PACKAGE_NAME}-${ABIWORD_SERIES}" - -ABIWORD_GLADEDIR="${ABIWORD_DATADIR}/glade" - -ABIWORD_HEADERSDIR="${includedir}/${PACKAGE_NAME}-${ABIWORD_SERIES}" - -ABIWORD_LIBDIR="${libdir}/${PACKAGE_NAME}-${ABIWORD_SERIES}" - -ABIWORD_PLUGINSDIR="${ABIWORD_LIBDIR}/plugins" - - -if test "$srcdir" = "."; then - abi_rootdir=".." -else - abi_rootdir="`dirname $srcdir`" -fi -abs_srcdir="`cd $srcdir && pwd`" - - -abi_save_CFLAGS="$CFLAGS" -abi_save_CXXFLAGS="$CXXFLAGS" - -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 -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; } -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_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; } -else - { 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 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; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_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; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - 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 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -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 -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# 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; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# 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 - # 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 | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext - -# 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; } -# 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' - { (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 - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ 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 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 { (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 - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -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 | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -{ 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; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -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 conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +ZLIB_LIBS +ZLIB_CFLAGS +WV_LIBS +WV_CFLAGS +EXPAT_PEERDIR +XML_LIBS +XML_CFLAGS +HAVE_EXPAT_FALSE +HAVE_EXPAT_TRUE +ABI_XML_CONFIG +BIGENDIAN_FALSE +BIGENDIAN_TRUE +XSUBPPDIR +PLATFORM_LIBS +PLATFORM_CFLAGS +DEBUG_CFLAGS +LIBJPEG_LIBS +PROFILE_CFLAGS +OPTIMIZE_CFLAGS +ABI_FEATURE_DEFS +DEBUG_FALSE +DEBUG_TRUE +WITH_RESOURCE_MANAGER_FALSE +WITH_RESOURCE_MANAGER_TRUE +PLUGIN_DEFS +PLUGIN_LIST +PLUGIN_LIBS +PLUGIN_CFLAGS +BUILD_IN_PLUGINS_FALSE +BUILD_IN_PLUGINS_TRUE +_abi_wordperfect_LIBS +_abi_wordperfect_CFLAGS +_abi_sdw_LIBS +_abi_sdw_CFLAGS +_abi_openwriter_LIBS +_abi_openwriter_CFLAGS +abi_magickpp_config +_abi_ots_LIBS +_abi_ots_CFLAGS +FRIBIDI_LIBS +FRIBIDI_CFLAGS +WITH_ISPELL_FALSE +WITH_ISPELL_TRUE +WITH_ENCHANT_FALSE +WITH_ENCHANT_TRUE +SPELL_LIBS +SPELL_CFLAGS +ENABLE_SPELL_FALSE +ENABLE_SPELL_TRUE +ABI_BUILD_STATIC_FALSE +ABI_BUILD_STATIC_TRUE +ABI_BUILD_SHARED_FALSE +ABI_BUILD_SHARED_TRUE +WITH_GNOMEUI_FALSE +WITH_GNOMEUI_TRUE +GNOMEUI_LIBS +GNOMEUI_CFLAGS +WITH_GNOMEVFS_FALSE +WITH_GNOMEVFS_TRUE +GNOMEVFS_LIBS +GNOMEVFS_CFLAGS +WITH_SYSTEM_GOFFICE_FALSE +WITH_SYSTEM_GOFFICE_TRUE +goffice_gladedir +goffice_plugindir +goffice_localedir +goffice_icondir +goffice_libdir +goffice_datadir +GOFFICE_LIBS +GOFFICE_CFLAGS +GSF_HTTP_LIBS +GSF_HTTP_CFLAGS +GSF_LIBS +GSF_CFLAGS +WITH_XFT_FALSE +WITH_XFT_TRUE +XFT_LIBS +XFT_CFLAGS +WITH_GUCHARMAP_FALSE +WITH_GUCHARMAP_TRUE +GUCHARMAP_LIBS +GUCHARMAP_CFLAGS +ICONV_LIBS +ICONV_INCLUDES +LIBICONV_PEERDIR +ABI_BE +ABI_FE +OBJCXXDEPMODE +OBJCXXFLAGS +OBJCXX +WITH_BINRELOC_FALSE +WITH_BINRELOC_TRUE +WITH_WIN32_FALSE +WITH_WIN32_TRUE +WITH_QNX_FALSE +WITH_QNX_TRUE +WITH_COCOA_FALSE +WITH_COCOA_TRUE +WITH_MACOSX_FALSE +WITH_MACOSX_TRUE +WITH_UNIX_FALSE +WITH_UNIX_TRUE +BINRELOC_LIBS +BINRELOC_CFLAGS +FREETYPE_LIBS +FREETYPE_CFLAGS +GNOMEPRINT_LIBS +GNOMEPRINT_CFLAGS +X_EXTRA_LIBS +X_LIBS +X_PRE_LIBS +X_CFLAGS +XMKMF +PANGOFT2_LIBS +PANGOFT2_CFLAGS +GTK_LIBS +GTK_CFLAGS +HAVE_THREADS_FALSE +HAVE_THREADS_TRUE +THREAD_LIBS +THREAD_CFLAGS +GTHREAD_LIBS +GTHREAD_CFLAGS +GMODULE_LIBS +GMODULE_CFLAGS +GLIB_LIBS +GLIB_CFLAGS +BUILD_TTFTOOL_FALSE +BUILD_TTFTOOL_TRUE +ENABLE_PRINT_FALSE +ENABLE_PRINT_TRUE +EMBEDDED_LIBS +EMBEDDED_CFLAGS +ENABLE_STATUSBAR_FALSE +ENABLE_STATUSBAR_TRUE +EMBEDDED_HILDON_FALSE +EMBEDDED_HILDON_TRUE +HILDON_LIBS +HILDON_CFLAGS +PKG_CONFIG +WITH_LIBABIWORD_FALSE +WITH_LIBABIWORD_TRUE +ABITYPES_CFLAGS +EGREP +GREP +WARNING_CFLAGS +OS_NAME +BE_PLATFORM +PLATFORM +ABI_MACSDK_ROOT +EPATH_WV_BUILD_FLAGS +ABI_EPATH_DYLIB_FALSE +ABI_EPATH_DYLIB_TRUE +INSIDE_GNOME_COMMON_FALSE +INSIDE_GNOME_COMMON_TRUE +RANLIB +LN_S +CPP +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +ac_ct_CC +CFLAGS +CC +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CXX +CPPFLAGS +LDFLAGS +CXXFLAGS +CXX +ABIWORD_PLUGINSDIR +ABIWORD_LIBDIR +ABIWORD_HEADERSDIR +ABIWORD_GLADEDIR +ABIWORD_DATADIR +ABIWORD_SERIES +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_dependency_tracking +with_epath +with_fink +with_darwinports +with_abiportssdk +enable_Cocoa +enable_libabiword +enable_embedded +enable_printing +enable_exports +with_x +enable_binreloc +enable_binreloc_threads +with_libiconv +enable_gucharmap +enable_gnomevfs +enable_gnomeui +enable_shared +enable_static +enable_spellcheck +with_builtin_plugins +with_ImageMagick +enable_profile +enable_extra_optimization +enable_debug +enable_symbols +enable_peer_config +with_libxml2 +with_expat +with_zlib +with_libpng +with_popt +with_libjpeg_prefix +' + ac_precious_vars='build_alias +host_alias +target_alias +CXX +CXXFLAGS +LDFLAGS +LIBS +CPPFLAGS +CCC +CC +CFLAGS +CPP +PKG_CONFIG +HILDON_CFLAGS +HILDON_LIBS +GLIB_CFLAGS +GLIB_LIBS +GMODULE_CFLAGS +GMODULE_LIBS +GTHREAD_CFLAGS +GTHREAD_LIBS +GTK_CFLAGS +GTK_LIBS +PANGOFT2_CFLAGS +PANGOFT2_LIBS +XMKMF +GNOMEPRINT_CFLAGS +GNOMEPRINT_LIBS +FREETYPE_CFLAGS +FREETYPE_LIBS +GUCHARMAP_CFLAGS +GUCHARMAP_LIBS +XFT_CFLAGS +XFT_LIBS +GSF_CFLAGS +GSF_LIBS +GSF_HTTP_CFLAGS +GSF_HTTP_LIBS +GOFFICE_CFLAGS +GOFFICE_LIBS +GNOMEVFS_CFLAGS +GNOMEVFS_LIBS +GNOMEUI_CFLAGS +GNOMEUI_LIBS +SPELL_CFLAGS +SPELL_LIBS +FRIBIDI_CFLAGS +FRIBIDI_LIBS +_abi_ots_CFLAGS +_abi_ots_LIBS +_abi_openwriter_CFLAGS +_abi_openwriter_LIBS +_abi_sdw_CFLAGS +_abi_sdw_LIBS +_abi_wordperfect_CFLAGS +_abi_wordperfect_LIBS +WV_CFLAGS +WV_LIBS +LIBPNG_CFLAGS +LIBPNG_LIBS' -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -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; } -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; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE -int -main () -{ -#ifndef __GNUC__ - choke me -#endif +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi - ac_compiler_gnu=no -fi + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + # Accept the important Cygnus configure options, so we can diagnose typos. -fi -{ 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 -{ 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 - 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 -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -int -main () -{ + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; -int -main () -{ + --config-cache | -C) + cache_file=config.cache ;; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; - 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. */ + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; -int -main () -{ + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + -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 ;; -fi + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; -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=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 -DEPDIR="${am__leading_dot}deps" + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; -ac_config_commands="$ac_config_commands depfiles" + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.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; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } -rm -f confinc confmf + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval=$enable_dependency_tracking; -fi + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; -depcc="$CXX" am_compiler_list= + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; -{ 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 - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; -fi -{ 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 + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; -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 + -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 ;; -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; - 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 + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; -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 + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; - 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; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; -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 + --x) + # Obsolete; use --with-x. + with_x=yes ;; + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + + esac done -IFS=$as_save_IFS -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 + { (exit 1); exit 1; }; } ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi - test -n "$ac_ct_CC" && break +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@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 +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi fi +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test "$silent" = yes && exec 6>/dev/null -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { $as_echo "$as_me: error: working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_srcdir_defaulted=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done -int -main () -{ +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures abiword 2.6.8 to adapt to many kinds of systems. - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +Usage: $0 [OPTION]... [VAR=VALUE]... - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. -int -main () -{ +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] - 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. */ +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. -int -main () -{ +For better control, use the options below. - ; - return 0; -} +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/abiword] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + cat <<\_ACEOF -fi +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +X features: + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +_ACEOF fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of abiword 2.6.8:";; + esac + cat <<\_ACEOF -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --disable-cocoa don't use Cocoa API (MacOSX builds only) + --enable-libabiword Build libabiword + --enable-embedded=generic|hildon|poky Include embedded features + --enable-printing Include printing capabilities + --disable-exports Do not export any symbols + --enable-binreloc compile with binary relocation support + (default=disable) + --enable-binreloc-threads compile binary relocation with threads support + (default=yes) + --disable-gucharmap Turn off gucharmap + --enable-gnomevfs Turn on gnomevfs + --enable-gnomeui Enable use of GnomeProgram + --disable-shared don't build shared AbiWord (UNIX/GTK builds only) + --enable-static build static AbiWord (UNIX/GTK builds only) + --disable-spellcheck Disable spell-checking capabilities + --enable-profile Turn on profile + --enable-extra-optimization Turn on extra optimizations + --enable-debug Turn on debugging + --enable-symbols Debugging symbols, but not debug-specific code + --enable-peer-config Enable automatic configuration of peer directories (on by default) -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --without-epath hardcode relative install path in libwv (MacOS X only) + --with-fink add /sw/... to CPP/LDFLAGS (Mac OS X) + --with-darwinports add /opt/local/... to CPP/LDFLAGS (Mac OS X) + --with-abiportssdk=SDK_ROOT add /opt/abi/... to CPP/LDFLAGS and SDK usage (Mac OS X only) + --with-x use the X Window System + --with-libiconv=DIR use libiconv in DIR + --with-builtin-plugins (experimental) compile-in a selection of plugins + --with-ImageMagick=DIR Use ImageMagick in DIR + --with-libxml2 force use of libxml2 + --with-expat force use of expat + --with-zlib=DIR use zlib in DIR + --with-libpng=DIR use libpng in DIR + --with-popt=DIR use popt in DIR + --with-libjpeg-prefix=PFX Prefix where libjpeg is installed (optional) + +Some influential environment variables: + CXX C++ compiler command + CXXFLAGS C++ compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CC C compiler command + CFLAGS C compiler flags + CPP C preprocessor + PKG_CONFIG path to pkg-config utility + HILDON_CFLAGS + C compiler flags for HILDON, overriding pkg-config + HILDON_LIBS linker flags for HILDON, overriding pkg-config + GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config + GLIB_LIBS linker flags for GLIB, overriding pkg-config + GMODULE_CFLAGS + C compiler flags for GMODULE, overriding pkg-config + GMODULE_LIBS + linker flags for GMODULE, overriding pkg-config + GTHREAD_CFLAGS + C compiler flags for GTHREAD, overriding pkg-config + GTHREAD_LIBS + linker flags for GTHREAD, overriding pkg-config + GTK_CFLAGS C compiler flags for GTK, overriding pkg-config + GTK_LIBS linker flags for GTK, overriding pkg-config + PANGOFT2_CFLAGS + C compiler flags for PANGOFT2, overriding pkg-config + PANGOFT2_LIBS + linker flags for PANGOFT2, overriding pkg-config + XMKMF Path to xmkmf, Makefile generator for X Window System + GNOMEPRINT_CFLAGS + C compiler flags for GNOMEPRINT, overriding pkg-config + GNOMEPRINT_LIBS + linker flags for GNOMEPRINT, overriding pkg-config + FREETYPE_CFLAGS + C compiler flags for FREETYPE, overriding pkg-config + FREETYPE_LIBS + linker flags for FREETYPE, overriding pkg-config + GUCHARMAP_CFLAGS + C compiler flags for GUCHARMAP, overriding pkg-config + GUCHARMAP_LIBS + linker flags for GUCHARMAP, overriding pkg-config + XFT_CFLAGS C compiler flags for XFT, overriding pkg-config + XFT_LIBS linker flags for XFT, overriding pkg-config + GSF_CFLAGS C compiler flags for GSF, overriding pkg-config + GSF_LIBS linker flags for GSF, overriding pkg-config + GSF_HTTP_CFLAGS + C compiler flags for GSF_HTTP, overriding pkg-config + GSF_HTTP_LIBS + linker flags for GSF_HTTP, overriding pkg-config + GOFFICE_CFLAGS + C compiler flags for GOFFICE, overriding pkg-config + GOFFICE_LIBS + linker flags for GOFFICE, overriding pkg-config + GNOMEVFS_CFLAGS + C compiler flags for GNOMEVFS, overriding pkg-config + GNOMEVFS_LIBS + linker flags for GNOMEVFS, overriding pkg-config + GNOMEUI_CFLAGS + C compiler flags for GNOMEUI, overriding pkg-config + GNOMEUI_LIBS + linker flags for GNOMEUI, overriding pkg-config + SPELL_CFLAGS + C compiler flags for SPELL, overriding pkg-config + SPELL_LIBS linker flags for SPELL, overriding pkg-config + FRIBIDI_CFLAGS + C compiler flags for FRIBIDI, overriding pkg-config + FRIBIDI_LIBS + linker flags for FRIBIDI, overriding pkg-config + _abi_ots_CFLAGS + C compiler flags for _abi_ots, overriding pkg-config + _abi_ots_LIBS + linker flags for _abi_ots, overriding pkg-config + _abi_openwriter_CFLAGS + C compiler flags for _abi_openwriter, overriding pkg-config + _abi_openwriter_LIBS + linker flags for _abi_openwriter, overriding pkg-config + _abi_sdw_CFLAGS + C compiler flags for _abi_sdw, overriding pkg-config + _abi_sdw_LIBS + linker flags for _abi_sdw, overriding pkg-config + _abi_wordperfect_CFLAGS + C compiler flags for _abi_wordperfect, overriding pkg-config + _abi_wordperfect_LIBS + linker flags for _abi_wordperfect, overriding pkg-config + WV_CFLAGS C compiler flags for WV, overriding pkg-config + WV_LIBS linker flags for WV, overriding pkg-config + LIBPNG_CFLAGS + C compiler flags for LIBPNG, overriding pkg-config + LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config -/* 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]; +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +Report bugs to . _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_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 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +abiword configure 2.6.8 +generated by GNU Autoconf 2.63 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; - xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -esac - +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. -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 +It was created by abiword $as_me 2.6.8, which was +generated by GNU Autoconf 2.63. Invocation command line was -depcc="$CC" am_compiler_list= + $ $0 $@ -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type +_ASUNAME - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" +done +IFS=$as_save_IFS +} >&5 +cat >&5 <<_ACEOF -{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } -if test "${ac_cv_search_strerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* 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 -char strerror (); -int -main () -{ -return strerror (); - ; - return 0; -} -_ACEOF -for ac_lib in '' cposix; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_strerror=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +## ----------- ## +## Core tests. ## +## ----------- ## +_ACEOF -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_strerror+set}" = set; then - break -fi +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + esac + done done -if test "${ac_cv_search_strerror+set}" = set; then - : -else - ac_cv_search_strerror=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -echo "${ECHO_T}$ac_cv_search_strerror" >&6; } -ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -fi +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------------- ## +## File substitutions. ## +## ------------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +done +ac_signal=0 - # Broken: fails on valid input. -continue -fi +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h -rm -f conftest.err conftest.$ac_ext +# Predefined preprocessor variables. - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - done - ac_cv_prog_CPP=$CPP +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF -fi - CPP=$ac_cv_prog_CPP + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + ac_site_file1=$CONFIG_SITE +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - ac_cv_prog_CPP=$CPP + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : + test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi - # Broken: fails on valid input. -continue +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } fi -rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi + + + + + + + + + + + + + + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4480,20 +2212,39 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -CFLAGS="$abi_save_CFLAGS" -CXXFLAGS="$abi_save_CXXFLAGS" -{ echo "$as_me:$LINENO: checking CFLAGS" >&5 -echo $ECHO_N "checking CFLAGS... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $CFLAGS" >&5 -echo "${ECHO_T}$CFLAGS" >&6; } - -{ echo "$as_me:$LINENO: checking CXXFLAGS" >&5 -echo $ECHO_N "checking CXXFLAGS... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $CXXFLAGS" >&5 -echo "${ECHO_T}$CXXFLAGS" >&6; } +ac_aux_dir= +for ac_dir in ac-helpers "$srcdir"/ac-helpers; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ac-helpers \"$srcdir\"/ac-helpers" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in ac-helpers \"$srcdir\"/ac-helpers" >&2;} + { (exit 1); exit 1; }; } +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -ABI_FEATURE_DEFS="" + +am__api_version='1.10' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -4508,11 +2259,12 @@ # 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; } +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -4541,17 +2293,29 @@ # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -4564,8 +2328,8 @@ INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -4575,97 +2339,133 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } -fi +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; 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 + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&5 +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&2;} + { (exit 1); exit 1; }; } + fi + + test "$2" = conftest.file + ) +then + # Ok. + : else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -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 + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! +Check your system clock" >&5 +$as_echo "$as_me: error: newly created file is older than distributed files! +Check your system clock" >&2;} + { (exit 1); exit 1; }; } fi -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= +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +test "$program_prefix" != NONE && + 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" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" + am_missing_run= + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} 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; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + $as_echo_n "(cached) " >&6 else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done done IFS=$as_save_IFS fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { 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; } -fi +{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac -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; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then + $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -4674,8 +2474,8 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4684,767 +2484,598 @@ 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; } +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - 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 + test -n "$AWK" && break +done - if test x = y; then - INSIDE_GNOME_COMMON_TRUE= - INSIDE_GNOME_COMMON_FALSE='#' +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_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 + $as_echo_n "(cached) " >&6 else - INSIDE_GNOME_COMMON_TRUE='#' - INSIDE_GNOME_COMMON_FALSE= -fi - - - test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - - for k in ac-helpers ; do ACLOCAL="$ACLOCAL -I $k" ; done - - - - - - -################################################################## -################################################################## -# OS_NAME is the output of uname -s minus any forward slashes -# (so we don't imply another level of depth). This is to solve -# a problem with BSD/OS. In fact, it might be good to do this -# to all uname results, so that one doesn't see "sun4/m" as an -# architecture. The substitutions are taken from the Linux -# kernel Makefile. The result of this is that even if you have -# a Pentium Pro, you will see your bins in a "...i386" directory. -# This doesn't mean it didn't use your optimizations. - -# this makes HP-UX look like "HP" (sed turns "HP-UX" into "HP" with the -.* pattern) -OS_NAME=`uname -s | sed "s/\//-/" | sed "s/_/-/" | sed "s/-.*//g"` -OS_RELEASE=`uname -r | sed "s/\//-/" | sed "s/() .*//g"` - -################################################################## -################################################################## -#### Cygnus keeps changing the value that uname returns between -#### different versions of the package and between different -#### versions of Windows. Here we fold them all in into one symbol. - -if test "$OS_NAME" = "CYGWIN32"; then - OS_NAME="WIN32" -fi - -if test "$OS_NAME" = "CYGWIN"; then - OS_NAME="WIN32" -fi - -if test "$OS_NAME" = "WIN32"; then - CYGWIN_MAJOR_VERSION=`echo $(OS_RELEASE) | cut -d . -f 1` - CYGWIN_MINOR_VERSION=`echo $(OS_RELEASE) | cut -d . -f 2` - CYGWIN_REVISION=`echo $(OS_RELEASE) | cut -d . -f 3` -fi - -################################################################## -################################################################## -#### MINGW configuration - -if test "$OS_NAME" = "MINGW32"; then - OS_NAME="WIN32" -fi - -################################################################## -################################################################## -#### Mac OS X / darwin configuration -# -# Whether to use Darwin's @executable_path dynamic linker feature -# -EPATH_WV_BUILD_FLAGS="" - -# Check whether --with-epath was given. -if test "${with_epath+set}" = set; then - withval=$with_epath; - if test "x$withval" = "xno"; then - abi_epath=no - elif test "$OS_NAME" = "Darwin"; then - abi_epath=yes - EPATH_WV_BUILD_FLAGS="EPATH_DYLIB=1" - else - { { echo "$as_me:$LINENO: error: * * * --with-epath is a MacOS X option * * *" >&5 -echo "$as_me: error: * * * --with-epath is a MacOS X option * * *" >&2;} - { (exit 1); exit 1; }; } - fi - + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +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 \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= else - if test "$OS_NAME" = "Darwin"; then - abi_epath=yes - EPATH_WV_BUILD_FLAGS="EPATH_DYLIB=1" - else - abi_epath=no - fi - + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" fi - if test $abi_epath = yes; then - ABI_EPATH_DYLIB_TRUE= - ABI_EPATH_DYLIB_FALSE='#' +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. else - ABI_EPATH_DYLIB_TRUE='#' - ABI_EPATH_DYLIB_FALSE= + am__leading_dot=_ fi +rmdir .tst 2>/dev/null +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } + fi +fi -# -# convenience option for building with fink installed... -# - -# Check whether --with-fink was given. -if test "${with_fink+set}" = set; then - withval=$with_fink; - if test "x$withval" != "xno"; then - CPPFLAGS="$CPPFLAGS -I/sw/include" - LDFLAGS="$LDFLAGS -L/sw/lib" - PKG_CONFIG_PATH=/sw/lib/pkgconfig:$PKG_CONFIG_PATH - export PKG_CONFIG_PATH - fi - +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi fi -# -# convenience option for building with darwin ports installed... -# +# Define the identity of the package. + PACKAGE='abiword' + VERSION='2.6.8' -# Check whether --with-darwinports was given. -if test "${with_darwinports+set}" = set; then - withval=$with_darwinports; - if test "x$withval" != "xno"; then - CPPFLAGS="$CPPFLAGS -I/opt/local/include" - LDFLAGS="$LDFLAGS -L/opt/local/lib" - PKG_CONFIG_PATH=/opt/local/lib/pkgconfig:$PKG_CONFIG_PATH - export PKG_CONFIG_PATH - fi -fi +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF -# convenience option for building with the abiportssdk... -# +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF -# Check whether --with-abiportssdk was given. -if test "${with_abiportssdk+set}" = set; then - withval=$with_abiportssdk; - if test "x$withval" != "xno"; then - if test "x$withval" = xyes ; then - _sdk_root=/Developer/SDKs - else - _sdk_root=$withval - fi - CPPFLAGS="-isysroot $_sdk_root/AbiMacOSX.sdk $CPPFLAGS" - LDFLAGS="-isysroot $_sdk_root/AbiMacOSX.sdk -Wl,-syslibroot,$_sdk_root/AbiMacOSX.sdk $LDFLAGS" +# Some tools Automake needs. - CPPFLAGS="$CPPFLAGS -I/opt/abi/include" - LDFLAGS="$LDFLAGS -L/opt/abi/lib" - PKG_CONFIG_PATH=$_sdk_root/AbiMacOSX.sdk/opt/abi/lib/pkgconfig:$PKG_CONFIG_PATH - export PKG_CONFIG_PATH - ABI_MACSDK_ROOT=$_sdk_root +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - fi -fi +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -# -# 1. Whether to consider using Cocoa API: -# -# Check whether --enable-Cocoa was given. -if test "${enable_Cocoa+set}" = set; then - enableval=$enable_Cocoa; - if test "x$enableval" = "xno" ; then - abi_gui_cocoa=no - else - abi_gui_cocoa=yes - fi +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} -else - abi_gui_cocoa=yes -fi -# -# 2. Whether to consider using Carbon API: -# -# I scraped Carbon stuff (Hub) -# -# 3. Default to Cocoa, then Carbon, then GTK -# (Values are equivalent to PLATFORM setting) -# -if test $abi_gui_cocoa = yes ; then - abi_gui=cocoa -else - abi_gui=unix -fi -# -# 4. For Cocoa or Carbon, recognize Darwin as MACOSX; otherwise, recognize as FreeBSD -# -if test "$OS_NAME" = "Darwin"; then - if test $abi_gui = unix ; then - OS_NAME=FreeBSD - else - OS_NAME=MACOSX - fi -fi +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} -# At this point, we now have the following info: -# OS_NAME = something like 'Linux' -# OS_RELEASE = something like '2.6.1' -# Additionally, there may be info about Cygwin versions. -case "$OS_NAME" in - MACOSX) - # the default for MacOS X is to no enable warnings with - # the Apple-derived gcc. - WARNING_CFLAGS="" - ;; - *BSD|DragonFly) - WARNING_CFLAGS="-Wall -pedantic -D_BSD_SOURCE -pipe" #-ansi - ;; - IRIX*) - case "$GCC" in - yes) - WARNING_CFLAGS="-Wall -pedantic -D_POSIX_SOURCE -pipe" #-ansi - ;; - no) - # the default with the IRIX compiler is for warnings to be - # on. You can turn individual warnings off using the - # `-woff #' directive to the MIPSpro compiler. - WARNING_CFLAGS="" - ;; - esac - ;; - SunOS) - case "$GCC" in - yes) - # why -D_BSD_SOURCE? - WARNING_CFLAGS="-Wall -pedantic -D_BSD_SOURCE -pipe" #-ansi - WARNING_CFLAGS="$WARNING_CFLAGS -D__EXTENSIONS__ -DSCANDIR_MISSING -DSunOS" - ;; - no) - # the default with the SparcWorks 5.x and Forte 6.x and - # later is for all warnings to be on. See the - # -erroff and -errtags section of the cc man page. - WARNING_CFLAGS="" - ;; - esac - ;; - OSF1) - case "$GCC" in - yes) - WARNING_CFLAGS="-Wall -pedantic -D_POSIX_SOURCE -D_BSD_SOURCE -D_OSF_SOURCE -D_XOPEN_SOURCE_EXTENDED -DAES_SOURCE" #-ansi - ;; - no) - # the DEC/Compaq compiler has a plethora of options related - # to warnings. Enabling `-portable' and then turning off - # specific, annoying warnings may be the easiest way to go. - # some versions of the compiler under 4.x might not have - # supported `-portable', so leave WARNING_CFLAGS empty in - # that case - case "$OS_RELEASE" in - V5*) - no_msg='hexoctunsign,switchlong,valuepres' - WARNING_CFLAGS="-portable -msg_disable $no_msg" - no_msg='' - ;; - *) WARNING_CFLAGS="" - ;; - esac - ;; - esac - ;; - QNX|procnto) - WARNING_CLFAGS="-w9 -D_POSIX_SOURCE" #-ansi - LDFLAGS="-lph -lphrender -lAp" - ;; - *) - case "$GCC" in - yes) - WARNING_CFLAGS="-Wall -pedantic -D_POSIX_SOURCE" #-ansi - WARNING_CFLAGS="$WARNING_CFLAGS -D_BSD_SOURCE -pipe" - ;; - no) - WARNING_CFLAGS="" - ;; - esac - ;; -esac +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -# huge nasty case statement to actually pick the platform +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -case "$OS_NAME" in - WIN32) - PLATFORM="win" - ;; - Linux|AIX|*BSD|IRIX*|HP|OSF1|SunOS|DragonFly) - PLATFORM="unix" - ;; - QNX|procnto) - PLATFORM="qnx" - ;; - MACOSX) - PLATFORM=$abi_gui - ;; - *) - PLATFORM="unix" - ;; -esac +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -if test "$PLATFORM" = "cocoa"; then - BE_PLATFORM="unix" +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - BE_PLATFORM="$PLATFORM" + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - - - - - - -{ 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 +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + $as_echo_n "(cached) " >&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 + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. 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 +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_GREP_found && break 3 - done + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done - done IFS=$as_save_IFS - 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 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else - ac_cv_path_GREP=$GREP + STRIP="$ac_cv_prog_STRIP" fi +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + + + + + +ABIWORD_SERIES="2.6" + +cat >>confdefs.h <<_ACEOF +#define ABIWORD_SERIES "${ABIWORD_SERIES}" +_ACEOF + +ABIWORD_DATADIR="${datadir}/${PACKAGE_NAME}-${ABIWORD_SERIES}" + +ABIWORD_GLADEDIR="${ABIWORD_DATADIR}/glade" + +ABIWORD_HEADERSDIR="${includedir}/${PACKAGE_NAME}-${ABIWORD_SERIES}" + +ABIWORD_LIBDIR="${libdir}/${PACKAGE_NAME}-${ABIWORD_SERIES}" + +ABIWORD_PLUGINSDIR="${ABIWORD_LIBDIR}/plugins" + +if test "$srcdir" = "."; then + abi_rootdir=".." +else + abi_rootdir="`dirname $srcdir`" fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" +abs_srcdir="`cd $srcdir && pwd`" -{ 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 +abi_save_CFLAGS="$CFLAGS" +abi_save_CXXFLAGS="$CXXFLAGS" + +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 -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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. 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 +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_EGREP_found && break 3 - done + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done - done IFS=$as_save_IFS - fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } fi - +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - ac_cv_path_EGREP=$EGREP + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - fi + test -n "$CXX" && break + done fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -z "$CXX"; then + ac_ct_CXX=$CXX + 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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - ac_cv_header_stdc=no fi - -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. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - ac_cv_header_stdc=no + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest* -fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + test -n "$ac_ct_CXX" && break +done -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi -rm -f conftest* + fi fi +# Provide some information about the compiler. +$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int main () { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; + + ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# 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. +{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 +$as_echo_n "checking for C++ compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.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") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # 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 | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= +else + ac_file='' fi -fi -{ 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 -#define STDC_HEADERS 1 -_ACEOF +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +if test -z "$ac_file"; then + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C++ compiler cannot create executables +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } fi -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.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 { 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 -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default +ac_exeext=$ac_cv_exeext -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 +$as_echo_n "checking whether the C++ compiler works... " >&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' + { (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 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -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 -_ACEOF - + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot run C++ compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi + fi fi +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -done - - - - +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +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 | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi +rm -f conftest$ac_cv_exeext +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } -{ echo "$as_me:$LINENO: checking for long int" >&5 -echo $ECHO_N "checking for long int... $ECHO_C" >&6; } -if test "${ac_cv_type_long_int+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5452,110 +3083,72 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -typedef long int ac__type_new_; + int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; + ; return 0; } _ACEOF -rm -f conftest.$ac_objext +rm -f conftest.o conftest.obj 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 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_long_int=yes + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + 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 | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_long_int=no +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5 -echo "${ECHO_T}$ac_cv_type_long_int" >&6; } - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of long int" >&5 -echo $ECHO_N "checking size of long int... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_long_int+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default - typedef long int ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 +#ifndef __GNUC__ + choke me +#endif ; return 0; @@ -5567,86 +3160,58 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break + ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_compiler_gnu=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if test "${ac_cv_prog_cxx_g+set}" = set; then + $as_echo_n "(cached) " >&6 +else + 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 cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default - typedef long int ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 ; return 0; @@ -5658,59 +3223,34 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done + ac_cv_prog_cxx_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - 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_includes_default - typedef long int ac__type_sizeof_; + int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 ; return 0; @@ -5722,1869 +3262,2275 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid + : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_long_int=$ac_lo;; -'') if test "$ac_cv_type_long_int" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long int) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_long_int=0 - fi ;; -esac -else - 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_includes_default - typedef long int ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include + int main () { - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_long_int=`cat conftest.val` + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -if test "$ac_cv_type_long_int" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long int) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_long_int=0 - fi -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val -fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int -_ACEOF - - -ABISIZEOF_LONG_INT="-DABISIZEOF_LONG_INT=$ac_cv_sizeof_long_int" +fi -ABITYPES_CFLAGS="$ABISIZEOF_LONG_INT" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$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=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 +DEPDIR="${am__leading_dot}deps" +ac_config_commands="$ac_config_commands depfiles" +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi -with_unix=false -with_macosx=false -with_cocoa=false -with_qnx=false -with_win32=false +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf -# this variable accumulates all the required pkg-config -# packages for the current configuration -ABIWORD_REQUIRED_PKGS='' +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval=$enable_dependency_tracking; +fi -# when cross-compiling must have perl for cdump.pl -if test x$cross_compiling = xyes; then -{ echo "$as_me:$LINENO: checking for perl" >&5 -echo $ECHO_N "checking for perl... $ECHO_C" >&6; } -if test "x$(which perl)" = "x"; then - { { echo "$as_me:$LINENO: error: not found. Must have perl when cross-compiling." >&5 -echo "$as_me: error: not found. Must have perl when cross-compiling." >&2;} - { (exit 1); exit 1; }; } +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' fi -{ echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= fi -# libabiword support +depcc="$CXX" am_compiler_list= -libabiword=false -abi_lib_message="no" +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -# Check whether --enable-libabiword was given. -if test "${enable_libabiword+set}" = set; then - enableval=$enable_libabiword; + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - if test "x$enableval" = "xyes"; then - if test "$PLATFORM" != unix; then - { { echo "$as_me:$LINENO: error: sorry: --enable-libabiword supported only on UNIX platforms" >&5 -echo "$as_me: error: sorry: --enable-libabiword supported only on UNIX platforms" >&2;} - { (exit 1); exit 1; }; } - fi - libabiword=true - abi_lib_message="yes" - fi + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none fi - -if test "$libabiword" = true ; then - CFLAGS="$CFLAGS -fPIC" - CXXFLAGS="$CXXFLAGS -fPIC" fi +{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - if test "x$libabiword" = "xtrue"; then - WITH_LIBABIWORD_TRUE= - WITH_LIBABIWORD_FALSE='#' + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' else - WITH_LIBABIWORD_TRUE='#' - WITH_LIBABIWORD_FALSE= + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= fi - - -# check for embedded and print first, so we can handle gnomeprint dependency -# correcly - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - 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; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_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; } +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "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; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&6 else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_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 + ac_cv_prog_ac_ct_CC="gcc" + $as_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; } +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" + 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;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - PKG_CONFIG=$ac_pt_PKG_CONFIG + CC=$ac_ct_CC fi else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" + CC="$ac_cv_prog_CC" 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; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { 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; } - PKG_CONFIG="" - 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. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -# We define EMBEDDED_TARGET to a numerical value so that we can do like -# #if EMBEDDED_TARGET == EMBEDDED_TARGET_HILDON -# -# The following have to be defined unconditionally, because we want -# EMBEDDED_TARGET to be undefined if not building for embedded so that we -# can use #ifdef and #ifndef on it (two undefined symbols will return -# true if tested for equality in #if construct) -cat >>confdefs.h <<\_ACEOF -#define EMBEDDED_TARGET_GENERIC 1 -_ACEOF - -cat >>confdefs.h <<\_ACEOF -#define EMBEDDED_TARGET_HILDON 2 -_ACEOF - -cat >>confdefs.h <<\_ACEOF -#define EMBEDDED_TARGET_POKY 3 -_ACEOF + 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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -embedded=none -embedded_print=undefined -embedded_statusbar=false -embedded_menubutton=true -EMBEDDED_CFLAGS="" -EMBEDDED_LIBS="" -HILDON_CFLAGS="" -HILDON_LIBS="" +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -# Check whether --enable-embedded was given. -if test "${enable_embedded+set}" = set; then - enableval=$enable_embedded; - if test "${enableval}" != "no" ; then - if test "$PLATFORM" != unix; then - { { echo "$as_me:$LINENO: error: --enable-embedded available only on UNIX platforms" >&5 -echo "$as_me: error: --enable-embedded available only on UNIX platforms" >&2;} - { (exit 1); exit 1; }; } - fi - fi - case "${enableval}" in - hildon) +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -pkg_failed=no -{ echo "$as_me:$LINENO: checking for HILDON" >&5 -echo $ECHO_N "checking for HILDON... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$HILDON_CFLAGS"; then - pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 hildon-fm-2 dbus-1 libosso\"") >&5 - ($PKG_CONFIG --exists --print-errors "hildon-1 hildon-fm-2 dbus-1 libosso") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 hildon-fm-2 dbus-1 libosso" 2>/dev/null` -else - pkg_failed=yes + test -n "$CC" && break + done fi - fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&6 else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$HILDON_LIBS"; then - pkg_cv_HILDON_LIBS="$HILDON_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 hildon-fm-2 dbus-1 libosso\"") >&5 - ($PKG_CONFIG --exists --print-errors "hildon-1 hildon-fm-2 dbus-1 libosso") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-1 hildon-fm-2 dbus-1 libosso" 2>/dev/null` + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - pkg_failed=yes +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi - fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - pkg_failed=untried + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$ac_ct_CC" && break +done -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi - if test $_pkg_short_errors_supported = yes; then - HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1 hildon-fm-2 dbus-1 libosso"` - else - HILDON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1 hildon-fm-2 dbus-1 libosso"` - fi - # Put the nasty error message in config.log where it belongs - echo "$HILDON_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: Hildon dependencies not satisfied." >&5 -echo "$as_me: error: Hildon dependencies not satisfied." >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: Hildon dependencies not satisfied." >&5 -echo "$as_me: error: Hildon dependencies not satisfied." >&2;} - { (exit 1); exit 1; }; } -else - HILDON_CFLAGS=$pkg_cv_HILDON_CFLAGS - HILDON_LIBS=$pkg_cv_HILDON_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : fi - EMBEDDED_CFLAGS="$EMBEDDED_CFLAGS $HILDON_CFLAGS" - EMBEDDED_LIBS="$EMBEDDED_LIBS $HILDON_LIBS" - embedded=EMBEDDED_TARGET_HILDON - embedded_print=false;; - poky) - embedded_print=false - embedded=EMBEDDED_TARGET_POKY ;; - generic) - embedded_print=false - embedded=EMBEDDED_TARGET_GENERIC ;; - yes) - embedded_print=false - embedded=EMBEDDED_TARGET_GENERIC ;; - no) - embedded=none ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-embedded" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-embedded" >&2;} - { (exit 1); exit 1; }; } ;; - esac - -else - embedded=none - -fi +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } -if test "$embedded" != "none"; then +# Provide some information about the compiler. +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -cat >>confdefs.h <<_ACEOF -#define EMBEDDED_TARGET $embedded +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int +main () +{ +#ifndef __GNUC__ + choke me +#endif - if test "$embedded_menubutton" = "true"; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_MENUBUTTON 1 + ; + return 0; +} _ACEOF - - fi +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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes else - # make sure we do not prevent statusbar from building - embedded_statusbar=true -fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if test "$embedded_statusbar" = "true"; then + ac_compiler_gnu=no +fi -cat >>confdefs.h <<\_ACEOF -#define ENABLE_STATUSBAR 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu fi - - if test "x$embedded" = "xEMBEDDED_TARGET_HILDON"; then - EMBEDDED_HILDON_TRUE= - EMBEDDED_HILDON_FALSE='#' +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes else - EMBEDDED_HILDON_TRUE='#' - EMBEDDED_HILDON_FALSE= + GCC= fi - - if test "x$embedded_statusbar" = "xtrue"; then - ENABLE_STATUSBAR_TRUE= - ENABLE_STATUSBAR_FALSE='#' +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then + $as_echo_n "(cached) " >&6 else - ENABLE_STATUSBAR_TRUE='#' - ENABLE_STATUSBAR_FALSE= -fi - - + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int +main () +{ + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + $as_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. */ -# by default we, of course, want Abi to be able to print, but on embedded -# systems it might not be required and because of the dependencies, we want an -# option to disable printing at compile time +int +main () +{ -# on embedded we will make --disable-print the default if no -# --enable/disable-printing is given + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -{ echo "$as_me:$LINENO: checking for printing support" >&5 -echo $ECHO_N "checking for printing support... $ECHO_C" >&6; } + 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. */ -# Check whether --enable-printing was given. -if test "${enable_printing+set}" = set; then - enableval=$enable_printing; - case "${enableval}" in - yes) print=true ;; - no) print=false ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-printing" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-printing" >&2;} - { (exit 1); exit 1; }; } ;; - esac +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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes else - print=undefined -fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if test "$print" = "undefined" && test "$embedded_print" = "false"; then - print=false -elif test "$print" = "undefined"; then - print=true; fi -if test "$print" = "true" ; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_PRINT 1 -_ACEOF - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: ${print}" >&5 -echo "${ECHO_T}${print}" >&6; } - - if test "$print" = "true"; then - ENABLE_PRINT_TRUE= - ENABLE_PRINT_FALSE='#' -else - ENABLE_PRINT_TRUE='#' - ENABLE_PRINT_FALSE= +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - - if test $PLATFORM = unix && test x$print != xfalse; then - BUILD_TTFTOOL_TRUE= - BUILD_TTFTOOL_FALSE='#' +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi else - BUILD_TTFTOOL_TRUE='#' - BUILD_TTFTOOL_FALSE= + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -# Check whether --enable-exports was given. -if test "${enable_exports+set}" = set; then - enableval=$enable_exports; - if test x$enableval = xno && test x$PLATFORM = xunix ; then +/* 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]; -cat >>confdefs.h <<\_ACEOF -#define ABI_UNIX_NO_EXPORTS 1 +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} _ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - fi fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC -if test "$PLATFORM" = "unix"; then - ABI_FE="Unix" - ABI_BE="$ABI_FE" - with_unix=true - +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -pkg_failed=no -{ echo "$as_me:$LINENO: checking for GLIB" >&5 -echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; } +depcc="$CC" am_compiler_list= -if test -n "$PKG_CONFIG"; then - if test -n "$GLIB_CFLAGS"; then - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$GLIB_LIBS"; then - pkg_cv_GLIB_LIBS="$GLIB_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0" 2>/dev/null` +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + $as_echo_n "(cached) " >&6 else - pkg_failed=yes -fi + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then + done -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + cd .. + rm -rf conftest.dir else - _pkg_short_errors_supported=no + am_cv_CC_dependencies_compiler_type=none fi - if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.0"` - else - GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GLIB_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - abi_glib2=no - -elif test $pkg_failed = untried; then - abi_glib2=no - -else - GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS - GLIB_LIBS=$pkg_cv_GLIB_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - - abi_glib2=yes - ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS glib-2.0 >= 2.0" fi - if test $abi_glib2 = no; then - { { echo "$as_me:$LINENO: error: $GLIB_PKG_ERRORS" >&5 -echo "$as_me: error: $GLIB_PKG_ERRORS" >&2;} - { (exit 1); exit 1; }; } - fi - - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for GMODULE" >&5 -echo $ECHO_N "checking for GMODULE... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -if test -n "$PKG_CONFIG"; then - if test -n "$GMODULE_CFLAGS"; then - pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$GMODULE_LIBS"; then - pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' else - pkg_failed=untried + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= fi -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 +$as_echo_n "checking for library containing strerror... " >&6; } +if test "${ac_cv_search_strerror+set}" = set; then + $as_echo_n "(cached) " >&6 else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmodule-2.0 >= 2.0"` - else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmodule-2.0 >= 2.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GMODULE_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - abi_gmodule2=no - -elif test $pkg_failed = untried; then - abi_gmodule2=no + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* 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 +char strerror (); +int +main () +{ +return strerror (); + ; + return 0; +} +_ACEOF +for ac_lib in '' cposix; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_strerror=$ac_res else - GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS - GMODULE_LIBS=$pkg_cv_GMODULE_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - abi_gmodule2=yes - ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS gmodule-2.0 >= 2.0" fi - if test $abi_gmodule2 = no; then - { { echo "$as_me:$LINENO: error: $GMODULE_PKG_ERRORS" >&5 -echo "$as_me: error: $GMODULE_PKG_ERRORS" >&2;} - { (exit 1); exit 1; }; } - fi - - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for GTHREAD" >&5 -echo $ECHO_N "checking for GTHREAD... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GTHREAD_CFLAGS"; then - pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then + break fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTHREAD_LIBS"; then - pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null` +done +if test "${ac_cv_search_strerror+set}" = set; then + : else - pkg_failed=yes + ac_cv_search_strerror=no fi - fi -else - pkg_failed=untried +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +$as_echo "$ac_cv_search_strerror" >&6; } +ac_res=$ac_cv_search_strerror +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no fi - if test $_pkg_short_errors_supported = yes; then - GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0"` - else - GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GTHREAD_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - abi_gthread2=no - -elif test $pkg_failed = untried; then - abi_gthread2=no - -else - GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS - GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - - abi_gthread2=yes - ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS gthread-2.0" +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 +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= fi - if test $abi_gthread2 = no; then - { { echo "$as_me:$LINENO: error: $GTHREAD_PKG_ERRORS" >&5 -echo "$as_me: error: $GTHREAD_PKG_ERRORS" >&2;} - { (exit 1); exit 1; }; } - else - THREAD_CFLAGS="-DHAVE_THREADS=1 $GTHREAD_CFLAGS" - THREAD_LIBS=$GTHREAD_LIBS - fi - +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext - if test $abi_gthread2 = yes; then - HAVE_THREADS_TRUE= - HAVE_THREADS_FALSE='#' + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue else - HAVE_THREADS_TRUE='#' - HAVE_THREADS_FALSE= -fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi -pkg_failed=no -{ echo "$as_me:$LINENO: checking for GTK" >&5 -echo $ECHO_N "checking for GTK... $ECHO_C" >&6; } + done + ac_cv_prog_CPP=$CPP -if test -n "$PKG_CONFIG"; then - if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - gtk+-2.0 >= 2.6.0 - pangoxft >= 1.2.0 - libglade-2.0 >= 2.0.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - gtk+-2.0 >= 2.6.0 - pangoxft >= 1.2.0 - libglade-2.0 >= 2.0.0 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags " - gtk+-2.0 >= 2.6.0 - pangoxft >= 1.2.0 - libglade-2.0 >= 2.0.0 - " 2>/dev/null` +fi + CPP=$ac_cv_prog_CPP else - pkg_failed=yes + ac_cv_prog_CPP=$CPP fi - fi +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : else - pkg_failed=untried + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - gtk+-2.0 >= 2.6.0 - pangoxft >= 1.2.0 - libglade-2.0 >= 2.0.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - gtk+-2.0 >= 2.6.0 - pangoxft >= 1.2.0 - libglade-2.0 >= 2.0.0 - ") 2>&5 + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs " - gtk+-2.0 >= 2.6.0 - pangoxft >= 1.2.0 - libglade-2.0 >= 2.0.0 - " 2>/dev/null` + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue else - pkg_failed=yes + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break fi - fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : else - pkg_failed=untried + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test $pkg_failed = yes; then +CFLAGS="$abi_save_CFLAGS" +CXXFLAGS="$abi_save_CXXFLAGS" -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - gtk+-2.0 >= 2.6.0 - pangoxft >= 1.2.0 - libglade-2.0 >= 2.0.0 - "` - else - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - gtk+-2.0 >= 2.6.0 - pangoxft >= 1.2.0 - libglade-2.0 >= 2.0.0 - "` - fi - # Put the nasty error message in config.log where it belongs - echo "$GTK_PKG_ERRORS" >&5 +{ $as_echo "$as_me:$LINENO: checking CFLAGS" >&5 +$as_echo_n "checking CFLAGS... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $CFLAGS" >&5 +$as_echo "$CFLAGS" >&6; } + +{ $as_echo "$as_me:$LINENO: checking CXXFLAGS" >&5 +$as_echo_n "checking CXXFLAGS... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $CXXFLAGS" >&5 +$as_echo "$CXXFLAGS" >&6; } - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - abi_gtk2=no +ABI_FEATURE_DEFS="" -elif test $pkg_failed = untried; then - abi_gtk2=no +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac -else - GTK_CFLAGS=$pkg_cv_GTK_CFLAGS - GTK_LIBS=$pkg_cv_GTK_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +done +IFS=$as_save_IFS - abi_gtk2=yes - ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS gtk+-2.0 >= 2.6.0 pangoxft >= 1.2.0 libglade-2.0 >= 2.0.0" +rm -rf conftest.one conftest.two conftest.dir fi - if test $abi_gtk2 = no; then - { { echo "$as_me:$LINENO: error: $GTK_PKG_ERRORS" >&5 -echo "$as_me: error: $GTK_PKG_ERRORS" >&2;} - { (exit 1); exit 1; }; } - fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -pkg_failed=no -{ echo "$as_me:$LINENO: checking for PANGOFT2" >&5 -echo $ECHO_N "checking for PANGOFT2... $ECHO_C" >&6; } +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -if test -n "$PKG_CONFIG"; then - if test -n "$PANGOFT2_CFLAGS"; then - pkg_cv_PANGOFT2_CFLAGS="$PANGOFT2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - pangoft2 >= 1.2.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - pangoft2 >= 1.2.0 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags " - pangoft2 >= 1.2.0 - " 2>/dev/null` +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - pkg_failed=yes + { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi - fi + +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_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 + $as_echo_n "(cached) " >&6 else - pkg_failed=untried + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +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 test -n "$PKG_CONFIG"; then - if test -n "$PANGOFT2_LIBS"; then - pkg_cv_PANGOFT2_LIBS="$PANGOFT2_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - pangoft2 >= 1.2.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - pangoft2 >= 1.2.0 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_PANGOFT2_LIBS=`$PKG_CONFIG --libs " - pangoft2 >= 1.2.0 - " 2>/dev/null` +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= else - pkg_failed=yes + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" fi - 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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 else - pkg_failed=untried -fi + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -if test $pkg_failed = yes; then +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - _pkg_short_errors_supported=no + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - if test $_pkg_short_errors_supported = yes; then - PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - pangoft2 >= 1.2.0 - "` - else - PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - pangoft2 >= 1.2.0 - "` - fi - # Put the nasty error message in config.log where it belongs - echo "$PANGOFT2_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - pango_ft2=no + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi -elif test $pkg_failed = untried; then - pango_ft2=no + if test x = y; then + INSIDE_GNOME_COMMON_TRUE= + INSIDE_GNOME_COMMON_FALSE='#' else - PANGOFT2_CFLAGS=$pkg_cv_PANGOFT2_CFLAGS - PANGOFT2_LIBS=$pkg_cv_PANGOFT2_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + INSIDE_GNOME_COMMON_TRUE='#' + INSIDE_GNOME_COMMON_FALSE= +fi - pango_ft2=yes - ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS pangoft2 >= 1.2.0" -fi + test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - if test $pango_ft2 = yes; then - GTK_CFLAGS="$GTK_CFLAGS $PANGOFT2_CFLAGS" - GTK_LIBS="$GTK_LIBS $PANGOFT2_LIBS" + for k in ac-helpers ; do ACLOCAL="$ACLOCAL -I $k" ; done -cat >>confdefs.h <<\_ACEOF -#define HAVE_PANGOFT2 1 -_ACEOF - fi - { echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6; } -# Check whether --with-x was given. -if test "${with_x+set}" = set; then - withval=$with_x; -fi +################################################################## +################################################################## +# OS_NAME is the output of uname -s minus any forward slashes +# (so we don't imply another level of depth). This is to solve +# a problem with BSD/OS. In fact, it might be good to do this +# to all uname results, so that one doesn't see "sun4/m" as an +# architecture. The substitutions are taken from the Linux +# kernel Makefile. The result of this is that even if you have +# a Pentium Pro, you will see your bins in a "...i386" directory. +# This doesn't mean it didn't use your optimizations. -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - case $x_includes,$x_libraries in #( - *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 -echo "$as_me: error: Cannot use X directory names containing '" >&2;} - { (exit 1); exit 1; }; };; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - cat >Imakefile <<'_ACEOF' -incroot: - @echo incroot='${INCROOT}' -usrlibdir: - @echo usrlibdir='${USRLIBDIR}' -libdir: - @echo libdir='${LIBDIR}' -_ACEOF - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - for ac_var in incroot usrlibdir libdir; do - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ac_x_includes= ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -f -r conftest.dir -fi +# this makes HP-UX look like "HP" (sed turns "HP-UX" into "HP" with the -.* pattern) +OS_NAME=`uname -s | sed "s/\//-/" | sed "s/_/-/" | sed "s/-.*//g"` +OS_RELEASE=`uname -r | sed "s/\//-/" | sed "s/() .*//g"` -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include +################################################################## +################################################################## +#### Cygnus keeps changing the value that uname returns between +#### different versions of the package and between different +#### versions of Windows. Here we fold them all in into one symbol. + +if test "$OS_NAME" = "CYGWIN32"; then + OS_NAME="WIN32" +fi -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 +if test "$OS_NAME" = "CYGWIN"; then + OS_NAME="WIN32" +fi -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include +if test "$OS_NAME" = "WIN32"; then + CYGWIN_MAJOR_VERSION=`echo $(OS_RELEASE) | cut -d . -f 1` + CYGWIN_MINOR_VERSION=`echo $(OS_RELEASE) | cut -d . -f 2` + CYGWIN_REVISION=`echo $(OS_RELEASE) | cut -d . -f 3` +fi -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 +################################################################## +################################################################## +#### MINGW configuration -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 +if test "$OS_NAME" = "MINGW32"; then + OS_NAME="WIN32" +fi -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include +################################################################## +################################################################## +#### Mac OS X / darwin configuration +# +# Whether to use Darwin's @executable_path dynamic linker feature +# +EPATH_WV_BUILD_FLAGS="" -/usr/openwin/include -/usr/openwin/share/include' +# Check whether --with-epath was given. +if test "${with_epath+set}" = set; then + withval=$with_epath; + if test "x$withval" = "xno"; then + abi_epath=no + elif test "$OS_NAME" = "Darwin"; then + abi_epath=yes + EPATH_WV_BUILD_FLAGS="EPATH_DYLIB=1" + else + { { $as_echo "$as_me:$LINENO: error: * * * --with-epath is a MacOS X option * * *" >&5 +$as_echo "$as_me: error: * * * --with-epath is a MacOS X option * * *" >&2;} + { (exit 1); exit 1; }; } + fi -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # We can compile using X headers with no special include directory. -ac_x_includes= else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test "$OS_NAME" = "Darwin"; then + abi_epath=yes + EPATH_WV_BUILD_FLAGS="EPATH_DYLIB=1" + else + abi_epath=no + fi - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -done fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XrmInitialize () - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= + if test $abi_epath = yes; then + ABI_EPATH_DYLIB_TRUE= + ABI_EPATH_DYLIB_FALSE='#' else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r "$ac_dir/libX11.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done + ABI_EPATH_DYLIB_TRUE='#' + ABI_EPATH_DYLIB_FALSE= fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no -case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) - # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" -esac -fi -;; #( - *) have_x=yes;; - esac - eval "$ac_cv_have_x" -fi # $with_x != no +# +# convenience option for building with fink installed... +# + +# Check whether --with-fink was given. +if test "${with_fink+set}" = set; then + withval=$with_fink; + if test "x$withval" != "xno"; then + CPPFLAGS="$CPPFLAGS -I/sw/include" + LDFLAGS="$LDFLAGS -L/sw/lib" + PKG_CONFIG_PATH=/sw/lib/pkgconfig:$PKG_CONFIG_PATH + export PKG_CONFIG_PATH + fi -if test "$have_x" != yes; then - { echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6; } - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$x_includes'\ - ac_x_libraries='$x_libraries'" - { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } fi - if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF +# +# convenience option for building with darwin ports installed... +# - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi +# Check whether --with-darwinports was given. +if test "${with_darwinports+set}" = set; then + withval=$with_darwinports; + if test "x$withval" != "xno"; then + CPPFLAGS="$CPPFLAGS -I/opt/local/include" + LDFLAGS="$LDFLAGS -L/opt/local/lib" + PKG_CONFIG_PATH=/opt/local/lib/pkgconfig:$PKG_CONFIG_PATH + export PKG_CONFIG_PATH + fi - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - ac_xsave_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +fi -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - X_LIBS="$X_LIBS -R$x_libraries" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# convenience option for building with the abiportssdk... +# - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Check whether --with-abiportssdk was given. +if test "${with_abiportssdk+set}" = set; then + withval=$with_abiportssdk; + if test "x$withval" != "xno"; then + if test "x$withval" = xyes ; then + _sdk_root=/Developer/SDKs + else + _sdk_root=$withval + fi + CPPFLAGS="-isysroot $_sdk_root/AbiMacOSX.sdk $CPPFLAGS" + LDFLAGS="-isysroot $_sdk_root/AbiMacOSX.sdk -Wl,-syslibroot,$_sdk_root/AbiMacOSX.sdk $LDFLAGS" -int -main () -{ + CPPFLAGS="$CPPFLAGS -I/opt/abi/include" + LDFLAGS="$LDFLAGS -L/opt/abi/lib" + PKG_CONFIG_PATH=$_sdk_root/AbiMacOSX.sdk/opt/abi/lib/pkgconfig:$PKG_CONFIG_PATH + export PKG_CONFIG_PATH + ABI_MACSDK_ROOT=$_sdk_root - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - X_LIBS="$X_LIBS -R $x_libraries" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + fi - { echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_c_werror_flag=$ac_xsave_c_werror_flag - LIBS=$ac_xsave_LIBS - fi +# +# 1. Whether to consider using Cocoa API: +# +# Check whether --enable-Cocoa was given. +if test "${enable_Cocoa+set}" = set; then + enableval=$enable_Cocoa; + if test "x$enableval" = "xno" ; then + abi_gui_cocoa=no + else + abi_gui_cocoa=yes + fi - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. +else + abi_gui_cocoa=yes +fi - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# +# 2. Whether to consider using Carbon API: +# +# I scraped Carbon stuff (Hub) +# +# 3. Default to Cocoa, then Carbon, then GTK +# (Values are equivalent to PLATFORM setting) +# +if test $abi_gui_cocoa = yes ; then + abi_gui=cocoa +else + abi_gui=unix +fi +# +# 4. For Cocoa or Carbon, recognize Darwin as MACOSX; otherwise, recognize as FreeBSD +# +if test "$OS_NAME" = "Darwin"; then + if test $abi_gui = unix ; then + OS_NAME=FreeBSD + else + OS_NAME=MACOSX + fi +fi -/* 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 -char XOpenDisplay (); -int -main () -{ -return XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +# At this point, we now have the following info: +# OS_NAME = something like 'Linux' +# OS_RELEASE = something like '2.6.1' +# Additionally, there may be info about Cygwin versions. + +case "$OS_NAME" in + MACOSX) + # the default for MacOS X is to no enable warnings with + # the Apple-derived gcc. + WARNING_CFLAGS="" + ;; + *BSD|DragonFly) + WARNING_CFLAGS="-Wall -pedantic -D_BSD_SOURCE -pipe" #-ansi + ;; + IRIX*) + case "$GCC" in + yes) + WARNING_CFLAGS="-Wall -pedantic -D_POSIX_SOURCE -pipe" #-ansi + ;; + no) + # the default with the IRIX compiler is for warnings to be + # on. You can turn individual warnings off using the + # `-woff #' directive to the MIPSpro compiler. + WARNING_CFLAGS="" + ;; + esac + ;; + SunOS) + case "$GCC" in + yes) + # why -D_BSD_SOURCE? + WARNING_CFLAGS="-Wall -pedantic -D_BSD_SOURCE -pipe" #-ansi + WARNING_CFLAGS="$WARNING_CFLAGS -D__EXTENSIONS__ -DSCANDIR_MISSING -DSunOS" + ;; + no) + # the default with the SparcWorks 5.x and Forte 6.x and + # later is for all warnings to be on. See the + # -erroff and -errtags section of the cc man page. + WARNING_CFLAGS="" + ;; + esac + ;; + OSF1) + case "$GCC" in + yes) + WARNING_CFLAGS="-Wall -pedantic -D_POSIX_SOURCE -D_BSD_SOURCE -D_OSF_SOURCE -D_XOPEN_SOURCE_EXTENDED -DAES_SOURCE" #-ansi + ;; + no) + # the DEC/Compaq compiler has a plethora of options related + # to warnings. Enabling `-portable' and then turning off + # specific, annoying warnings may be the easiest way to go. + # some versions of the compiler under 4.x might not have + # supported `-portable', so leave WARNING_CFLAGS empty in + # that case + case "$OS_RELEASE" in + V5*) + no_msg='hexoctunsign,switchlong,valuepres' + WARNING_CFLAGS="-portable -msg_disable $no_msg" + no_msg='' + ;; + *) WARNING_CFLAGS="" + ;; + esac + ;; + esac + ;; + QNX|procnto) + WARNING_CLFAGS="-w9 -D_POSIX_SOURCE" #-ansi + LDFLAGS="-lph -lphrender -lAp" + ;; + *) + case "$GCC" in + yes) + WARNING_CFLAGS="-Wall -pedantic -D_POSIX_SOURCE" #-ansi + WARNING_CFLAGS="$WARNING_CFLAGS -D_BSD_SOURCE -pipe" + ;; + no) + WARNING_CFLAGS="" + ;; + esac + ;; 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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# huge nasty case statement to actually pick the platform -/* 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 -char dnet_ntoa (); -int -main () -{ -return dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +case "$OS_NAME" in + WIN32) + PLATFORM="win" + ;; + Linux|AIX|*BSD|IRIX*|HP|OSF1|SunOS|DragonFly) + PLATFORM="unix" + ;; + QNX|procnto) + PLATFORM="qnx" + ;; + MACOSX) + PLATFORM=$abi_gui + ;; + *) + PLATFORM="unix" + ;; 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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dnet_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dnet_dnet_ntoa=no +if test "$PLATFORM" = "cocoa"; then + BE_PLATFORM="unix" +else + BE_PLATFORM="$PLATFORM" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* 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 -char dnet_ntoa (); -int -main () -{ -return dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - fi -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - { echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } -if test "${ac_cv_func_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_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 -#ifdef __STDC__ -# include -#else -# include -#endif + $ac_path_GREP_found && break 3 + done + done +done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } + fi +else + ac_cv_path_GREP=$GREP +fi -#undef gethostbyname +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" -/* 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 -char gethostbyname (); -/* 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_gethostbyname || defined __stub___gethostbyname -choke me -#endif -int -main () -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_gethostbyname=yes +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + $as_echo_n "(cached) " >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_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_cv_func_gethostbyname=no + $ac_path_EGREP_found && break 3 + done + done +done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } + fi +else + ac_cv_path_EGREP=$EGREP fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" - if test $ac_cv_func_gethostbyname = no; then - { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF + +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include +#include +#include +#include -/* 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 -char gethostbyname (); int main () { -return gethostbyname (); + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_nsl_gethostbyname=yes + } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_nsl_gethostbyname=no + ac_cv_header_stdc=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +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. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" +rm -f conftest* + fi - if test $ac_cv_lib_nsl_gethostbyname = no; then - { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include -/* 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" +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif -char gethostbyname (); + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int main () { -return gethostbyname (); - ; + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +rm -f conftest$ac_exeext 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 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_bsd_gethostbyname=yes + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_bsd_gethostbyname=no +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then - fi - fi +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - { echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6; } -if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -7592,673 +5538,690 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* 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 -char connect (); -/* 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_connect || defined __stub___connect -choke me -#endif +$ac_includes_default -int -main () -{ -return connect (); - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_connect=yes + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_connect=no + eval "$as_ac_Header=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6; } - if test $ac_cv_func_connect = no; then - { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +done + + + + + + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:$LINENO: checking size of long int" >&5 +$as_echo_n "checking size of long int... " >&6; } +if test "${ac_cv_sizeof_long_int+set}" = set; then + $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* 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 -char connect (); +$ac_includes_default int main () { -return connect (); +static int test_array [1 - 2 * !(((long int) (sizeof (long int))) >= 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_connect=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } -if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - { echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6; } -if test "${ac_cv_func_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove - -/* 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 -char remove (); -/* 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_remove || defined __stub___remove -choke me -#endif - +$ac_includes_default int main () { -return remove (); +static int test_array [1 - 2 * !(((long int) (sizeof (long int))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_remove=yes + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_remove=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6; } - if test $ac_cv_func_remove = no; then - { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } -if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* 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 -char remove (); +$ac_includes_default int main () { -return remove (); +static int test_array [1 - 2 * !(((long int) (sizeof (long int))) < 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_posix_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_posix_remove=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } -if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - { echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } -if test "${ac_cv_func_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmat - -/* 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 -char shmat (); -/* 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_shmat || defined __stub___shmat -choke me -#endif - +$ac_includes_default int main () { -return shmat (); +static int test_array [1 - 2 * !(((long int) (sizeof (long int))) >= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_shmat=yes + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_shmat=no + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6; } - if test $ac_cv_func_shmat = no; then - { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* 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 -char shmat (); +$ac_includes_default int main () { -return shmat (); +static int test_array [1 - 2 * !(((long int) (sizeof (long int))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_ipc_shmat=yes + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ipc_shmat=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } -if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_long_int=$ac_lo;; +'') if test "$ac_cv_type_long_int" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long int) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (long int) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_long_int=0 + fi ;; +esac else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* 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 -char IceConnectionNumber (); +$ac_includes_default +static long int longval () { return (long int) (sizeof (long int)); } +static unsigned long int ulongval () { return (long int) (sizeof (long int)); } +#include +#include int main () { -return IceConnectionNumber (); + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (long int))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (long int)))) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (long int)))) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +rm -f conftest$ac_exeext 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 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_ICE_IceConnectionNumber=yes + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_long_int=`cat conftest.val` else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ICE_IceConnectionNumber=no +( exit $ac_status ) +if test "$ac_cv_type_long_int" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long int) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (long int) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_long_int=0 + fi fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +rm -f conftest.val fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5 +$as_echo "$ac_cv_sizeof_long_int" >&6; } - LDFLAGS=$ac_save_LDFLAGS -fi +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int +_ACEOF - GTK_LIBS="$GTK_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" +ABISIZEOF_LONG_INT="-DABISIZEOF_LONG_INT=$ac_cv_sizeof_long_int" -if test $print = true; then +ABITYPES_CFLAGS="$ABISIZEOF_LONG_INT" -GNOMEPRINT_CFLAGS="" -GNOMEPRINT_LIBS="" -gnomeprint_modules='libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >= 2.2.0' -pkg_failed=no -{ 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 - pkg_cv_GNOMEPRINT_CFLAGS="$GNOMEPRINT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomeprint_modules\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gnomeprint_modules") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GNOMEPRINT_CFLAGS=`$PKG_CONFIG --cflags "$gnomeprint_modules" 2>/dev/null` -else - pkg_failed=yes + +with_unix=false +with_macosx=false +with_cocoa=false +with_qnx=false +with_win32=false + +# this variable accumulates all the required pkg-config +# packages for the current configuration +ABIWORD_REQUIRED_PKGS='' + +# when cross-compiling must have perl for cdump.pl +if test x$cross_compiling = xyes; then +{ $as_echo "$as_me:$LINENO: checking for perl" >&5 +$as_echo_n "checking for perl... " >&6; } +if test "x$(which perl)" = "x"; then + { { $as_echo "$as_me:$LINENO: error: not found. Must have perl when cross-compiling." >&5 +$as_echo "$as_me: error: not found. Must have perl when cross-compiling." >&2;} + { (exit 1); exit 1; }; } fi - fi -else - pkg_failed=untried +{ $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } fi -if test -n "$PKG_CONFIG"; then - if test -n "$GNOMEPRINT_LIBS"; then - pkg_cv_GNOMEPRINT_LIBS="$GNOMEPRINT_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomeprint_modules\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gnomeprint_modules") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GNOMEPRINT_LIBS=`$PKG_CONFIG --libs "$gnomeprint_modules" 2>/dev/null` -else - pkg_failed=yes + +# libabiword support + + + +libabiword=false +abi_lib_message="no" + +# Check whether --enable-libabiword was given. +if test "${enable_libabiword+set}" = set; then + enableval=$enable_libabiword; + + if test "x$enableval" = "xyes"; then + if test "$PLATFORM" != unix; then + { { $as_echo "$as_me:$LINENO: error: sorry: --enable-libabiword supported only on UNIX platforms" >&5 +$as_echo "$as_me: error: sorry: --enable-libabiword supported only on UNIX platforms" >&2;} + { (exit 1); exit 1; }; } + fi + libabiword=true + abi_lib_message="yes" + fi + fi - fi + + +if test "$libabiword" = true ; then + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" +fi + + if test "x$libabiword" = "xtrue"; then + WITH_LIBABIWORD_TRUE= + WITH_LIBABIWORD_FALSE='#' else - pkg_failed=untried + WITH_LIBABIWORD_TRUE='#' + WITH_LIBABIWORD_FALSE= fi -if test $pkg_failed = yes; then -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +# check for embedded and print first, so we can handle gnomeprint dependency +# correcly + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + 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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 else - _pkg_short_errors_supported=no + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_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 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - if test $_pkg_short_errors_supported = yes; then - GNOMEPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gnomeprint_modules"` - else - GNOMEPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gnomeprint_modules"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GNOMEPRINT_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: Error: $gnomeprint_modules required" >&5 -echo "$as_me: error: Error: $gnomeprint_modules required" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: Error: $gnomeprint_modules required" >&5 -echo "$as_me: error: Error: $gnomeprint_modules required" >&2;} - { (exit 1); exit 1; }; } +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_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 + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } 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; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi - abi_gnomeprint=yes - ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS $gnomeprint_modules" + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi fi -GNOMEPRINT_CFLAGS="$GNOMEPRINT_CFLAGS" - +# We define EMBEDDED_TARGET to a numerical value so that we can do like +# #if EMBEDDED_TARGET == EMBEDDED_TARGET_HILDON +# +# The following have to be defined unconditionally, because we want +# EMBEDDED_TARGET to be undefined if not building for embedded so that we +# can use #ifdef and #ifndef on it (two undefined symbols will return +# true if tested for equality in #if construct) +cat >>confdefs.h <<\_ACEOF +#define EMBEDDED_TARGET_GENERIC 1 +_ACEOF +cat >>confdefs.h <<\_ACEOF +#define EMBEDDED_TARGET_HILDON 2 +_ACEOF -fi +cat >>confdefs.h <<\_ACEOF +#define EMBEDDED_TARGET_POKY 3 +_ACEOF +embedded=none +embedded_print=undefined +embedded_statusbar=false +embedded_menubutton=true -FREETYPE_CFLAGS="" -FREETYPE_LIBS="" -freetype_modules='freetype2 >= 2.1.0' +EMBEDDED_CFLAGS="" +EMBEDDED_LIBS="" +HILDON_CFLAGS="" +HILDON_LIBS="" +# Check whether --enable-embedded was given. +if test "${enable_embedded+set}" = set; then + enableval=$enable_embedded; + if test "${enableval}" != "no" ; then + if test "$PLATFORM" != unix; then + { { $as_echo "$as_me:$LINENO: error: --enable-embedded available only on UNIX platforms" >&5 +$as_echo "$as_me: error: --enable-embedded available only on UNIX platforms" >&2;} + { (exit 1); exit 1; }; } + fi + fi + case "${enableval}" in + hildon) pkg_failed=no -{ echo "$as_me:$LINENO: checking for FREETYPE" >&5 -echo $ECHO_N "checking for FREETYPE... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for HILDON" >&5 +$as_echo_n "checking for HILDON... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$FREETYPE_CFLAGS"; then - pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$freetype_modules\"") >&5 - ($PKG_CONFIG --exists --print-errors "$freetype_modules") 2>&5 +if test -n "$HILDON_CFLAGS"; then + pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 hildon-fm-2 dbus-1 libosso\"") >&5 + ($PKG_CONFIG --exists --print-errors "hildon-1 hildon-fm-2 dbus-1 libosso") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "$freetype_modules" 2>/dev/null` + pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 hildon-fm-2 dbus-1 libosso" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$FREETYPE_LIBS"; then - pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$freetype_modules\"") >&5 - ($PKG_CONFIG --exists --print-errors "$freetype_modules") 2>&5 +if test -n "$HILDON_LIBS"; then + pkg_cv_HILDON_LIBS="$HILDON_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 hildon-fm-2 dbus-1 libosso\"") >&5 + ($PKG_CONFIG --exists --print-errors "hildon-1 hildon-fm-2 dbus-1 libosso") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "$freetype_modules" 2>/dev/null` + pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-1 hildon-fm-2 dbus-1 libosso" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -8271,278 +6234,222 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$freetype_modules"` + HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hildon-1 hildon-fm-2 dbus-1 libosso" 2>&1` else - FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$freetype_modules"` + HILDON_PKG_ERRORS=`$PKG_CONFIG --print-errors "hildon-1 hildon-fm-2 dbus-1 libosso" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$FREETYPE_PKG_ERRORS" >&5 + echo "$HILDON_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: Error: $freetype_modules required" >&5 -echo "$as_me: error: Error: $freetype_modules required" >&2;} + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: Hildon dependencies not satisfied." >&5 +$as_echo "$as_me: error: Hildon dependencies not satisfied." >&2;} { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: Error: $freetype_modules required" >&5 -echo "$as_me: error: Error: $freetype_modules required" >&2;} + { { $as_echo "$as_me:$LINENO: error: Hildon dependencies not satisfied." >&5 +$as_echo "$as_me: error: Hildon dependencies not satisfied." >&2;} { (exit 1); exit 1; }; } +else + HILDON_CFLAGS=$pkg_cv_HILDON_CFLAGS + HILDON_LIBS=$pkg_cv_HILDON_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + EMBEDDED_CFLAGS="$EMBEDDED_CFLAGS $HILDON_CFLAGS" + EMBEDDED_LIBS="$EMBEDDED_LIBS $HILDON_LIBS" + embedded=EMBEDDED_TARGET_HILDON + embedded_print=false;; + poky) + embedded_print=false + embedded=EMBEDDED_TARGET_POKY ;; + generic) + embedded_print=false + embedded=EMBEDDED_TARGET_GENERIC ;; + yes) + embedded_print=false + embedded=EMBEDDED_TARGET_GENERIC ;; + no) + embedded=none ;; + *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-embedded" >&5 +$as_echo "$as_me: error: bad value ${enableval} for --enable-embedded" >&2;} + { (exit 1); exit 1; }; } ;; + esac else - FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS - FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - abi_freetype=yes - ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS $freetype_modules" + embedded=none fi +if test "$embedded" != "none"; then + +cat >>confdefs.h <<_ACEOF +#define EMBEDDED_TARGET $embedded +_ACEOF + if test "$embedded_menubutton" = "true"; then +cat >>confdefs.h <<\_ACEOF +#define ENABLE_MENUBUTTON 1 +_ACEOF - # Check whether --enable-binreloc was given. -if test "${enable_binreloc+set}" = set; then - enableval=$enable_binreloc; enable_binreloc=$enableval + fi else - enable_binreloc=no + # make sure we do not prevent statusbar from building + embedded_statusbar=true fi +if test "$embedded_statusbar" = "true"; then - # Check whether --enable-binreloc-threads was given. -if test "${enable_binreloc_threads+set}" = set; then - enableval=$enable_binreloc_threads; enable_binreloc_threads=$enableval -else - enable_binreloc_threads=yes -fi +cat >>confdefs.h <<\_ACEOF +#define ENABLE_STATUSBAR 1 +_ACEOF +fi - BINRELOC_CFLAGS= - BINRELOC_LIBS= - if test "x$enable_binreloc" = "xauto"; then - { echo "$as_me:$LINENO: checking for /proc/self/maps" >&5 -echo $ECHO_N "checking for /proc/self/maps... $ECHO_C" >&6; } -if test "${ac_cv_file__proc_self_maps+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -if test -r "/proc/self/maps"; then - ac_cv_file__proc_self_maps=yes + if test "x$embedded" = "xEMBEDDED_TARGET_HILDON"; then + EMBEDDED_HILDON_TRUE= + EMBEDDED_HILDON_FALSE='#' else - ac_cv_file__proc_self_maps=no -fi + EMBEDDED_HILDON_TRUE='#' + EMBEDDED_HILDON_FALSE= fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__proc_self_maps" >&5 -echo "${ECHO_T}$ac_cv_file__proc_self_maps" >&6; } - { echo "$as_me:$LINENO: checking whether everything is installed to the same prefix" >&5 -echo $ECHO_N "checking whether everything is installed to the same prefix... $ECHO_C" >&6; } -if test "${br_cv_valid_prefixes+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "x$embedded_statusbar" = "xtrue"; then + ENABLE_STATUSBAR_TRUE= + ENABLE_STATUSBAR_FALSE='#' else + ENABLE_STATUSBAR_TRUE='#' + ENABLE_STATUSBAR_FALSE= +fi - if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \ - "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \ - "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc' - then - br_cv_valid_prefixes=yes - else - br_cv_valid_prefixes=no - fi -fi -{ echo "$as_me:$LINENO: result: $br_cv_valid_prefixes" >&5 -echo "${ECHO_T}$br_cv_valid_prefixes" >&6; } - fi - { echo "$as_me:$LINENO: checking whether binary relocation support should be enabled" >&5 -echo $ECHO_N "checking whether binary relocation support should be enabled... $ECHO_C" >&6; } -if test "${br_cv_binreloc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$enable_binreloc" = "xyes"; then - br_cv_binreloc=yes - elif test "x$enable_binreloc" = "xauto"; then - if test "x$br_cv_valid_prefixes" = "xyes" -a \ - "x$ac_cv_file__proc_self_maps" = "xyes"; then - br_cv_binreloc=yes - else - br_cv_binreloc=no - fi - else - br_cv_binreloc=no - fi -fi -{ echo "$as_me:$LINENO: result: $br_cv_binreloc" >&5 -echo "${ECHO_T}$br_cv_binreloc" >&6; } - if test "x$br_cv_binreloc" = "xyes"; then - BINRELOC_CFLAGS="-DENABLE_BINRELOC" -cat >>confdefs.h <<\_ACEOF -#define ENABLE_BINRELOC -_ACEOF - if test "x$enable_binreloc_threads" = "xyes"; then -{ echo "$as_me:$LINENO: checking for pthread_getspecific in -lpthread" >&5 -echo $ECHO_N "checking for pthread_getspecific in -lpthread... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthread_pthread_getspecific+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# by default we, of course, want Abi to be able to print, but on embedded +# systems it might not be required and because of the dependencies, we want an +# option to disable printing at compile time -/* 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 -char pthread_getspecific (); -int -main () -{ -return pthread_getspecific (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_pthread_pthread_getspecific=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# on embedded we will make --disable-print the default if no +# --enable/disable-printing is given - ac_cv_lib_pthread_pthread_getspecific=no +{ $as_echo "$as_me:$LINENO: checking for printing support" >&5 +$as_echo_n "checking for printing support... " >&6; } + +# Check whether --enable-printing was given. +if test "${enable_printing+set}" = set; then + enableval=$enable_printing; + case "${enableval}" in + yes) print=true ;; + no) print=false ;; + *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-printing" >&5 +$as_echo "$as_me: error: bad value ${enableval} for --enable-printing" >&2;} + { (exit 1); exit 1; }; } ;; + esac + +else + print=undefined fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +if test "$print" = "undefined" && test "$embedded_print" = "false"; then + print=false +elif test "$print" = "undefined"; then + print=true; fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_getspecific" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_getspecific" >&6; } -if test $ac_cv_lib_pthread_pthread_getspecific = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBPTHREAD 1 + +if test "$print" = "true" ; then + +cat >>confdefs.h <<\_ACEOF +#define ENABLE_PRINT 1 _ACEOF - LIBS="-lpthread $LIBS" +fi +{ $as_echo "$as_me:$LINENO: result: ${print}" >&5 +$as_echo "${print}" >&6; } + + if test "$print" = "true"; then + ENABLE_PRINT_TRUE= + ENABLE_PRINT_FALSE='#' +else + ENABLE_PRINT_TRUE='#' + ENABLE_PRINT_FALSE= fi - fi - { echo "$as_me:$LINENO: checking whether binary relocation should use threads" >&5 -echo $ECHO_N "checking whether binary relocation should use threads... $ECHO_C" >&6; } -if test "${br_cv_binreloc_threads+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test $PLATFORM = unix && test x$print != xfalse; then + BUILD_TTFTOOL_TRUE= + BUILD_TTFTOOL_FALSE='#' else - if test "x$enable_binreloc_threads" = "xyes"; then - if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then - br_cv_binreloc_threads=yes - else - br_cv_binreloc_threads=no - fi - else - br_cv_binreloc_threads=no - fi + BUILD_TTFTOOL_TRUE='#' + BUILD_TTFTOOL_FALSE= fi -{ echo "$as_me:$LINENO: result: $br_cv_binreloc_threads" >&5 -echo "${ECHO_T}$br_cv_binreloc_threads" >&6; } - - if test "x$br_cv_binreloc_threads" = "xyes"; then - BINRELOC_LIBS="-lpthread" -cat >>confdefs.h <<\_ACEOF -#define BR_PTHREAD 1 -_ACEOF - else - BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREADS=0" +# Check whether --enable-exports was given. +if test "${enable_exports+set}" = set; then + enableval=$enable_exports; + if test x$enableval = xno && test x$PLATFORM = xunix ; then cat >>confdefs.h <<\_ACEOF -#define BR_PTHREAD 0 +#define ABI_UNIX_NO_EXPORTS 1 _ACEOF - fi fi +fi -elif test "$PLATFORM" = "cocoa" ; then +if test "$PLATFORM" = "unix"; then + ABI_FE="Unix" + ABI_BE="$ABI_FE" + with_unix=true + pkg_failed=no -{ echo "$as_me:$LINENO: checking for GLIB" >&5 -echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5 +$as_echo_n "checking for GLIB... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GLIB_CFLAGS"; then - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0\"") >&5 +if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GLIB_LIBS"; then - pkg_cv_GLIB_LIBS="$GLIB_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0\"") >&5 +if test -n "$GLIB_LIBS"; then + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -8555,15 +6462,15 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.0"` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.0"` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } abi_glib2=no elif test $pkg_failed = untried; then @@ -8572,59 +6479,55 @@ else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } abi_glib2=yes ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS glib-2.0 >= 2.0" fi if test $abi_glib2 = no; then - { { echo "$as_me:$LINENO: error: $GLIB_PKG_ERRORS" >&5 -echo "$as_me: error: $GLIB_PKG_ERRORS" >&2;} + { { $as_echo "$as_me:$LINENO: error: $GLIB_PKG_ERRORS" >&5 +$as_echo "$as_me: error: $GLIB_PKG_ERRORS" >&2;} { (exit 1); exit 1; }; } fi pkg_failed=no -{ echo "$as_me:$LINENO: checking for GMODULE" >&5 -echo $ECHO_N "checking for GMODULE... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GMODULE" >&5 +$as_echo_n "checking for GMODULE... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GMODULE_CFLAGS"; then - pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.0\"") >&5 +if test -n "$GMODULE_CFLAGS"; then + pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GMODULE_LIBS"; then - pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.0\"") >&5 +if test -n "$GMODULE_LIBS"; then + pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -8637,15 +6540,15 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmodule-2.0 >= 2.0"` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0 >= 2.0" 2>&1` else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmodule-2.0 >= 2.0"` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0 >= 2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GMODULE_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } abi_gmodule2=no elif test $pkg_failed = untried; then @@ -8654,59 +6557,55 @@ else GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS GMODULE_LIBS=$pkg_cv_GMODULE_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } abi_gmodule2=yes ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS gmodule-2.0 >= 2.0" fi if test $abi_gmodule2 = no; then - { { echo "$as_me:$LINENO: error: $GMODULE_PKG_ERRORS" >&5 -echo "$as_me: error: $GMODULE_PKG_ERRORS" >&2;} + { { $as_echo "$as_me:$LINENO: error: $GMODULE_PKG_ERRORS" >&5 +$as_echo "$as_me: error: $GMODULE_PKG_ERRORS" >&2;} { (exit 1); exit 1; }; } fi pkg_failed=no -{ echo "$as_me:$LINENO: checking for GTHREAD" >&5 -echo $ECHO_N "checking for GTHREAD... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GTHREAD" >&5 +$as_echo_n "checking for GTHREAD... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GTHREAD_CFLAGS"; then - pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5 +if test -n "$GTHREAD_CFLAGS"; then + pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTHREAD_LIBS"; then - pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5 +if test -n "$GTHREAD_LIBS"; then + pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -8719,15 +6618,15 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0"` + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gthread-2.0" 2>&1` else - GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"` + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTHREAD_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } abi_gthread2=no elif test $pkg_failed = untried; then @@ -8736,16 +6635,16 @@ else GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } abi_gthread2=yes ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS gthread-2.0" fi if test $abi_gthread2 = no; then - { { echo "$as_me:$LINENO: error: $GTHREAD_PKG_ERRORS" >&5 -echo "$as_me: error: $GTHREAD_PKG_ERRORS" >&2;} + { { $as_echo "$as_me:$LINENO: error: $GTHREAD_PKG_ERRORS" >&5 +$as_echo "$as_me: error: $GTHREAD_PKG_ERRORS" >&2;} { (exit 1); exit 1; }; } else THREAD_CFLAGS="-DHAVE_THREADS=1 $GTHREAD_CFLAGS" @@ -8764,214 +6663,539 @@ fi - ABI_FE="Cocoa" - ABI_BE="Unix" - with_macosx=true - with_cocoa=true - - OBJCXX="c++" - OBJCXXFLAGS="" - OBJCXXDEPMODE="depmode=gcc3" -elif test "$PLATFORM" = "win" ; then - with_win32=true - ABI_FE="Win32" - ABI_BE="$ABI_FE" -# Check whether --enable-threads was given. -if test "${enable_threads+set}" = set; then - enableval=$enable_threads; - if test "x$enableval" = "xno"; then - abi_threads=no - else - abi_threads=yes - fi +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for GTK" >&5 +$as_echo_n "checking for GTK... " >&6; } + +if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gtk+-2.0 >= 2.6.0 + pangoxft >= 1.2.0 + libglade-2.0 >= 2.0.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + gtk+-2.0 >= 2.6.0 + pangoxft >= 1.2.0 + libglade-2.0 >= 2.0.0 + ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags " + gtk+-2.0 >= 2.6.0 + pangoxft >= 1.2.0 + libglade-2.0 >= 2.0.0 + " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gtk+-2.0 >= 2.6.0 + pangoxft >= 1.2.0 + libglade-2.0 >= 2.0.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + gtk+-2.0 >= 2.6.0 + pangoxft >= 1.2.0 + libglade-2.0 >= 2.0.0 + ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs " + gtk+-2.0 >= 2.6.0 + pangoxft >= 1.2.0 + libglade-2.0 >= 2.0.0 + " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + gtk+-2.0 >= 2.6.0 + pangoxft >= 1.2.0 + libglade-2.0 >= 2.0.0 + " 2>&1` + else + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors " + gtk+-2.0 >= 2.6.0 + pangoxft >= 1.2.0 + libglade-2.0 >= 2.0.0 + " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + abi_gtk2=no + +elif test $pkg_failed = untried; then + abi_gtk2=no + +else + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + abi_gtk2=yes + ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS gtk+-2.0 >= 2.6.0 pangoxft >= 1.2.0 libglade-2.0 >= 2.0.0" + +fi + if test $abi_gtk2 = no; then + { { $as_echo "$as_me:$LINENO: error: $GTK_PKG_ERRORS" >&5 +$as_echo "$as_me: error: $GTK_PKG_ERRORS" >&2;} + { (exit 1); exit 1; }; } + fi + + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for PANGOFT2" >&5 +$as_echo_n "checking for PANGOFT2... " >&6; } + +if test -n "$PANGOFT2_CFLAGS"; then + pkg_cv_PANGOFT2_CFLAGS="$PANGOFT2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + pangoft2 >= 1.2.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + pangoft2 >= 1.2.0 + ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags " + pangoft2 >= 1.2.0 + " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PANGOFT2_LIBS"; then + pkg_cv_PANGOFT2_LIBS="$PANGOFT2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + pangoft2 >= 1.2.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + pangoft2 >= 1.2.0 + ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_PANGOFT2_LIBS=`$PKG_CONFIG --libs " + pangoft2 >= 1.2.0 + " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + pangoft2 >= 1.2.0 + " 2>&1` + else + PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --print-errors " + pangoft2 >= 1.2.0 + " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PANGOFT2_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + pango_ft2=no + +elif test $pkg_failed = untried; then + pango_ft2=no + +else + PANGOFT2_CFLAGS=$pkg_cv_PANGOFT2_CFLAGS + PANGOFT2_LIBS=$pkg_cv_PANGOFT2_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + pango_ft2=yes + ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS pangoft2 >= 1.2.0" + +fi + + if test $pango_ft2 = yes; then + GTK_CFLAGS="$GTK_CFLAGS $PANGOFT2_CFLAGS" + GTK_LIBS="$GTK_LIBS $PANGOFT2_LIBS" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_PANGOFT2 1 +_ACEOF + + fi + + { $as_echo "$as_me:$LINENO: checking for X" >&5 +$as_echo_n "checking for X... " >&6; } + + +# Check whether --with-x was given. +if test "${with_x+set}" = set; then + withval=$with_x; +fi + +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled +else + case $x_includes,$x_libraries in #( + *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 +$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} + { (exit 1); exit 1; }; };; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then + $as_echo_n "(cached) " >&6 +else + # One or both of the vars are not set, and there is no cached value. +ac_x_includes=no ac_x_libraries=no +rm -f -r conftest.dir +if mkdir conftest.dir; then + cd conftest.dir + cat >Imakefile <<'_ACEOF' +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' +_ACEOF + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl dylib la dll; do + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case $ac_im_incroot in + /usr/include) ac_x_includes= ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in + /usr/lib | /usr/lib64 | /lib | /lib64) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. + rm -f -r conftest.dir +fi + +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include + +/usr/include/X11 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 + +/usr/local/X11/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include + +/usr/local/include/X11 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 -else - abi_threads=check +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 -fi +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include +/usr/openwin/include +/usr/openwin/share/include' -if test $abi_threads != no; then - if test "${ac_cv_header_pthread_h+set}" = set; then - { echo "$as_me:$LINENO: checking for pthread.h" >&5 -echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } -if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking pthread.h usability" >&5 -echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include +#include _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + }; then + # We can compile using X headers with no special include directory. +ac_x_includes= else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +done fi -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; } +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no -# Is the header present? -{ echo "$as_me:$LINENO: checking pthread.h presence" >&5 -echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF +if test "$ac_x_libraries" = no; then + # Check for the libraries. + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include +int +main () +{ +XrmInitialize () + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext conftest$ac_exeext +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_cpp conftest.$ac_ext") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext }; then - ac_header_preproc=yes + LIBS=$ac_save_LIBS +# We can link X programs with no special library path. +ac_x_libraries= else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + LIBS=$ac_save_LIBS +for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl dylib la dll; do + if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 + fi + done +done fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi # $ac_x_libraries = no -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------- ## -## Report this to http://www.abisource.com/ ## -## ---------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; +case $ac_x_includes,$ac_x_libraries in #( + no,* | *,no | *\'*) + # Didn't find X, or a directory has "'" in its name. + ac_cv_have_x="have_x=no";; #( + *) + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$ac_x_includes'\ + ac_x_libraries='$ac_x_libraries'" esac -{ echo "$as_me:$LINENO: checking for pthread.h" >&5 -echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } -if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_pthread_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } +;; #( + *) have_x=yes;; + esac + eval "$ac_cv_have_x" +fi # $with_x != no +if test "$have_x" != yes; then + { $as_echo "$as_me:$LINENO: result: $have_x" >&5 +$as_echo "$have_x" >&6; } + no_x=yes +else + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" + { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +$as_echo "libraries $x_libraries, headers $x_includes" >&6; } fi -if test $ac_cv_header_pthread_h = yes; then - { echo "$as_me:$LINENO: checking for pthread_create" >&5 -echo $ECHO_N "checking for pthread_create... $ECHO_C" >&6; } -if test "${ac_cv_func_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + +cat >>confdefs.h <<\_ACEOF +#define X_DISPLAY_MISSING 1 +_ACEOF + + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else - cat >conftest.$ac_ext <<_ACEOF + if test -n "$x_includes"; then + X_CFLAGS="$X_CFLAGS -I$x_includes" + fi + + # It would also be nice to do this for all -L options, not just this one. + if test -n "$x_libraries"; then + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . + { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +$as_echo_n "checking whether -R must be followed by a space... " >&6; } + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + ac_xsave_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define pthread_create to an innocuous variant, in case declares pthread_create. - For example, HP-UX 11i declares gettimeofday. */ -#define pthread_create innocuous_pthread_create - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_create (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif +int +main () +{ -#undef pthread_create + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -/* 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 -char pthread_create (); -/* 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_pthread_create || defined __stub___pthread_create -choke me -#endif + LIBS="$ac_xsave_LIBS -R $x_libraries" + 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 pthread_create (); + ; return 0; } @@ -8982,61 +7206,61 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_pthread_create=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_pthread_create=no + { $as_echo "$as_me:$LINENO: result: neither works" >&5 +$as_echo "neither works" >&6; } fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_create" >&6; } -if test $ac_cv_func_pthread_create = yes; then - - abi_pthread_libs="" - { echo "$as_me:$LINENO: checking for pthread_yield" >&5 -echo $ECHO_N "checking for pthread_yield... $ECHO_C" >&6; } -if test "${ac_cv_func_pthread_yield+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag + LIBS=$ac_xsave_LIBS + fi + + # Check for system-dependent libraries X programs must link with. + # Do this before checking for the system-independent R6 libraries + # (-lICE), since we may need -lsocket or whatever for X linking. + + if test "$ISC" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" + else + # Martyn Johnson says this is needed for Ultrix, if the X + # libraries were built with DECnet support. And Karl Berry says + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define pthread_yield to an innocuous variant, in case declares pthread_yield. - For example, HP-UX 11i declares gettimeofday. */ -#define pthread_yield innocuous_pthread_yield - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_yield (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef pthread_yield /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -9044,18 +7268,11 @@ #ifdef __cplusplus extern "C" #endif -char pthread_yield (); -/* 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_pthread_yield || defined __stub___pthread_yield -choke me -#endif - +char XOpenDisplay (); int main () { -return pthread_yield (); +return XOpenDisplay (); ; return 0; } @@ -9066,46 +7283,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_pthread_yield=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_pthread_yield=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_yield" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_yield" >&6; } -if test $ac_cv_func_pthread_yield = yes; then - abi_pthread_yield=yes -else - abi_pthread_yield=no -fi - - -else - { echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5 -echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" +LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9119,11 +7323,11 @@ #ifdef __cplusplus extern "C" #endif -char pthread_exit (); +char dnet_ntoa (); int main () { -return pthread_exit (); +return dnet_ntoa (); ; return 0; } @@ -9134,42 +7338,48 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_pthread_pthread_exit=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_dnet_dnet_ntoa=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pthread_pthread_exit=no + ac_cv_lib_dnet_dnet_ntoa=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_exit" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_exit" >&6; } -if test $ac_cv_lib_pthread_pthread_exit = yes; then - - abi_pthread_libs="-lpthread" - { echo "$as_me:$LINENO: checking for pthread_yield in -lpthread" >&5 -echo $ECHO_N "checking for pthread_yield in -lpthread... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthread_pthread_yield+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" +fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" +LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9183,11 +7393,11 @@ #ifdef __cplusplus extern "C" #endif -char pthread_yield (); +char dnet_ntoa (); int main () { -return pthread_yield (); +return dnet_ntoa (); ; return 0; } @@ -9198,269 +7408,226 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_pthread_pthread_yield=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pthread_pthread_yield=no + ac_cv_lib_dnet_stub_dnet_ntoa=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_yield" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_yield" >&6; } -if test $ac_cv_lib_pthread_pthread_yield = yes; then - - abi_pthread_yield=yes - -else - abi_pthread_yield=no - -fi - - -else - { { echo "$as_me:$LINENO: error: * * * posix threads broken? * * *" >&5 -echo "$as_me: error: * * * posix threads broken? * * *" >&2;} - { (exit 1); exit 1; }; } - -fi - - -fi - - -else - if test $abi_threads = yes; then - { { echo "$as_me:$LINENO: error: * * * only posix threads supported currently * * *" >&5 -echo "$as_me: error: * * * only posix threads supported currently * * *" >&2;} - { (exit 1); exit 1; }; } - fi - abi_threads=no - -fi - - -fi - -if test $abi_threads != no; then - THREAD_CFLAGS="-DHAVE_THREADS=1 -DHAVE_POSIX_THREADS=1" - THREAD_LIBS="$abi_pthread_libs" - if test "x$abi_pthread_yield" = "xyes"; then - THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_PTHREAD_YIELD=1" - fi - abi_threads=yes -else - THREAD_CFLAGS="" - THREAD_LIBS="" -fi - if test $abi_threads = yes; then - HAVE_THREADS_TRUE= - HAVE_THREADS_FALSE='#' -else - HAVE_THREADS_TRUE='#' - HAVE_THREADS_FALSE= +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi - - - - -elif test "$PLATFORM" = "qnx" ; then - ABI_FE="QNX" - with_qnx=true - - -# Check whether --enable-threads was given. -if test "${enable_threads+set}" = set; then - enableval=$enable_threads; - if test "x$enableval" = "xno"; then - abi_threads=no - else - abi_threads=yes - fi - -else - abi_threads=check - + fi fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" -if test $abi_threads != no; then - if test "${ac_cv_header_pthread_h+set}" = set; then - { echo "$as_me:$LINENO: checking for pthread.h" >&5 -echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } -if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, + # to get the SysV transport functions. + # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) + # needs -lnsl. + # The nsl library prevents programs from opening the X display + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. + { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 +$as_echo_n "checking for gethostbyname... " >&6; } +if test "${ac_cv_func_gethostbyname+set}" = set; then + $as_echo_n "(cached) " >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking pthread.h usability" >&5 -echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include +/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. + For example, HP-UX 11i declares gettimeofday. */ +#define gethostbyname innocuous_gethostbyname + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gethostbyname (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef gethostbyname + +/* 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 +char gethostbyname (); +/* 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_gethostbyname || defined __stub___gethostbyname +choke me +#endif + +int +main () +{ +return gethostbyname (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +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_compile") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_gethostbyname=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_func_gethostbyname=no fi -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; } +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +$as_echo "$ac_cv_func_gethostbyname" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking pthread.h presence" >&5 -echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6; } + if test $ac_cv_func_gethostbyname = no; then + { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include + +/* 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 +char gethostbyname (); +int +main () +{ +return gethostbyname (); + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext conftest$ac_exeext +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_cpp conftest.$ac_ext") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext }; then - ac_header_preproc=yes + ac_cv_lib_nsl_gethostbyname=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + ac_cv_lib_nsl_gethostbyname=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; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------- ## -## Report this to http://www.abisource.com/ ## -## ---------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for pthread.h" >&5 -echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } -if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_pthread_h=$ac_header_preproc +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } - +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi -if test $ac_cv_header_pthread_h = yes; then - { echo "$as_me:$LINENO: checking for pthread_create" >&5 -echo $ECHO_N "checking for pthread_create... $ECHO_C" >&6; } -if test "${ac_cv_func_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test $ac_cv_lib_nsl_gethostbyname = no; then + { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define pthread_create to an innocuous variant, in case declares pthread_create. - For example, HP-UX 11i declares gettimeofday. */ -#define pthread_create innocuous_pthread_create - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_create (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef pthread_create /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -9468,18 +7635,11 @@ #ifdef __cplusplus extern "C" #endif -char pthread_create (); -/* 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_pthread_create || defined __stub___pthread_create -choke me -#endif - +char gethostbyname (); int main () { -return pthread_create (); +return gethostbyname (); ; return 0; } @@ -9490,38 +7650,54 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_pthread_create=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_bsd_gethostbyname=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_pthread_create=no + ac_cv_lib_bsd_gethostbyname=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_create" >&6; } -if test $ac_cv_func_pthread_create = yes; then - - abi_pthread_libs="" - { echo "$as_me:$LINENO: checking for pthread_yield" >&5 -echo $ECHO_N "checking for pthread_yield... $ECHO_C" >&6; } -if test "${ac_cv_func_pthread_yield+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + fi + fi + + # lieder@skyler.mavd.honeywell.com says without -lsocket, + # socket/setsockopt and other routines are undefined under SCO ODT + # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary + # on later versions), says Simon Leinen: it contains gethostby* + # variants that don't use the name server (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. + { $as_echo "$as_me:$LINENO: checking for connect" >&5 +$as_echo_n "checking for connect... " >&6; } +if test "${ac_cv_func_connect+set}" = set; then + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9529,12 +7705,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define pthread_yield to an innocuous variant, in case declares pthread_yield. +/* Define connect to an innocuous variant, in case declares connect. For example, HP-UX 11i declares gettimeofday. */ -#define pthread_yield innocuous_pthread_yield +#define connect innocuous_connect /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_yield (); below. + which can conflict with char connect (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -9544,7 +7720,7 @@ # include #endif -#undef pthread_yield +#undef connect /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -9552,18 +7728,18 @@ #ifdef __cplusplus extern "C" #endif -char pthread_yield (); +char connect (); /* 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_pthread_yield || defined __stub___pthread_yield +#if defined __stub_connect || defined __stub___connect choke me #endif int main () { -return pthread_yield (); +return connect (); ; return 0; } @@ -9574,46 +7750,44 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_pthread_yield=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_connect=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_pthread_yield=no + ac_cv_func_connect=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_yield" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_yield" >&6; } -if test $ac_cv_func_pthread_yield = yes; then - abi_pthread_yield=yes -else - abi_pthread_yield=no -fi - +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +$as_echo "$ac_cv_func_connect" >&6; } -else - { echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5 -echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test $ac_cv_func_connect = no; then + { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +$as_echo_n "checking for connect in -lsocket... " >&6; } +if test "${ac_cv_lib_socket_connect+set}" = set; then + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" +LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9627,11 +7801,11 @@ #ifdef __cplusplus extern "C" #endif -char pthread_exit (); +char connect (); int main () { -return pthread_exit (); +return connect (); ; return 0; } @@ -9642,48 +7816,70 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_pthread_pthread_exit=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_socket_connect=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pthread_pthread_exit=no + ac_cv_lib_socket_connect=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_exit" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_exit" >&6; } -if test $ac_cv_lib_pthread_pthread_exit = yes; then - - abi_pthread_libs="-lpthread" - { echo "$as_me:$LINENO: checking for pthread_yield in -lpthread" >&5 -echo $ECHO_N "checking for pthread_yield in -lpthread... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthread_pthread_yield+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +$as_echo "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = x""yes; then + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +fi + + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. + { $as_echo "$as_me:$LINENO: checking for remove" >&5 +$as_echo_n "checking for remove... " >&6; } +if test "${ac_cv_func_remove+set}" = set; then + $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define remove to an innocuous variant, in case declares remove. + For example, HP-UX 11i declares gettimeofday. */ +#define remove innocuous_remove + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char remove (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef remove /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -9691,11 +7887,18 @@ #ifdef __cplusplus extern "C" #endif -char pthread_yield (); +char remove (); +/* 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_remove || defined __stub___remove +choke me +#endif + int main () { -return pthread_yield (); +return remove (); ; return 0; } @@ -9706,245 +7909,113 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_pthread_pthread_yield=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_remove=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pthread_pthread_yield=no + ac_cv_func_remove=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_yield" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_yield" >&6; } -if test $ac_cv_lib_pthread_pthread_yield = yes; then - - abi_pthread_yield=yes - -else - abi_pthread_yield=no - -fi - - -else - { { echo "$as_me:$LINENO: error: * * * posix threads broken? * * *" >&5 -echo "$as_me: error: * * * posix threads broken? * * *" >&2;} - { (exit 1); exit 1; }; } - -fi - - -fi - - -else - if test $abi_threads = yes; then - { { echo "$as_me:$LINENO: error: * * * only posix threads supported currently * * *" >&5 -echo "$as_me: error: * * * only posix threads supported currently * * *" >&2;} - { (exit 1); exit 1; }; } - fi - abi_threads=no - -fi - - fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +$as_echo "$ac_cv_func_remove" >&6; } -if test $abi_threads != no; then - THREAD_CFLAGS="-DHAVE_THREADS=1 -DHAVE_POSIX_THREADS=1" - THREAD_LIBS="$abi_pthread_libs" - if test "x$abi_pthread_yield" = "xyes"; then - THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_PTHREAD_YIELD=1" - fi - abi_threads=yes -else - THREAD_CFLAGS="" - THREAD_LIBS="" -fi - if test $abi_threads = yes; then - HAVE_THREADS_TRUE= - HAVE_THREADS_FALSE='#' -else - HAVE_THREADS_TRUE='#' - HAVE_THREADS_FALSE= -fi - - - - - - -else - - -# Check whether --enable-threads was given. -if test "${enable_threads+set}" = set; then - enableval=$enable_threads; - if test "x$enableval" = "xno"; then - abi_threads=no - else - abi_threads=yes - fi - -else - abi_threads=check - -fi - - -if test $abi_threads != no; then - if test "${ac_cv_header_pthread_h+set}" = set; then - { echo "$as_me:$LINENO: checking for pthread.h" >&5 -echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } -if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } + if test $ac_cv_func_remove = no; then + { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +$as_echo_n "checking for remove in -lposix... " >&6; } +if test "${ac_cv_lib_posix_remove+set}" = set; then + $as_echo_n "(cached) " >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking pthread.h usability" >&5 -echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; } + ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include + +/* 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 +char remove (); +int +main () +{ +return remove (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +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_compile") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -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 pthread.h presence" >&5 -echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext }; then - ac_header_preproc=yes + ac_cv_lib_posix_remove=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + ac_cv_lib_posix_remove=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; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------- ## -## Report this to http://www.abisource.com/ ## -## ---------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for pthread.h" >&5 -echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } -if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_pthread_h=$ac_header_preproc +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } - +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +$as_echo "$ac_cv_lib_posix_remove" >&6; } +if test "x$ac_cv_lib_posix_remove" = x""yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi -if test $ac_cv_header_pthread_h = yes; then - { echo "$as_me:$LINENO: checking for pthread_create" >&5 -echo $ECHO_N "checking for pthread_create... $ECHO_C" >&6; } -if test "${ac_cv_func_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + { $as_echo "$as_me:$LINENO: checking for shmat" >&5 +$as_echo_n "checking for shmat... " >&6; } +if test "${ac_cv_func_shmat+set}" = set; then + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9952,12 +8023,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define pthread_create to an innocuous variant, in case declares pthread_create. +/* Define shmat to an innocuous variant, in case declares shmat. For example, HP-UX 11i declares gettimeofday. */ -#define pthread_create innocuous_pthread_create +#define shmat innocuous_shmat /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_create (); below. + which can conflict with char shmat (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -9967,7 +8038,7 @@ # include #endif -#undef pthread_create +#undef shmat /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -9975,18 +8046,18 @@ #ifdef __cplusplus extern "C" #endif -char pthread_create (); +char shmat (); /* 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_pthread_create || defined __stub___pthread_create +#if defined __stub_shmat || defined __stub___shmat choke me #endif int main () { -return pthread_create (); +return shmat (); ; return 0; } @@ -9997,61 +8068,50 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_pthread_create=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_shmat=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_pthread_create=no + ac_cv_func_shmat=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_create" >&6; } -if test $ac_cv_func_pthread_create = yes; then - - abi_pthread_libs="" - { echo "$as_me:$LINENO: checking for pthread_yield" >&5 -echo $ECHO_N "checking for pthread_yield... $ECHO_C" >&6; } -if test "${ac_cv_func_pthread_yield+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +$as_echo "$ac_cv_func_shmat" >&6; } + + if test $ac_cv_func_shmat = no; then + { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +$as_echo_n "checking for shmat in -lipc... " >&6; } +if test "${ac_cv_lib_ipc_shmat+set}" = set; then + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lipc $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define pthread_yield to an innocuous variant, in case declares pthread_yield. - For example, HP-UX 11i declares gettimeofday. */ -#define pthread_yield innocuous_pthread_yield - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_yield (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef pthread_yield /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -10059,18 +8119,11 @@ #ifdef __cplusplus extern "C" #endif -char pthread_yield (); -/* 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_pthread_yield || defined __stub___pthread_yield -choke me -#endif - +char shmat (); int main () { -return pthread_yield (); +return shmat (); ; return 0; } @@ -10081,46 +8134,59 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_pthread_yield=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_ipc_shmat=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_pthread_yield=no + ac_cv_lib_ipc_shmat=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_yield" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_yield" >&6; } -if test $ac_cv_func_pthread_yield = yes; then - abi_pthread_yield=yes -else - abi_pthread_yield=no +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +$as_echo "$ac_cv_lib_ipc_shmat" >&6; } +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi + fi + fi -else - { echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5 -echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # Check for libraries that X11R6 Xt/Xaw programs need. + ac_save_LDFLAGS=$LDFLAGS + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" + # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to + # check for ICE first), but we must link in the order -lSM -lICE or + # we get undefined symbols. So assume we have SM if we have ICE. + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry + { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" +LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -10134,11 +8200,11 @@ #ifdef __cplusplus extern "C" #endif -char pthread_exit (); +char IceConnectionNumber (); int main () { -return pthread_exit (); +return IceConnectionNumber (); ; return 0; } @@ -10149,39 +8215,319 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_pthread_pthread_exit=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_ICE_IceConnectionNumber=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pthread_pthread_exit=no + ac_cv_lib_ICE_IceConnectionNumber=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_exit" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_exit" >&6; } -if test $ac_cv_lib_pthread_pthread_exit = yes; then - - abi_pthread_libs="-lpthread" - { echo "$as_me:$LINENO: checking for pthread_yield in -lpthread" >&5 -echo $ECHO_N "checking for pthread_yield in -lpthread... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthread_pthread_yield+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +fi + + LDFLAGS=$ac_save_LDFLAGS + +fi + + + GTK_LIBS="$GTK_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" + + + +if test $print = true; then + + + +GNOMEPRINT_CFLAGS="" +GNOMEPRINT_LIBS="" +gnomeprint_modules='libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >= 2.2.0' + + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for GNOMEPRINT" >&5 +$as_echo_n "checking for GNOMEPRINT... " >&6; } + +if test -n "$GNOMEPRINT_CFLAGS"; then + pkg_cv_GNOMEPRINT_CFLAGS="$GNOMEPRINT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomeprint_modules\"") >&5 + ($PKG_CONFIG --exists --print-errors "$gnomeprint_modules") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GNOMEPRINT_CFLAGS=`$PKG_CONFIG --cflags "$gnomeprint_modules" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GNOMEPRINT_LIBS"; then + pkg_cv_GNOMEPRINT_LIBS="$GNOMEPRINT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomeprint_modules\"") >&5 + ($PKG_CONFIG --exists --print-errors "$gnomeprint_modules") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GNOMEPRINT_LIBS=`$PKG_CONFIG --libs "$gnomeprint_modules" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GNOMEPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$gnomeprint_modules" 2>&1` + else + GNOMEPRINT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$gnomeprint_modules" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GNOMEPRINT_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: Error: $gnomeprint_modules required" >&5 +$as_echo "$as_me: error: Error: $gnomeprint_modules required" >&2;} + { (exit 1); exit 1; }; } + +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:$LINENO: error: Error: $gnomeprint_modules required" >&5 +$as_echo "$as_me: error: Error: $gnomeprint_modules required" >&2;} + { (exit 1); exit 1; }; } + +else + GNOMEPRINT_CFLAGS=$pkg_cv_GNOMEPRINT_CFLAGS + GNOMEPRINT_LIBS=$pkg_cv_GNOMEPRINT_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + abi_gnomeprint=yes + ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS $gnomeprint_modules" + +fi +GNOMEPRINT_CFLAGS="$GNOMEPRINT_CFLAGS" + + + + + +fi + + + +FREETYPE_CFLAGS="" +FREETYPE_LIBS="" +freetype_modules='freetype2 >= 2.1.0' + + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for FREETYPE" >&5 +$as_echo_n "checking for FREETYPE... " >&6; } + +if test -n "$FREETYPE_CFLAGS"; then + pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$freetype_modules\"") >&5 + ($PKG_CONFIG --exists --print-errors "$freetype_modules") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "$freetype_modules" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$FREETYPE_LIBS"; then + pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$freetype_modules\"") >&5 + ($PKG_CONFIG --exists --print-errors "$freetype_modules") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "$freetype_modules" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$freetype_modules" 2>&1` + else + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$freetype_modules" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$FREETYPE_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: Error: $freetype_modules required" >&5 +$as_echo "$as_me: error: Error: $freetype_modules required" >&2;} + { (exit 1); exit 1; }; } + +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:$LINENO: error: Error: $freetype_modules required" >&5 +$as_echo "$as_me: error: Error: $freetype_modules required" >&2;} + { (exit 1); exit 1; }; } + +else + FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS + FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + abi_freetype=yes + ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS $freetype_modules" + +fi + + + + + + + # Check whether --enable-binreloc was given. +if test "${enable_binreloc+set}" = set; then + enableval=$enable_binreloc; enable_binreloc=$enableval +else + enable_binreloc=no +fi + + + # Check whether --enable-binreloc-threads was given. +if test "${enable_binreloc_threads+set}" = set; then + enableval=$enable_binreloc_threads; enable_binreloc_threads=$enableval +else + enable_binreloc_threads=yes +fi + + + BINRELOC_CFLAGS= + BINRELOC_LIBS= + if test "x$enable_binreloc" = "xauto"; then + { $as_echo "$as_me:$LINENO: checking for /proc/self/maps" >&5 +$as_echo_n "checking for /proc/self/maps... " >&6; } +if test "${ac_cv_file__proc_self_maps+set}" = set; then + $as_echo_n "(cached) " >&6 +else + test "$cross_compiling" = yes && + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/proc/self/maps"; then + ac_cv_file__proc_self_maps=yes +else + ac_cv_file__proc_self_maps=no +fi +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__proc_self_maps" >&5 +$as_echo "$ac_cv_file__proc_self_maps" >&6; } + + { $as_echo "$as_me:$LINENO: checking whether everything is installed to the same prefix" >&5 +$as_echo_n "checking whether everything is installed to the same prefix... " >&6; } +if test "${br_cv_valid_prefixes+set}" = set; then + $as_echo_n "(cached) " >&6 +else + + if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \ + "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \ + "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc' + then + br_cv_valid_prefixes=yes + else + br_cv_valid_prefixes=no + fi + +fi +{ $as_echo "$as_me:$LINENO: result: $br_cv_valid_prefixes" >&5 +$as_echo "$br_cv_valid_prefixes" >&6; } + fi + { $as_echo "$as_me:$LINENO: checking whether binary relocation support should be enabled" >&5 +$as_echo_n "checking whether binary relocation support should be enabled... " >&6; } +if test "${br_cv_binreloc+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "x$enable_binreloc" = "xyes"; then + br_cv_binreloc=yes + elif test "x$enable_binreloc" = "xauto"; then + if test "x$br_cv_valid_prefixes" = "xyes" -a \ + "x$ac_cv_file__proc_self_maps" = "xyes"; then + br_cv_binreloc=yes + else + br_cv_binreloc=no + fi + else + br_cv_binreloc=no + fi +fi +{ $as_echo "$as_me:$LINENO: result: $br_cv_binreloc" >&5 +$as_echo "$br_cv_binreloc" >&6; } + + if test "x$br_cv_binreloc" = "xyes"; then + BINRELOC_CFLAGS="-DENABLE_BINRELOC" + +cat >>confdefs.h <<\_ACEOF +#define ENABLE_BINRELOC /**/ +_ACEOF + + if test "x$enable_binreloc_threads" = "xyes"; then + +{ $as_echo "$as_me:$LINENO: checking for pthread_getspecific in -lpthread" >&5 +$as_echo_n "checking for pthread_getspecific in -lpthread... " >&6; } +if test "${ac_cv_lib_pthread_pthread_getspecific+set}" = set; then + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" @@ -10198,11 +8544,11 @@ #ifdef __cplusplus extern "C" #endif -char pthread_yield (); +char pthread_getspecific (); int main () { -return pthread_yield (); +return pthread_getspecific (); ; return 0; } @@ -10213,78 +8559,328 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_pthread_pthread_yield=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_pthread_pthread_getspecific=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pthread_pthread_yield=no + ac_cv_lib_pthread_pthread_getspecific=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_yield" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_yield" >&6; } -if test $ac_cv_lib_pthread_pthread_yield = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_getspecific" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_getspecific" >&6; } +if test "x$ac_cv_lib_pthread_pthread_getspecific" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPTHREAD 1 +_ACEOF + + LIBS="-lpthread $LIBS" + +fi + + fi + + { $as_echo "$as_me:$LINENO: checking whether binary relocation should use threads" >&5 +$as_echo_n "checking whether binary relocation should use threads... " >&6; } +if test "${br_cv_binreloc_threads+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "x$enable_binreloc_threads" = "xyes"; then + if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then + br_cv_binreloc_threads=yes + else + br_cv_binreloc_threads=no + fi + else + br_cv_binreloc_threads=no + fi +fi +{ $as_echo "$as_me:$LINENO: result: $br_cv_binreloc_threads" >&5 +$as_echo "$br_cv_binreloc_threads" >&6; } + + if test "x$br_cv_binreloc_threads" = "xyes"; then + BINRELOC_LIBS="-lpthread" + +cat >>confdefs.h <<\_ACEOF +#define BR_PTHREAD 1 +_ACEOF + + else + BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREADS=0" + +cat >>confdefs.h <<\_ACEOF +#define BR_PTHREAD 0 +_ACEOF + + fi + fi + + + +elif test "$PLATFORM" = "cocoa" ; then - abi_pthread_yield=yes + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5 +$as_echo_n "checking for GLIB... " >&6; } + +if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GLIB_LIBS"; then + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0" 2>/dev/null` else - abi_pthread_yield=no + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.0" 2>&1` + else + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + abi_glib2=no +elif test $pkg_failed = untried; then + abi_glib2=no else - { { echo "$as_me:$LINENO: error: * * * posix threads broken? * * *" >&5 -echo "$as_me: error: * * * posix threads broken? * * *" >&2;} + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + abi_glib2=yes + ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS glib-2.0 >= 2.0" + +fi + if test $abi_glib2 = no; then + { { $as_echo "$as_me:$LINENO: error: $GLIB_PKG_ERRORS" >&5 +$as_echo "$as_me: error: $GLIB_PKG_ERRORS" >&2;} { (exit 1); exit 1; }; } + fi + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for GMODULE" >&5 +$as_echo_n "checking for GMODULE... " >&6; } + +if test -n "$GMODULE_CFLAGS"; then + pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GMODULE_LIBS"; then + pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0 >= 2.0" 2>&1` + else + GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0 >= 2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GMODULE_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + abi_gmodule2=no +elif test $pkg_failed = untried; then + abi_gmodule2=no else - if test $abi_threads = yes; then - { { echo "$as_me:$LINENO: error: * * * only posix threads supported currently * * *" >&5 -echo "$as_me: error: * * * only posix threads supported currently * * *" >&2;} + GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS + GMODULE_LIBS=$pkg_cv_GMODULE_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + abi_gmodule2=yes + ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS gmodule-2.0 >= 2.0" + +fi + if test $abi_gmodule2 = no; then + { { $as_echo "$as_me:$LINENO: error: $GMODULE_PKG_ERRORS" >&5 +$as_echo "$as_me: error: $GMODULE_PKG_ERRORS" >&2;} { (exit 1); exit 1; }; } - fi - abi_threads=no + fi + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for GTHREAD" >&5 +$as_echo_n "checking for GTHREAD... " >&6; } + +if test -n "$GTHREAD_CFLAGS"; then + pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTHREAD_LIBS"; then + pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gthread-2.0" 2>&1` + else + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTHREAD_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + abi_gthread2=no + +elif test $pkg_failed = untried; then + abi_gthread2=no -if test $abi_threads != no; then - THREAD_CFLAGS="-DHAVE_THREADS=1 -DHAVE_POSIX_THREADS=1" - THREAD_LIBS="$abi_pthread_libs" - if test "x$abi_pthread_yield" = "xyes"; then - THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_PTHREAD_YIELD=1" - fi - abi_threads=yes else - THREAD_CFLAGS="" - THREAD_LIBS="" + GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS + GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + abi_gthread2=yes + ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS gthread-2.0" + fi - if test $abi_threads = yes; then + if test $abi_gthread2 = no; then + { { $as_echo "$as_me:$LINENO: error: $GTHREAD_PKG_ERRORS" >&5 +$as_echo "$as_me: error: $GTHREAD_PKG_ERRORS" >&2;} + { (exit 1); exit 1; }; } + else + THREAD_CFLAGS="-DHAVE_THREADS=1 $GTHREAD_CFLAGS" + THREAD_LIBS=$GTHREAD_LIBS + fi + + + + + if test $abi_gthread2 = yes; then HAVE_THREADS_TRUE= HAVE_THREADS_FALSE='#' else @@ -10293,9 +8889,21 @@ fi + ABI_FE="Cocoa" + ABI_BE="Unix" + with_macosx=true + with_cocoa=true - - + OBJCXX="c++" + OBJCXXFLAGS="" + OBJCXXDEPMODE="depmode=gcc3" +elif test "$PLATFORM" = "win" ; then + with_win32=true + ABI_FE="Win32" + ABI_BE="$ABI_FE" +elif test "$PLATFORM" = "qnx" ; then + ABI_FE="QNX" + with_qnx=true fi if $with_unix; then WITH_UNIX_TRUE= @@ -10386,17 +8994,17 @@ fi # test for existence & nature of iconv.h if test "${ac_cv_header_iconv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for iconv.h" >&5 -echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for iconv.h" >&5 +$as_echo_n "checking for iconv.h... " >&6; } if test "${ac_cv_header_iconv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 -echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 +$as_echo "$ac_cv_header_iconv_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking iconv.h usability" >&5 -echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking iconv.h usability" >&5 +$as_echo_n "checking iconv.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -10412,32 +9020,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking iconv.h presence" >&5 -echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking iconv.h presence" >&5 +$as_echo_n "checking iconv.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -10451,51 +9060,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: iconv.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: iconv.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: iconv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: iconv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: iconv.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: iconv.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: iconv.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: iconv.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ---------------------------------------- ## ## Report this to http://www.abisource.com/ ## @@ -10504,18 +9114,18 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for iconv.h" >&5 -echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for iconv.h" >&5 +$as_echo_n "checking for iconv.h... " >&6; } if test "${ac_cv_header_iconv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_iconv_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 -echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 +$as_echo "$ac_cv_header_iconv_h" >&6; } fi -if test $ac_cv_header_iconv_h = yes; then +if test "x$ac_cv_header_iconv_h" = x""yes; then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10547,36 +9157,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then if test $abi_libiconv = no; then - { { echo "$as_me:$LINENO: error: found libiconv - can I use it?" >&5 -echo "$as_me: error: found libiconv - can I use it?" >&2;} + { { $as_echo "$as_me:$LINENO: error: found libiconv - can I use it?" >&5 +$as_echo "$as_me: error: found libiconv - can I use it?" >&2;} { (exit 1); exit 1; }; } fi abi_iconv=sys_libiconv else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 if test $abi_libiconv = sys; then - { { echo "$as_me:$LINENO: error: (usable) libiconv not found" >&5 -echo "$as_me: error: (usable) libiconv not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: (usable) libiconv not found" >&5 +$as_echo "$as_me: error: (usable) libiconv not found" >&2;} { (exit 1); exit 1; }; } fi if test $abi_libiconv = yes; then - { echo "$as_me:$LINENO: WARNING: libiconv not found in system location" >&5 -echo "$as_me: WARNING: libiconv not found in system location" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libiconv not found in system location" >&5 +$as_echo "$as_me: WARNING: libiconv not found in system location" >&2;} abi_iconv=peer else abi_iconv=sys_iconv @@ -10600,16 +9211,16 @@ LIBICONV_PEERDIR="$abi_rootdir/libiconv" if test $abi_iconv = peer; then - { echo "$as_me:$LINENO: checking for libiconv in peer directory" >&5 -echo $ECHO_N "checking for libiconv in peer directory... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for libiconv in peer directory" >&5 +$as_echo_n "checking for libiconv in peer directory... " >&6; } if test -d $LIBICONV_PEERDIR; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: unable to use libiconv - no peer found" >&5 -echo "$as_me: error: unable to use libiconv - no peer found" >&2;} + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: unable to use libiconv - no peer found" >&5 +$as_echo "$as_me: error: unable to use libiconv - no peer found" >&2;} { (exit 1); exit 1; }; } fi @@ -10666,44 +9277,40 @@ if test "x$test_cmap" = "xtrue" ; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for GUCHARMAP" >&5 -echo $ECHO_N "checking for GUCHARMAP... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GUCHARMAP" >&5 +$as_echo_n "checking for GUCHARMAP... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GUCHARMAP_CFLAGS"; then - pkg_cv_GUCHARMAP_CFLAGS="$GUCHARMAP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gucharmap >= 1.4\"") >&5 +if test -n "$GUCHARMAP_CFLAGS"; then + pkg_cv_GUCHARMAP_CFLAGS="$GUCHARMAP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gucharmap >= 1.4\"") >&5 ($PKG_CONFIG --exists --print-errors "gucharmap >= 1.4") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GUCHARMAP_CFLAGS=`$PKG_CONFIG --cflags "gucharmap >= 1.4" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GUCHARMAP_LIBS"; then - pkg_cv_GUCHARMAP_LIBS="$GUCHARMAP_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gucharmap >= 1.4\"") >&5 +if test -n "$GUCHARMAP_LIBS"; then + pkg_cv_GUCHARMAP_LIBS="$GUCHARMAP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gucharmap >= 1.4\"") >&5 ($PKG_CONFIG --exists --print-errors "gucharmap >= 1.4") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GUCHARMAP_LIBS=`$PKG_CONFIG --libs "gucharmap >= 1.4" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -10716,15 +9323,15 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gucharmap >= 1.4"` + GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gucharmap >= 1.4" 2>&1` else - GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gucharmap >= 1.4"` + GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gucharmap >= 1.4" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GUCHARMAP_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } have_cmap=false @@ -10735,8 +9342,8 @@ else GUCHARMAP_CFLAGS=$pkg_cv_GUCHARMAP_CFLAGS GUCHARMAP_LIBS=$pkg_cv_GUCHARMAP_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } have_cmap=true ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS gucharmap >= 1.4" @@ -10778,44 +9385,40 @@ if test "x$xft" = "xtrue" ; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for XFT" >&5 -echo $ECHO_N "checking for XFT... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for XFT" >&5 +$as_echo_n "checking for XFT... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$XFT_CFLAGS"; then - pkg_cv_XFT_CFLAGS="$XFT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$xft_modules \"") >&5 +if test -n "$XFT_CFLAGS"; then + pkg_cv_XFT_CFLAGS="$XFT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$xft_modules \"") >&5 ($PKG_CONFIG --exists --print-errors " $xft_modules ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags " $xft_modules " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$XFT_LIBS"; then - pkg_cv_XFT_LIBS="$XFT_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$xft_modules \"") >&5 +if test -n "$XFT_LIBS"; then + pkg_cv_XFT_LIBS="$XFT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$xft_modules \"") >&5 ($PKG_CONFIG --exists --print-errors " $xft_modules ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs " $xft_modules " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -10828,14 +9431,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $xft_modules "` + XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $xft_modules " 2>&1` else - XFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $xft_modules "` + XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors " $xft_modules " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$XFT_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements ( $xft_modules ) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ( $xft_modules ) were not met: $XFT_PKG_ERRORS @@ -10846,7 +9449,7 @@ and XFT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements ( $xft_modules ) were not met: +$as_echo "$as_me: error: Package requirements ( $xft_modules ) were not met: $XFT_PKG_ERRORS @@ -10859,7 +9462,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -10869,7 +9474,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -10879,12 +9484,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else XFT_CFLAGS=$pkg_cv_XFT_CFLAGS XFT_LIBS=$pkg_cv_XFT_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS $xft_modules" @@ -10911,44 +9516,40 @@ pkg_failed=no -{ echo "$as_me:$LINENO: checking for GSF" >&5 -echo $ECHO_N "checking for GSF... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GSF" >&5 +$as_echo_n "checking for GSF... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GSF_CFLAGS"; then - pkg_cv_GSF_CFLAGS="$GSF_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GSF_MODULES\"") >&5 +if test -n "$GSF_CFLAGS"; then + pkg_cv_GSF_CFLAGS="$GSF_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GSF_MODULES\"") >&5 ($PKG_CONFIG --exists --print-errors "$GSF_MODULES") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GSF_CFLAGS=`$PKG_CONFIG --cflags "$GSF_MODULES" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GSF_LIBS"; then - pkg_cv_GSF_LIBS="$GSF_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GSF_MODULES\"") >&5 +if test -n "$GSF_LIBS"; then + pkg_cv_GSF_LIBS="$GSF_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GSF_MODULES\"") >&5 ($PKG_CONFIG --exists --print-errors "$GSF_MODULES") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GSF_LIBS=`$PKG_CONFIG --libs "$GSF_MODULES" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -10961,14 +9562,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GSF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GSF_MODULES"` + GSF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GSF_MODULES" 2>&1` else - GSF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GSF_MODULES"` + GSF_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GSF_MODULES" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GSF_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements ($GSF_MODULES) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ($GSF_MODULES) were not met: $GSF_PKG_ERRORS @@ -10979,7 +9580,7 @@ and GSF_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements ($GSF_MODULES) were not met: +$as_echo "$as_me: error: Package requirements ($GSF_MODULES) were not met: $GSF_PKG_ERRORS @@ -10992,7 +9593,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11002,7 +9605,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11012,12 +9615,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else GSF_CFLAGS=$pkg_cv_GSF_CFLAGS GSF_LIBS=$pkg_cv_GSF_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS $GSF_MODULES" @@ -11025,44 +9628,40 @@ pkg_failed=no -{ echo "$as_me:$LINENO: checking for GSF_HTTP" >&5 -echo $ECHO_N "checking for GSF_HTTP... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GSF_HTTP" >&5 +$as_echo_n "checking for GSF_HTTP... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GSF_HTTP_CFLAGS"; then - pkg_cv_GSF_HTTP_CFLAGS="$GSF_HTTP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.14.4\"") >&5 +if test -n "$GSF_HTTP_CFLAGS"; then + pkg_cv_GSF_HTTP_CFLAGS="$GSF_HTTP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.14.4\"") >&5 ($PKG_CONFIG --exists --print-errors "libgsf-1 >= 1.14.4") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GSF_HTTP_CFLAGS=`$PKG_CONFIG --cflags "libgsf-1 >= 1.14.4" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GSF_HTTP_LIBS"; then - pkg_cv_GSF_HTTP_LIBS="$GSF_HTTP_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.14.4\"") >&5 +if test -n "$GSF_HTTP_LIBS"; then + pkg_cv_GSF_HTTP_LIBS="$GSF_HTTP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.14.4\"") >&5 ($PKG_CONFIG --exists --print-errors "libgsf-1 >= 1.14.4") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GSF_HTTP_LIBS=`$PKG_CONFIG --libs "libgsf-1 >= 1.14.4" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -11075,29 +9674,29 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GSF_HTTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgsf-1 >= 1.14.4"` + GSF_HTTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgsf-1 >= 1.14.4" 2>&1` else - GSF_HTTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgsf-1 >= 1.14.4"` + GSF_HTTP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgsf-1 >= 1.14.4" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GSF_HTTP_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - { echo "$as_me:$LINENO: WARNING: building without HTTP VFS support" >&5 -echo "$as_me: WARNING: building without HTTP VFS support" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: building without HTTP VFS support" >&5 +$as_echo "$as_me: WARNING: building without HTTP VFS support" >&2;} elif test $pkg_failed = untried; then - { echo "$as_me:$LINENO: WARNING: building without HTTP VFS support" >&5 -echo "$as_me: WARNING: building without HTTP VFS support" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: building without HTTP VFS support" >&5 +$as_echo "$as_me: WARNING: building without HTTP VFS support" >&2;} else GSF_HTTP_CFLAGS=$pkg_cv_GSF_HTTP_CFLAGS GSF_HTTP_LIBS=$pkg_cv_GSF_HTTP_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } GSF_CFLAGS="$GSF_CFLAGS -DWITH_GSF_INPUT_HTTP=1" @@ -11113,44 +9712,40 @@ pkg_failed=no -{ echo "$as_me:$LINENO: checking for GOFFICE" >&5 -echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GOFFICE" >&5 +$as_echo_n "checking for GOFFICE... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GOFFICE_CFLAGS"; then - pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$goffice_modules \"") >&5 +if test -n "$GOFFICE_CFLAGS"; then + pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$goffice_modules \"") >&5 ($PKG_CONFIG --exists --print-errors " $goffice_modules ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags " $goffice_modules " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GOFFICE_LIBS"; then - pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$goffice_modules \"") >&5 +if test -n "$GOFFICE_LIBS"; then + pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$goffice_modules \"") >&5 ($PKG_CONFIG --exists --print-errors " $goffice_modules ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs " $goffice_modules " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -11163,15 +9758,15 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $goffice_modules "` + GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $goffice_modules " 2>&1` else - GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $goffice_modules "` + GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors " $goffice_modules " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GOFFICE_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } HAVE_SYSTEM_GOFFICE=no @@ -11182,8 +9777,8 @@ else GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } HAVE_SYSTEM_GOFFICE=yes ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS $goffice_modules" @@ -11245,15 +9840,15 @@ enableval=$enable_gnomevfs; if test "x$enableval" = "xyes"; then if test "$PLATFORM" != unix; then - { { echo "$as_me:$LINENO: error: sorry: --enable-gnomevfs supported only on UNIX platforms" >&5 -echo "$as_me: error: sorry: --enable-gnomevfs supported only on UNIX platforms" >&2;} + { { $as_echo "$as_me:$LINENO: error: sorry: --enable-gnomevfs supported only on UNIX platforms" >&5 +$as_echo "$as_me: error: sorry: --enable-gnomevfs supported only on UNIX platforms" >&2;} { (exit 1); exit 1; }; } fi if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomevfs_modules\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomevfs_modules\"") >&5 ($PKG_CONFIG --exists --print-errors "$gnomevfs_modules") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then gnomevfs=true @@ -11271,10 +9866,10 @@ else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomevfs_modules\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomevfs_modules\"") >&5 ($PKG_CONFIG --exists --print-errors "$gnomevfs_modules") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then gnomevfs=true @@ -11292,44 +9887,40 @@ if test "$gnomevfs" = true ; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for GNOMEVFS" >&5 -echo $ECHO_N "checking for GNOMEVFS... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GNOMEVFS" >&5 +$as_echo_n "checking for GNOMEVFS... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GNOMEVFS_CFLAGS"; then - pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$gnomevfs_modules \"") >&5 +if test -n "$GNOMEVFS_CFLAGS"; then + pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$gnomevfs_modules \"") >&5 ($PKG_CONFIG --exists --print-errors " $gnomevfs_modules ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags " $gnomevfs_modules " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$GNOMEVFS_LIBS"; then - pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$gnomevfs_modules \"") >&5 + else + pkg_failed=untried +fi +if test -n "$GNOMEVFS_LIBS"; then + pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$gnomevfs_modules \"") >&5 ($PKG_CONFIG --exists --print-errors " $gnomevfs_modules ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs " $gnomevfs_modules " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -11342,14 +9933,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $gnomevfs_modules "` + GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $gnomevfs_modules " 2>&1` else - GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $gnomevfs_modules "` + GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --print-errors " $gnomevfs_modules " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GNOMEVFS_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements ( $gnomevfs_modules ) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ( $gnomevfs_modules ) were not met: $GNOMEVFS_PKG_ERRORS @@ -11360,7 +9951,7 @@ and GNOMEVFS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements ( $gnomevfs_modules ) were not met: +$as_echo "$as_me: error: Package requirements ( $gnomevfs_modules ) were not met: $GNOMEVFS_PKG_ERRORS @@ -11373,7 +9964,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11383,7 +9976,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11393,12 +9986,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else GNOMEVFS_CFLAGS=$pkg_cv_GNOMEVFS_CFLAGS GNOMEVFS_LIBS=$pkg_cv_GNOMEVFS_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS $gnomevfs_modules" @@ -11438,15 +10031,15 @@ enableval=$enable_gnomeui; if test "x$enableval" = "xyes"; then if test "$PLATFORM" != unix; then - { { echo "$as_me:$LINENO: error: sorry: --enable-gnomeui supported only on UNIX platforms" >&5 -echo "$as_me: error: sorry: --enable-gnomeui supported only on UNIX platforms" >&2;} + { { $as_echo "$as_me:$LINENO: error: sorry: --enable-gnomeui supported only on UNIX platforms" >&5 +$as_echo "$as_me: error: sorry: --enable-gnomeui supported only on UNIX platforms" >&2;} { (exit 1); exit 1; }; } fi if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomeui_modules\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomeui_modules\"") >&5 ($PKG_CONFIG --exists --print-errors "$gnomeui_modules") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then gnomeui=true @@ -11464,10 +10057,10 @@ else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomeui_modules\"") >&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gnomeui_modules\"") >&5 ($PKG_CONFIG --exists --print-errors "$gnomeui_modules") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then gnomeui=true @@ -11485,44 +10078,40 @@ if test "$gnomeui" = true ; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for GNOMEUI" >&5 -echo $ECHO_N "checking for GNOMEUI... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GNOMEUI" >&5 +$as_echo_n "checking for GNOMEUI... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GNOMEUI_CFLAGS"; then - pkg_cv_GNOMEUI_CFLAGS="$GNOMEUI_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$gnomeui_modules \"") >&5 +if test -n "$GNOMEUI_CFLAGS"; then + pkg_cv_GNOMEUI_CFLAGS="$GNOMEUI_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$gnomeui_modules \"") >&5 ($PKG_CONFIG --exists --print-errors " $gnomeui_modules ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags " $gnomeui_modules " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GNOMEUI_LIBS"; then - pkg_cv_GNOMEUI_LIBS="$GNOMEUI_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$gnomeui_modules \"") >&5 +if test -n "$GNOMEUI_LIBS"; then + pkg_cv_GNOMEUI_LIBS="$GNOMEUI_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$gnomeui_modules \"") >&5 ($PKG_CONFIG --exists --print-errors " $gnomeui_modules ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_GNOMEUI_LIBS=`$PKG_CONFIG --libs " $gnomeui_modules " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -11535,14 +10124,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNOMEUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $gnomeui_modules "` + GNOMEUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $gnomeui_modules " 2>&1` else - GNOMEUI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $gnomeui_modules "` + GNOMEUI_PKG_ERRORS=`$PKG_CONFIG --print-errors " $gnomeui_modules " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GNOMEUI_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements ( $gnomeui_modules ) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ( $gnomeui_modules ) were not met: $GNOMEUI_PKG_ERRORS @@ -11553,7 +10142,7 @@ and GNOMEUI_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements ( $gnomeui_modules ) were not met: +$as_echo "$as_me: error: Package requirements ( $gnomeui_modules ) were not met: $GNOMEUI_PKG_ERRORS @@ -11566,7 +10155,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11576,7 +10167,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11586,12 +10177,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else GNOMEUI_CFLAGS=$pkg_cv_GNOMEUI_CFLAGS GNOMEUI_LIBS=$pkg_cv_GNOMEUI_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS $gnomeui_modules" @@ -11678,8 +10269,8 @@ case "${enableval}" in yes) do_spell=true ;; no) do_spell=false ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-spell" >&5 -echo "$as_me: error: bad value ${enableval} for --disable-spell" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-spell" >&5 +$as_echo "$as_me: error: bad value ${enableval} for --disable-spell" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -11702,44 +10293,40 @@ if test x$do_spell != xfalse ; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for SPELL" >&5 -echo $ECHO_N "checking for SPELL... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for SPELL" >&5 +$as_echo_n "checking for SPELL... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$SPELL_CFLAGS"; then - pkg_cv_SPELL_CFLAGS="$SPELL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.2.0\"") >&5 +if test -n "$SPELL_CFLAGS"; then + pkg_cv_SPELL_CFLAGS="$SPELL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "enchant >= 1.2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_SPELL_CFLAGS=`$PKG_CONFIG --cflags "enchant >= 1.2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$SPELL_LIBS"; then - pkg_cv_SPELL_LIBS="$SPELL_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.2.0\"") >&5 +if test -n "$SPELL_LIBS"; then + pkg_cv_SPELL_LIBS="$SPELL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "enchant >= 1.2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_SPELL_LIBS=`$PKG_CONFIG --libs "enchant >= 1.2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -11752,14 +10339,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "enchant >= 1.2.0"` + SPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "enchant >= 1.2.0" 2>&1` else - SPELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "enchant >= 1.2.0"` + SPELL_PKG_ERRORS=`$PKG_CONFIG --print-errors "enchant >= 1.2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SPELL_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (enchant >= 1.2.0) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (enchant >= 1.2.0) were not met: $SPELL_PKG_ERRORS @@ -11770,7 +10357,7 @@ and SPELL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (enchant >= 1.2.0) were not met: +$as_echo "$as_me: error: Package requirements (enchant >= 1.2.0) were not met: $SPELL_PKG_ERRORS @@ -11783,7 +10370,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11793,7 +10382,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11803,12 +10392,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else SPELL_CFLAGS=$pkg_cv_SPELL_CFLAGS SPELL_LIBS=$pkg_cv_SPELL_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS enchant >= 1.2.0" @@ -11859,44 +10448,40 @@ pkg_failed=no -{ echo "$as_me:$LINENO: checking for FRIBIDI" >&5 -echo $ECHO_N "checking for FRIBIDI... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for FRIBIDI" >&5 +$as_echo_n "checking for FRIBIDI... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$FRIBIDI_CFLAGS"; then - pkg_cv_FRIBIDI_CFLAGS="$FRIBIDI_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fribidi >= 0.10.4\"") >&5 +if test -n "$FRIBIDI_CFLAGS"; then + pkg_cv_FRIBIDI_CFLAGS="$FRIBIDI_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fribidi >= 0.10.4\"") >&5 ($PKG_CONFIG --exists --print-errors "fribidi >= 0.10.4") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_FRIBIDI_CFLAGS=`$PKG_CONFIG --cflags "fribidi >= 0.10.4" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$FRIBIDI_LIBS"; then - pkg_cv_FRIBIDI_LIBS="$FRIBIDI_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fribidi >= 0.10.4\"") >&5 +if test -n "$FRIBIDI_LIBS"; then + pkg_cv_FRIBIDI_LIBS="$FRIBIDI_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fribidi >= 0.10.4\"") >&5 ($PKG_CONFIG --exists --print-errors "fribidi >= 0.10.4") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_FRIBIDI_LIBS=`$PKG_CONFIG --libs "fribidi >= 0.10.4" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -11909,15 +10494,15 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fribidi >= 0.10.4"` + FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fribidi >= 0.10.4" 2>&1` else - FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fribidi >= 0.10.4"` + FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --print-errors "fribidi >= 0.10.4" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$FRIBIDI_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } echo "" echo "fribidi sources can be downloaded from SourceForge" echo "" @@ -11926,8 +10511,8 @@ echo "Note: Don't use the fribidi source which is sometimes" echo " included with AbiWord since that version is for" echo " Windows only." - { { echo "$as_me:$LINENO: error: * * * fribidi >= 0.10.4 is required * * *" >&5 -echo "$as_me: error: * * * fribidi >= 0.10.4 is required * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * fribidi >= 0.10.4 is required * * *" >&5 +$as_echo "$as_me: error: * * * fribidi >= 0.10.4 is required * * *" >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then @@ -11939,15 +10524,15 @@ echo "Note: Don't use the fribidi source which is sometimes" echo " included with AbiWord since that version is for" echo " Windows only." - { { echo "$as_me:$LINENO: error: * * * fribidi >= 0.10.4 is required * * *" >&5 -echo "$as_me: error: * * * fribidi >= 0.10.4 is required * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * fribidi >= 0.10.4 is required * * *" >&5 +$as_echo "$as_me: error: * * * fribidi >= 0.10.4 is required * * *" >&2;} { (exit 1); exit 1; }; } else FRIBIDI_CFLAGS=$pkg_cv_FRIBIDI_CFLAGS FRIBIDI_LIBS=$pkg_cv_FRIBIDI_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } abi_fribidi=yes ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS fribidi >= 0.10.4" @@ -12015,17 +10600,17 @@ ABI_COMMAND_LDFLAGS="" have_readline=unknown if test "${ac_cv_header_readline_readline_h+set}" = set; then - { echo "$as_me:$LINENO: checking for readline/readline.h" >&5 -echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for readline/readline.h" >&5 +$as_echo_n "checking for readline/readline.h... " >&6; } if test "${ac_cv_header_readline_readline_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 +$as_echo "$ac_cv_header_readline_readline_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking readline/readline.h usability" >&5 -echo $ECHO_N "checking readline/readline.h usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking readline/readline.h usability" >&5 +$as_echo_n "checking readline/readline.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12041,32 +10626,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking readline/readline.h presence" >&5 -echo $ECHO_N "checking readline/readline.h presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking readline/readline.h presence" >&5 +$as_echo_n "checking readline/readline.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12080,51 +10666,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: readline/readline.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: readline/readline.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: readline/readline.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: readline/readline.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: readline/readline.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ---------------------------------------- ## ## Report this to http://www.abisource.com/ ## @@ -12133,31 +10720,31 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for readline/readline.h" >&5 -echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for readline/readline.h" >&5 +$as_echo_n "checking for readline/readline.h... " >&6; } if test "${ac_cv_header_readline_readline_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_readline_readline_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 +$as_echo "$ac_cv_header_readline_readline_h" >&6; } fi -if test $ac_cv_header_readline_readline_h = yes; then +if test "x$ac_cv_header_readline_readline_h" = x""yes; then if test "${ac_cv_header_readline_history_h+set}" = set; then - { echo "$as_me:$LINENO: checking for readline/history.h" >&5 -echo $ECHO_N "checking for readline/history.h... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for readline/history.h" >&5 +$as_echo_n "checking for readline/history.h... " >&6; } if test "${ac_cv_header_readline_history_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_history_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 +$as_echo "$ac_cv_header_readline_history_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking readline/history.h usability" >&5 -echo $ECHO_N "checking readline/history.h usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking readline/history.h usability" >&5 +$as_echo_n "checking readline/history.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12173,32 +10760,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking readline/history.h presence" >&5 -echo $ECHO_N "checking readline/history.h presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking readline/history.h presence" >&5 +$as_echo_n "checking readline/history.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12212,51 +10800,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: readline/history.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: readline/history.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: readline/history.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: readline/history.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: readline/history.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: readline/history.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: readline/history.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: readline/history.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: readline/history.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: readline/history.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: readline/history.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: readline/history.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: readline/history.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: readline/history.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: readline/history.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: readline/history.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: readline/history.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: readline/history.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ---------------------------------------- ## ## Report this to http://www.abisource.com/ ## @@ -12265,23 +10854,23 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for readline/history.h" >&5 -echo $ECHO_N "checking for readline/history.h... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for readline/history.h" >&5 +$as_echo_n "checking for readline/history.h... " >&6; } if test "${ac_cv_header_readline_history_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_readline_history_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_history_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 +$as_echo "$ac_cv_header_readline_history_h" >&6; } fi -if test $ac_cv_header_readline_history_h = yes; then +if test "x$ac_cv_header_readline_history_h" = x""yes; then - { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 -echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 +$as_echo_n "checking for readline in -lreadline... " >&6; } if test "${ac_cv_lib_readline_readline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline -ltermcap $LIBS" @@ -12313,43 +10902,47 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_readline_readline=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_readline_readline=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 -echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; } -if test $ac_cv_lib_readline_readline = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 +$as_echo "$ac_cv_lib_readline_readline" >&6; } +if test "x$ac_cv_lib_readline_readline" = x""yes; then have_readline=yes LDFLAGS="-ltermcap $LDFLAGS" ABI_COMMAND_LDFLAGS="-ltermcap $ABI_COMMAND_LDFLAGS" else - { echo "$as_me:$LINENO: checking for rl_initialize in -lreadline" >&5 -echo $ECHO_N "checking for rl_initialize in -lreadline... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for rl_initialize in -lreadline" >&5 +$as_echo_n "checking for rl_initialize in -lreadline... " >&6; } if test "${ac_cv_lib_readline_rl_initialize+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline -lcurses $LIBS" @@ -12381,33 +10974,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_readline_rl_initialize=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_readline_rl_initialize=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_initialize" >&5 -echo "${ECHO_T}$ac_cv_lib_readline_rl_initialize" >&6; } -if test $ac_cv_lib_readline_rl_initialize = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_initialize" >&5 +$as_echo "$ac_cv_lib_readline_rl_initialize" >&6; } +if test "x$ac_cv_lib_readline_rl_initialize" = x""yes; then have_readline=yes LDFLAGS="-lcurses $LDFLAGS" @@ -12434,8 +11031,8 @@ if test $have_readline != yes; then - { { echo "$as_me:$LINENO: error: abicommand: error - readline libs or hdrs not found" >&5 -echo "$as_me: error: abicommand: error - readline libs or hdrs not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: abicommand: error - readline libs or hdrs not found" >&5 +$as_echo "$as_me: error: abicommand: error - readline libs or hdrs not found" >&2;} { (exit 1); exit 1; }; } else PLUGIN_LIBS="$PLUGIN_LIBS -lreadline -lhistory $ABI_COMMAND_LDFLAGS" @@ -12469,44 +11066,40 @@ _abi_plugin_lib=AbiOTS pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_ots" >&5 -echo $ECHO_N "checking for _abi_ots... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for _abi_ots" >&5 +$as_echo_n "checking for _abi_ots... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_ots_CFLAGS"; then - pkg_cv__abi_ots_CFLAGS="$_abi_ots_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libots-1 >= 0.2.0\"") >&5 +if test -n "$_abi_ots_CFLAGS"; then + pkg_cv__abi_ots_CFLAGS="$_abi_ots_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libots-1 >= 0.2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "libots-1 >= 0.2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv__abi_ots_CFLAGS=`$PKG_CONFIG --cflags "libots-1 >= 0.2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_ots_LIBS"; then - pkg_cv__abi_ots_LIBS="$_abi_ots_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libots-1 >= 0.2.0\"") >&5 +if test -n "$_abi_ots_LIBS"; then + pkg_cv__abi_ots_LIBS="$_abi_ots_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libots-1 >= 0.2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "libots-1 >= 0.2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv__abi_ots_LIBS=`$PKG_CONFIG --libs "libots-1 >= 0.2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -12519,14 +11112,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_ots_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libots-1 >= 0.2.0"` + _abi_ots_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libots-1 >= 0.2.0" 2>&1` else - _abi_ots_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libots-1 >= 0.2.0"` + _abi_ots_PKG_ERRORS=`$PKG_CONFIG --print-errors "libots-1 >= 0.2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$_abi_ots_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (libots-1 >= 0.2.0) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (libots-1 >= 0.2.0) were not met: $_abi_ots_PKG_ERRORS @@ -12537,7 +11130,7 @@ and _abi_ots_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (libots-1 >= 0.2.0) were not met: +$as_echo "$as_me: error: Package requirements (libots-1 >= 0.2.0) were not met: $_abi_ots_PKG_ERRORS @@ -12550,7 +11143,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -12560,7 +11155,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -12570,12 +11165,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else _abi_ots_CFLAGS=$pkg_cv__abi_ots_CFLAGS _abi_ots_LIBS=$pkg_cv__abi_ots_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } : fi PLUGIN_LIBS="$PLUGIN_LIBS $_abi_ots_LIBS" @@ -12635,8 +11230,8 @@ withval=$with_ImageMagick; if test "x$withval" = "xno" ; then if test $abi_magickpp_opt = required ; then - { { echo "$as_me:$LINENO: error: * * * ImageMagick++ is not optional! * * *" >&5 -echo "$as_me: error: * * * ImageMagick++ is not optional! * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * ImageMagick++ is not optional! * * *" >&5 +$as_echo "$as_me: error: * * * ImageMagick++ is not optional! * * *" >&2;} { (exit 1); exit 1; }; } fi abi_magickpp_opt=no @@ -12657,10 +11252,10 @@ if test "x$abi_magickpp_dir" = "x" ; then # Extract the first word of "Magick++-config", so it can be a program name with args. set dummy Magick++-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_abi_magickpp_config+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $abi_magickpp_config in [\\/]* | ?:[\\/]*) @@ -12675,7 +11270,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_abi_magickpp_config="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12687,21 +11282,21 @@ fi abi_magickpp_config=$ac_cv_path_abi_magickpp_config if test -n "$abi_magickpp_config"; then - { echo "$as_me:$LINENO: result: $abi_magickpp_config" >&5 -echo "${ECHO_T}$abi_magickpp_config" >&6; } + { $as_echo "$as_me:$LINENO: result: $abi_magickpp_config" >&5 +$as_echo "$abi_magickpp_config" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi else # Extract the first word of "Magick++-config", so it can be a program name with args. set dummy Magick++-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_abi_magickpp_config+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $abi_magickpp_config in [\\/]* | ?:[\\/]*) @@ -12717,7 +11312,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_abi_magickpp_config="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12729,19 +11324,19 @@ fi abi_magickpp_config=$ac_cv_path_abi_magickpp_config if test -n "$abi_magickpp_config"; then - { echo "$as_me:$LINENO: result: $abi_magickpp_config" >&5 -echo "${ECHO_T}$abi_magickpp_config" >&6; } + { $as_echo "$as_me:$LINENO: result: $abi_magickpp_config" >&5 +$as_echo "$abi_magickpp_config" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "x$abi_magickpp_config" = "x" ; then if test $abi_magickpp_opt = required ; then - { { echo "$as_me:$LINENO: error: * * * unable to find Magick++-config in path! * * *" >&5 -echo "$as_me: error: * * * unable to find Magick++-config in path! * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * unable to find Magick++-config in path! * * *" >&5 +$as_echo "$as_me: error: * * * unable to find Magick++-config in path! * * *" >&2;} { (exit 1); exit 1; }; } fi abi_magickpp_opt=no @@ -12754,8 +11349,8 @@ _abi_magickpp_minor=`echo $_abi_magickpp_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` _abi_magickpp_micro=`echo $_abi_magickpp_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - { echo "$as_me:$LINENO: checking for ImageMagick++ >= $_abi_magickpp_major.$_abi_magickpp_minor.$_abi_magickpp_micro" >&5 -echo $ECHO_N "checking for ImageMagick++ >= $_abi_magickpp_major.$_abi_magickpp_minor.$_abi_magickpp_micro... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for ImageMagick++ >= $_abi_magickpp_major.$_abi_magickpp_minor.$_abi_magickpp_micro" >&5 +$as_echo_n "checking for ImageMagick++ >= $_abi_magickpp_major.$_abi_magickpp_minor.$_abi_magickpp_micro... " >&6; } abi_magickpp_version=`$abi_magickpp_config --version` abi_magickpp_major=`echo $abi_magickpp_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` @@ -12776,23 +11371,23 @@ fi if test "x$abi_magickpp_version" = "x" ; then if test $abi_magickpp_opt = required ; then - { { echo "$as_me:$LINENO: error: * * * ImageMagick++ version is incompatible! require at least \"1.2.5.4.0\" * * *" >&5 -echo "$as_me: error: * * * ImageMagick++ version is incompatible! require at least \"1.2.5.4.0\" * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * ImageMagick++ version is incompatible! require at least \"1.2.5.4.0\" * * *" >&5 +$as_echo "$as_me: error: * * * ImageMagick++ version is incompatible! require at least \"1.2.5.4.0\" * * *" >&2;} { (exit 1); exit 1; }; } fi abi_magickpp_opt=no - { echo "$as_me:$LINENO: result: no - $abi_magickpp_major.$abi_magickpp_minor.$abi_magickpp_micro" >&5 -echo "${ECHO_T}no - $abi_magickpp_major.$abi_magickpp_minor.$abi_magickpp_micro" >&6; } + { $as_echo "$as_me:$LINENO: result: no - $abi_magickpp_major.$abi_magickpp_minor.$abi_magickpp_micro" >&5 +$as_echo "no - $abi_magickpp_major.$abi_magickpp_minor.$abi_magickpp_micro" >&6; } else - { echo "$as_me:$LINENO: result: yes - $abi_magickpp_version" >&5 -echo "${ECHO_T}yes - $abi_magickpp_version" >&6; } + { $as_echo "$as_me:$LINENO: result: yes - $abi_magickpp_version" >&5 +$as_echo "yes - $abi_magickpp_version" >&6; } fi else - { echo "$as_me:$LINENO: WARNING: * * * problem obtaining ImageMagick++ version... * * *" >&5 -echo "$as_me: WARNING: * * * problem obtaining ImageMagick++ version... * * *" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: * * * problem obtaining ImageMagick++ version... * * *" >&5 +$as_echo "$as_me: WARNING: * * * problem obtaining ImageMagick++ version... * * *" >&2;} if test $abi_magickpp_opt = required ; then - { { echo "$as_me:$LINENO: error: * * * unable to determine ImageMagick++ version! * * *" >&5 -echo "$as_me: error: * * * unable to determine ImageMagick++ version! * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * unable to determine ImageMagick++ version! * * *" >&5 +$as_echo "$as_me: error: * * * unable to determine ImageMagick++ version! * * *" >&2;} { (exit 1); exit 1; }; } fi abi_magickpp_opt=no @@ -12839,44 +11434,40 @@ _abi_plugin_lib=AbiOpenWriter pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_openwriter" >&5 -echo $ECHO_N "checking for _abi_openwriter... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for _abi_openwriter" >&5 +$as_echo_n "checking for _abi_openwriter... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_openwriter_CFLAGS"; then - pkg_cv__abi_openwriter_CFLAGS="$_abi_openwriter_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.4.0\"") >&5 +if test -n "$_abi_openwriter_CFLAGS"; then + pkg_cv__abi_openwriter_CFLAGS="$_abi_openwriter_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.4.0\"") >&5 ($PKG_CONFIG --exists --print-errors "libgsf-1 >= 1.4.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv__abi_openwriter_CFLAGS=`$PKG_CONFIG --cflags "libgsf-1 >= 1.4.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_openwriter_LIBS"; then - pkg_cv__abi_openwriter_LIBS="$_abi_openwriter_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.4.0\"") >&5 +if test -n "$_abi_openwriter_LIBS"; then + pkg_cv__abi_openwriter_LIBS="$_abi_openwriter_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.4.0\"") >&5 ($PKG_CONFIG --exists --print-errors "libgsf-1 >= 1.4.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv__abi_openwriter_LIBS=`$PKG_CONFIG --libs "libgsf-1 >= 1.4.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -12889,14 +11480,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_openwriter_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgsf-1 >= 1.4.0"` + _abi_openwriter_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgsf-1 >= 1.4.0" 2>&1` else - _abi_openwriter_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgsf-1 >= 1.4.0"` + _abi_openwriter_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgsf-1 >= 1.4.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$_abi_openwriter_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (libgsf-1 >= 1.4.0) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (libgsf-1 >= 1.4.0) were not met: $_abi_openwriter_PKG_ERRORS @@ -12907,7 +11498,7 @@ and _abi_openwriter_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (libgsf-1 >= 1.4.0) were not met: +$as_echo "$as_me: error: Package requirements (libgsf-1 >= 1.4.0) were not met: $_abi_openwriter_PKG_ERRORS @@ -12920,7 +11511,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -12930,7 +11523,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -12940,12 +11533,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else _abi_openwriter_CFLAGS=$pkg_cv__abi_openwriter_CFLAGS _abi_openwriter_LIBS=$pkg_cv__abi_openwriter_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } : fi PLUGIN_LIBS="$PLUGIN_LIBS $_abi_openwriter_LIBS" @@ -12963,44 +11556,40 @@ _abi_plugin_lib=AbiSDW pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_sdw" >&5 -echo $ECHO_N "checking for _abi_sdw... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for _abi_sdw" >&5 +$as_echo_n "checking for _abi_sdw... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_sdw_CFLAGS"; then - pkg_cv__abi_sdw_CFLAGS="$_abi_sdw_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.4.0\"") >&5 +if test -n "$_abi_sdw_CFLAGS"; then + pkg_cv__abi_sdw_CFLAGS="$_abi_sdw_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.4.0\"") >&5 ($PKG_CONFIG --exists --print-errors "libgsf-1 >= 1.4.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv__abi_sdw_CFLAGS=`$PKG_CONFIG --cflags "libgsf-1 >= 1.4.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_sdw_LIBS"; then - pkg_cv__abi_sdw_LIBS="$_abi_sdw_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.4.0\"") >&5 +if test -n "$_abi_sdw_LIBS"; then + pkg_cv__abi_sdw_LIBS="$_abi_sdw_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.4.0\"") >&5 ($PKG_CONFIG --exists --print-errors "libgsf-1 >= 1.4.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv__abi_sdw_LIBS=`$PKG_CONFIG --libs "libgsf-1 >= 1.4.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -13013,14 +11602,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_sdw_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgsf-1 >= 1.4.0"` + _abi_sdw_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgsf-1 >= 1.4.0" 2>&1` else - _abi_sdw_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgsf-1 >= 1.4.0"` + _abi_sdw_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgsf-1 >= 1.4.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$_abi_sdw_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (libgsf-1 >= 1.4.0) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (libgsf-1 >= 1.4.0) were not met: $_abi_sdw_PKG_ERRORS @@ -13031,7 +11620,7 @@ and _abi_sdw_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (libgsf-1 >= 1.4.0) were not met: +$as_echo "$as_me: error: Package requirements (libgsf-1 >= 1.4.0) were not met: $_abi_sdw_PKG_ERRORS @@ -13044,7 +11633,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -13054,7 +11645,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -13064,12 +11655,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else _abi_sdw_CFLAGS=$pkg_cv__abi_sdw_CFLAGS _abi_sdw_LIBS=$pkg_cv__abi_sdw_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } : fi PLUGIN_LIBS="$PLUGIN_LIBS $_abi_sdw_LIBS" @@ -13084,44 +11675,40 @@ _abi_plugin_lib=AbiWordPerfect pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_wordperfect" >&5 -echo $ECHO_N "checking for _abi_wordperfect... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for _abi_wordperfect" >&5 +$as_echo_n "checking for _abi_wordperfect... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_wordperfect_CFLAGS"; then - pkg_cv__abi_wordperfect_CFLAGS="$_abi_wordperfect_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpd-1 >= 0.5.0\"") >&5 +if test -n "$_abi_wordperfect_CFLAGS"; then + pkg_cv__abi_wordperfect_CFLAGS="$_abi_wordperfect_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpd-1 >= 0.5.0\"") >&5 ($PKG_CONFIG --exists --print-errors "libwpd-1 >= 0.5.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv__abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-1 >= 0.5.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_wordperfect_LIBS"; then - pkg_cv__abi_wordperfect_LIBS="$_abi_wordperfect_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpd-1 >= 0.5.0\"") >&5 +if test -n "$_abi_wordperfect_LIBS"; then + pkg_cv__abi_wordperfect_LIBS="$_abi_wordperfect_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpd-1 >= 0.5.0\"") >&5 ($PKG_CONFIG --exists --print-errors "libwpd-1 >= 0.5.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv__abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-1 >= 0.5.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -13134,14 +11721,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libwpd-1 >= 0.5.0"` + _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwpd-1 >= 0.5.0" 2>&1` else - _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-1 >= 0.5.0"` + _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwpd-1 >= 0.5.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$_abi_wordperfect_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (libwpd-1 >= 0.5.0) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (libwpd-1 >= 0.5.0) were not met: $_abi_wordperfect_PKG_ERRORS @@ -13152,7 +11739,7 @@ and _abi_wordperfect_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (libwpd-1 >= 0.5.0) were not met: +$as_echo "$as_me: error: Package requirements (libwpd-1 >= 0.5.0) were not met: $_abi_wordperfect_PKG_ERRORS @@ -13165,7 +11752,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -13175,7 +11764,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -13185,12 +11774,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else _abi_wordperfect_CFLAGS=$pkg_cv__abi_wordperfect_CFLAGS _abi_wordperfect_LIBS=$pkg_cv__abi_wordperfect_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } : fi PLUGIN_LIBS="$PLUGIN_LIBS $_abi_wordperfect_LIBS" @@ -13205,8 +11794,8 @@ _abi_plugin_lib=AbiScriptHappy ;; *) - { { echo "$as_me:$LINENO: error: I do not know plugin $p" >&5 -echo "$as_me: error: I do not know plugin $p" >&2;} + { { $as_echo "$as_me:$LINENO: error: I do not know plugin $p" >&5 +$as_echo "$as_me: error: I do not know plugin $p" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -13248,8 +11837,8 @@ enableval=$enable_profile; case "${enableval}" in yes) PROFILE_CFLAGS="-pg -fprofile-arcs -ftest-coverage" ;; no) PROFILE_CFLAGS="" ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-profile" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-profile" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-profile" >&5 +$as_echo "$as_me: error: bad value ${enableval} for --enable-profile" >&2;} { (exit 1); exit 1; }; } ;; esac else @@ -13262,8 +11851,8 @@ enableval=$enable_extra_optimization; case "${enableval}" in yes) OPTIMIZE_CFLAGS="-O3" ;; no) OPTIMIZE_CFLAGS="-O2" ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-extra-optimization" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-extra-optimization" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-extra-optimization" >&5 +$as_echo "$as_me: error: bad value ${enableval} for --enable-extra-optimization" >&2;} { (exit 1); exit 1; }; } ;; esac else @@ -13281,8 +11870,8 @@ OPTIMIZE_CFLAGS="" ;; no) debug=false ; DEBUG_CFLAGS="-DNDEBUG" ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5 +$as_echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -13310,8 +11899,8 @@ DEBUG_CFLAGS="-g" ; OPTIMIZE_CFLAGS="" ;; no) symbols=false ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-symbols" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-symbols" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-symbols" >&5 +$as_echo "$as_me: error: bad value ${enableval} for --enable-symbols" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -13337,8 +11926,8 @@ enableval=$enable_peer_config; case "${enableval}" in yes) peerconfig=true ;; no) peerconfig=false ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-peer-config" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-peer-config" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-peer-config" >&5 +$as_echo "$as_me: error: bad value ${enableval} for --enable-peer-config" >&2;} { (exit 1); exit 1; }; } ;; esac else @@ -13346,66 +11935,6 @@ fi -# Check whether --enable-scripting was given. -if test "${enable_scripting+set}" = set; then - enableval=$enable_scripting; case "${enableval}" in - yes) script=true ;; - no) script=false ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-scripting" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-scripting" >&2;} - { (exit 1); exit 1; }; } ;; - esac -else - script=false -fi - - - - if test x$script = xtrue; then - SCRIPT_TRUE= - SCRIPT_FALSE='#' -else - SCRIPT_TRUE='#' - SCRIPT_FALSE= -fi - - -case "$script" in - "true" ) - SCRIPT_LIBS="`perl -MExtUtils::Embed -e ldopts`" - { echo "$as_me:$LINENO: checking for perl" >&5 -echo $ECHO_N "checking for perl... $ECHO_C" >&6; } - ABI_WHICH_PERL="`which perl 2>&1 | grep -v no\ perl`" - { echo "$as_me:$LINENO: result: ${ABI_WHICH_PERL}" >&5 -echo "${ECHO_T}${ABI_WHICH_PERL}" >&6; } - { echo "$as_me:$LINENO: checking perl version" >&5 -echo $ECHO_N "checking perl version... $ECHO_C" >&6; } - ABI_PERL_VERSION=`perl -V:version | tr -d "version=" | tr -d "\'" | tr -d "\;" | tr -d . | awk '{printf "%d", $1 * 10}'` - if test "$ABI_PERL_VERSION" -le 5699; then - SCRIPT_CFLAGS="-DABI_OPT_PERL `perl -MExtUtils::Embed -e ccopts` -Ubool -DNOT_PERL_5_8" - else - SCRIPT_CFLAGS="-DABI_OPT_PERL `perl -MExtUtils::Embed -e ccopts` -Ubool" - fi - { echo "$as_me:$LINENO: result: $ABI_PERL_VERSION" >&5 -echo "${ECHO_T}$ABI_PERL_VERSION" >&6; } - { echo "$as_me:$LINENO: checking for perl xsubpp precompiler" >&5 -echo $ECHO_N "checking for perl xsubpp precompiler... $ECHO_C" >&6; } - XSUBPPDIR="`(cd $abs_srcdir/src/bindings/perl && perl -MExtUtils::MakeMaker -e 'print ExtUtils::MakeMaker->new({NAME => qw(abi)})->tool_xsubpp') | grep ^XSUBPPDIR | sed -e 's/XSUBPPDIR = //g;'`" - if test -n "${XSUBPPDIR}"; then - { echo "$as_me:$LINENO: result: ${XSUBPPDIR}" >&5 -echo "${ECHO_T}${XSUBPPDIR}" >&6; } - else - { { echo "$as_me:$LINENO: error: not found" >&5 -echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } - fi - ;; - * ) - SCRIPT_CFLAGS="" - SCRIPT_LIBS="" - ;; -esac - if test "$PLATFORM" = "unix"; then PLATFORM_CFLAGS="$GTK_CFLAGS $GMODULE_CFLAGS $GUCHARMAP_CFLAGS $GNOMEPRINT_CFLAGS $FREETYPE_CFLAGS $GOFFICE_CFLAGS $BONOBO_CFLAGS $GNOMEVFS_CFLAGS $GNOMEUI_CFLAGS -DSUPPORTS_UT_IDLE=1" PLATFORM_LIBS="$GTK_LIBS $GMODULE_LIBS $GUCHARMAP_LIBS $GNOMEPRINT_LIBS $FREETYPE_LIBS $BONOBO_LIBS $GNOMEVFS_LIBS $GNOMEUI_LIBS" @@ -13447,12 +11976,10 @@ - - -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -13479,20 +12006,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no @@ -13584,37 +12112,40 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (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_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi +rm -rf conftest.dSYM 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -13630,20 +12161,21 @@ for ac_header in limits.h strings.h sys/time.h unistd.h malloc.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 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; } + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$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; } +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13659,32 +12191,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$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; } +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13698,51 +12231,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -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;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ---------------------------------------- ## ## Report this to http://www.abisource.com/ ## @@ -13751,21 +12285,24 @@ ) | 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -13773,10 +12310,10 @@ done -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -13838,9 +12375,225 @@ return !cs[0] && !zero.x; #endif - ; - return 0; -} + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_c_const=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_const=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then + +cat >>confdefs.h <<\_ACEOF +#define const /**/ +_ACEOF + +fi + + + +if test "$abi_c_inline" = ""; then + for _abi_kw in inline __inline__ __inline; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +} $_abi_kw foo() { + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + abi_c_inline=$_abi_kw; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done + if test "$abi_c_inline" != "inline"; then + CFLAGS="-Dinline=$abi_c_inline $CFLAGS" + + fi +fi + + +{ $as_echo "$as_me:$LINENO: checking for size_t" >&5 +$as_echo_n "checking for size_t... " >&6; } +if test "${ac_cv_type_size_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_size_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if (sizeof (size_t)) + return 0; + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if (sizeof ((size_t))) + return 0; + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_size_t=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +$as_echo "$ac_cv_type_size_t" >&6; } +if test "x$ac_cv_type_size_t" = x""yes; then + : +else + +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF + +fi + + + { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if test "${ac_cv_c_bigendian+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -13848,52 +12601,53 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_c_const=yes + + # Check for potential -arch flags. It is not universal unless + # there are some -arch flags. Note that *ppc* also matches + # ppc64. This check is also rather less than ideal. + case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( + *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; + esac else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_c_const=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF fi - - -if test "$abi_c_inline" = ""; then - for _abi_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include + #include int main () { -} $_abi_kw foo() { +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif + ; return 0; } @@ -13904,54 +12658,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - abi_c_inline=$_abi_kw; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - if test "$abi_c_inline" != "inline"; then - CFLAGS="-Dinline=$abi_c_inline $CFLAGS" - - fi -fi - - -{ echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + # It does; now see whether it defined to BIG_ENDIAN or not. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -typedef size_t ac__type_new_; +#include + #include + int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif + ; return 0; } @@ -13962,61 +12697,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_size_t=yes + ac_cv_c_bigendian=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_size_t=no + ac_cv_c_bigendian=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6; } -if test $ac_cv_type_size_t = yes; then - : else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF fi -{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # See if sys/param.h defines the BYTE_ORDER macro. -cat >conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include +#include int main () { -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ - && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) - bogus endian macros -#endif +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif ; return 0; @@ -14028,33 +12754,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - # It does; now see whether it defined to BIG_ENDIAN or not. -cat >conftest.$ac_ext <<_ACEOF + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include +#include int main () { -#if BYTE_ORDER != BIG_ENDIAN - not big endian -#endif +#ifndef _BIG_ENDIAN + not big endian + #endif ; return 0; @@ -14066,20 +12792,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_c_bigendian=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_c_bigendian=no @@ -14087,29 +12814,44 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # It does not; compile a test program. -if test "$cross_compiling" = yes; then - # try to guess the endianness by grepping values into an object file - ac_cv_c_bigendian=unknown - cat >conftest.$ac_ext <<_ACEOF + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then + # Try to guess by grepping values from an object file. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; + int main () { - _ascii (); _ebcdic (); +return use_ascii (foo) == use_ebcdic (foo); ; return 0; } @@ -14120,30 +12862,31 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then - ac_cv_c_bigendian=yes -fi -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi -fi + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -14162,14 +12905,14 @@ main () { - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; ; return 0; @@ -14181,55 +12924,62 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (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_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_bigendian=no else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_bigendian=yes fi +rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + fi fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } -case $ac_cv_c_bigendian in - yes) +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + cat >>confdefs.h <<\_ACEOF +#define WORDS_BIGENDIAN 1 +_ACEOF +;; #( + no) + ;; #( + universal) cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 +#define AC_APPLE_UNIVERSAL_BUILD 1 _ACEOF - ;; - no) - ;; - *) - { { echo "$as_me:$LINENO: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} + + ;; #( + *) + { { $as_echo "$as_me:$LINENO: error: unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +$as_echo "$as_me: error: unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} { (exit 1); exit 1; }; } ;; -esac + esac cat >>confdefs.h <<\_ACEOF #define CHECKED_ENDIANNESS 1 @@ -14278,29 +13028,29 @@ withval=$with_expat; if test "x$withval" = "xno"; then if test $abi_xml != xml2; then - { { echo "$as_me:$LINENO: error: * * * require either expat or libxml2 * * *" >&5 -echo "$as_me: error: * * * require either expat or libxml2 * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * require either expat or libxml2 * * *" >&5 +$as_echo "$as_me: error: * * * require either expat or libxml2 * * *" >&2;} { (exit 1); exit 1; }; } fi abi_xml=xml2 elif test "x$withval" = "xpeer"; then if test $abi_xml = xml2; then - { { echo "$as_me:$LINENO: error: * * * don't specify both expat and libxml2 * * *" >&5 -echo "$as_me: error: * * * don't specify both expat and libxml2 * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * don't specify both expat and libxml2 * * *" >&5 +$as_echo "$as_me: error: * * * don't specify both expat and libxml2 * * *" >&2;} { (exit 1); exit 1; }; } fi abi_xml=peer elif test "x$withval" = "xyes"; then if test $abi_xml = xml2; then - { { echo "$as_me:$LINENO: error: * * * don't specify both expat and libxml2 * * *" >&5 -echo "$as_me: error: * * * don't specify both expat and libxml2 * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * don't specify both expat and libxml2 * * *" >&5 +$as_echo "$as_me: error: * * * don't specify both expat and libxml2 * * *" >&2;} { (exit 1); exit 1; }; } fi abi_xml=expat else if test $abi_xml = xml2; then - { { echo "$as_me:$LINENO: error: * * * don't specify both expat and libxml2 * * *" >&5 -echo "$as_me: error: * * * don't specify both expat and libxml2 * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * don't specify both expat and libxml2 * * *" >&5 +$as_echo "$as_me: error: * * * don't specify both expat and libxml2 * * *" >&2;} { (exit 1); exit 1; }; } fi abi_xml=expat @@ -14318,10 +13068,10 @@ if test "x$ABI_XML_DIR" = "x"; then # Extract the first word of "xml2-config", so it can be a program name with args. set dummy xml2-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_ABI_XML_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $ABI_XML_CONFIG in [\\/]* | ?:[\\/]*) @@ -14336,7 +13086,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ABI_XML_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14348,21 +13098,21 @@ fi ABI_XML_CONFIG=$ac_cv_path_ABI_XML_CONFIG if test -n "$ABI_XML_CONFIG"; then - { echo "$as_me:$LINENO: result: $ABI_XML_CONFIG" >&5 -echo "${ECHO_T}$ABI_XML_CONFIG" >&6; } + { $as_echo "$as_me:$LINENO: result: $ABI_XML_CONFIG" >&5 +$as_echo "$ABI_XML_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi else # Extract the first word of "xml2-config", so it can be a program name with args. set dummy xml2-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_ABI_XML_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $ABI_XML_CONFIG in [\\/]* | ?:[\\/]*) @@ -14378,7 +13128,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ABI_XML_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14390,18 +13140,18 @@ fi ABI_XML_CONFIG=$ac_cv_path_ABI_XML_CONFIG if test -n "$ABI_XML_CONFIG"; then - { echo "$as_me:$LINENO: result: $ABI_XML_CONFIG" >&5 -echo "${ECHO_T}$ABI_XML_CONFIG" >&6; } + { $as_echo "$as_me:$LINENO: result: $ABI_XML_CONFIG" >&5 +$as_echo "$ABI_XML_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "x$ABI_XML_CONFIG" = "x"; then - { { echo "$as_me:$LINENO: error: * * * unable to find xml2-config! require libxml2-devel * * *" >&5 -echo "$as_me: error: * * * unable to find xml2-config! require libxml2-devel * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * unable to find xml2-config! require libxml2-devel * * *" >&5 +$as_echo "$as_me: error: * * * unable to find xml2-config! require libxml2-devel * * *" >&2;} { (exit 1); exit 1; }; } fi XML_CFLAGS="`$ABI_XML_CONFIG --cflags`" @@ -14417,17 +13167,17 @@ LDFLAGS="$LDFLAGS -L$ABI_XML_DIR/lib" fi if test "${ac_cv_header_expat_h+set}" = set; then - { echo "$as_me:$LINENO: checking for expat.h" >&5 -echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for expat.h" >&5 +$as_echo_n "checking for expat.h... " >&6; } if test "${ac_cv_header_expat_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 -echo "${ECHO_T}$ac_cv_header_expat_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +$as_echo "$ac_cv_header_expat_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking expat.h usability" >&5 -echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking expat.h usability" >&5 +$as_echo_n "checking expat.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14443,32 +13193,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking expat.h presence" >&5 -echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking expat.h presence" >&5 +$as_echo_n "checking expat.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14482,51 +13233,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ---------------------------------------- ## ## Report this to http://www.abisource.com/ ## @@ -14535,23 +13287,23 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for expat.h" >&5 -echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for expat.h" >&5 +$as_echo_n "checking for expat.h... " >&6; } if test "${ac_cv_header_expat_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_expat_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 -echo "${ECHO_T}$ac_cv_header_expat_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +$as_echo "$ac_cv_header_expat_h" >&6; } fi -if test $ac_cv_header_expat_h = yes; then +if test "x$ac_cv_header_expat_h" = x""yes; then - { echo "$as_me:$LINENO: checking for XML_Parse in -lexpat" >&5 -echo $ECHO_N "checking for XML_Parse in -lexpat... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for XML_Parse in -lexpat" >&5 +$as_echo_n "checking for XML_Parse in -lexpat... " >&6; } if test "${ac_cv_lib_expat_XML_Parse+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lexpat $LIBS" @@ -14583,47 +13335,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_expat_XML_Parse=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_expat_XML_Parse=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_Parse" >&5 -echo "${ECHO_T}$ac_cv_lib_expat_XML_Parse" >&6; } -if test $ac_cv_lib_expat_XML_Parse = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_Parse" >&5 +$as_echo "$ac_cv_lib_expat_XML_Parse" >&6; } +if test "x$ac_cv_lib_expat_XML_Parse" = x""yes; then XML_LIBS="-lexpat" else - { { echo "$as_me:$LINENO: error: * * * require expat-devel; or --with-expat=peer * * *" >&5 -echo "$as_me: error: * * * require expat-devel; or --with-expat=peer * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * require expat-devel; or --with-expat=peer * * *" >&5 +$as_echo "$as_me: error: * * * require expat-devel; or --with-expat=peer * * *" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:$LINENO: error: * * * require expat-devel; or --with-expat=peer * * *" >&5 -echo "$as_me: error: * * * require expat-devel; or --with-expat=peer * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * require expat-devel; or --with-expat=peer * * *" >&5 +$as_echo "$as_me: error: * * * require expat-devel; or --with-expat=peer * * *" >&2;} { (exit 1); exit 1; }; } fi @@ -14640,15 +13396,15 @@ if test $abi_xml = peer; then abi_xml=expat - { echo "$as_me:$LINENO: checking for peer expat" >&5 -echo $ECHO_N "checking for peer expat... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for peer expat" >&5 +$as_echo_n "checking for peer expat... " >&6; } if test -d "$abi_rootdir/expat"; then EXPAT_PEERDIR="$abi_rootdir/expat" - { echo "$as_me:$LINENO: result: $EXPAT_PEERDIR" >&5 -echo "${ECHO_T}$EXPAT_PEERDIR" >&6; } + { $as_echo "$as_me:$LINENO: result: $EXPAT_PEERDIR" >&5 +$as_echo "$EXPAT_PEERDIR" >&6; } else - { { echo "$as_me:$LINENO: error: peer expat not found" >&5 -echo "$as_me: error: peer expat not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: peer expat not found" >&5 +$as_echo "$as_me: error: peer expat not found" >&2;} { (exit 1); exit 1; }; } fi XML_CFLAGS="-I\$(top_builddir)/../expat/lib" @@ -14693,44 +13449,40 @@ # Thank goodness, or fjf, for using pkgconfig now. pkg_failed=no -{ echo "$as_me:$LINENO: checking for WV" >&5 -echo $ECHO_N "checking for WV... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for WV" >&5 +$as_echo_n "checking for WV... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$WV_CFLAGS"; then - pkg_cv_WV_CFLAGS="$WV_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"wv-1.0 >= 1.2.0\"") >&5 +if test -n "$WV_CFLAGS"; then + pkg_cv_WV_CFLAGS="$WV_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"wv-1.0 >= 1.2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "wv-1.0 >= 1.2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_WV_CFLAGS=`$PKG_CONFIG --cflags "wv-1.0 >= 1.2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$WV_LIBS"; then - pkg_cv_WV_LIBS="$WV_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"wv-1.0 >= 1.2.0\"") >&5 +if test -n "$WV_LIBS"; then + pkg_cv_WV_LIBS="$WV_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"wv-1.0 >= 1.2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "wv-1.0 >= 1.2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_WV_LIBS=`$PKG_CONFIG --libs "wv-1.0 >= 1.2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -14743,14 +13495,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "wv-1.0 >= 1.2.0"` + WV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "wv-1.0 >= 1.2.0" 2>&1` else - WV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "wv-1.0 >= 1.2.0"` + WV_PKG_ERRORS=`$PKG_CONFIG --print-errors "wv-1.0 >= 1.2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$WV_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (wv-1.0 >= 1.2.0) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (wv-1.0 >= 1.2.0) were not met: $WV_PKG_ERRORS @@ -14761,7 +13513,7 @@ and WV_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (wv-1.0 >= 1.2.0) were not met: +$as_echo "$as_me: error: Package requirements (wv-1.0 >= 1.2.0) were not met: $WV_PKG_ERRORS @@ -14774,7 +13526,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -14784,7 +13538,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -14794,12 +13548,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else WV_CFLAGS=$pkg_cv_WV_CFLAGS WV_LIBS=$pkg_cv_WV_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ABIWORD_REQUIRED_PKGS="$ABIWORD_REQUIRED_PKGS wv-1.0 >= 1.2.0" @@ -14828,8 +13582,8 @@ if test "${with_zlib+set}" = set; then withval=$with_zlib; if test "$withval" = "no" ; then - { { echo "$as_me:$LINENO: error: * * * zlib is required by AbiWord * * *" >&5 -echo "$as_me: error: * * * zlib is required by AbiWord * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * zlib is required by AbiWord * * *" >&5 +$as_echo "$as_me: error: * * * zlib is required by AbiWord * * *" >&2;} { (exit 1); exit 1; }; } elif test "$withval" = "yes" ; then abi_zlib=check @@ -14854,17 +13608,17 @@ CPPFLAGS="$CPPFLAGS -I$ABI_ZLIB_DIR/include" fi if test "${ac_cv_header_zlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5 +$as_echo_n "checking for zlib.h... " >&6; } if test "${ac_cv_header_zlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +$as_echo "$ac_cv_header_zlib_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking zlib.h usability" >&5 -echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5 +$as_echo_n "checking zlib.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14880,32 +13634,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking zlib.h presence" >&5 -echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5 +$as_echo_n "checking zlib.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14919,51 +13674,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ---------------------------------------- ## ## Report this to http://www.abisource.com/ ## @@ -14972,25 +13728,25 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5 +$as_echo_n "checking for zlib.h... " >&6; } if test "${ac_cv_header_zlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_zlib_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +$as_echo "$ac_cv_header_zlib_h" >&6; } fi -if test $ac_cv_header_zlib_h = yes; then +if test "x$ac_cv_header_zlib_h" = x""yes; then abi_z=sys else if test $abi_zlib = sys; then - { { echo "$as_me:$LINENO: error: * * * zlib not found in system location * * *" >&5 -echo "$as_me: error: * * * zlib not found in system location * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * zlib not found in system location * * *" >&5 +$as_echo "$as_me: error: * * * zlib not found in system location * * *" >&2;} { (exit 1); exit 1; }; } fi abi_z=peer @@ -15005,24 +13761,24 @@ if test $abi_z = peer; then - { echo "$as_me:$LINENO: checking for zlib in peer directory" >&5 -echo $ECHO_N "checking for zlib in peer directory... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for zlib in peer directory" >&5 +$as_echo_n "checking for zlib in peer directory... " >&6; } if test -d ../zlib; then if test -r ../zlib/libz.a; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: unable to use peer zlib - zlib/libz.a not found" >&5 -echo "$as_me: error: unable to use peer zlib - zlib/libz.a not found" >&2;} + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: unable to use peer zlib - zlib/libz.a not found" >&5 +$as_echo "$as_me: error: unable to use peer zlib - zlib/libz.a not found" >&2;} { (exit 1); exit 1; }; } fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: unable to use zlib - no peer found" >&5 -echo "$as_me: error: unable to use zlib - no peer found" >&2;} + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: unable to use zlib - no peer found" >&5 +$as_echo "$as_me: error: unable to use zlib - no peer found" >&2;} { (exit 1); exit 1; }; } fi @@ -15060,8 +13816,8 @@ if test "${with_libpng+set}" = set; then withval=$with_libpng; if test "$withval" = "no"; then - { { echo "$as_me:$LINENO: error: * * * libpng is required by AbiWord * * *" >&5 -echo "$as_me: error: * * * libpng is required by AbiWord * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * libpng is required by AbiWord * * *" >&5 +$as_echo "$as_me: error: * * * libpng is required by AbiWord * * *" >&2;} { (exit 1); exit 1; }; } elif test "$withval" = "yes"; then abi_libpng=check @@ -15081,44 +13837,40 @@ if test $abi_libpng = check; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for LIBPNG" >&5 -echo $ECHO_N "checking for LIBPNG... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for LIBPNG" >&5 +$as_echo_n "checking for LIBPNG... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$LIBPNG_CFLAGS"; then - pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5 +if test -n "$LIBPNG_CFLAGS"; then + pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5 ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng12" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$LIBPNG_LIBS"; then - pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5 +if test -n "$LIBPNG_LIBS"; then + pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5 ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng12" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -15131,15 +13883,15 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng12"` + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng12" 2>&1` else - LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng12"` + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng12" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBPNG_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } abi_libpng=check elif test $pkg_failed = untried; then @@ -15148,8 +13900,8 @@ else LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } abi_libpng=pkg abi_png=sys @@ -15166,17 +13918,17 @@ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS -I$ABI_LIBPNG_DIR/include" fi if test "${ac_cv_header_png_h+set}" = set; then - { echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for png.h" >&5 +$as_echo_n "checking for png.h... " >&6; } if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +$as_echo "$ac_cv_header_png_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking png.h usability" >&5 -echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking png.h usability" >&5 +$as_echo_n "checking png.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15192,32 +13944,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking png.h presence" >&5 -echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5 +$as_echo_n "checking png.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15231,51 +13984,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ---------------------------------------- ## ## Report this to http://www.abisource.com/ ## @@ -15284,25 +14038,25 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for png.h" >&5 +$as_echo_n "checking for png.h... " >&6; } if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_png_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +$as_echo "$ac_cv_header_png_h" >&6; } fi -if test $ac_cv_header_png_h = yes; then +if test "x$ac_cv_header_png_h" = x""yes; then abi_png=sys else if test $abi_libpng = sys; then - { { echo "$as_me:$LINENO: error: * * * libpng not found in system location * * *" >&5 -echo "$as_me: error: * * * libpng not found in system location * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * libpng not found in system location * * *" >&5 +$as_echo "$as_me: error: * * * libpng not found in system location * * *" >&2;} { (exit 1); exit 1; }; } fi abi_png=peer @@ -15318,24 +14072,24 @@ LIBPNG_PEERDIR="`cd ..; pwd`/libpng" if test $abi_png = peer; then - { echo "$as_me:$LINENO: checking for libpng in peer directory" >&5 -echo $ECHO_N "checking for libpng in peer directory... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for libpng in peer directory" >&5 +$as_echo_n "checking for libpng in peer directory... " >&6; } if test -d ../libpng; then if test -r ../libpng/pngconf.h; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: unable to use peer libpng - libpng/pngconf.h not found" >&5 -echo "$as_me: error: unable to use peer libpng - libpng/pngconf.h not found" >&2;} + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: unable to use peer libpng - libpng/pngconf.h not found" >&5 +$as_echo "$as_me: error: unable to use peer libpng - libpng/pngconf.h not found" >&2;} { (exit 1); exit 1; }; } fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: unable to use libpng - no peer found" >&5 -echo "$as_me: error: unable to use libpng - no peer found" >&2;} + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: unable to use libpng - no peer found" >&5 +$as_echo "$as_me: error: unable to use libpng - no peer found" >&2;} { (exit 1); exit 1; }; } fi @@ -15377,8 +14131,8 @@ if test "${with_popt+set}" = set; then withval=$with_popt; if test "$withval" = "no" ; then - { { echo "$as_me:$LINENO: error: * * * popt is required by AbiWord * * *" >&5 -echo "$as_me: error: * * * popt is required by AbiWord * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * popt is required by AbiWord * * *" >&5 +$as_echo "$as_me: error: * * * popt is required by AbiWord * * *" >&2;} { (exit 1); exit 1; }; } elif test "$withval" = "yes" ; then abi_libpopt=check @@ -15403,17 +14157,17 @@ CPPFLAGS="$CPPFLAGS -I$ABI_LIBPOPT_DIR/include" fi if test "${ac_cv_header_popt_h+set}" = set; then - { echo "$as_me:$LINENO: checking for popt.h" >&5 -echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for popt.h" >&5 +$as_echo_n "checking for popt.h... " >&6; } if test "${ac_cv_header_popt_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 -echo "${ECHO_T}$ac_cv_header_popt_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 +$as_echo "$ac_cv_header_popt_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking popt.h usability" >&5 -echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking popt.h usability" >&5 +$as_echo_n "checking popt.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15429,32 +14183,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking popt.h presence" >&5 -echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking popt.h presence" >&5 +$as_echo_n "checking popt.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15468,51 +14223,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: popt.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: popt.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: popt.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: popt.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: popt.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: popt.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: popt.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: popt.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ---------------------------------------- ## ## Report this to http://www.abisource.com/ ## @@ -15521,25 +14277,25 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for popt.h" >&5 -echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for popt.h" >&5 +$as_echo_n "checking for popt.h... " >&6; } if test "${ac_cv_header_popt_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_popt_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 -echo "${ECHO_T}$ac_cv_header_popt_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 +$as_echo "$ac_cv_header_popt_h" >&6; } fi -if test $ac_cv_header_popt_h = yes; then +if test "x$ac_cv_header_popt_h" = x""yes; then abi_popt=sys else if test $abi_libpopt = sys; then - { { echo "$as_me:$LINENO: error: * * * libpopt not found in system location * * *" >&5 -echo "$as_me: error: * * * libpopt not found in system location * * *" >&2;} + { { $as_echo "$as_me:$LINENO: error: * * * libpopt not found in system location * * *" >&5 +$as_echo "$as_me: error: * * * libpopt not found in system location * * *" >&2;} { (exit 1); exit 1; }; } fi abi_popt=peer @@ -15555,16 +14311,16 @@ LIBPOPT_PEERDIR="$abi_rootdir/popt" if test $abi_popt = peer; then - { echo "$as_me:$LINENO: checking for popt in peer directory" >&5 -echo $ECHO_N "checking for popt in peer directory... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for popt in peer directory" >&5 +$as_echo_n "checking for popt in peer directory... " >&6; } if test -d $LIBPOPT_PEERDIR; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: unable to use popt - no peer found" >&5 -echo "$as_me: error: unable to use popt - no peer found" >&2;} + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: unable to use popt - no peer found" >&5 +$as_echo "$as_me: error: unable to use popt - no peer found" >&2;} { (exit 1); exit 1; }; } fi @@ -15620,10 +14376,10 @@ if test "$good_libjpeg_prefix" = "yes"; then saved_ldflags="$LDFLAGS" LDFLAGS="-L$libjpeg_prefix/lib" - { echo "$as_me:$LINENO: checking for jpeg_start_decompress in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_start_decompress in -ljpeg... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for jpeg_start_decompress in -ljpeg" >&5 +$as_echo_n "checking for jpeg_start_decompress in -ljpeg... " >&6; } if test "${ac_cv_lib_jpeg_jpeg_start_decompress+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" @@ -15655,33 +14411,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_jpeg_jpeg_start_decompress=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_jpeg_jpeg_start_decompress=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_start_decompress" >&6; } -if test $ac_cv_lib_jpeg_jpeg_start_decompress = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5 +$as_echo "$ac_cv_lib_jpeg_jpeg_start_decompress" >&6; } +if test "x$ac_cv_lib_jpeg_jpeg_start_decompress" = x""yes; then abi_libjpeg_libs="-L$libjpeg_prefix/lib -ljpeg" abi_found_libjpeg="yes" else abi_found_libjpeg="no" @@ -15691,10 +14451,10 @@ else if test "$abi_found_libjpeg" = "no"; then echo "checking for libjpeg" - { echo "$as_me:$LINENO: checking for jpeg_start_decompress in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_start_decompress in -ljpeg... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for jpeg_start_decompress in -ljpeg" >&5 +$as_echo_n "checking for jpeg_start_decompress in -ljpeg... " >&6; } if test "${ac_cv_lib_jpeg_jpeg_start_decompress+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" @@ -15726,33 +14486,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_jpeg_jpeg_start_decompress=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_jpeg_jpeg_start_decompress=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_start_decompress" >&6; } -if test $ac_cv_lib_jpeg_jpeg_start_decompress = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5 +$as_echo "$ac_cv_lib_jpeg_jpeg_start_decompress" >&6; } +if test "x$ac_cv_lib_jpeg_jpeg_start_decompress" = x""yes; then abi_libjpeg_libs="-ljpeg" abi_found_libjpeg="yes" else abi_found_libjpeg="no" @@ -15775,17 +14539,17 @@ fi else if test "${ac_cv_header_jpeglib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +$as_echo_n "checking for jpeglib.h... " >&6; } if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +$as_echo "$ac_cv_header_jpeglib_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 -echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 +$as_echo_n "checking jpeglib.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15801,32 +14565,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 -echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 +$as_echo_n "checking jpeglib.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15840,51 +14605,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ---------------------------------------- ## ## Report this to http://www.abisource.com/ ## @@ -15893,18 +14659,18 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +$as_echo_n "checking for jpeglib.h... " >&6; } if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_jpeglib_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +$as_echo "$ac_cv_header_jpeglib_h" >&6; } fi -if test $ac_cv_header_jpeglib_h = yes; then +if test "x$ac_cv_header_jpeglib_h" = x""yes; then abi_found_libjpegincs="yes" fi @@ -15936,10 +14702,10 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -{ echo "$as_me:$LINENO: checking for working alloca.h" >&5 -echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5 +$as_echo_n "checking for working alloca.h... " >&6; } if test "${ac_cv_working_alloca_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -15963,31 +14729,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_working_alloca_h=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_working_alloca_h=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +$as_echo "$ac_cv_working_alloca_h" >&6; } if test $ac_cv_working_alloca_h = yes; then cat >>confdefs.h <<\_ACEOF @@ -15996,10 +14766,10 @@ fi -{ echo "$as_me:$LINENO: checking for alloca" >&5 -echo $ECHO_N "checking for alloca... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for alloca" >&5 +$as_echo_n "checking for alloca... " >&6; } if test "${ac_cv_func_alloca_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16043,31 +14813,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_func_alloca_works=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_alloca_works=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 -echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +$as_echo "$ac_cv_func_alloca_works" >&6; } if test $ac_cv_func_alloca_works = yes; then @@ -16088,10 +14862,10 @@ _ACEOF -{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 -echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 +$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } if test "${ac_cv_os_cray+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16115,15 +14889,15 @@ rm -f conftest* fi -{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 -echo "${ECHO_T}$ac_cv_os_cray" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 +$as_echo "$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; 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; } + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16176,33 +14950,40 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then eval "$as_ac_var=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -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 +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func @@ -16214,10 +14995,10 @@ done fi -{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 +$as_echo_n "checking stack direction for C alloca... " >&6; } if test "${ac_cv_c_stack_direction+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then ac_cv_c_stack_direction=0 @@ -16255,36 +15036,39 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (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_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_stack_direction=1 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi +rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 +$as_echo "$ac_cv_c_stack_direction" >&6; } cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction @@ -16293,10 +15077,10 @@ fi -{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16321,20 +15105,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_type_signal=int else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_signal=void @@ -16342,8 +15127,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal @@ -16414,8 +15199,8 @@ 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 whether scandir select requires const struct dirent" >&5 -echo $ECHO_N "checking whether scandir select requires const struct dirent... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether scandir select requires const struct dirent" >&5 +$as_echo_n "checking whether scandir select requires const struct dirent... " >&6; } cat >conftest.$ac_ext <<_ACEOF @@ -16447,20 +15232,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF #define ABI_SCANDIR_SELECT_QUALIFIER const @@ -16468,15 +15254,15 @@ else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +{ $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } cat >>confdefs.h <<\_ACEOF -#define ABI_SCANDIR_SELECT_QUALIFIER +#define ABI_SCANDIR_SELECT_QUALIFIER /**/ _ACEOF @@ -16499,10 +15285,10 @@ # Extract the first word of "valgrind", so it can be a program name with args. set dummy valgrind; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_VALGRIND+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$VALGRIND"; then ac_cv_prog_VALGRIND="$VALGRIND" # Let the user override the test. @@ -16515,7 +15301,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_VALGRIND="valgrind" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16526,31 +15312,32 @@ fi VALGRIND=$ac_cv_prog_VALGRIND if test -n "$VALGRIND"; then - { echo "$as_me:$LINENO: result: $VALGRIND" >&5 -echo "${ECHO_T}$VALGRIND" >&6; } + { $as_echo "$as_me:$LINENO: result: $VALGRIND" >&5 +$as_echo "$VALGRIND" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi for ac_header in valgrind/memcheck.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 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; } + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$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; } +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16566,32 +15353,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$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; } +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16605,51 +15393,52 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -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;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ---------------------------------------- ## ## Report this to http://www.abisource.com/ ## @@ -16658,21 +15447,24 @@ ) | 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -16680,8 +15472,8 @@ done if test "$VALGRIND" = ""; then - { echo "$as_me:$LINENO: WARNING: Valgrind is missing. UnitTesting will run without" >&5 -echo "$as_me: WARNING: Valgrind is missing. UnitTesting will run without" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Valgrind is missing. UnitTesting will run without" >&5 +$as_echo "$as_me: WARNING: Valgrind is missing. UnitTesting will run without" >&2;} fi if test "$VALGRIND" != ""; then vg_ver=`valgrind --version | sed -e 's/.*-\([0-9]\)\.[0-9].*/\1/'` @@ -16709,7 +15501,7 @@ ac_config_files="$ac_config_files abiword.pc libabiword.pc GNUmakefile src/GNUmakefile src/af/GNUmakefile src/af/tf/GNUmakefile src/af/ev/GNUmakefile src/af/ev/xp/GNUmakefile src/af/ev/cocoa/GNUmakefile src/af/ev/qnx/GNUmakefile src/af/ev/unix/GNUmakefile src/af/ev/unix/gnome/GNUmakefile src/af/ev/win/GNUmakefile src/af/gr/GNUmakefile src/af/gr/xp/GNUmakefile src/af/gr/cocoa/GNUmakefile src/af/gr/unix/GNUmakefile src/af/gr/qnx/GNUmakefile src/af/gr/win/GNUmakefile src/af/util/GNUmakefile src/af/util/xp/GNUmakefile src/af/util/xp/t/GNUmakefile src/af/util/unix/GNUmakefile src/af/util/qnx/GNUmakefile src/af/util/win/GNUmakefile src/af/tf/xp/GNUmakefile src/af/xap/GNUmakefile src/af/xap/xp/GNUmakefile src/af/xap/cocoa/GNUmakefile src/af/xap/qnx/GNUmakefile src/af/xap/win/GNUmakefile src/af/xap/unix/GNUmakefile src/af/xap/unix/t/GNUmakefile src/af/xap/unix/hildon/GNUmakefile src/config/GNUmakefile src/config/platforms/GNUmakefile src/config/require/GNUmakefile src/config/require/win/GNUmakefile src/other/GNUmakefile src/other/spell/GNUmakefile src/other/spell/xp/GNUmakefile src/pkg/GNUmakefile src/pkg/maemo/GNUmakefile src/pkg/maemo/abiword.desktop src/pkg/maemo/com.abisource.abiword.service src/pkg/maemo/debian/GNUmakefile src/text/GNUmakefile src/text/fmt/GNUmakefile src/text/fmt/xp/GNUmakefile src/text/fmt/unix/GNUmakefile src/text/ptbl/GNUmakefile src/text/ptbl/xp/GNUmakefile src/text/ptbl/xp/t/GNUmakefile src/wp/GNUmakefile src/wp/ap/GNUmakefile src/wp/ap/xp/GNUmakefile src/wp/ap/cocoa/GNUmakefile src/wp/ap/qnx/GNUmakefile src/wp/ap/unix/GNUmakefile src/wp/ap/unix/hildon/GNUmakefile src/wp/ap/win/GNUmakefile src/wp/ap/win/ToolbarIcons/GNUmakefile src/wp/impexp/GNUmakefile src/wp/impexp/cocoa/GNUmakefile src/wp/impexp/unix/GNUmakefile src/wp/impexp/qnx/GNUmakefile src/wp/impexp/win/GNUmakefile src/wp/impexp/xp/GNUmakefile" -ac_config_files="$ac_config_files src/wp/main/GNUmakefile src/wp/main/xp/GNUmakefile src/wp/main/cocoa/GNUmakefile src/wp/main/cocoa/bundle/GNUmakefile src/wp/main/cocoa/bundle/Info.plist src/wp/main/cocoa/AbiWord.app/GNUmakefile src/wp/main/cocoa/AbiWord.app/Contents/GNUmakefile src/wp/main/cocoa/AbiWord.app/Contents/MacOS/GNUmakefile src/wp/main/cocoa/AbiWord.app/Contents/Frameworks/GNUmakefile src/wp/main/cocoa/AbiWord.app/Contents/Resources/GNUmakefile src/wp/main/cocoa/AbiWord.app/Contents/Resources/English.lproj/GNUmakefile src/wp/main/qnx/GNUmakefile src/wp/main/unix/GNUmakefile src/wp/main/win/GNUmakefile src/wp/test/GNUmakefile src/wp/test/xp/GNUmakefile src/wp/test/unix/GNUmakefile src/wp/test/unix/testwrap.sh src/wp/test/win/GNUmakefile src/wp/test/win/testwrap.sh src/wp/test/cocoa/GNUmakefile src/tools/GNUmakefile src/tools/cdump/GNUmakefile src/tools/cdump/xp/GNUmakefile src/tools/po2str/GNUmakefile src/tools/po2str/xp/GNUmakefile src/tools/scripts/GNUmakefile src/tools/scripts/unix/GNUmakefile src/bindings/GNUmakefile src/bindings/perl/GNUmakefile src/bindings/perl/examples/GNUmakefile user/GNUmakefile user/wp/GNUmakefile user/wp/scripts/GNUmakefile user/wp/strings/GNUmakefile user/wp/templates/GNUmakefile" +ac_config_files="$ac_config_files src/wp/main/GNUmakefile src/wp/main/xp/GNUmakefile src/wp/main/cocoa/GNUmakefile src/wp/main/cocoa/bundle/GNUmakefile src/wp/main/cocoa/bundle/Info.plist src/wp/main/cocoa/AbiWord.app/GNUmakefile src/wp/main/cocoa/AbiWord.app/Contents/GNUmakefile src/wp/main/cocoa/AbiWord.app/Contents/MacOS/GNUmakefile src/wp/main/cocoa/AbiWord.app/Contents/Frameworks/GNUmakefile src/wp/main/cocoa/AbiWord.app/Contents/Resources/GNUmakefile src/wp/main/cocoa/AbiWord.app/Contents/Resources/English.lproj/GNUmakefile src/wp/main/qnx/GNUmakefile src/wp/main/unix/GNUmakefile src/wp/main/win/GNUmakefile src/wp/test/GNUmakefile src/wp/test/xp/GNUmakefile src/wp/test/unix/GNUmakefile src/wp/test/unix/testwrap.sh src/wp/test/win/GNUmakefile src/wp/test/win/testwrap.sh src/wp/test/cocoa/GNUmakefile src/tools/GNUmakefile src/tools/cdump/GNUmakefile src/tools/cdump/xp/GNUmakefile src/tools/po2str/GNUmakefile src/tools/po2str/xp/GNUmakefile user/GNUmakefile user/wp/GNUmakefile user/wp/strings/GNUmakefile user/wp/templates/GNUmakefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16738,11 +15530,12 @@ 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;} ;; + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -16775,12 +15568,12 @@ 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;} + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -16797,6 +15590,12 @@ # take arguments), then branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} t clear :clear s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g @@ -16826,7 +15625,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` + ac_i=`$as_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" @@ -16838,292 +15637,266 @@ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. +$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${INSIDE_GNOME_COMMON_TRUE}" && test -z "${INSIDE_GNOME_COMMON_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"INSIDE_GNOME_COMMON\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"INSIDE_GNOME_COMMON\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"INSIDE_GNOME_COMMON\" was never defined. +$as_echo "$as_me: error: conditional \"INSIDE_GNOME_COMMON\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${ABI_EPATH_DYLIB_TRUE}" && test -z "${ABI_EPATH_DYLIB_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABI_EPATH_DYLIB\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"ABI_EPATH_DYLIB\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABI_EPATH_DYLIB\" was never defined. +$as_echo "$as_me: error: conditional \"ABI_EPATH_DYLIB\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_LIBABIWORD_TRUE}" && test -z "${WITH_LIBABIWORD_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_LIBABIWORD\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_LIBABIWORD\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_LIBABIWORD\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_LIBABIWORD\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${EMBEDDED_HILDON_TRUE}" && test -z "${EMBEDDED_HILDON_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"EMBEDDED_HILDON\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"EMBEDDED_HILDON\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"EMBEDDED_HILDON\" was never defined. +$as_echo "$as_me: error: conditional \"EMBEDDED_HILDON\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${ENABLE_STATUSBAR_TRUE}" && test -z "${ENABLE_STATUSBAR_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_STATUSBAR\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_STATUSBAR\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_STATUSBAR\" was never defined. +$as_echo "$as_me: error: conditional \"ENABLE_STATUSBAR\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${ENABLE_PRINT_TRUE}" && test -z "${ENABLE_PRINT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_PRINT\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_PRINT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_PRINT\" was never defined. +$as_echo "$as_me: error: conditional \"ENABLE_PRINT\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${BUILD_TTFTOOL_TRUE}" && test -z "${BUILD_TTFTOOL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_TTFTOOL\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_TTFTOOL\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_THREADS_TRUE}" && test -z "${HAVE_THREADS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_THREADS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_THREADS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_THREADS_TRUE}" && test -z "${HAVE_THREADS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_THREADS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_THREADS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_THREADS_TRUE}" && test -z "${HAVE_THREADS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_THREADS\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_TTFTOOL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_THREADS\" was never defined. +$as_echo "$as_me: error: conditional \"BUILD_TTFTOOL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${HAVE_THREADS_TRUE}" && test -z "${HAVE_THREADS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_THREADS\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_THREADS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_THREADS\" was never defined. +$as_echo "$as_me: error: conditional \"HAVE_THREADS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${HAVE_THREADS_TRUE}" && test -z "${HAVE_THREADS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_THREADS\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_THREADS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_THREADS\" was never defined. +$as_echo "$as_me: error: conditional \"HAVE_THREADS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_UNIX_TRUE}" && test -z "${WITH_UNIX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_UNIX\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_UNIX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_UNIX\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_UNIX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_MACOSX_TRUE}" && test -z "${WITH_MACOSX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_MACOSX\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_MACOSX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_MACOSX\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_MACOSX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_COCOA_TRUE}" && test -z "${WITH_COCOA_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_COCOA\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_COCOA\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_COCOA\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_COCOA\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_QNX_TRUE}" && test -z "${WITH_QNX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_QNX\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_QNX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_QNX\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_QNX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_WIN32_TRUE}" && test -z "${WITH_WIN32_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_WIN32\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_WIN32\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_BINRELOC_TRUE}" && test -z "${WITH_BINRELOC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_BINRELOC\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_BINRELOC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_BINRELOC\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_BINRELOC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_GUCHARMAP_TRUE}" && test -z "${WITH_GUCHARMAP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_GUCHARMAP\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_GUCHARMAP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_GUCHARMAP\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_GUCHARMAP\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_XFT_TRUE}" && test -z "${WITH_XFT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_XFT\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_XFT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_XFT\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_XFT\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_SYSTEM_GOFFICE_TRUE}" && test -z "${WITH_SYSTEM_GOFFICE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_SYSTEM_GOFFICE\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_SYSTEM_GOFFICE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_SYSTEM_GOFFICE\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_SYSTEM_GOFFICE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_GNOMEVFS_TRUE}" && test -z "${WITH_GNOMEVFS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_GNOMEVFS\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_GNOMEVFS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_GNOMEVFS\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_GNOMEVFS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_GNOMEUI_TRUE}" && test -z "${WITH_GNOMEUI_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_GNOMEUI\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_GNOMEUI\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_GNOMEUI\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_GNOMEUI\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${ABI_BUILD_SHARED_TRUE}" && test -z "${ABI_BUILD_SHARED_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABI_BUILD_SHARED\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"ABI_BUILD_SHARED\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABI_BUILD_SHARED\" was never defined. +$as_echo "$as_me: error: conditional \"ABI_BUILD_SHARED\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${ABI_BUILD_STATIC_TRUE}" && test -z "${ABI_BUILD_STATIC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABI_BUILD_STATIC\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"ABI_BUILD_STATIC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABI_BUILD_STATIC\" was never defined. +$as_echo "$as_me: error: conditional \"ABI_BUILD_STATIC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${ENABLE_SPELL_TRUE}" && test -z "${ENABLE_SPELL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SPELL\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SPELL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_SPELL\" was never defined. +$as_echo "$as_me: error: conditional \"ENABLE_SPELL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_ENCHANT_TRUE}" && test -z "${WITH_ENCHANT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_ENCHANT\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_ENCHANT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_ENCHANT\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_ENCHANT\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_ISPELL_TRUE}" && test -z "${WITH_ISPELL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_ISPELL\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_ISPELL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_ISPELL\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_ISPELL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${BUILD_IN_PLUGINS_TRUE}" && test -z "${BUILD_IN_PLUGINS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_IN_PLUGINS\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_IN_PLUGINS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_IN_PLUGINS\" was never defined. +$as_echo "$as_me: error: conditional \"BUILD_IN_PLUGINS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_RESOURCE_MANAGER_TRUE}" && test -z "${WITH_RESOURCE_MANAGER_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_RESOURCE_MANAGER\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_RESOURCE_MANAGER\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_RESOURCE_MANAGER\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_RESOURCE_MANAGER\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"DEBUG\" was never defined. +$as_echo "$as_me: error: conditional \"DEBUG\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"DEBUG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${SCRIPT_TRUE}" && test -z "${SCRIPT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"SCRIPT\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"SCRIPT\" was never defined. +$as_echo "$as_me: error: conditional \"DEBUG\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi + if test -z "${BIGENDIAN_TRUE}" && test -z "${BIGENDIAN_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BIGENDIAN\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"BIGENDIAN\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BIGENDIAN\" was never defined. +$as_echo "$as_me: error: conditional \"BIGENDIAN\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${HAVE_EXPAT_TRUE}" && test -z "${HAVE_EXPAT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_EXPAT\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_EXPAT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_EXPAT\" was never defined. +$as_echo "$as_me: error: conditional \"HAVE_EXPAT\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${WITH_LIBJPEG_TRUE}" && test -z "${WITH_LIBJPEG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WITH_LIBJPEG\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_LIBJPEG\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WITH_LIBJPEG\" was never defined. +$as_echo "$as_me: error: conditional \"WITH_LIBJPEG\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. +$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -17136,7 +15909,7 @@ SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -17146,7 +15919,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -17168,17 +15941,45 @@ 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=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -17194,8 +15995,6 @@ # 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. @@ -17218,7 +16017,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -17231,17 +16030,10 @@ PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -17263,7 +16055,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -17314,7 +16106,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_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 @@ -17342,7 +16134,6 @@ *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -17355,19 +16146,22 @@ rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -17392,10 +16186,10 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -17417,8 +16211,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by abiword $as_me 2.6.2, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by abiword $as_me 2.6.8, which was +generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -17431,27 +16225,34 @@ _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_commands="$ac_config_commands" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [FILE]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE Configuration files: $config_files @@ -17462,13 +16263,13 @@ Report bugs to ." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -abiword config.status 2.6.2 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +abiword config.status 2.6.8 +configured by $0, generated by GNU Autoconf 2.63, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -17476,11 +16277,12 @@ srcdir='$srcdir' INSTALL='$INSTALL' MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -17502,21 +16304,24 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ac_need_defaults=false;; --he | --h | --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 + -*) { $as_echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -17535,27 +16340,29 @@ fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # @@ -17563,7 +16370,7 @@ _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -17665,19 +16472,13 @@ "src/tools/cdump/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES src/tools/cdump/xp/GNUmakefile" ;; "src/tools/po2str/GNUmakefile") CONFIG_FILES="$CONFIG_FILES src/tools/po2str/GNUmakefile" ;; "src/tools/po2str/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES src/tools/po2str/xp/GNUmakefile" ;; - "src/tools/scripts/GNUmakefile") CONFIG_FILES="$CONFIG_FILES src/tools/scripts/GNUmakefile" ;; - "src/tools/scripts/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES src/tools/scripts/unix/GNUmakefile" ;; - "src/bindings/GNUmakefile") CONFIG_FILES="$CONFIG_FILES src/bindings/GNUmakefile" ;; - "src/bindings/perl/GNUmakefile") CONFIG_FILES="$CONFIG_FILES src/bindings/perl/GNUmakefile" ;; - "src/bindings/perl/examples/GNUmakefile") CONFIG_FILES="$CONFIG_FILES src/bindings/perl/examples/GNUmakefile" ;; "user/GNUmakefile") CONFIG_FILES="$CONFIG_FILES user/GNUmakefile" ;; "user/wp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES user/wp/GNUmakefile" ;; - "user/wp/scripts/GNUmakefile") CONFIG_FILES="$CONFIG_FILES user/wp/scripts/GNUmakefile" ;; "user/wp/strings/GNUmakefile") CONFIG_FILES="$CONFIG_FILES user/wp/strings/GNUmakefile" ;; "user/wp/templates/GNUmakefile") CONFIG_FILES="$CONFIG_FILES user/wp/templates/GNUmakefile" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done @@ -17717,416 +16518,144 @@ (umask 077 && mkdir "$tmp") } || { - echo "$me: cannot create a temporary directory in ." >&2 + $as_echo "$as_me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF - - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -am__isrc!$am__isrc$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 -ABIWORD_SERIES!$ABIWORD_SERIES$ac_delim -ABIWORD_DATADIR!$ABIWORD_DATADIR$ac_delim -ABIWORD_GLADEDIR!$ABIWORD_GLADEDIR$ac_delim -ABIWORD_HEADERSDIR!$ABIWORD_HEADERSDIR$ac_delim -ABIWORD_LIBDIR!$ABIWORD_LIBDIR$ac_delim -ABIWORD_PLUGINSDIR!$ABIWORD_PLUGINSDIR$ac_delim -CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$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 -CXXDEPMODE!$CXXDEPMODE$ac_delim -am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -CCDEPMODE!$CCDEPMODE$ac_delim -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -CPP!$CPP$ac_delim -LN_S!$LN_S$ac_delim -RANLIB!$RANLIB$ac_delim -INSIDE_GNOME_COMMON_TRUE!$INSIDE_GNOME_COMMON_TRUE$ac_delim -INSIDE_GNOME_COMMON_FALSE!$INSIDE_GNOME_COMMON_FALSE$ac_delim -ABI_EPATH_DYLIB_TRUE!$ABI_EPATH_DYLIB_TRUE$ac_delim -ABI_EPATH_DYLIB_FALSE!$ABI_EPATH_DYLIB_FALSE$ac_delim -EPATH_WV_BUILD_FLAGS!$EPATH_WV_BUILD_FLAGS$ac_delim -ABI_MACSDK_ROOT!$ABI_MACSDK_ROOT$ac_delim -PLATFORM!$PLATFORM$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 -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` +ac_cr=' ' +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr 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 >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -BE_PLATFORM!$BE_PLATFORM$ac_delim -OS_NAME!$OS_NAME$ac_delim -WARNING_CFLAGS!$WARNING_CFLAGS$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -ABITYPES_CFLAGS!$ABITYPES_CFLAGS$ac_delim -WITH_LIBABIWORD_TRUE!$WITH_LIBABIWORD_TRUE$ac_delim -WITH_LIBABIWORD_FALSE!$WITH_LIBABIWORD_FALSE$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim -HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim -HILDON_LIBS!$HILDON_LIBS$ac_delim -EMBEDDED_HILDON_TRUE!$EMBEDDED_HILDON_TRUE$ac_delim -EMBEDDED_HILDON_FALSE!$EMBEDDED_HILDON_FALSE$ac_delim -ENABLE_STATUSBAR_TRUE!$ENABLE_STATUSBAR_TRUE$ac_delim -ENABLE_STATUSBAR_FALSE!$ENABLE_STATUSBAR_FALSE$ac_delim -EMBEDDED_CFLAGS!$EMBEDDED_CFLAGS$ac_delim -EMBEDDED_LIBS!$EMBEDDED_LIBS$ac_delim -ENABLE_PRINT_TRUE!$ENABLE_PRINT_TRUE$ac_delim -ENABLE_PRINT_FALSE!$ENABLE_PRINT_FALSE$ac_delim -BUILD_TTFTOOL_TRUE!$BUILD_TTFTOOL_TRUE$ac_delim -BUILD_TTFTOOL_FALSE!$BUILD_TTFTOOL_FALSE$ac_delim -GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim -GLIB_LIBS!$GLIB_LIBS$ac_delim -GMODULE_CFLAGS!$GMODULE_CFLAGS$ac_delim -GMODULE_LIBS!$GMODULE_LIBS$ac_delim -GTHREAD_CFLAGS!$GTHREAD_CFLAGS$ac_delim -GTHREAD_LIBS!$GTHREAD_LIBS$ac_delim -THREAD_CFLAGS!$THREAD_CFLAGS$ac_delim -THREAD_LIBS!$THREAD_LIBS$ac_delim -HAVE_THREADS_TRUE!$HAVE_THREADS_TRUE$ac_delim -HAVE_THREADS_FALSE!$HAVE_THREADS_FALSE$ac_delim -GTK_CFLAGS!$GTK_CFLAGS$ac_delim -GTK_LIBS!$GTK_LIBS$ac_delim -PANGOFT2_CFLAGS!$PANGOFT2_CFLAGS$ac_delim -PANGOFT2_LIBS!$PANGOFT2_LIBS$ac_delim -XMKMF!$XMKMF$ac_delim -X_CFLAGS!$X_CFLAGS$ac_delim -X_PRE_LIBS!$X_PRE_LIBS$ac_delim -X_LIBS!$X_LIBS$ac_delim -X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim -GNOMEPRINT_CFLAGS!$GNOMEPRINT_CFLAGS$ac_delim -GNOMEPRINT_LIBS!$GNOMEPRINT_LIBS$ac_delim -FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim -FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim -BINRELOC_CFLAGS!$BINRELOC_CFLAGS$ac_delim -BINRELOC_LIBS!$BINRELOC_LIBS$ac_delim -WITH_UNIX_TRUE!$WITH_UNIX_TRUE$ac_delim -WITH_UNIX_FALSE!$WITH_UNIX_FALSE$ac_delim -WITH_MACOSX_TRUE!$WITH_MACOSX_TRUE$ac_delim -WITH_MACOSX_FALSE!$WITH_MACOSX_FALSE$ac_delim -WITH_COCOA_TRUE!$WITH_COCOA_TRUE$ac_delim -WITH_COCOA_FALSE!$WITH_COCOA_FALSE$ac_delim -WITH_QNX_TRUE!$WITH_QNX_TRUE$ac_delim -WITH_QNX_FALSE!$WITH_QNX_FALSE$ac_delim -WITH_WIN32_TRUE!$WITH_WIN32_TRUE$ac_delim -WITH_WIN32_FALSE!$WITH_WIN32_FALSE$ac_delim -WITH_BINRELOC_TRUE!$WITH_BINRELOC_TRUE$ac_delim -WITH_BINRELOC_FALSE!$WITH_BINRELOC_FALSE$ac_delim -OBJCXX!$OBJCXX$ac_delim -OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim -OBJCXXDEPMODE!$OBJCXXDEPMODE$ac_delim -ABI_FE!$ABI_FE$ac_delim -ABI_BE!$ABI_BE$ac_delim -LIBICONV_PEERDIR!$LIBICONV_PEERDIR$ac_delim -ICONV_INCLUDES!$ICONV_INCLUDES$ac_delim -ICONV_LIBS!$ICONV_LIBS$ac_delim -GUCHARMAP_CFLAGS!$GUCHARMAP_CFLAGS$ac_delim -GUCHARMAP_LIBS!$GUCHARMAP_LIBS$ac_delim -WITH_GUCHARMAP_TRUE!$WITH_GUCHARMAP_TRUE$ac_delim -WITH_GUCHARMAP_FALSE!$WITH_GUCHARMAP_FALSE$ac_delim -XFT_CFLAGS!$XFT_CFLAGS$ac_delim -XFT_LIBS!$XFT_LIBS$ac_delim -WITH_XFT_TRUE!$WITH_XFT_TRUE$ac_delim -WITH_XFT_FALSE!$WITH_XFT_FALSE$ac_delim -GSF_CFLAGS!$GSF_CFLAGS$ac_delim -GSF_LIBS!$GSF_LIBS$ac_delim -GSF_HTTP_CFLAGS!$GSF_HTTP_CFLAGS$ac_delim -GSF_HTTP_LIBS!$GSF_HTTP_LIBS$ac_delim -GOFFICE_CFLAGS!$GOFFICE_CFLAGS$ac_delim -GOFFICE_LIBS!$GOFFICE_LIBS$ac_delim -goffice_datadir!$goffice_datadir$ac_delim -goffice_libdir!$goffice_libdir$ac_delim -goffice_icondir!$goffice_icondir$ac_delim -goffice_localedir!$goffice_localedir$ac_delim -goffice_plugindir!$goffice_plugindir$ac_delim -goffice_gladedir!$goffice_gladedir$ac_delim -WITH_SYSTEM_GOFFICE_TRUE!$WITH_SYSTEM_GOFFICE_TRUE$ac_delim -WITH_SYSTEM_GOFFICE_FALSE!$WITH_SYSTEM_GOFFICE_FALSE$ac_delim -GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim -GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim -WITH_GNOMEVFS_TRUE!$WITH_GNOMEVFS_TRUE$ac_delim -WITH_GNOMEVFS_FALSE!$WITH_GNOMEVFS_FALSE$ac_delim -GNOMEUI_CFLAGS!$GNOMEUI_CFLAGS$ac_delim -GNOMEUI_LIBS!$GNOMEUI_LIBS$ac_delim -WITH_GNOMEUI_TRUE!$WITH_GNOMEUI_TRUE$ac_delim -WITH_GNOMEUI_FALSE!$WITH_GNOMEUI_FALSE$ac_delim -ABI_BUILD_SHARED_TRUE!$ABI_BUILD_SHARED_TRUE$ac_delim -_ACEOF + . ./conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; 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;} + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_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 +rm -f conf$$subs.sh -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 -_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 >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\).*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\).*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -ABI_BUILD_SHARED_FALSE!$ABI_BUILD_SHARED_FALSE$ac_delim -ABI_BUILD_STATIC_TRUE!$ABI_BUILD_STATIC_TRUE$ac_delim -ABI_BUILD_STATIC_FALSE!$ABI_BUILD_STATIC_FALSE$ac_delim -ENABLE_SPELL_TRUE!$ENABLE_SPELL_TRUE$ac_delim -ENABLE_SPELL_FALSE!$ENABLE_SPELL_FALSE$ac_delim -SPELL_CFLAGS!$SPELL_CFLAGS$ac_delim -SPELL_LIBS!$SPELL_LIBS$ac_delim -WITH_ENCHANT_TRUE!$WITH_ENCHANT_TRUE$ac_delim -WITH_ENCHANT_FALSE!$WITH_ENCHANT_FALSE$ac_delim -WITH_ISPELL_TRUE!$WITH_ISPELL_TRUE$ac_delim -WITH_ISPELL_FALSE!$WITH_ISPELL_FALSE$ac_delim -FRIBIDI_CFLAGS!$FRIBIDI_CFLAGS$ac_delim -FRIBIDI_LIBS!$FRIBIDI_LIBS$ac_delim -_abi_ots_CFLAGS!$_abi_ots_CFLAGS$ac_delim -_abi_ots_LIBS!$_abi_ots_LIBS$ac_delim -abi_magickpp_config!$abi_magickpp_config$ac_delim -_abi_openwriter_CFLAGS!$_abi_openwriter_CFLAGS$ac_delim -_abi_openwriter_LIBS!$_abi_openwriter_LIBS$ac_delim -_abi_sdw_CFLAGS!$_abi_sdw_CFLAGS$ac_delim -_abi_sdw_LIBS!$_abi_sdw_LIBS$ac_delim -_abi_wordperfect_CFLAGS!$_abi_wordperfect_CFLAGS$ac_delim -_abi_wordperfect_LIBS!$_abi_wordperfect_LIBS$ac_delim -BUILD_IN_PLUGINS_TRUE!$BUILD_IN_PLUGINS_TRUE$ac_delim -BUILD_IN_PLUGINS_FALSE!$BUILD_IN_PLUGINS_FALSE$ac_delim -PLUGIN_CFLAGS!$PLUGIN_CFLAGS$ac_delim -PLUGIN_LIBS!$PLUGIN_LIBS$ac_delim -PLUGIN_LIST!$PLUGIN_LIST$ac_delim -PLUGIN_DEFS!$PLUGIN_DEFS$ac_delim -WITH_RESOURCE_MANAGER_TRUE!$WITH_RESOURCE_MANAGER_TRUE$ac_delim -WITH_RESOURCE_MANAGER_FALSE!$WITH_RESOURCE_MANAGER_FALSE$ac_delim -DEBUG_TRUE!$DEBUG_TRUE$ac_delim -DEBUG_FALSE!$DEBUG_FALSE$ac_delim -SCRIPT_TRUE!$SCRIPT_TRUE$ac_delim -SCRIPT_FALSE!$SCRIPT_FALSE$ac_delim -ABI_FEATURE_DEFS!$ABI_FEATURE_DEFS$ac_delim -OPTIMIZE_CFLAGS!$OPTIMIZE_CFLAGS$ac_delim -PROFILE_CFLAGS!$PROFILE_CFLAGS$ac_delim -LIBJPEG_LIBS!$LIBJPEG_LIBS$ac_delim -DEBUG_CFLAGS!$DEBUG_CFLAGS$ac_delim -SCRIPT_CFLAGS!$SCRIPT_CFLAGS$ac_delim -SCRIPT_LIBS!$SCRIPT_LIBS$ac_delim -PLATFORM_CFLAGS!$PLATFORM_CFLAGS$ac_delim -PLATFORM_LIBS!$PLATFORM_LIBS$ac_delim -XSUBPPDIR!$XSUBPPDIR$ac_delim -BIGENDIAN_TRUE!$BIGENDIAN_TRUE$ac_delim -BIGENDIAN_FALSE!$BIGENDIAN_FALSE$ac_delim -ABI_XML_CONFIG!$ABI_XML_CONFIG$ac_delim -HAVE_EXPAT_TRUE!$HAVE_EXPAT_TRUE$ac_delim -HAVE_EXPAT_FALSE!$HAVE_EXPAT_FALSE$ac_delim -XML_CFLAGS!$XML_CFLAGS$ac_delim -XML_LIBS!$XML_LIBS$ac_delim -EXPAT_PEERDIR!$EXPAT_PEERDIR$ac_delim -WV_CFLAGS!$WV_CFLAGS$ac_delim -WV_LIBS!$WV_LIBS$ac_delim -ZLIB_CFLAGS!$ZLIB_CFLAGS$ac_delim -ZLIB_LIBS!$ZLIB_LIBS$ac_delim -LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim -LIBPNG_LIBS!$LIBPNG_LIBS$ac_delim -LIBPNG_PEERDIR!$LIBPNG_PEERDIR$ac_delim -LIBPOPT_PEERDIR!$LIBPOPT_PEERDIR$ac_delim -LIBPOPT_CFLAGS!$LIBPOPT_CFLAGS$ac_delim -LIBPOPT_LIBS!$LIBPOPT_LIBS$ac_delim -LIBJPEG_CFLAGS!$LIBJPEG_CFLAGS$ac_delim -WITH_LIBJPEG_TRUE!$WITH_LIBJPEG_TRUE$ac_delim -WITH_LIBJPEG_FALSE!$WITH_LIBJPEG_FALSE$ac_delim -ALLOCA!$ALLOCA$ac_delim -ABI_SCANDIR_SELECT_QUALIFIER!$ABI_SCANDIR_SELECT_QUALIFIER$ac_delim -PEERDIRS!$PEERDIRS$ac_delim -PEERS!$PEERS$ac_delim -VALGRIND!$VALGRIND$ac_delim -CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim -CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim -ABIWORD_REQUIRED_PKGS!$ABIWORD_REQUIRED_PKGS$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + print line +} - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; 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;} +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +$as_echo "$as_me: error: could not setup config files machinery" >&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-3.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 >$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 @@ -18142,19 +16671,21 @@ }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" -for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS +eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS" +shift +for ac_tag 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;} + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; @@ -18183,26 +16714,38 @@ [\\/$]*) 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;} + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} { (exit 1); exit 1; }; };; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + ac_file_inputs="$ac_file_inputs '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + configure_input='Generated from '` + $as_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;} + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$tmp/stdin" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; esac ;; esac @@ -18212,7 +16755,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -18238,7 +16781,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -18247,7 +16790,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -18268,17 +16811,17 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_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/ ;; @@ -18323,12 +16866,13 @@ esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -18337,13 +16881,14 @@ /@infodir@/p /@localedir@/p /@mandir@/p -' $ac_file_inputs` in +' +case `eval "sed -n \"\$ac_sed_dataroot\" $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;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g @@ -18357,15 +16902,16 @@ # 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 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -18376,32 +16922,48 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } 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' + { $as_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' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +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. @@ -18411,13 +16973,13 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -echo X"$mf" | +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -18461,7 +17023,7 @@ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$file" | +$as_echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -18487,7 +17049,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -18496,7 +17058,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -18517,8 +17079,8 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" @@ -18535,6 +17097,11 @@ chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -18556,26 +17123,30 @@ # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi echo " " case "$PLATFORM" in "unix" ) - { echo "$as_me:$LINENO: result: Configured to build on a Unix/Linux platform." >&5 -echo "${ECHO_T}Configured to build on a Unix/Linux platform." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured to build on a Unix/Linux platform." >&5 +$as_echo "Configured to build on a Unix/Linux platform." >&6; } ;; "win32" ) - { echo "$as_me:$LINENO: result: Configured to build on a Windows platform." >&5 -echo "${ECHO_T}Configured to build on a Windows platform." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured to build on a Windows platform." >&5 +$as_echo "Configured to build on a Windows platform." >&6; } ;; "qnx" ) - { echo "$as_me:$LINENO: result: Configured to build on a QNX RTOS platform." >&5 -echo "${ECHO_T}Configured to build on a QNX RTOS platform." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured to build on a QNX RTOS platform." >&5 +$as_echo "Configured to build on a QNX RTOS platform." >&6; } ;; "cocoa" ) - { echo "$as_me:$LINENO: result: Configured to build on a Mac OS X platform using Cocoa." >&5 -echo "${ECHO_T}Configured to build on a Mac OS X platform using Cocoa." >&6; } + { $as_echo "$as_me:$LINENO: result: Configured to build on a Mac OS X platform using Cocoa." >&5 +$as_echo "Configured to build on a Mac OS X platform using Cocoa." >&6; } if test ! -z $ABI_MACSDK_ROOT ; then - { echo "$as_me:$LINENO: result: Using SDK in $ABI_MACSDK_ROOT " >&5 -echo "${ECHO_T} Using SDK in $ABI_MACSDK_ROOT " >&6; } + { $as_echo "$as_me:$LINENO: result: Using SDK in $ABI_MACSDK_ROOT " >&5 +$as_echo " Using SDK in $ABI_MACSDK_ROOT " >&6; } fi ;; esac @@ -18583,56 +17154,56 @@ case "$embedded" in "none" ) ;; *) - { echo "$as_me:$LINENO: result: Configured for embedded target (${embedded})." >&5 -echo "${ECHO_T}Configured for embedded target (${embedded})." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured for embedded target (${embedded})." >&5 +$as_echo "Configured for embedded target (${embedded})." >&6; } ;; esac case "$debug" in "true" ) - { echo "$as_me:$LINENO: result: Configured with debugging symbols." >&5 -echo "${ECHO_T}Configured with debugging symbols." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured with debugging symbols." >&5 +$as_echo "Configured with debugging symbols." >&6; } ;; esac case "$print" in "true" ) - { echo "$as_me:$LINENO: result: Configured with printing capabilities." >&5 -echo "${ECHO_T}Configured with printing capabilities." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured with printing capabilities." >&5 +$as_echo "Configured with printing capabilities." >&6; } ;; "false" ) - { echo "$as_me:$LINENO: result: Configured without printing capabilites." >&5 -echo "${ECHO_T}Configured without printing capabilites." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured without printing capabilites." >&5 +$as_echo "Configured without printing capabilites." >&6; } ;; esac case "$do_spell" in "false" ) - { echo "$as_me:$LINENO: result: Configured without spellchecking capabilities." >&5 -echo "${ECHO_T}Configured without spellchecking capabilities." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured without spellchecking capabilities." >&5 +$as_echo "Configured without spellchecking capabilities." >&6; } ;; "*" ) - { echo "$as_me:$LINENO: result: Configured with spellchecking capabilites." >&5 -echo "${ECHO_T}Configured with spellchecking capabilites." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured with spellchecking capabilites." >&5 +$as_echo "Configured with spellchecking capabilites." >&6; } ;; esac case "$script" in "true" ) - { echo "$as_me:$LINENO: result: Configured with scripting support." >&5 -echo "${ECHO_T}Configured with scripting support." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured with scripting support." >&5 +$as_echo "Configured with scripting support." >&6; } ;; esac case "$bidi" in "true" ) - { echo "$as_me:$LINENO: result: Configured with BiDi support." >&5 -echo "${ECHO_T}Configured with BiDi support." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured with BiDi support." >&5 +$as_echo "Configured with BiDi support." >&6; } ;; esac case "$xft" in "true" ) - { echo "$as_me:$LINENO: result: Configured with XFT support." >&5 -echo "${ECHO_T}Configured with XFT support." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Configured with XFT support." >&5 +$as_echo "Configured with XFT support." >&6; } ;; esac case "$cross_compiling" in "yes" ) - { echo "$as_me:$LINENO: result: Cross compiling -- not using binary custom tools." >&5 -echo "${ECHO_T}Cross compiling -- not using binary custom tools." >&6; } ;; + { $as_echo "$as_me:$LINENO: result: Cross compiling -- not using binary custom tools." >&5 +$as_echo "Cross compiling -- not using binary custom tools." >&6; } ;; esac echo " " @@ -18660,5 +17231,5 @@ ABI_WV_WARNING fi -{ echo "$as_me:$LINENO: result: Type make to build AbiWord." >&5 -echo "${ECHO_T}Type make to build AbiWord." >&6; } +{ $as_echo "$as_me:$LINENO: result: Type make to build AbiWord." >&5 +$as_echo "Type make to build AbiWord." >&6; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/configure.ac /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/configure.ac --- abiword-2.6.2/abiword/configure.ac 2008-04-06 22:22:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword/configure.ac 2009-07-15 16:56:23.000000000 +0100 @@ -24,7 +24,7 @@ m4_define([abiword_version_major], [2]) m4_define([abiword_version_minor], [6]) -m4_define([abiword_version_micro], [2]) +m4_define([abiword_version_micro], [8]) m4_define([abiword_series], [abiword_version_major.abiword_version_minor]) m4_define([abiword_version], [abiword_version_major.abiword_version_minor.abiword_version_micro]) @@ -177,14 +177,9 @@ with_win32=true ABI_FE="Win32" ABI_BE="$ABI_FE" - ABI_THREAD elif test "$PLATFORM" = "qnx" ; then ABI_FE="QNX" with_qnx=true - ABI_THREAD - -else - ABI_THREAD fi AM_CONDITIONAL(WITH_UNIX,$with_unix) AM_CONDITIONAL(WITH_MACOSX,$with_macosx) @@ -320,51 +315,6 @@ *) AC_MSG_ERROR(bad value ${enableval} for --enable-peer-config) ;; esac],[peerconfig=true]) -AC_ARG_ENABLE(scripting, - [ --enable-scripting Enable the perl scripting interface ], - [case "${enableval}" in - yes) script=true ;; - no) script=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-scripting) ;; - esac],[script=false]) - -dnl if test "x$script" = "xtrue"; then -dnl AC_MSG_WARN([scripting not currently supported - please contact your priest for details]) -dnl script=false -dnl fi - -dnl this isn't actually used anywhere, but we provide it anyway -AM_CONDITIONAL(SCRIPT, test x$script = xtrue) - -case "$script" in - "true" ) - SCRIPT_LIBS="`perl -MExtUtils::Embed -e ldopts`" - AC_MSG_CHECKING(for perl) - ABI_WHICH_PERL="`which perl 2>&1 | grep -v no\ perl`" - dnl I had an actual check, but the error-if-absent part didn't work, and I was/am too drunk to figure out why - AC_MSG_RESULT(${ABI_WHICH_PERL}) - AC_MSG_CHECKING(perl version) - ABI_PERL_VERSION=`perl -V:version | tr -d "version=" | tr -d "\'" | tr -d "\;" | tr -d . | awk '{printf "%d", [$]1 * 10}'` - if test "$ABI_PERL_VERSION" -le 5699; then - SCRIPT_CFLAGS="-DABI_OPT_PERL `perl -MExtUtils::Embed -e ccopts` -Ubool -DNOT_PERL_5_8" - else - SCRIPT_CFLAGS="-DABI_OPT_PERL `perl -MExtUtils::Embed -e ccopts` -Ubool" - fi - AC_MSG_RESULT($ABI_PERL_VERSION) - AC_MSG_CHECKING(for perl xsubpp precompiler) - XSUBPPDIR="`(cd $abs_srcdir/src/bindings/perl && perl -MExtUtils::MakeMaker -e 'print ExtUtils::MakeMaker->new({NAME => qw(abi)})->tool_xsubpp') | grep ^XSUBPPDIR | sed -e 's/XSUBPPDIR = //g;'`" - if test -n "${XSUBPPDIR}"; then - AC_MSG_RESULT(${XSUBPPDIR}) - else - AC_MSG_ERROR(not found) - fi - ;; - * ) - SCRIPT_CFLAGS="" - SCRIPT_LIBS="" - ;; -esac - if test "$PLATFORM" = "unix"; then PLATFORM_CFLAGS="$GTK_CFLAGS $GMODULE_CFLAGS $GUCHARMAP_CFLAGS $GNOMEPRINT_CFLAGS $FREETYPE_CFLAGS $GOFFICE_CFLAGS $BONOBO_CFLAGS $GNOMEVFS_CFLAGS $GNOMEUI_CFLAGS -DSUPPORTS_UT_IDLE=1" PLATFORM_LIBS="$GTK_LIBS $GMODULE_LIBS $GUCHARMAP_LIBS $GNOMEPRINT_LIBS $FREETYPE_LIBS $BONOBO_LIBS $GNOMEVFS_LIBS $GNOMEUI_LIBS" @@ -400,8 +350,6 @@ AC_SUBST(PROFILE_CFLAGS) AC_SUBST(LIBJPEG_LIBS) AC_SUBST(DEBUG_CFLAGS) -AC_SUBST(SCRIPT_CFLAGS) -AC_SUBST(SCRIPT_LIBS) AC_SUBST(PLATFORM_CFLAGS) AC_SUBST(PLATFORM_LIBS) AC_SUBST(XSUBPPDIR) @@ -581,14 +529,8 @@ src/tools/cdump/xp/GNUmakefile src/tools/po2str/GNUmakefile src/tools/po2str/xp/GNUmakefile - src/tools/scripts/GNUmakefile - src/tools/scripts/unix/GNUmakefile - src/bindings/GNUmakefile - src/bindings/perl/GNUmakefile - src/bindings/perl/examples/GNUmakefile user/GNUmakefile user/wp/GNUmakefile - user/wp/scripts/GNUmakefile user/wp/strings/GNUmakefile user/wp/templates/GNUmakefile ]) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/GNUmakefile.in --- abiword-2.6.2/abiword/GNUmakefile.in 2008-04-06 22:26:21.000000000 +0100 +++ abiword-2.6.8repack2/abiword/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -233,8 +232,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -314,6 +311,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ac-helpers @@ -544,8 +542,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -570,8 +568,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -581,13 +579,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -661,6 +658,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -687,6 +688,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -843,10 +846,10 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ + dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ install-desktopDATA install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-iconDATA \ install-info install-info-am install-man install-mimeDATA \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/goffice-bits/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/goffice-bits/GNUmakefile.in --- abiword-2.6.2/abiword/goffice-bits/GNUmakefile.in 2008-04-06 22:26:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword/goffice-bits/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -55,7 +55,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -221,8 +220,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -302,6 +299,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libgoffice.a @@ -353,8 +351,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -592,8 +590,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -605,8 +603,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -616,13 +614,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/includes.mk /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/includes.mk --- abiword-2.6.2/abiword/includes.mk 2008-04-06 17:08:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword/includes.mk 2009-07-15 16:56:23.000000000 +0100 @@ -84,7 +84,7 @@ # off ABI_CFLAGS=@WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -118,7 +118,7 @@ ABI_BE = @ABI_BE@ ABI_GNOME_PREFIX = Gnome -OTHER_LIBS=@SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ +OTHER_LIBS=@SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ @ZLIB_LIBS@ \ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ @THREAD_LIBS@ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/Makefile --- abiword-2.6.2/abiword/Makefile 2008-04-06 16:59:28.000000000 +0100 +++ abiword-2.6.8repack2/abiword/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -109,9 +109,15 @@ distribution: compile canonical $(MAKE) ABI_ROOT=$(ABI_ROOT) prefix=$(prefix) -C src distribution +toolsplugins: + $(MAKE) ABI_ROOT=$(ABI_ROOT) prefix=$(prefix) -C src toolsplugins + disttools: $(MAKE) ABI_ROOT=$(ABI_ROOT) prefix=$(prefix) -C src disttools +impexpplugins: + $(MAKE) ABI_ROOT=$(ABI_ROOT) prefix=$(prefix) -C src impexpplugins + distimpexp: $(MAKE) ABI_ROOT=$(ABI_ROOT) prefix=$(prefix) -C src distimpexp ################################################################## diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/po/abiword.pot /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/po/abiword.pot --- abiword-2.6.2/abiword/po/abiword.pot 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/abiword/po/abiword.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,8256 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-07 01:06+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. -#. * Translatable strings file generated by extract-ui. -#. * DO NOT compile this file as part of your application. -#. -#. MENU_LABEL__BOGUS1__ -#. MENU_LABEL__BOGUS2__ -#. MENU_STATUSLINE__BOGUS1__ -#. MENU_STATUSLINE__BOGUS2__ -#. MENU_STATUSLINE_OPEN_TEMPLATE -#. MENU_STATUSLINE_FILE -#. MENU_STATUSLINE_EDIT -#. MENU_STATUSLINE_VIEW -#. MENU_STATUSLINE_VIEW_TOOLBARS -#. MENU_STATUSLINE_INSERT -#. MENU_STATUSLINE_FORMAT -#. MENU_STATUSLINE_FMT -#. MENU_STATUSLINE_TOOLS -#. MENU_STATUSLINE_TOOLS_SPELLING -#. MENU_STATUSLINE_ALIGN -#. MENU_STATUSLINE_WINDOW -#. MENU_STATUSLINE_HELP -#: po/tmp/ap_String_Id.h.h:23 -msgid " " -msgstr "" - -#. DLG_Styles_ErrNotTitle2 -#: po/tmp/ap_String_Id.h.h:25 -msgid "" -" - Reserved. \n" -" You cannot use this name. Choose Another \n" -msgstr "" - -#. DLG_WordCount_Auto_Update -#: po/tmp/ap_String_Id.h.h:27 -msgid " Auto Update" -msgstr "" - -#. DLG_PageSetup_Percent -#: po/tmp/ap_String_Id.h.h:29 -#, c-format -msgid "% of normal size" -msgstr "" - -#. MENU_LABEL_SPELL_SUGGEST_1 -#. MENU_LABEL_SPELL_SUGGEST_2 -#. MENU_LABEL_SPELL_SUGGEST_3 -#. MENU_LABEL_SPELL_SUGGEST_4 -#. MENU_LABEL_SPELL_SUGGEST_5 -#. MENU_LABEL_SPELL_SUGGEST_6 -#. MENU_LABEL_SPELL_SUGGEST_7 -#. MENU_LABEL_SPELL_SUGGEST_8 -#. MENU_LABEL_SPELL_SUGGEST_9 -#: po/tmp/ap_String_Id.h.h:39 -#, c-format -msgid "%s" -msgstr "" - -#. MSG_DlgNotImp -#: po/tmp/ap_String_Id.h.h:41 -#, c-format -msgid "" -"%s not implemented yet.\n" -"\n" -"If you are a programmer, feel free to add code in %s, line %d\n" -"and mail patches to:\n" -"\n" -"\tabiword-dev@abisource.com\n" -"\n" -"Otherwise, please be patient." -msgstr "" - -#. MENU_LABEL_FILE_RECENT_1 -#. MENU_LABEL_VIEW_TB_1 -#. MENU_LABEL_WINDOW_1 -#: po/tmp/ap_String_Id.h.h:45 -#, c-format -msgid "&1 %s" -msgstr "" - -#. DLG_Tab_Radio_None -#: po/tmp/ap_String_Id.h.h:47 -msgid "&1 None" -msgstr "" - -#. MENU_LABEL_FILE_RECENT_2 -#. MENU_LABEL_VIEW_TB_2 -#. MENU_LABEL_WINDOW_2 -#: po/tmp/ap_String_Id.h.h:51 -#, c-format -msgid "&2 %s" -msgstr "" - -#. DLG_Tab_Radio_Dot -#: po/tmp/ap_String_Id.h.h:53 -msgid "&2 .........." -msgstr "" - -#. MENU_LABEL_FILE_RECENT_3 -#. MENU_LABEL_VIEW_TB_3 -#. MENU_LABEL_WINDOW_3 -#: po/tmp/ap_String_Id.h.h:57 -#, c-format -msgid "&3 %s" -msgstr "" - -#. DLG_Tab_Radio_Dash -#: po/tmp/ap_String_Id.h.h:59 -msgid "&3 ----------" -msgstr "" - -#. MENU_LABEL_FILE_RECENT_4 -#. MENU_LABEL_VIEW_TB_4 -#. MENU_LABEL_WINDOW_4 -#: po/tmp/ap_String_Id.h.h:63 -#, c-format -msgid "&4 %s" -msgstr "" - -#. DLG_Tab_Radio_Underline -#: po/tmp/ap_String_Id.h.h:65 -msgid "&4 __________" -msgstr "" - -#. MENU_LABEL_FILE_RECENT_5 -#. MENU_LABEL_WINDOW_5 -#: po/tmp/ap_String_Id.h.h:68 -#, c-format -msgid "&5 %s" -msgstr "" - -#. MENU_LABEL_FILE_RECENT_6 -#. MENU_LABEL_WINDOW_6 -#: po/tmp/ap_String_Id.h.h:71 -#, c-format -msgid "&6 %s" -msgstr "" - -#. MENU_LABEL_FILE_RECENT_7 -#. MENU_LABEL_WINDOW_7 -#: po/tmp/ap_String_Id.h.h:74 -#, c-format -msgid "&7 %s" -msgstr "" - -#. MENU_LABEL_FILE_RECENT_8 -#. MENU_LABEL_WINDOW_8 -#: po/tmp/ap_String_Id.h.h:77 -#, c-format -msgid "&8 %s" -msgstr "" - -#. MENU_LABEL_FILE_RECENT_9 -#. MENU_LABEL_WINDOW_9 -#: po/tmp/ap_String_Id.h.h:80 -#, c-format -msgid "&9 %s" -msgstr "" - -#. MENU_LABEL_HELP_ABOUT -#: po/tmp/ap_String_Id.h.h:82 -#, c-format -msgid "&About %s" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION -#: po/tmp/ap_String_Id.h.h:84 -msgid "&Accept revision" -msgstr "" - -#. DLG_Spell_AddToDict -#. MENU_LABEL_SPELL_ADD -#: po/tmp/ap_String_Id.h.h:87 -msgid "&Add" -msgstr "" - -#. DLG_PageSetup_Adjust -#: po/tmp/ap_String_Id.h.h:89 -msgid "&Adjust to:" -msgstr "" - -#. MENU_LABEL_ALIGN -#: po/tmp/ap_String_Id.h.h:91 -msgid "&Align" -msgstr "" - -#. DLG_Options_Label_ViewAll -#: po/tmp/ap_String_Id.h.h:93 -msgid "&All" -msgstr "" - -#. DLG_ApplyButton -#: po/tmp/ap_String_Id.h.h:95 -msgid "&Apply" -msgstr "" - -#. DLG_Para_LabelAt -#: po/tmp/ap_String_Id.h.h:97 -msgid "&At:" -msgstr "" - -#. MENU_LABEL_TOOLS_AUTOSPELL -#: po/tmp/ap_String_Id.h.h:99 -msgid "&Auto Spellcheck" -msgstr "" - -#. MENU_LABEL_TABLE_AUTOFIT -#: po/tmp/ap_String_Id.h.h:101 -msgid "&Autofit Table" -msgstr "" - -#. DLG_Options_Label_PrefsAutoSave -#: po/tmp/ap_String_Id.h.h:103 -msgid "&Automatically save this Scheme" -msgstr "" - -#. DLG_DateTime_AvailableFormats -#: po/tmp/ap_String_Id.h.h:105 -msgid "&Available formats:" -msgstr "" - -#. DLG_Para_LabelBefore -#: po/tmp/ap_String_Id.h.h:107 -msgid "&Before:" -msgstr "" - -#. MENU_LABEL_FMT_BOLD -#: po/tmp/ap_String_Id.h.h:109 -msgid "&Bold" -msgstr "" - -#. DLG_PageSetup_Bottom -#: po/tmp/ap_String_Id.h.h:111 -msgid "&Bottom:" -msgstr "" - -#. MENU_LABEL_INSERT_BREAK -#: po/tmp/ap_String_Id.h.h:113 -msgid "&Break" -msgstr "" - -#. MENU_LABEL_TABLE_SELECT_CELL -#: po/tmp/ap_String_Id.h.h:115 -msgid "&Cell" -msgstr "" - -#. MENU_LABEL_TABLE_INSERT_CELLS -#. MENU_LABEL_TABLE_DELETE_CELLS -#: po/tmp/ap_String_Id.h.h:118 -msgid "&Cells" -msgstr "" - -#. MENU_LABEL_ALIGN_CENTER -#: po/tmp/ap_String_Id.h.h:120 -msgid "&Center" -msgstr "" - -#. DLG_Spell_Change -#: po/tmp/ap_String_Id.h.h:122 -msgid "&Change" -msgstr "" - -#. MENU_LABEL_INSERT_CLIPART -#: po/tmp/ap_String_Id.h.h:124 -msgid "&Clip Art" -msgstr "" - -#. DLG_CloseButton -#. MENU_LABEL_FILE_CLOSE -#: po/tmp/ap_String_Id.h.h:127 -msgid "&Close" -msgstr "" - -#. MENU_LABEL_TABLE_DELETE_COLUMNS -#: po/tmp/ap_String_Id.h.h:129 -msgid "&Column" -msgstr "" - -#. DLG_Break_ColumnBreak -#: po/tmp/ap_String_Id.h.h:131 -msgid "&Column break" -msgstr "" - -#. MENU_LABEL_FMT_COLUMNS -#: po/tmp/ap_String_Id.h.h:133 -msgid "&Columns" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_COMPARE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:135 -msgid "&Compare documents" -msgstr "" - -#. MENU_LABEL_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:137 -msgid "&Copy" -msgstr "" - -#. MENU_LABEL_FMT_STYLE_DEFINE -#: po/tmp/ap_String_Id.h.h:139 -msgid "&Create and Modify Styles" -msgstr "" - -#. DLG_Options_Label_PrefsCurrentScheme -#: po/tmp/ap_String_Id.h.h:141 -msgid "&Current Preferences Scheme" -msgstr "" - -#. MENU_LABEL_TABLE_DELETE -#: po/tmp/ap_String_Id.h.h:143 -msgid "&Delete" -msgstr "" - -#. MENU_LABEL_INSERT_DELETE_HYPERLINK -#: po/tmp/ap_String_Id.h.h:145 -msgid "&Delete hyperlink" -msgstr "" - -#. DLG_Options_Btn_CustomDict -#: po/tmp/ap_String_Id.h.h:147 -msgid "&Dictionary..." -msgstr "" - -#. MENU_LABEL_INSERT_DIRECTIONMARKER -#: po/tmp/ap_String_Id.h.h:149 -msgid "&Direction Marker" -msgstr "" - -#. MENU_LABEL_FMT_DOCUMENT -#: po/tmp/ap_String_Id.h.h:151 -msgid "&Document" -msgstr "" - -#. MENU_LABEL_TOOLS_HISTORY -#: po/tmp/ap_String_Id.h.h:153 -msgid "&Document History" -msgstr "" - -#. MENU_LABEL_WINDOW -#: po/tmp/ap_String_Id.h.h:155 -msgid "&Documents" -msgstr "" - -#. DLG_Para_PushNoHyphenate -#: po/tmp/ap_String_Id.h.h:157 -msgid "&Don't hyphenate" -msgstr "" - -#. DLG_Options_Btn_IgnoreEdit -#. MENU_LABEL_EDIT -#: po/tmp/ap_String_Id.h.h:160 -msgid "&Edit" -msgstr "" - -#. MENU_LABEL_INSERT_EDIT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:162 -msgid "&Edit hyperlink" -msgstr "" - -#. DLG_Options_Label_SmartQuotesEnable -#: po/tmp/ap_String_Id.h.h:164 -msgid "&Enable smart quotes" -msgstr "" - -#. MENU_LABEL_INSERT_ENDNOTE -#: po/tmp/ap_String_Id.h.h:166 -msgid "&Endnote" -msgstr "" - -#. DLG_Break_EvenPage -#: po/tmp/ap_String_Id.h.h:168 -msgid "&Even page" -msgstr "" - -#. MENU_LABEL_INSERT_FIELD -#: po/tmp/ap_String_Id.h.h:170 -msgid "&Field" -msgstr "" - -#. DLG_Field_Fields_No_Colon -#: po/tmp/ap_String_Id.h.h:172 -msgid "&Fields" -msgstr "" - -#. DLG_Field_Fields -#: po/tmp/ap_String_Id.h.h:174 -msgid "&Fields:" -msgstr "" - -#. MENU_LABEL_FILE -#: po/tmp/ap_String_Id.h.h:176 -msgid "&File" -msgstr "" - -#. DLG_Options_Label_FileExtension -#: po/tmp/ap_String_Id.h.h:178 -msgid "&File extension:" -msgstr "" - -#. MENU_LABEL_EDIT_FIND -#: po/tmp/ap_String_Id.h.h:180 -msgid "&Find" -msgstr "" - -#. DLG_FR_FindNextButton -#: po/tmp/ap_String_Id.h.h:182 -msgid "&Find Next" -msgstr "" - -#. MENU_LABEL_FMT_FONT -#: po/tmp/ap_String_Id.h.h:184 -msgid "&Font" -msgstr "" - -#. DLG_PageSetup_Footer -#: po/tmp/ap_String_Id.h.h:186 -msgid "&Footer:" -msgstr "" - -#. MENU_LABEL_TABLE_FORMAT -#: po/tmp/ap_String_Id.h.h:188 -msgid "&Format Table" -msgstr "" - -#. MENU_LABEL_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:190 -msgid "&Go To" -msgstr "" - -#. DLG_FormatTOC_HasHeading -#: po/tmp/ap_String_Id.h.h:192 -msgid "&Has Heading" -msgstr "" - -#. MENU_LABEL_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:194 -msgid "&Header and Footer" -msgstr "" - -#. DLG_PageSetup_Header -#: po/tmp/ap_String_Id.h.h:196 -msgid "&Header:" -msgstr "" - -#. DLG_PageSetup_Height -#: po/tmp/ap_String_Id.h.h:198 -msgid "&Height:" -msgstr "" - -#. DLG_HelpButton -#. MENU_LABEL_HELP -#: po/tmp/ap_String_Id.h.h:201 -msgid "&Help" -msgstr "" - -#. DLG_Options_Label_ViewHiddenText -#: po/tmp/ap_String_Id.h.h:203 -msgid "&Hidden Text" -msgstr "" - -#. DLG_Options_Label_SpellHighlightMisspelledWords -#: po/tmp/ap_String_Id.h.h:205 -msgid "&Highlight misspelled words" -msgstr "" - -#. MENU_LABEL_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:207 -msgid "&Hyperlink" -msgstr "" - -#. DLG_Spell_Ignore -#: po/tmp/ap_String_Id.h.h:209 -msgid "&Ignore" -msgstr "" - -#. MENU_LABEL_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:211 -msgid "&Ignore All" -msgstr "" - -#. MENU_LABEL_FMT_IMAGE -#. MENU_LABEL_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:214 -msgid "&Image" -msgstr "" - -#. MENU_LABEL_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:216 -msgid "&Import Styles" -msgstr "" - -#. MENU_LABEL_WEB_WEBPREVIEW -#: po/tmp/ap_String_Id.h.h:218 -msgid "&In web browser" -msgstr "" - -#. DLG_FormatTOC_InheritLabel -#: po/tmp/ap_String_Id.h.h:220 -msgid "&Inherit label" -msgstr "" - -#. DLG_InsertButton -#. MENU_LABEL_INSERT -#. MENU_LABEL_TABLE_INSERT -#. DLG_Insert -#: po/tmp/ap_String_Id.h.h:224 po/tmp/xap_String_Id.h.h:15 -msgid "&Insert" -msgstr "" - -#. DLG_Options_Label_AutoSaveInterval -#: po/tmp/ap_String_Id.h.h:226 -msgid "&Interval:" -msgstr "" - -#. MENU_LABEL_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:228 -msgid "&Italic" -msgstr "" - -#. MENU_LABEL_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:230 -msgid "&Jump to hyperlink" -msgstr "" - -#. MENU_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:232 -msgid "&Justify" -msgstr "" - -#. DLG_Para_PushKeepLinesTogether -#: po/tmp/ap_String_Id.h.h:234 -msgid "&Keep lines together" -msgstr "" - -#. MENU_LABEL_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:236 -msgid "&LRM" -msgstr "" - -#. DLG_PageSetup_Landscape -#: po/tmp/ap_String_Id.h.h:238 -msgid "&Landscape" -msgstr "" - -#. MENU_LABEL_TOOLS_LANGUAGE -#: po/tmp/ap_String_Id.h.h:240 -msgid "&Language" -msgstr "" - -#. MENU_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:242 -msgid "&Left" -msgstr "" - -#. MENU_LABEL_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:244 -msgid "&Left-to-right text" -msgstr "" - -#. DLG_Para_LabelLeft -#. DLG_PageSetup_Left -#: po/tmp/ap_String_Id.h.h:247 -msgid "&Left:" -msgstr "" - -#. MENU_LABEL_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:249 -msgid "&Lock layout" -msgstr "" - -#. MENU_LABEL_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:251 -msgid "&Mail Merge" -msgstr "" - -#. MENU_LABEL_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:253 -msgid "&Mail Merge Field" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:255 -msgid "&Maintain Full History" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:257 -msgid "&Mark revisions while typing" -msgstr "" - -#. DLG_FR_MatchCase -#: po/tmp/ap_String_Id.h.h:259 -msgid "&Match case" -msgstr "" - -#. MENU_LABEL_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:261 -msgid "&Merge Cells" -msgstr "" - -#. MENU_LABEL_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:263 -msgid "&More Documents" -msgstr "" - -#. DLG_Goto_Label_Name -#: po/tmp/ap_String_Id.h.h:265 -msgid "&Name:" -msgstr "" - -#. MENU_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:267 -msgid "&New" -msgstr "" - -#. MENU_LABEL_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:269 -msgid "&New Window" -msgstr "" - -#. MENU_LABEL_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:271 -msgid "&New using Template" -msgstr "" - -#. DLG_Break_NextPage -#: po/tmp/ap_String_Id.h.h:273 -msgid "&Next page" -msgstr "" - -#. MENU_LABEL_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:275 -msgid "&Normal Layout" -msgstr "" - -#. DLG_Goto_Label_Number -#: po/tmp/ap_String_Id.h.h:277 -msgid "&Number:" -msgstr "" - -#. DLG_FormatTOC_NumberingType -#: po/tmp/ap_String_Id.h.h:279 -msgid "&Numbering type:" -msgstr "" - -#. DLG_Break_OddPage -#: po/tmp/ap_String_Id.h.h:281 -msgid "&Odd page" -msgstr "" - -#. MENU_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:283 -msgid "&Open" -msgstr "" - -#. DLG_MailMerge_OpenFile -#: po/tmp/ap_String_Id.h.h:285 -msgid "&Open File" -msgstr "" - -#. MENU_LABEL_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:287 -msgid "&Overline" -msgstr "" - -#. MENU_LABEL_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:289 -msgid "&Page Width" -msgstr "" - -#. DLG_Break_PageBreak -#: po/tmp/ap_String_Id.h.h:291 -msgid "&Page break" -msgstr "" - -#. DLG_FormatTOC_PageNumbering -#: po/tmp/ap_String_Id.h.h:293 -msgid "&Page numbering:" -msgstr "" - -#. MENU_LABEL_FMT_PARAGRAPH -#: po/tmp/ap_String_Id.h.h:295 -msgid "&Paragraph" -msgstr "" - -#. MENU_LABEL_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:297 -msgid "&Paste" -msgstr "" - -#. MENU_LABEL_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:299 -msgid "&Picture" -msgstr "" - -#. MENU_LABEL_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:301 -msgid "&Plugins" -msgstr "" - -#. DLG_PageSetup_Portrait -#: po/tmp/ap_String_Id.h.h:303 -msgid "&Portrait" -msgstr "" - -#. MENU_LABEL_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:305 -msgid "&Print" -msgstr "" - -#. MENU_LABEL_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:307 -msgid "&Print Layout" -msgstr "" - -#. MENU_LABEL_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:309 -msgid "&Purge History" -msgstr "" - -#. MENU_LABEL_FILE_EXIT -#: po/tmp/ap_String_Id.h.h:311 -msgid "&Quit" -msgstr "" - -#. MENU_LABEL_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:313 -msgid "&RLM" -msgstr "" - -#. MENU_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:315 -msgid "&Redo" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:317 -msgid "&Reject revision" -msgstr "" - -#. DLG_FR_ReplaceButton -#: po/tmp/ap_String_Id.h.h:319 -msgid "&Replace" -msgstr "" - -#. DLG_Options_Btn_IgnoreReset -#: po/tmp/ap_String_Id.h.h:321 -msgid "&Reset" -msgstr "" - -#. MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:323 -msgid "&Reset to default layout" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:325 -msgid "&Revisions" -msgstr "" - -#. MENU_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:327 -msgid "&Right" -msgstr "" - -#. MENU_LABEL_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:329 -msgid "&Right-to-left text" -msgstr "" - -#. DLG_Para_LabelRight -#. DLG_PageSetup_Right -#: po/tmp/ap_String_Id.h.h:332 -msgid "&Right:" -msgstr "" - -#. MENU_LABEL_TABLE_DELETE_ROWS -#. MENU_LABEL_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:335 -msgid "&Row" -msgstr "" - -#. DLG_Options_Label_ViewRuler -#: po/tmp/ap_String_Id.h.h:337 -msgid "&Ruler" -msgstr "" - -#. MENU_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:339 -msgid "&Save" -msgstr "" - -#. MENU_LABEL_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:341 -msgid "&Save Image As" -msgstr "" - -#. MENU_LABEL_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:343 -msgid "&Save web page" -msgstr "" - -#. MENU_LABEL_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:345 -msgid "&Search for Help" -msgstr "" - -#. MENU_LABEL_TABLE_SELECT -#: po/tmp/ap_String_Id.h.h:347 -msgid "&Select" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL -#: po/tmp/ap_String_Id.h.h:349 -msgid "&Select revision" -msgstr "" - -#. MENU_LABEL_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:351 -msgid "&Show History" -msgstr "" - -#. MENU_LABEL_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:353 -msgid "&Show Status Bar" -msgstr "" - -#. DLG_Para_LabelSpecial -#: po/tmp/ap_String_Id.h.h:355 -msgid "&Special:" -msgstr "" - -#. MENU_LABEL_TOOLS_SPELLING -#: po/tmp/ap_String_Id.h.h:357 -msgid "&Spelling" -msgstr "" - -#. DLG_FormatTOC_StartAt -#: po/tmp/ap_String_Id.h.h:359 -msgid "&Start at:" -msgstr "" - -#. DLG_Options_Label_ViewStatusBar -#: po/tmp/ap_String_Id.h.h:361 -msgid "&Status bar" -msgstr "" - -#. MENU_LABEL_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:363 -msgid "&Subscript" -msgstr "" - -#. DLG_Para_PushSuppressLineNumbers -#: po/tmp/ap_String_Id.h.h:365 -msgid "&Suppress line numbers" -msgstr "" - -#. DLG_FormatTOC_TabLeader -#: po/tmp/ap_String_Id.h.h:367 -msgid "&Tab leader:" -msgstr "" - -#. MENU_LABEL_TABLE_INSERT_TABLE -#. MENU_LABEL_TABLE_DELETE_TABLE -#. MENU_LABEL_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:371 -msgid "&Table" -msgstr "" - -#. MENU_LABEL_FMT_TABS -#: po/tmp/ap_String_Id.h.h:373 -msgid "&Tabs" -msgstr "" - -#. DLG_Para_ButtonTabs -#: po/tmp/ap_String_Id.h.h:375 -msgid "&Tabs..." -msgstr "" - -#. MENU_LABEL_VIEW_TOOLBARS -#: po/tmp/ap_String_Id.h.h:377 -msgid "&Toolbars" -msgstr "" - -#. MENU_LABEL_TOOLS -#: po/tmp/ap_String_Id.h.h:379 -msgid "&Tools" -msgstr "" - -#. DLG_PageSetup_Top -#: po/tmp/ap_String_Id.h.h:381 -msgid "&Top:" -msgstr "" - -#. DLG_Field_Types_No_Colon -#: po/tmp/ap_String_Id.h.h:383 -msgid "&Types" -msgstr "" - -#. DLG_Field_Types -#: po/tmp/ap_String_Id.h.h:385 -msgid "&Types:" -msgstr "" - -#. MENU_LABEL_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:387 -msgid "&Underline" -msgstr "" - -#. MENU_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:389 -msgid "&Undo" -msgstr "" - -#. DLG_Options_Label_ViewUnits -#. DLG_PageSetup_Units -#: po/tmp/ap_String_Id.h.h:392 -msgid "&Units:" -msgstr "" - -#. MENU_LABEL_VIEW -#. DLG_MW_ViewButton -#: po/tmp/ap_String_Id.h.h:394 po/tmp/xap_String_Id.h.h:21 -msgid "&View" -msgstr "" - -#. MENU_LABEL_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:396 -msgid "&Web Layout" -msgstr "" - -#. MENU_LABEL_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:398 -msgid "&Whole Page" -msgstr "" - -#. DLG_FR_WholeWord -#: po/tmp/ap_String_Id.h.h:400 -msgid "&Whole word" -msgstr "" - -#. DLG_Para_PushWidowOrphanControl -#: po/tmp/ap_String_Id.h.h:402 -msgid "&Widow/Orphan control" -msgstr "" - -#. DLG_PageSetup_Width -#: po/tmp/ap_String_Id.h.h:404 -msgid "&Width:" -msgstr "" - -#. MENU_LABEL_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:406 -msgid "&Word Count" -msgstr "" - -#. MENU_LABEL_VIEW_ZOOM_MENU -#. MENU_LABEL_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:409 -msgid "&Zoom" -msgstr "" - -#. DLG_ListRevisions_LevelZero -#: po/tmp/ap_String_Id.h.h:411 -msgid "(All revisions visible)" -msgstr "" - -#. DLG_Spell_NoSuggestions -#: po/tmp/ap_String_Id.h.h:413 -msgid "(no spelling suggestions)" -msgstr "" - -#. DLG_Para_SpecialNone -#: po/tmp/ap_String_Id.h.h:415 -msgid "(none)" -msgstr "" - -#. TOOLBAR_LABEL_1COLUMN -#. TOOLBAR_STATUSLINE_1COLUMN -#. TOOLBAR_TOOLTIP_1COLUMN -#: po/tmp/ap_String_Id.h.h:419 -msgid "1 Column" -msgstr "" - -#. TOOLBAR_LABEL_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:421 -msgid "1.5 Spacing" -msgstr "" - -#. DLG_Para_SpacingHalf -#: po/tmp/ap_String_Id.h.h:423 -msgid "1.5 lines" -msgstr "" - -#. TOOLBAR_STATUSLINE_MIDDLE_SPACE -#. TOOLBAR_TOOLTIP_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:426 -msgid "1.5 spacing" -msgstr "" - -#. TOOLBAR_LABEL_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:428 -msgid "12 pt before" -msgstr "" - -#. TOOLBAR_LABEL_2COLUMN -#. TOOLBAR_STATUSLINE_2COLUMN -#. TOOLBAR_TOOLTIP_2COLUMN -#: po/tmp/ap_String_Id.h.h:432 -msgid "2 Columns" -msgstr "" - -#. TOOLBAR_LABEL_3COLUMN -#. TOOLBAR_STATUSLINE_3COLUMN -#. TOOLBAR_TOOLTIP_3COLUMN -#: po/tmp/ap_String_Id.h.h:436 -msgid "3 Columns" -msgstr "" - -#. DLG_Goto_Btn_Prev -#: po/tmp/ap_String_Id.h.h:438 -msgid "<< Prev" -msgstr "" - -#. MSG_Exception -#: po/tmp/ap_String_Id.h.h:440 -msgid "" -"A fatal error has just occurred. Abiword is going to shutdown.\n" -"The current document has been saved to disc with a \".saved\" extension." -msgstr "" - -#. DLG_Options_Label_SpellSuggest -#: po/tmp/ap_String_Id.h.h:442 -msgid "A&lways suggest corrections" -msgstr "" - -#. FIELD_DateTime_AMPM -#: po/tmp/ap_String_Id.h.h:444 -msgid "AM/PM" -msgstr "" - -#. MSG_IE_BogusDocument -#: po/tmp/ap_String_Id.h.h:446 -#, c-format -msgid "AbiWord cannot open %s. It appears to be an invalid document" -msgstr "" - -#. MSG_SpellSelectionDone -#: po/tmp/ap_String_Id.h.h:448 -msgid "AbiWord finished checking the selection." -msgstr "" - -#. DLG_FR_FinishedReplace -#: po/tmp/ap_String_Id.h.h:450 -#, c-format -msgid "" -"AbiWord has finished its search of the document and has made %d replacements." -msgstr "" - -#. DLG_FR_FinishedFind -#: po/tmp/ap_String_Id.h.h:452 -msgid "AbiWord has finished searching the document." -msgstr "" - -#. WINDOWS_COMCTL_WARNING -#: po/tmp/ap_String_Id.h.h:454 -msgid "" -"AbiWord is designed for a newer version of the system file COMCTL32.DLL\n" -"than the one currently on your system. (COMCTL32.DLL version 4.72 or newer)\n" -"A solution to this problem is explained in the FAQ on the AbiSource web " -"site\n" -"\n" -"\thttp://www.abisource.com\n" -"\n" -"You can use the program, but the toolbar may be missing." -msgstr "" - -#. WINDOWS_NEED_UNICOWS -#: po/tmp/ap_String_Id.h.h:456 -#, c-format -msgid "" -"AbiWord needs the file %s.dll\n" -"Please download and install it from http://www.microsoft.com/msdownload/" -"platformsdk/sdkupdate/psdkredist.htm" -msgstr "" - -#. MENU_LABEL_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:458 -msgid "About G&NOME Office" -msgstr "" - -#. MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:460 -msgid "About the GNOME Office project" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION -#: po/tmp/ap_String_Id.h.h:462 -msgid "Accept the suggested change" -msgstr "" - -#. TOOLBAR_STATUSLINE_ADD_COLUMN -#. TOOLBAR_TOOLTIP_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:465 -msgid "Add a column to this table after the current column" -msgstr "" - -#. TOOLBAR_STATUSLINE_ADD_ROW -#. TOOLBAR_TOOLTIP_ADD_ROW -#: po/tmp/ap_String_Id.h.h:468 -msgid "Add a row to this table after the current row" -msgstr "" - -#. MENU_STATUSLINE_FMT_BORDERS -#: po/tmp/ap_String_Id.h.h:470 -msgid "Add borders and shading to the selection" -msgstr "" - -#. TOOLBAR_LABEL_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:472 -msgid "Add column after" -msgstr "" - -#. MENU_STATUSLINE_FMT_BULLETS -#: po/tmp/ap_String_Id.h.h:474 -msgid "Add or modify bullets and numbering for selected paragraphs" -msgstr "" - -#. TOOLBAR_LABEL_ADD_ROW -#: po/tmp/ap_String_Id.h.h:476 -msgid "Add row after" -msgstr "" - -#. MENU_STATUSLINE_SPELL_ADD -#: po/tmp/ap_String_Id.h.h:478 -msgid "Add this word to the custom dictionary" -msgstr "" - -#. DLG_Styles_ModifyTemplate -#: po/tmp/ap_String_Id.h.h:480 -msgid "Add to template" -msgstr "" - -#. DLG_Para_LabelAfter -#: po/tmp/ap_String_Id.h.h:482 -msgid "Aft&er:" -msgstr "" - -#. DLG_Para_LabelAlignment -#: po/tmp/ap_String_Id.h.h:484 -msgid "Ali&gnment:" -msgstr "" - -#. DLG_Tab_Label_Alignment -#. DLG_PageNumbers_Alignment_No_Colon -#: po/tmp/ap_String_Id.h.h:487 -msgid "Alignment" -msgstr "" - -#. DLG_PageNumbers_Alignment -#: po/tmp/ap_String_Id.h.h:489 -msgid "Alignment:" -msgstr "" - -#. DLG_Styles_LBL_All -#. DLG_UP_All -#: po/tmp/ap_String_Id.h.h:491 po/tmp/xap_String_Id.h.h:51 -msgid "All" -msgstr "" - -#. DLG_Options_Label_CheckAllowCustomToolbars -#: po/tmp/ap_String_Id.h.h:493 -msgid "Allow Custom Toolbars" -msgstr "" - -#. MENU_STATUSLINE_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:495 -msgid "Allow formatting using styles only" -msgstr "" - -#. DLG_Options_Label_CheckWhiteForTransparent -#: po/tmp/ap_String_Id.h.h:497 -msgid "Allow screen colors other than white" -msgstr "" - -#. MENU_LABEL_INSERT_ANNOTATION -#: po/tmp/ap_String_Id.h.h:499 -msgid "Annotation" -msgstr "" - -#. FIELD_Application -#: po/tmp/ap_String_Id.h.h:501 -msgid "Application" -msgstr "" - -#. DLG_Options_Label_AppStartup -#: po/tmp/ap_String_Id.h.h:503 -msgid "Application Startup" -msgstr "" - -#. DLG_Options_Btn_Apply -#. DLG_Apply -#: po/tmp/ap_String_Id.h.h:505 po/tmp/xap_String_Id.h.h:63 -msgid "Apply" -msgstr "" - -#. TOOLBAR_STATUSLINE_FMTPAINTER -#. TOOLBAR_TOOLTIP_FMTPAINTER -#: po/tmp/ap_String_Id.h.h:508 -msgid "Apply the previously copied paragraph formatting onto the selected text" -msgstr "" - -#. DLG_Lists_Apply_Current -#: po/tmp/ap_String_Id.h.h:510 -msgid "Apply to Current List" -msgstr "" - -#. DLG_FormatTable_Apply_To -#: po/tmp/ap_String_Id.h.h:512 -msgid "Apply to:" -msgstr "" - -#. DLG_Lists_Arabic_List -#: po/tmp/ap_String_Id.h.h:514 -msgid "Arabic List" -msgstr "" - -#. MSG_AutoRevisionOffWarning -#: po/tmp/ap_String_Id.h.h:516 -msgid "" -"Are you sure you do not want to maintain full history record? If you " -"proceed, you will not be able to restore earlier versions of this document." -msgstr "" - -#. DLG_Para_SpacingAtLeast -#: po/tmp/ap_String_Id.h.h:518 -msgid "At least" -msgstr "" - -#. DLG_Lists_Resume -#: po/tmp/ap_String_Id.h.h:520 -msgid "Attach to Previous List" -msgstr "" - -#. DLG_MetaData_Author_LBL -#. DLG_PLUGIN_MANAGER_AUTHOR -#: po/tmp/ap_String_Id.h.h:522 po/tmp/xap_String_Id.h.h:85 -msgid "Author:" -msgstr "" - -#. DLG_Options_Label_AutoSaveUnderline -#: po/tmp/ap_String_Id.h.h:524 -msgid "Auto &Save" -msgstr "" - -#. DLG_Options_Label_AutoSaveCurrent -#: po/tmp/ap_String_Id.h.h:526 -msgid "Auto &save current file every" -msgstr "" - -#. DLG_Options_Label_AutoSave -#: po/tmp/ap_String_Id.h.h:528 -msgid "Auto Save" -msgstr "" - -#. DLG_Options_Label_SpellAutoReplace -#: po/tmp/ap_String_Id.h.h:530 -msgid "Auto replace misspelled words" -msgstr "" - -#. DLG_InsertTable_AutoFit_Capital -#: po/tmp/ap_String_Id.h.h:532 -msgid "AutoFit Behavior" -msgstr "" - -#. DLG_InsertTable_AutoFit -#: po/tmp/ap_String_Id.h.h:534 -msgid "AutoFit behavior" -msgstr "" - -#. MENU_STATUSLINE_TABLE_AUTOFIT -#: po/tmp/ap_String_Id.h.h:536 -msgid "Autofit Table" -msgstr "" - -#. DLG_Options_Label_Grammar -#: po/tmp/ap_String_Id.h.h:538 -msgid "Automatic Grammar Checking" -msgstr "" - -#. DLG_InsertTable_AutoColSize -#: po/tmp/ap_String_Id.h.h:540 -msgid "Automatic column size" -msgstr "" - -#. DLG_Options_Label_CheckAutoLoadPlugins -#: po/tmp/ap_String_Id.h.h:542 -msgid "Automatically load all plugins found" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_AUTOSPELL -#: po/tmp/ap_String_Id.h.h:544 -msgid "Automatically spell-check the document" -msgstr "" - -#. DLG_Styles_ModifyAutomatic -#: po/tmp/ap_String_Id.h.h:546 -msgid "Automatically update" -msgstr "" - -#. MSG_AutoMerge -#: po/tmp/ap_String_Id.h.h:548 -msgid "Automerge" -msgstr "" - -#. DLG_MailMerge_AvailableFields -#: po/tmp/ap_String_Id.h.h:550 -msgid "Available Fields" -msgstr "" - -#. DLG_DateTime_AvailableFormats_Capital -#: po/tmp/ap_String_Id.h.h:552 -msgid "Available Formats" -msgstr "" - -#. DLG_Styles_Available -#: po/tmp/ap_String_Id.h.h:554 -msgid "Available Styles" -msgstr "" - -#. DLG_Para_LabelBy -#: po/tmp/ap_String_Id.h.h:556 -msgid "B&y:" -msgstr "" - -#. DLG_FormatFrame_Background -#. DLG_FormatTable_Background -#: po/tmp/ap_String_Id.h.h:559 -msgid "Background" -msgstr "" - -#. DLG_FormatFrame_Background_Color -#. DLG_FormatTable_Background_Color -#: po/tmp/ap_String_Id.h.h:562 -msgid "Background color:" -msgstr "" - -#. DLG_Tab_Radio_Bar -#: po/tmp/ap_String_Id.h.h:564 -msgid "Bar" -msgstr "" - -#. TabToggleBarTab -#: po/tmp/ap_String_Id.h.h:566 -msgid "Bar Tab" -msgstr "" - -#. DLG_Styles_ModifyBasedOn -#: po/tmp/ap_String_Id.h.h:568 -msgid "Based On:" -msgstr "" - -#. DLG_Options_Label_BiDiOptions -#: po/tmp/ap_String_Id.h.h:570 -msgid "Bi-Directional Options" -msgstr "" - -#. TOOLBAR_LABEL_FMT_BOLD -#. TOOLBAR_STATUSLINE_FMT_BOLD -#. TOOLBAR_TOOLTIP_FMT_BOLD -#. DLG_UFS_StyleBold -#: po/tmp/ap_String_Id.h.h:574 po/tmp/xap_String_Id.h.h:119 -msgid "Bold" -msgstr "" - -#. MENU_LABEL_INSERT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:576 -msgid "Boo&kmark" -msgstr "" - -#. DLG_Goto_Target_Bookmark -#: po/tmp/ap_String_Id.h.h:578 -msgid "Bookmark" -msgstr "" - -#. MSG_BookmarkNotFound -#: po/tmp/ap_String_Id.h.h:580 -#, c-format -msgid "Bookmark \"%s\" was not found in this document." -msgstr "" - -#. DLG_FormatFrame_Border_Color -#. DLG_FormatTable_Border_Color -#: po/tmp/ap_String_Id.h.h:583 -msgid "Border color:" -msgstr "" - -#. DLG_FormatFrame_Borders -#. DLG_FormatTable_Borders -#: po/tmp/ap_String_Id.h.h:586 -msgid "Borders" -msgstr "" - -#. MENU_LABEL_FMT_BORDERS -#: po/tmp/ap_String_Id.h.h:588 -msgid "Borders and Shading" -msgstr "" - -#. BottomMarginStatus -#: po/tmp/ap_String_Id.h.h:590 -#, c-format -msgid "Bottom Margin [%s]" -msgstr "" - -#. MENU_LABEL_FMT_BOTTOMLINE -#. TOOLBAR_LABEL_FMT_BOTTOMLINE -#. TOOLBAR_STATUSLINE_FMT_BOTTOMLINE -#. TOOLBAR_TOOLTIP_FMT_BOTTOMLINE -#. DLG_UFS_BottomlineCheck -#: po/tmp/ap_String_Id.h.h:595 po/tmp/xap_String_Id.h.h:123 -msgid "Bottomline" -msgstr "" - -#. DLG_Lists_Box_List -#. STYLE_BOXLIST -#: po/tmp/ap_String_Id.h.h:597 po/tmp/xap_String_Id.h.h:125 -msgid "Box List" -msgstr "" - -#. FIELD_Application_BuildId -#: po/tmp/ap_String_Id.h.h:599 -msgid "Build Id." -msgstr "" - -#. FIELD_Application_Options -#: po/tmp/ap_String_Id.h.h:601 -msgid "Build Options" -msgstr "" - -#. FIELD_Application_Target -#: po/tmp/ap_String_Id.h.h:603 -msgid "Build Target" -msgstr "" - -#. DLG_Lists_Type_bullet -#: po/tmp/ap_String_Id.h.h:605 -msgid "Bullet" -msgstr "" - -#. DLG_Lists_Bullet_List -#. STYLE_BULLETLIST -#: po/tmp/ap_String_Id.h.h:607 po/tmp/xap_String_Id.h.h:133 -msgid "Bullet List" -msgstr "" - -#. TOOLBAR_LABEL_LISTS_BULLETS -#. TOOLBAR_STATUSLINE_LISTS_BULLETS -#. TOOLBAR_TOOLTIP_LISTS_BULLETS -#: po/tmp/ap_String_Id.h.h:611 -msgid "Bullets" -msgstr "" - -#. MENU_LABEL_FMT_BULLETS -#: po/tmp/ap_String_Id.h.h:613 -msgid "Bullets and &Numbering" -msgstr "" - -#. DLG_Options_Label_Look -#: po/tmp/ap_String_Id.h.h:615 -msgid "Button Style" -msgstr "" - -#. MENU_LABEL_FMT_TOGGLECASE -#: po/tmp/ap_String_Id.h.h:617 -msgid "C&hange Case" -msgstr "" - -#. MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION -#: po/tmp/ap_String_Id.h.h:619 -msgid "C&opy hyperlink location" -msgstr "" - -#. MENU_LABEL_HELP_CREDITS -#: po/tmp/ap_String_Id.h.h:621 -msgid "C&redits" -msgstr "" - -#. MSG_NoBreakInsideTable -#: po/tmp/ap_String_Id.h.h:623 -msgid "Can not insert a Break inside a table" -msgstr "" - -#. MSG_NoBreakInsideFrame -#: po/tmp/ap_String_Id.h.h:625 -msgid "Can not insert a Break inside a text box" -msgstr "" - -#. DLG_Styles_ErrStyleCantDelete -#: po/tmp/ap_String_Id.h.h:627 -msgid "Cannot delete this style" -msgstr "" - -#. DLG_Styles_ErrStyleBuiltin -#: po/tmp/ap_String_Id.h.h:629 -msgid "Cannot modify a builtin style" -msgstr "" - -#. PRINT_CANNOTSTARTPRINTJOB -#: po/tmp/ap_String_Id.h.h:631 -msgid "Cannot start print job" -msgstr "" - -#. DLG_MetaData_Category_LBL -#: po/tmp/ap_String_Id.h.h:633 -msgid "Category:" -msgstr "" - -#. DLG_Tab_Radio_Center -#. DLG_PageNumbers_Center -#. TOOLBAR_LABEL_ALIGN_CENTER -#: po/tmp/ap_String_Id.h.h:637 -msgid "Center" -msgstr "" - -#. TabToggleCenterTab -#: po/tmp/ap_String_Id.h.h:639 -msgid "Center Tab" -msgstr "" - -#. TOOLBAR_STATUSLINE_ALIGN_CENTER -#. TOOLBAR_TOOLTIP_ALIGN_CENTER -#: po/tmp/ap_String_Id.h.h:642 -msgid "Center alignment" -msgstr "" - -#. MENU_STATUSLINE_ALIGN_CENTER -#: po/tmp/ap_String_Id.h.h:644 -msgid "Center-align the paragraph" -msgstr "" - -#. DLG_Para_AlignCentered -#: po/tmp/ap_String_Id.h.h:646 -msgid "Centered" -msgstr "" - -#. DLG_Spell_ChangeTo -#: po/tmp/ap_String_Id.h.h:648 -msgid "Change &to:" -msgstr "" - -#. DLG_Spell_ChangeAll -#: po/tmp/ap_String_Id.h.h:650 -msgid "Change A&ll" -msgstr "" - -#. DLG_Background_Title -#: po/tmp/ap_String_Id.h.h:652 -msgid "Change Background Color" -msgstr "" - -#. DLG_ToggleCase_Title -#: po/tmp/ap_String_Id.h.h:654 -msgid "Change Case" -msgstr "" - -#. DLG_Lists_Cur_Change_Start -#: po/tmp/ap_String_Id.h.h:656 -msgid "" -"Change Current \n" -"List" -msgstr "" - -#. DLG_Background_TitleHighlight -#: po/tmp/ap_String_Id.h.h:658 -msgid "Change Highlight Color" -msgstr "" - -#. DLG_FormatTOC_ChangeStyle -#: po/tmp/ap_String_Id.h.h:660 -msgid "Change Style" -msgstr "" - -#. DLG_Background_TitleFore -#: po/tmp/ap_String_Id.h.h:662 -msgid "Change Text Color" -msgstr "" - -#. MENU_STATUSLINE_FMT_DIRECTION -#: po/tmp/ap_String_Id.h.h:664 -msgid "Change directional properties of text" -msgstr "" - -#. TOOLBAR_STATUSLINE_FMT_DOM_DIRECTION -#. TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION -#: po/tmp/ap_String_Id.h.h:667 -msgid "Change dominant direction of paragraph" -msgstr "" - -#. MENU_STATUSLINE_FMT_TOGGLECASE -#: po/tmp/ap_String_Id.h.h:669 -msgid "Change the case of the selected text" -msgstr "" - -#. MENU_STATUSLINE_FMT_FONT -#: po/tmp/ap_String_Id.h.h:671 -msgid "Change the font of the selected text" -msgstr "" - -#. MENU_STATUSLINE_FMT_PARAGRAPH -#: po/tmp/ap_String_Id.h.h:673 -msgid "Change the format of the selected paragraph" -msgstr "" - -#. MENU_STATUSLINE_FMT_LANGUAGE -#. MENU_STATUSLINE_TOOLS_LANGUAGE -#: po/tmp/ap_String_Id.h.h:676 -msgid "Change the language of the selected text" -msgstr "" - -#. MENU_STATUSLINE_FMT_COLUMNS -#: po/tmp/ap_String_Id.h.h:678 -msgid "Change the number of columns" -msgstr "" - -#. MENU_STATUSLINE_FILE_PAGESETUP -#: po/tmp/ap_String_Id.h.h:680 -msgid "Change the printing options" -msgstr "" - -#. MENU_STATUSLINE_FMT_FRAME -#: po/tmp/ap_String_Id.h.h:682 -msgid "Change the properties of the Text Box" -msgstr "" - -#. MENU_STATUSLINE_SPELL_SUGGEST_1 -#. MENU_STATUSLINE_SPELL_SUGGEST_2 -#. MENU_STATUSLINE_SPELL_SUGGEST_3 -#. MENU_STATUSLINE_SPELL_SUGGEST_4 -#. MENU_STATUSLINE_SPELL_SUGGEST_5 -#. MENU_STATUSLINE_SPELL_SUGGEST_6 -#. MENU_STATUSLINE_SPELL_SUGGEST_7 -#. MENU_STATUSLINE_SPELL_SUGGEST_8 -#. MENU_STATUSLINE_SPELL_SUGGEST_9 -#: po/tmp/ap_String_Id.h.h:692 -msgid "Change to this suggested spelling" -msgstr "" - -#. MENU_STATUSLINE_FMT_BACKGROUND -#: po/tmp/ap_String_Id.h.h:694 -msgid "Change your document's page background" -msgstr "" - -#. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_COLOR -#: po/tmp/ap_String_Id.h.h:696 -msgid "Change your document's page color" -msgstr "" - -#. DLG_Styles_ModifyCharacter -#: po/tmp/ap_String_Id.h.h:698 -msgid "Character" -msgstr "" - -#. FIELD_Numbers_CharCount -#: po/tmp/ap_String_Id.h.h:700 -msgid "Character Count" -msgstr "" - -#. FIELD_Numbers_NbspCount -#: po/tmp/ap_String_Id.h.h:702 -msgid "Character Count (w/o spaces)" -msgstr "" - -#. DLG_Styles_CharPrev -#: po/tmp/ap_String_Id.h.h:704 -msgid "Character Preview" -msgstr "" - -#. DLG_WordCount_Characters_No -#: po/tmp/ap_String_Id.h.h:706 -msgid "Characters (no spaces):" -msgstr "" - -#. DLG_WordCount_Characters_Sp -#: po/tmp/ap_String_Id.h.h:708 -msgid "Characters (with spaces):" -msgstr "" - -#. MENU_LABEL_TOOLS_SPELL -#: po/tmp/ap_String_Id.h.h:710 -msgid "Check &Spelling" -msgstr "" - -#. DLG_Options_Label_GrammarCheck -#: po/tmp/ap_String_Id.h.h:712 -msgid "Check &grammar as you type" -msgstr "" - -#. MENU_LABEL_HELP_CHECKVER -#: po/tmp/ap_String_Id.h.h:714 -msgid "Check for &Updates" -msgstr "" - -#. MENU_STATUSLINE_HELP_CHECKVER -#: po/tmp/ap_String_Id.h.h:716 -msgid "Check online for newer versions of AbiWord" -msgstr "" - -#. DLG_Options_Label_SpellCheckAsType -#: po/tmp/ap_String_Id.h.h:718 -msgid "Check s&pelling as you type" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_SPELL -#: po/tmp/ap_String_Id.h.h:720 -msgid "Check the document for incorrect spelling" -msgstr "" - -#. DLG_NEW_Choose -#: po/tmp/ap_String_Id.h.h:722 -msgid "Choose" -msgstr "" - -#. DLG_Options_Label_ChooseForTransparent -#: po/tmp/ap_String_Id.h.h:724 -msgid "Choose Screen Color" -msgstr "" - -#. DLG_Options_Label_ColorChooserLabel -#: po/tmp/ap_String_Id.h.h:726 -msgid "Choose screen color for AbiWord" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL -#: po/tmp/ap_String_Id.h.h:728 -msgid "Choose which revision you wish to view" -msgstr "" - -#. DLG_Goto_Label_Help -#: po/tmp/ap_String_Id.h.h:730 -msgid "" -"Choose your target in the left side.\n" -"If you want to use the \"Go To\" button, just fill the Number Entry with the " -"desired number. You can use + and - to perform relative movement.\tI.e., if " -"you write \"+2\" and you select \"Line\", the \"Go To\" will go 2 lines " -"below your current position." -msgstr "" - -#. MENU_LABEL_EDIT_CLEAR -#: po/tmp/ap_String_Id.h.h:732 -msgid "Cle&ar" -msgstr "" - -#. DLG_Tab_Button_Clear -#: po/tmp/ap_String_Id.h.h:734 -msgid "Clear" -msgstr "" - -#. DLG_Tab_Button_ClearAll -#: po/tmp/ap_String_Id.h.h:736 -msgid "Clear &All" -msgstr "" - -#. DLG_Background_ClearClr -#: po/tmp/ap_String_Id.h.h:738 -msgid "Clear Background Color" -msgstr "" - -#. DLG_Background_ClearHighlight -#: po/tmp/ap_String_Id.h.h:740 -msgid "Clear Highlight Color" -msgstr "" - -#. MSG_QueryExit -#: po/tmp/ap_String_Id.h.h:742 -msgid "Close all windows and exit?" -msgstr "" - -#. MENU_STATUSLINE_FILE_EXIT -#: po/tmp/ap_String_Id.h.h:744 -msgid "Close all windows in the application and exit" -msgstr "" - -#. MENU_STATUSLINE_FILE_CLOSE -#: po/tmp/ap_String_Id.h.h:746 -msgid "Close the document" -msgstr "" - -#. MENU_LABEL_TABLE_SELECT_COLUMN -#: po/tmp/ap_String_Id.h.h:748 -msgid "Co&lumn" -msgstr "" - -#. DLG_FormatFrame_Color -#. DLG_FormatTable_Color -#. DLG_UFS_ColorLabel -#: po/tmp/ap_String_Id.h.h:751 po/tmp/xap_String_Id.h.h:191 -msgid "Color:" -msgstr "" - -#. DLG_FormatTable_Apply_To_Column -#: po/tmp/ap_String_Id.h.h:753 -msgid "Column" -msgstr "" - -#. ColumnGapStatus -#: po/tmp/ap_String_Id.h.h:755 -#, c-format -msgid "Column Gap [%s]" -msgstr "" - -#. ColumnStatus -#: po/tmp/ap_String_Id.h.h:757 -#, c-format -msgid "Column [%d]" -msgstr "" - -#. DLG_Column_ColumnTitle -#: po/tmp/ap_String_Id.h.h:759 -msgid "Columns" -msgstr "" - -#. MENU_LABEL_TABLE_INSERT_COLUMNS_BEFORE -#: po/tmp/ap_String_Id.h.h:761 -msgid "Columns &Left" -msgstr "" - -#. MENU_LABEL_TABLE_INSERT_COLUMNS_AFTER -#: po/tmp/ap_String_Id.h.h:763 -msgid "Columns &Right" -msgstr "" - -#. DLG_ListRevisions_Column3Label -#: po/tmp/ap_String_Id.h.h:765 -msgid "Comment" -msgstr "" - -#. DLG_MarkRevisions_Comment2Label -#: po/tmp/ap_String_Id.h.h:767 -msgid "Comment to be associated with the revision:" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_COMPARE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:769 -msgid "Compare active document to another document" -msgstr "" - -#. FIELD_Application_CompileDate -#: po/tmp/ap_String_Id.h.h:771 -msgid "Compile Date" -msgstr "" - -#. FIELD_Application_CompileTime -#: po/tmp/ap_String_Id.h.h:773 -msgid "Compile Time" -msgstr "" - -#. DLG_Break_Continuous -#: po/tmp/ap_String_Id.h.h:775 -msgid "Con&tinuous" -msgstr "" - -#. TOC_TocHeading -#: po/tmp/ap_String_Id.h.h:777 -msgid "Contents" -msgstr "" - -#. DLG_MarkRevisions_Check1Label -#: po/tmp/ap_String_Id.h.h:779 -#, c-format -msgid "Continue previous revision (number %d)" -msgstr "" - -#. FIELD_Document_Contributor -#: po/tmp/ap_String_Id.h.h:781 -msgid "Contributor" -msgstr "" - -#. DLG_MetaData_CoAuthor_LBL -#: po/tmp/ap_String_Id.h.h:783 -msgid "Contributor(s):" -msgstr "" - -#. MENU_STATUSLINE_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:785 -msgid "Convert Selected Text to a Table" -msgstr "" - -#. MENU_LABEL_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:787 -msgid "Convert Table to Text" -msgstr "" - -#. MENU_LABEL_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:789 -msgid "Convert Text to Table" -msgstr "" - -#. MENU_STATUSLINE_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:791 -msgid "Convert from a Table to Text" -msgstr "" - -#. TOOLBAR_LABEL_EDIT_COPY -#. TOOLBAR_STATUSLINE_EDIT_COPY -#. TOOLBAR_TOOLTIP_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:795 -msgid "Copy" -msgstr "" - -#. MENU_STATUSLINE_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:797 -msgid "Copy Embedded Object" -msgstr "" - -#. MENU_LABEL_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:799 -msgid "Copy Image" -msgstr "" - -#. MENU_LABEL_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:801 -msgid "Copy Object" -msgstr "" - -#. MENU_LABEL_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:803 -msgid "Copy Text Box" -msgstr "" - -#. MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION -#: po/tmp/ap_String_Id.h.h:805 -msgid "Copy hyperlink location" -msgstr "" - -#. MENU_STATUSLINE_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:807 -msgid "Copy the Text Box to the clipboard" -msgstr "" - -#. MENU_STATUSLINE_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:809 -msgid "Copy the Text Box to the clipboard then remove it" -msgstr "" - -#. MENU_STATUSLINE_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:811 -msgid "Copy the selection and put it on the Clipboard" -msgstr "" - -#. MSG_IE_CouldNotOpen -#: po/tmp/ap_String_Id.h.h:813 -#, c-format -msgid "Could not open file %s for writing" -msgstr "" - -#. MSG_OpenFailed -#: po/tmp/ap_String_Id.h.h:815 -#, c-format -msgid "Could not open file %s." -msgstr "" - -#. MSG_IE_CouldNotWrite -#: po/tmp/ap_String_Id.h.h:817 -#, c-format -msgid "Could not write to file %s" -msgstr "" - -#. MSG_SaveFailed -#: po/tmp/ap_String_Id.h.h:819 -#, c-format -msgid "Could not write to the file %s." -msgstr "" - -#. MENU_STATUSLINE_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:821 -msgid "Count the number of words in the document" -msgstr "" - -#. FIELD_Document_Coverage -#: po/tmp/ap_String_Id.h.h:823 -msgid "Coverage" -msgstr "" - -#. DLG_MetaData_Coverage_LBL -#: po/tmp/ap_String_Id.h.h:825 -msgid "Coverage:" -msgstr "" - -#. DLG_NEW_Tab1_FAX1 -#: po/tmp/ap_String_Id.h.h:827 -msgid "Create a fax" -msgstr "" - -#. DLG_NEW_Tab1_WP1 -#: po/tmp/ap_String_Id.h.h:829 -msgid "Create a new blank document" -msgstr "" - -#. MENU_STATUSLINE_FILE_NEW -#. TOOLBAR_STATUSLINE_FILE_NEW -#. TOOLBAR_TOOLTIP_FILE_NEW -#: po/tmp/ap_String_Id.h.h:833 -msgid "Create a new document" -msgstr "" - -#. DLG_NEW_Create -#: po/tmp/ap_String_Id.h.h:835 -msgid "Create a new document from a template" -msgstr "" - -#. MENU_STATUSLINE_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:837 -msgid "Create a new document using a template" -msgstr "" - -#. DLG_NEW_StartEmpty -#: po/tmp/ap_String_Id.h.h:839 -msgid "Create an empty document" -msgstr "" - -#. FIELD_Document_Creator -#: po/tmp/ap_String_Id.h.h:841 -msgid "Creator" -msgstr "" - -#. MENU_LABEL_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:843 -msgid "Cu&t" -msgstr "" - -#. FIELD_Datetime_CurrentDate -#: po/tmp/ap_String_Id.h.h:845 -msgid "Current Date" -msgstr "" - -#. DLG_Lists_Current_Font -#: po/tmp/ap_String_Id.h.h:847 -msgid "Current Font" -msgstr "" - -#. DLG_Lists_Current_List_Label -#: po/tmp/ap_String_Id.h.h:849 -msgid "Current List Label" -msgstr "" - -#. DLG_Lists_Current_List_Type -#: po/tmp/ap_String_Id.h.h:851 -msgid "Current List Type" -msgstr "" - -#. MSG_EmptySelection -#: po/tmp/ap_String_Id.h.h:853 -msgid "Current Selection is Empty" -msgstr "" - -#. DLG_Styles_DefCurrent -#: po/tmp/ap_String_Id.h.h:855 -msgid "Current Settings" -msgstr "" - -#. FIELD_Datetime_CurrentTime -#: po/tmp/ap_String_Id.h.h:857 -msgid "Current Time" -msgstr "" - -#. DLG_Options_Label_ViewCursorBlink -#: po/tmp/ap_String_Id.h.h:859 -msgid "Cursor &blink" -msgstr "" - -#. DLG_Options_Label_SpellCustomDict -#: po/tmp/ap_String_Id.h.h:861 -msgid "Custom Dictionary:" -msgstr "" - -#. FIELD_DateTime_Custom -#: po/tmp/ap_String_Id.h.h:863 -msgid "Customizable date/time" -msgstr "" - -#. DLG_Lists_Customize -#: po/tmp/ap_String_Id.h.h:865 -msgid "Customized List" -msgstr "" - -#. TOOLBAR_LABEL_EDIT_CUT -#. TOOLBAR_STATUSLINE_EDIT_CUT -#. TOOLBAR_TOOLTIP_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:869 -msgid "Cut" -msgstr "" - -#. MENU_STATUSLINE_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:871 -msgid "Cut Embedded Object" -msgstr "" - -#. MENU_LABEL_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:873 -msgid "Cut Image" -msgstr "" - -#. MENU_LABEL_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:875 -msgid "Cut Object" -msgstr "" - -#. MENU_LABEL_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:877 -msgid "Cut Text Box" -msgstr "" - -#. MENU_STATUSLINE_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:879 -msgid "Cut the selection and put it on the Clipboard" -msgstr "" - -#. MENU_LABEL_FMT_DIRECTION -#: po/tmp/ap_String_Id.h.h:881 -msgid "D&irectional" -msgstr "" - -#. DLG_Lists_Dashed_List -#. STYLE_DASHEDLIST -#: po/tmp/ap_String_Id.h.h:883 po/tmp/xap_String_Id.h.h:241 -msgid "Dashed List" -msgstr "" - -#. FIELD_Document_Date -#. DLG_ListRevisions_Column2Label -#: po/tmp/ap_String_Id.h.h:886 -msgid "Date" -msgstr "" - -#. MENU_LABEL_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:888 -msgid "Date and &Time" -msgstr "" - -#. FIELD_Type_Datetime -#: po/tmp/ap_String_Id.h.h:890 -msgid "Date and Time" -msgstr "" - -#. FIELD_DateTime_DOY -#: po/tmp/ap_String_Id.h.h:892 -msgid "Day # in the year" -msgstr "" - -#. DLG_Options_Btn_Default -#: po/tmp/ap_String_Id.h.h:894 -msgid "De&faults" -msgstr "" - -#. DLG_Tab_Radio_Decimal -#: po/tmp/ap_String_Id.h.h:896 -msgid "Decimal" -msgstr "" - -#. TabToggleDecimalTab -#: po/tmp/ap_String_Id.h.h:898 -msgid "Decimal Tab" -msgstr "" - -#. TOOLBAR_LABEL_UNINDENT -#. TOOLBAR_STATUSLINE_UNINDENT -#. TOOLBAR_TOOLTIP_UNINDENT -#: po/tmp/ap_String_Id.h.h:902 -msgid "Decrease indent" -msgstr "" - -#. FIELD_DateTime_DefaultDateNoTime -#: po/tmp/ap_String_Id.h.h:904 -msgid "Default date (w/o time)" -msgstr "" - -#. FIELD_DateTime_DefaultDate -#: po/tmp/ap_String_Id.h.h:906 -msgid "Default date representation" -msgstr "" - -#. DLG_Options_Label_DefaultPageSize -#: po/tmp/ap_String_Id.h.h:908 -msgid "Default page size" -msgstr "" - -#. DLG_Tab_Label_DefaultTS -#: po/tmp/ap_String_Id.h.h:910 -msgid "Default tab stops:" -msgstr "" - -#. DLG_Options_Label_DirectionRtl -#: po/tmp/ap_String_Id.h.h:912 -msgid "Default to right-to-left direction of text" -msgstr "" - -#. DLG_FormatTOC_LevelDefs -#: po/tmp/ap_String_Id.h.h:914 -msgid "Define Main Properties" -msgstr "" - -#. MENU_STATUSLINE_FMT_STYLE -#. MENU_STATUSLINE_FMT_STYLE_DEFINE -#: po/tmp/ap_String_Id.h.h:917 -msgid "Define or apply style for the selection" -msgstr "" - -#. DLG_Styles_Delete -#. MENU_STATUSLINE_TABLE_DELETE -#. DLG_Delete -#: po/tmp/ap_String_Id.h.h:920 po/tmp/xap_String_Id.h.h:255 -msgid "Delete" -msgstr "" - -#. MENU_STATUSLINE_TABLE_DELETE_CELLS -#: po/tmp/ap_String_Id.h.h:922 -msgid "Delete Cells" -msgstr "" - -#. MENU_LABEL_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:924 -msgid "Delete Co&lumn" -msgstr "" - -#. MENU_STATUSLINE_TABLE_DELETE_COLUMNS -#. MENU_STATUSLINE_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:927 -msgid "Delete Column" -msgstr "" - -#. MENU_STATUSLINE_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:929 -msgid "Delete Embedded Object" -msgstr "" - -#. MENU_LABEL_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:931 -msgid "Delete Image" -msgstr "" - -#. MENU_LABEL_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:933 -msgid "Delete Object" -msgstr "" - -#. MENU_LABEL_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:935 -msgid "Delete Ro&w" -msgstr "" - -#. MENU_STATUSLINE_TABLE_DELETE_ROWS -#. MENU_STATUSLINE_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:938 -msgid "Delete Row" -msgstr "" - -#. MENU_LABEL_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:940 -msgid "Delete Tabl&e" -msgstr "" - -#. MENU_STATUSLINE_TABLE_DELETE_TABLE -#. MENU_STATUSLINE_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:943 -msgid "Delete Table" -msgstr "" - -#. MENU_LABEL_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:945 -msgid "Delete Text Box" -msgstr "" - -#. TOOLBAR_LABEL_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:947 -msgid "Delete column" -msgstr "" - -#. MENU_STATUSLINE_INSERT_DELETE_HYPERLINK -#: po/tmp/ap_String_Id.h.h:949 -msgid "Delete hyperlink" -msgstr "" - -#. TOOLBAR_LABEL_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:951 -msgid "Delete row" -msgstr "" - -#. MENU_STATUSLINE_EDIT_CLEAR -#: po/tmp/ap_String_Id.h.h:953 -msgid "Delete the selection" -msgstr "" - -#. TOOLBAR_STATUSLINE_DELETE_COLUMN -#. TOOLBAR_TOOLTIP_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:956 -msgid "Delete this column from its table" -msgstr "" - -#. TOOLBAR_STATUSLINE_DELETE_ROW -#. TOOLBAR_TOOLTIP_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:959 -msgid "Delete this row from its table" -msgstr "" - -#. DLG_Styles_Description -#. DLG_Styles_ModifyDescription -#. FIELD_Document_Description -#: po/tmp/ap_String_Id.h.h:963 -msgid "Description" -msgstr "" - -#. DLG_MetaData_Description_LBL -#. DLG_PLUGIN_MANAGER_DESC -#. DLG_Image_LblDescription -#: po/tmp/ap_String_Id.h.h:965 po/tmp/xap_String_Id.h.h:258 -msgid "Description:" -msgstr "" - -#. DLG_Lists_Diamond_List -#. STYLE_DIAMONLIST -#: po/tmp/ap_String_Id.h.h:967 po/tmp/xap_String_Id.h.h:260 -msgid "Diamond List" -msgstr "" - -#. DLG_Options_Label_SpellDictionaries -#: po/tmp/ap_String_Id.h.h:969 -msgid "Dictionaries" -msgstr "" - -#. DLG_HdrFtr_FooterEven -#: po/tmp/ap_String_Id.h.h:971 -msgid "Different footer on facing pages" -msgstr "" - -#. DLG_HdrFtr_FooterFirst -#: po/tmp/ap_String_Id.h.h:973 -msgid "Different footer on first page" -msgstr "" - -#. DLG_HdrFtr_FooterLast -#: po/tmp/ap_String_Id.h.h:975 -msgid "Different footer on last page" -msgstr "" - -#. DLG_HdrFtr_HeaderEven -#: po/tmp/ap_String_Id.h.h:977 -msgid "Different header on facing pages" -msgstr "" - -#. DLG_HdrFtr_HeaderFirst -#: po/tmp/ap_String_Id.h.h:979 -msgid "Different header on first page" -msgstr "" - -#. DLG_HdrFtr_HeaderLast -#: po/tmp/ap_String_Id.h.h:981 -msgid "Different header on last page" -msgstr "" - -#. DLG_Styles_StylesLocked -#: po/tmp/ap_String_Id.h.h:983 -msgid "Disable all formatting commands, except styles" -msgstr "" - -#. MENU_STATUSLINE_HELP_CREDITS -#: po/tmp/ap_String_Id.h.h:985 -msgid "Display Credits" -msgstr "" - -#. MENU_STATUSLINE_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:987 -msgid "Display Help Contents" -msgstr "" - -#. MENU_STATUSLINE_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:989 -msgid "Display Help Index" -msgstr "" - -#. MENU_STATUSLINE_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:991 -msgid "Display non-printing characters" -msgstr "" - -#. MENU_STATUSLINE_HELP_ABOUT -#: po/tmp/ap_String_Id.h.h:993 -msgid "Display program information, version number, and copyright" -msgstr "" - -#. DLG_FormatTOC_DispStyle -#: po/tmp/ap_String_Id.h.h:995 -msgid "Display style:" -msgstr "" - -#. DLG_Options_Prompt_IgnoreResetAll -#: po/tmp/ap_String_Id.h.h:997 -msgid "Do you want to reset ignored words in all the documents?" -msgstr "" - -#. DLG_Options_Prompt_IgnoreResetCurrent -#: po/tmp/ap_String_Id.h.h:999 -msgid "Do you want to reset ignored words in the current document?" -msgstr "" - -#. FIELD_Type_Document -#: po/tmp/ap_String_Id.h.h:1001 -msgid "Document" -msgstr "" - -#. DLG_MetaData_Title -#: po/tmp/ap_String_Id.h.h:1003 -msgid "Document Properties" -msgstr "" - -#. DLG_Options_Label_Documents -#: po/tmp/ap_String_Id.h.h:1005 -msgid "Documents" -msgstr "" - -#. DLG_FormatFootnotes_FootRestartNone -#: po/tmp/ap_String_Id.h.h:1007 -msgid "Don't restart" -msgstr "" - -#. DLG_Para_SpacingDouble -#: po/tmp/ap_String_Id.h.h:1009 -msgid "Double" -msgstr "" - -#. TOOLBAR_LABEL_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1011 -msgid "Double Spacing" -msgstr "" - -#. TOOLBAR_STATUSLINE_DOUBLE_SPACE -#. TOOLBAR_TOOLTIP_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1014 -msgid "Double spacing" -msgstr "" - -#. MENU_LABEL_EDIT_LATEXEQUATION -#: po/tmp/ap_String_Id.h.h:1016 -msgid "Edit Equation" -msgstr "" - -#. MENU_LABEL_EDIT_EDITFOOTER -#. TOOLBAR_LABEL_EDIT_FOOTER -#. TOOLBAR_STATUSLINE_EDIT_FOOTER -#. TOOLBAR_TOOLTIP_EDIT_FOOTER -#: po/tmp/ap_String_Id.h.h:1021 -msgid "Edit Footer" -msgstr "" - -#. MENU_LABEL_EDIT_EDITHEADER -#. TOOLBAR_LABEL_EDIT_HEADER -#. TOOLBAR_STATUSLINE_EDIT_HEADER -#. TOOLBAR_TOOLTIP_EDIT_HEADER -#: po/tmp/ap_String_Id.h.h:1026 -msgid "Edit Header" -msgstr "" - -#. MENU_STATUSLINE_EDIT_LATEXEQUATION -#: po/tmp/ap_String_Id.h.h:1028 -msgid "Edit Latex Equation" -msgstr "" - -#. MENU_STATUSLINE_INSERT_EDIT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1030 -msgid "Edit hyperlink" -msgstr "" - -#. MENU_STATUSLINE_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:1032 -msgid "Edit text at the top or bottom of every page" -msgstr "" - -#. MENU_STATUSLINE_EDIT_EDITFOOTER -#: po/tmp/ap_String_Id.h.h:1034 -msgid "Edit the Footer on the current page" -msgstr "" - -#. MENU_STATUSLINE_EDIT_EDITHEADER -#: po/tmp/ap_String_Id.h.h:1036 -msgid "Edit the Header on the current page" -msgstr "" - -#. TB_Embedded -#: po/tmp/ap_String_Id.h.h:1038 -msgid "Embedded" -msgstr "" - -#. MENU_LABEL_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:1040 -msgid "Enable F&ormatting Tools" -msgstr "" - -#. DLG_Options_Label_CheckEnableSmoothScrolling -#: po/tmp/ap_String_Id.h.h:1042 -msgid "Enable Smooth Scrolling" -msgstr "" - -#. FIELD_Numbers_EndnoteAnchor -#: po/tmp/ap_String_Id.h.h:1044 -msgid "Endnote anchor" -msgstr "" - -#. FIELD_Numbers_EndnoteReference -#: po/tmp/ap_String_Id.h.h:1046 -msgid "Endnote reference" -msgstr "" - -#. DLG_FormatFootnotes_EndStyle -#: po/tmp/ap_String_Id.h.h:1048 -msgid "Endnote style" -msgstr "" - -#. MENU_LABEL_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1050 -msgid "Equation" -msgstr "" - -#. FIELD_Error -#: po/tmp/ap_String_Id.h.h:1052 -msgid "Error calculating value!" -msgstr "" - -#. SCRIPT_CANTRUN -#: po/tmp/ap_String_Id.h.h:1054 -#, c-format -msgid "Error executing script %s" -msgstr "" - -#. MSG_ImportError -#: po/tmp/ap_String_Id.h.h:1056 -#, c-format -msgid "Error importing file %s." -msgstr "" - -#. MSG_SaveFailedExport -#: po/tmp/ap_String_Id.h.h:1058 -#, c-format -msgid "Error while attempting to save %s: could not construct exporter" -msgstr "" - -#. MSG_SaveFailedName -#: po/tmp/ap_String_Id.h.h:1060 -#, c-format -msgid "Error while attempting to save %s: invalid name" -msgstr "" - -#. TOOLBAR_LABEL_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1062 -msgid "Ex. script" -msgstr "" - -#. DLG_Para_SpacingExactly -#: po/tmp/ap_String_Id.h.h:1064 -msgid "Exactly" -msgstr "" - -#. DLG_Latex_Example -#: po/tmp/ap_String_Id.h.h:1066 -msgid "Example:" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1068 -msgid "Execute helper scripts" -msgstr "" - -#. TOOLBAR_STATUSLINE_SCRIPT_PLAY -#. TOOLBAR_TOOLTIP_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1071 -msgid "Execute script" -msgstr "" - -#. DLG_ListRevisions_Label1 -#: po/tmp/ap_String_Id.h.h:1073 -msgid "Existing revisions:" -msgstr "" - -#. TB_Extra -#: po/tmp/ap_String_Id.h.h:1075 -msgid "Extra" -msgstr "" - -#. DLG_Field_Parameters_Capital -#: po/tmp/ap_String_Id.h.h:1077 -msgid "Extra Parameters" -msgstr "" - -#. DLG_Options_Label_ViewExtraTB -#: po/tmp/ap_String_Id.h.h:1079 -msgid "Extra Toolbar" -msgstr "" - -#. DLG_Field_Parameters -#: po/tmp/ap_String_Id.h.h:1081 -msgid "Extra parameters:" -msgstr "" - -#. MENU_LABEL_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1083 -msgid "F&ile" -msgstr "" - -#. MENU_LABEL_FORMAT -#: po/tmp/ap_String_Id.h.h:1085 -msgid "F&ormat" -msgstr "" - -#. MENU_LABEL_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:1087 -msgid "F&ull Screen" -msgstr "" - -#. DLG_FR_FindLabel -#: po/tmp/ap_String_Id.h.h:1089 -msgid "Fi&nd what:" -msgstr "" - -#. DLG_MailMerge_Insert_No_Colon -#: po/tmp/ap_String_Id.h.h:1091 -msgid "Field Name" -msgstr "" - -#. DLG_MailMerge_Insert -#: po/tmp/ap_String_Id.h.h:1093 -msgid "Field Name:" -msgstr "" - -#. MSG_IE_UnsupportedType -#: po/tmp/ap_String_Id.h.h:1095 -#, c-format -msgid "File %s is not of a currently supported file type" -msgstr "" - -#. MSG_IE_FakeType -#: po/tmp/ap_String_Id.h.h:1097 -#, c-format -msgid "File %s is not of the type it claims to be" -msgstr "" - -#. MSG_IE_UnknownType -#: po/tmp/ap_String_Id.h.h:1099 -#, c-format -msgid "File %s is of unknown type" -msgstr "" - -#. MSG_IE_FileNotFound -#: po/tmp/ap_String_Id.h.h:1101 -#, c-format -msgid "File %s not found" -msgstr "" - -#. FIELD_Application_Filename -#: po/tmp/ap_String_Id.h.h:1103 -msgid "File Name" -msgstr "" - -#. DLG_FormatTOC_FillStyle -#: po/tmp/ap_String_Id.h.h:1105 -msgid "Fill style:" -msgstr "" - -#. DLG_FR_FindTitle -#: po/tmp/ap_String_Id.h.h:1107 -msgid "Find" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1109 -msgid "Find &next revision" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1111 -msgid "Find &previous revision" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1113 -msgid "Find next visible revision in the document" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1115 -msgid "Find previous visible revision in the document" -msgstr "" - -#. MENU_STATUSLINE_EDIT_FIND -#: po/tmp/ap_String_Id.h.h:1117 -msgid "Find the specified text" -msgstr "" - -#. FirstLineIndentStatus -#: po/tmp/ap_String_Id.h.h:1119 -#, c-format -msgid "First Line Indent [%s]" -msgstr "" - -#. DLG_Para_SpecialFirstLine -#: po/tmp/ap_String_Id.h.h:1121 -msgid "First line" -msgstr "" - -#. DLG_InsertTable_FixedColSize -#: po/tmp/ap_String_Id.h.h:1123 -msgid "Fixed column size:" -msgstr "" - -#. DLG_Lists_FoldingLevel1 -#: po/tmp/ap_String_Id.h.h:1125 -msgid "Fold below level 1" -msgstr "" - -#. DLG_Lists_FoldingLevel2 -#: po/tmp/ap_String_Id.h.h:1127 -msgid "Fold below level 2" -msgstr "" - -#. DLG_Lists_FoldingLevel3 -#: po/tmp/ap_String_Id.h.h:1129 -msgid "Fold below level 3" -msgstr "" - -#. DLG_Lists_FoldingLevel4 -#: po/tmp/ap_String_Id.h.h:1131 -msgid "Fold below level 4" -msgstr "" - -#. DLG_Para_PreviewFollowParagraph -#: po/tmp/ap_String_Id.h.h:1133 -msgid "" -"Following Paragraph Following Paragraph Following Paragraph Following " -"Paragraph Following Paragraph Following Paragraph Following Paragraph" -msgstr "" - -#. DLG_Styles_ModifyFont -#. TOOLBAR_LABEL_FMT_FONT -#. TOOLBAR_STATUSLINE_FMT_FONT -#. TOOLBAR_TOOLTIP_FMT_FONT -#. DLG_UFS_FontTitle -#. DLG_UFS_FontTab -#: po/tmp/ap_String_Id.h.h:1138 po/tmp/xap_String_Id.h.h:335 -msgid "Font" -msgstr "" - -#. TOOLBAR_STATUSLINE_FMT_CHOOSE -#: po/tmp/ap_String_Id.h.h:1140 -msgid "Font Choose" -msgstr "" - -#. TOOLBAR_LABEL_FMT_SIZE -#. TOOLBAR_STATUSLINE_FMT_SIZE -#. TOOLBAR_TOOLTIP_FMT_SIZE -#: po/tmp/ap_String_Id.h.h:1144 -msgid "Font Size" -msgstr "" - -#. TOOLBAR_LABEL_FMT_CHOOSE -#: po/tmp/ap_String_Id.h.h:1146 -msgid "Font choose" -msgstr "" - -#. TOOLBAR_LABEL_COLOR_FORE -#. TOOLBAR_STATUSLINE_COLOR_FORE -#. TOOLBAR_TOOLTIP_COLOR_FORE -#: po/tmp/ap_String_Id.h.h:1150 -msgid "Font color" -msgstr "" - -#. DLG_Lists_ButtonFont -#: po/tmp/ap_String_Id.h.h:1152 -msgid "Font..." -msgstr "" - -#. DLG_Lists_Font -#. DLG_UFS_FontLabel -#: po/tmp/ap_String_Id.h.h:1154 po/tmp/xap_String_Id.h.h:337 -msgid "Font:" -msgstr "" - -#. MENU_LABEL_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1156 -msgid "Foot¬e" -msgstr "" - -#. DLG_PageNumbers_Footer -#. MENU_LABEL_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1159 -msgid "Footer" -msgstr "" - -#. DLG_HdrFtr_FooterFrame -#: po/tmp/ap_String_Id.h.h:1161 -msgid "Footer Properties" -msgstr "" - -#. FooterStatus -#: po/tmp/ap_String_Id.h.h:1163 -#, c-format -msgid "Footer [%s]" -msgstr "" - -#. FIELD_Numbers_FootnoteAnchor -#: po/tmp/ap_String_Id.h.h:1165 -msgid "Footnote anchor" -msgstr "" - -#. FIELD_Numbers_FootnoteReference -#: po/tmp/ap_String_Id.h.h:1167 -msgid "Footnote reference" -msgstr "" - -#. DLG_FormatFootnotes_FootStyle -#: po/tmp/ap_String_Id.h.h:1169 -msgid "Footnote style" -msgstr "" - -#. MENU_LABEL_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:1171 -msgid "Footnotes and Endnotes" -msgstr "" - -#. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR -#. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1174 -msgid "Force LTR direction of text" -msgstr "" - -#. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_RTL -#. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1177 -msgid "Force RTL direction of text" -msgstr "" - -#. MENU_STATUSLINE_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:1179 -msgid "Force left-to-right direction of text" -msgstr "" - -#. MENU_STATUSLINE_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:1181 -msgid "Force right-to-left direction of text" -msgstr "" - -#. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1183 -msgid "Force text LTR" -msgstr "" - -#. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1185 -msgid "Force text RTL" -msgstr "" - -#. DLG_Styles_ModifyFormat -#. TB_Format -#: po/tmp/ap_String_Id.h.h:1188 -msgid "Format" -msgstr "" - -#. MENU_STATUSLINE_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1190 -msgid "Format Embedded Object" -msgstr "" - -#. DLG_FormatFootnotes_Endnotes -#: po/tmp/ap_String_Id.h.h:1192 -msgid "Format Endnotes" -msgstr "" - -#. DLG_FormatFootnotes_Footnotes -#: po/tmp/ap_String_Id.h.h:1194 -msgid "Format Footnotes" -msgstr "" - -#. DLG_FormatFootnotes_Title -#: po/tmp/ap_String_Id.h.h:1196 -msgid "Format Footnotes and Endnotes" -msgstr "" - -#. DLG_HdrFtr_Title -#: po/tmp/ap_String_Id.h.h:1198 -msgid "Format Header/Footers" -msgstr "" - -#. MENU_LABEL_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1200 -msgid "Format Object" -msgstr "" - -#. TOOLBAR_LABEL_FMTPAINTER -#: po/tmp/ap_String_Id.h.h:1202 -msgid "Format Painter" -msgstr "" - -#. DLG_FormatTableTitle -#. MENU_STATUSLINE_TABLE_FORMAT -#: po/tmp/ap_String_Id.h.h:1205 -msgid "Format Table" -msgstr "" - -#. DLG_FormatTOC_Title -#: po/tmp/ap_String_Id.h.h:1207 -msgid "Format Table of Contents" -msgstr "" - -#. DLG_FormatFrameTitle -#: po/tmp/ap_String_Id.h.h:1209 -msgid "Format Text Box" -msgstr "" - -#. DLG_Options_Label_ViewFormatTB -#: po/tmp/ap_String_Id.h.h:1211 -msgid "Format Toolbar" -msgstr "" - -#. MENU_STATUSLINE_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:1213 -msgid "Format this image" -msgstr "" - -#. MENU_STATUSLINE_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:1215 -msgid "Format your document using styles" -msgstr "" - -#. DLG_Lists_Format -#. DLG_DocComparison_Fmt -#: po/tmp/ap_String_Id.h.h:1217 po/tmp/xap_String_Id.h.h:343 -msgid "Format:" -msgstr "" - -#. MENU_LABEL_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1219 -msgid "From File" -msgstr "" - -#. MENU_LABEL_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1221 -msgid "From LaTeX" -msgstr "" - -#. TOOLBAR_LABEL_VIEW_FULL_SCREEN -#. TOOLBAR_STATUSLINE_VIEW_FULL_SCREEN -#. TOOLBAR_TOOLTIP_VIEW_FULL_SCREEN -#: po/tmp/ap_String_Id.h.h:1225 -msgid "Full Screen" -msgstr "" - -#. DLG_FormatTOC_General -#. DLG_Options_Label_General -#. DLG_MetaData_TAB_General -#: po/tmp/ap_String_Id.h.h:1229 -msgid "General" -msgstr "" - -#. DLG_Goto_Btn_Goto -#: po/tmp/ap_String_Id.h.h:1231 -msgid "Go To" -msgstr "" - -#. DLG_Goto_Label_What -#: po/tmp/ap_String_Id.h.h:1233 -msgid "Go To &What:" -msgstr "" - -#. DLG_Goto_Title -#: po/tmp/ap_String_Id.h.h:1235 -msgid "Go to..." -msgstr "" - -#. DLG_FormatTOC_HasLabel -#: po/tmp/ap_String_Id.h.h:1237 -msgid "H&as label" -msgstr "" - -#. DLG_FormatTOC_HeadingText -#: po/tmp/ap_String_Id.h.h:1239 -msgid "H&eading text:" -msgstr "" - -#. DLG_Lists_Hand_List -#. STYLE_HANDLIST -#: po/tmp/ap_String_Id.h.h:1241 po/tmp/xap_String_Id.h.h:383 -msgid "Hand List" -msgstr "" - -#. DLG_Para_SpecialHanging -#: po/tmp/ap_String_Id.h.h:1243 -msgid "Hanging" -msgstr "" - -#. DLG_PageNumbers_Header -#. MENU_LABEL_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1246 -msgid "Header" -msgstr "" - -#. DLG_HdrFtr_HeaderFrame -#: po/tmp/ap_String_Id.h.h:1248 -msgid "Header Properties" -msgstr "" - -#. HeaderStatus -#: po/tmp/ap_String_Id.h.h:1250 -#, c-format -msgid "Header [%s]" -msgstr "" - -#. MENU_LABEL_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:1252 -msgid "Header/Footers" -msgstr "" - -#. MSG_CHECK_PRINT_MODE -#: po/tmp/ap_String_Id.h.h:1254 -msgid "" -"Headers and Footers can only be created and edited while in Print View " -"Mode. \n" -" To enter this mode choose View then Print Layout from the Menus. \n" -" Would you like to enter Print Layout mode right now?" -msgstr "" - -#. DLG_Stylist_HeadingStyles -#: po/tmp/ap_String_Id.h.h:1256 -msgid "Heading Styles" -msgstr "" - -#. DLG_FormatTOC_HeadingStyle -#: po/tmp/ap_String_Id.h.h:1258 -msgid "Heading style:" -msgstr "" - -#. DLG_Lists_Heart_List -#. STYLE_HEARTLIST -#: po/tmp/ap_String_Id.h.h:1260 po/tmp/xap_String_Id.h.h:399 -msgid "Heart List" -msgstr "" - -#. DLG_Lists_Hebrew_List -#: po/tmp/ap_String_Id.h.h:1262 -msgid "Hebrew List" -msgstr "" - -#. TOOLBAR_LABEL_HELP -#. TOOLBAR_STATUSLINE_HELP -#. TOOLBAR_TOOLTIP_HELP -#: po/tmp/ap_String_Id.h.h:1266 -msgid "Help" -msgstr "" - -#. MENU_LABEL_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:1268 -msgid "Help &Contents" -msgstr "" - -#. MENU_LABEL_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:1270 -msgid "Help &Introduction" -msgstr "" - -#. DLG_Options_Label_Hide -#: po/tmp/ap_String_Id.h.h:1272 -msgid "Hide" -msgstr "" - -#. DLG_Options_Label_SpellHideErrors -#: po/tmp/ap_String_Id.h.h:1274 -msgid "Hide &spelling errors in the document" -msgstr "" - -#. DLG_Lists_FoldingLevelexp -#: po/tmp/ap_String_Id.h.h:1276 -msgid "Hide text below List Levels" -msgstr "" - -#. TOOLBAR_LABEL_COLOR_BACK -#. TOOLBAR_STATUSLINE_COLOR_BACK -#. TOOLBAR_TOOLTIP_COLOR_BACK -#: po/tmp/ap_String_Id.h.h:1280 -msgid "Highlight" -msgstr "" - -#. DLG_Spell_IgnoreAll -#: po/tmp/ap_String_Id.h.h:1282 -msgid "I&gnore All" -msgstr "" - -#. DLG_FormatTOC_Indent -#: po/tmp/ap_String_Id.h.h:1284 -msgid "I&ndent:" -msgstr "" - -#. InsertModeFieldINS -#: po/tmp/ap_String_Id.h.h:1286 -msgid "INS" -msgstr "" - -#. DLG_Options_Label_Icons -#: po/tmp/ap_String_Id.h.h:1288 -msgid "Icons" -msgstr "" - -#. DLG_Options_Label_Ignore -#: po/tmp/ap_String_Id.h.h:1290 -msgid "Ignore" -msgstr "" - -#. DLG_Options_Label_SpellIgnoreWords -#: po/tmp/ap_String_Id.h.h:1292 -msgid "Ignore Words" -msgstr "" - -#. MENU_STATUSLINE_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:1294 -msgid "Ignore all occurrences of this word in the document" -msgstr "" - -#. DLG_Options_Label_SpellIgnoredWord -#: po/tmp/ap_String_Id.h.h:1296 -msgid "Ignored words:" -msgstr "" - -#. DLG_FormatFrame_SetImageBackground -#. DLG_FormatTable_SetImageBackground -#: po/tmp/ap_String_Id.h.h:1299 -msgid "Image For Background" -msgstr "" - -#. DLG_Lists_Implies_List -#. STYLE_IMPLIES_LIST -#: po/tmp/ap_String_Id.h.h:1301 po/tmp/xap_String_Id.h.h:433 -msgid "Implies List" -msgstr "" - -#. MENU_STATUSLINE_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:1303 -msgid "Import style definitions from a document" -msgstr "" - -#. DLG_Styles_LBL_InUse -#: po/tmp/ap_String_Id.h.h:1305 -msgid "In Use" -msgstr "" - -#. WORD_PassInvalid -#: po/tmp/ap_String_Id.h.h:1307 -msgid "Incorrect Password" -msgstr "" - -#. TOOLBAR_LABEL_INDENT -#. TOOLBAR_STATUSLINE_INDENT -#. TOOLBAR_TOOLTIP_INDENT -#: po/tmp/ap_String_Id.h.h:1311 -msgid "Increase indent" -msgstr "" - -#. DLG_Para_LabelIndentation -#: po/tmp/ap_String_Id.h.h:1313 -msgid "Indentation" -msgstr "" - -#. DLG_Para_TabLabelIndentsAndSpacing -#: po/tmp/ap_String_Id.h.h:1315 -msgid "Indents and Spacing" -msgstr "" - -#. DLG_ToggleCase_FirstUpperCase -#: po/tmp/ap_String_Id.h.h:1317 -msgid "Initial Caps" -msgstr "" - -#. DLG_FormatFootnotes_EndInitialVal -#: po/tmp/ap_String_Id.h.h:1319 -msgid "Initial Endnote value" -msgstr "" - -#. DLG_FormatFootnotes_FootInitialVal -#: po/tmp/ap_String_Id.h.h:1321 -msgid "Initial Footnote value" -msgstr "" - -#. DLG_Break_Insert -#. MENU_STATUSLINE_TABLE_INSERT -#. DLG_IP_Button_Label -#: po/tmp/ap_String_Id.h.h:1324 po/tmp/xap_String_Id.h.h:443 -msgid "Insert" -msgstr "" - -#. MENU_LABEL_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1326 -msgid "Insert &Columns" -msgstr "" - -#. MENU_LABEL_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1328 -msgid "Insert &Rows" -msgstr "" - -#. MENU_LABEL_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1330 -msgid "Insert &Table" -msgstr "" - -#. DLG_InsertBookmark_Title -#. TOOLBAR_LABEL_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1333 -msgid "Insert Bookmark" -msgstr "" - -#. DLG_Break_BreakTitle_Capital -#: po/tmp/ap_String_Id.h.h:1335 -msgid "Insert Break" -msgstr "" - -#. MENU_STATUSLINE_TABLE_INSERT_CELLS -#: po/tmp/ap_String_Id.h.h:1337 -msgid "Insert Cells" -msgstr "" - -#. MENU_STATUSLINE_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1339 -msgid "Insert Clipboard contents" -msgstr "" - -#. DLG_DateTime_DateTimeTitle -#: po/tmp/ap_String_Id.h.h:1341 -msgid "Insert Date and Time" -msgstr "" - -#. MENU_LABEL_TOOLTIP_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1343 -msgid "Insert Equation" -msgstr "" - -#. MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1345 -msgid "Insert Equation from a LaTeX expression" -msgstr "" - -#. DLG_Field_FieldTitle_Capital -#: po/tmp/ap_String_Id.h.h:1347 -msgid "Insert Field" -msgstr "" - -#. DLG_InsertHyperlink_Title -#. TOOLBAR_LABEL_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1350 -msgid "Insert Hyperlink" -msgstr "" - -#. TOOLBAR_LABEL_IMG -#: po/tmp/ap_String_Id.h.h:1352 -msgid "Insert Image" -msgstr "" - -#. DLG_MailMerge_MailMergeTitle -#: po/tmp/ap_String_Id.h.h:1354 -msgid "Insert Mail Merge Field" -msgstr "" - -#. MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1356 -msgid "Insert MathML from a file" -msgstr "" - -#. DLG_InsertTable_TableTitle -#. MENU_STATUSLINE_TABLE_INSERT_TABLE -#. MENU_STATUSLINE_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1360 -msgid "Insert Table" -msgstr "" - -#. MENU_STATUSLINE_INSERT_DIRECTIONMARKER -#: po/tmp/ap_String_Id.h.h:1362 -msgid "Insert Unicode direction marker into the document" -msgstr "" - -#. MENU_STATUSLINE_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1364 -msgid "Insert a Footer" -msgstr "" - -#. MENU_STATUSLINE_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1366 -msgid "Insert a Header" -msgstr "" - -#. MENU_STATUSLINE_INSERT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:1368 -msgid "Insert a Table of Contents based on Headings" -msgstr "" - -#. MENU_STATUSLINE_INSERT_TEXTBOX -#: po/tmp/ap_String_Id.h.h:1370 -msgid "Insert a Text Box" -msgstr "" - -#. TOOLBAR_STATUSLINE_FMT_BOOKMARK -#. TOOLBAR_TOOLTIP_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1373 -msgid "Insert a bookmark into the document" -msgstr "" - -#. MENU_STATUSLINE_INSERT_FIELD -#: po/tmp/ap_String_Id.h.h:1375 -msgid "Insert a calculated field" -msgstr "" - -#. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_BEFORE -#: po/tmp/ap_String_Id.h.h:1377 -msgid "Insert a column to the left" -msgstr "" - -#. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_AFTER -#. MENU_STATUSLINE_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1380 -msgid "Insert a column to the right" -msgstr "" - -#. MENU_STATUSLINE_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1382 -msgid "Insert a footnote" -msgstr "" - -#. TOOLBAR_STATUSLINE_FMT_HYPERLINK -#. TOOLBAR_TOOLTIP_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1385 -msgid "Insert a hyperlink into the document" -msgstr "" - -#. MENU_STATUSLINE_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1387 -msgid "Insert a mail merge field" -msgstr "" - -#. TOOLBAR_STATUSLINE_INSERT_TABLE -#. TOOLBAR_TOOLTIP_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1390 -msgid "Insert a new table into your document" -msgstr "" - -#. MENU_STATUSLINE_INSERT_BREAK -#: po/tmp/ap_String_Id.h.h:1392 -msgid "Insert a page, column, or section break" -msgstr "" - -#. MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1394 -msgid "Insert a row above" -msgstr "" - -#. MENU_STATUSLINE_TABLE_INSERT_ROWS_AFTER -#. MENU_STATUSLINE_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1397 -msgid "Insert a row below" -msgstr "" - -#. MENU_STATUSLINE_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1399 -msgid "Insert a symbol or other special character" -msgstr "" - -#. MENU_STATUSLINE_INSERT_ANNOTATION -#: po/tmp/ap_String_Id.h.h:1401 -msgid "Insert an Annotation" -msgstr "" - -#. MENU_STATUSLINE_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1403 -msgid "Insert an automatically-updated page number" -msgstr "" - -#. MENU_STATUSLINE_INSERT_ENDNOTE -#: po/tmp/ap_String_Id.h.h:1405 -msgid "Insert an endnote" -msgstr "" - -#. MENU_STATUSLINE_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:1407 -msgid "Insert an existing picture from another file" -msgstr "" - -#. TOOLBAR_STATUSLINE_IMG -#. TOOLBAR_TOOLTIP_IMG -#: po/tmp/ap_String_Id.h.h:1410 -msgid "Insert an image into the document" -msgstr "" - -#. MENU_STATUSLINE_INSERT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1412 -msgid "Insert bookmark" -msgstr "" - -#. DLG_Break_BreakTitle -#: po/tmp/ap_String_Id.h.h:1414 -msgid "Insert break" -msgstr "" - -#. MENU_STATUSLINE_INSERT_CLIPART -#: po/tmp/ap_String_Id.h.h:1416 -msgid "Insert clipart" -msgstr "" - -#. DLG_Field_FieldTitle -#: po/tmp/ap_String_Id.h.h:1418 -msgid "Insert field" -msgstr "" - -#. MENU_STATUSLINE_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1420 -msgid "Insert hyperlink" -msgstr "" - -#. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:1422 -msgid "Insert left-to-right direction marker (LRM)" -msgstr "" - -#. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:1424 -msgid "Insert right-to-left direction marker (RLM)" -msgstr "" - -#. TOOLBAR_STATUSLINE_INSERT_SYMBOL -#. TOOLBAR_TOOLTIP_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1427 -msgid "Insert symbol" -msgstr "" - -#. TOOLBAR_LABEL_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1429 -msgid "Insert table" -msgstr "" - -#. MENU_STATUSLINE_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:1431 -msgid "Insert the Sum of a Table Column" -msgstr "" - -#. MENU_STATUSLINE_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:1433 -msgid "Insert the Sum of a Table Row" -msgstr "" - -#. MENU_STATUSLINE_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1435 -msgid "Insert the contents of another file" -msgstr "" - -#. MENU_STATUSLINE_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:1437 -msgid "Insert the date and/or time" -msgstr "" - -#. MENU_STATUSLINE_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1439 -msgid "Insert unformatted clipboard contents" -msgstr "" - -#. DLG_Options_Label_ViewUnprintable -#: po/tmp/ap_String_Id.h.h:1441 -msgid "Invisible &Layout Marks" -msgstr "" - -#. TOOLBAR_LABEL_FMT_ITALIC -#. TOOLBAR_STATUSLINE_FMT_ITALIC -#. TOOLBAR_TOOLTIP_FMT_ITALIC -#. DLG_UFS_StyleItalic -#: po/tmp/ap_String_Id.h.h:1445 po/tmp/xap_String_Id.h.h:473 -msgid "Italic" -msgstr "" - -#. MENU_STATUSLINE_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1447 -msgid "Jump to hyperlink" -msgstr "" - -#. DLG_Para_AlignJustified -#: po/tmp/ap_String_Id.h.h:1449 -msgid "Justified" -msgstr "" - -#. TOOLBAR_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1451 -msgid "Justify" -msgstr "" - -#. TOOLBAR_STATUSLINE_ALIGN_JUSTIFY -#. TOOLBAR_TOOLTIP_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1454 -msgid "Justify paragraph" -msgstr "" - -#. MENU_STATUSLINE_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1456 -msgid "Justify the paragraph" -msgstr "" - -#. DLG_Para_PushKeepWithNext -#: po/tmp/ap_String_Id.h.h:1458 -msgid "Keep with ne&xt" -msgstr "" - -#. FIELD_PieceTable_Test -#: po/tmp/ap_String_Id.h.h:1460 -msgid "Kevins Test" -msgstr "" - -#. FIELD_Document_Keywords -#: po/tmp/ap_String_Id.h.h:1462 -msgid "Keywords" -msgstr "" - -#. DLG_MetaData_Keywords_LBL -#: po/tmp/ap_String_Id.h.h:1464 -msgid "Keywords:" -msgstr "" - -#. DLG_Latex_LatexTitle -#. DLG_Latex_LatexEquation -#: po/tmp/ap_String_Id.h.h:1467 -msgid "LaTeX Equation" -msgstr "" - -#. DLG_Lists_Indent -#: po/tmp/ap_String_Id.h.h:1469 -msgid "Label Align:" -msgstr "" - -#. DLG_FormatTOC_DetailsTop -#: po/tmp/ap_String_Id.h.h:1471 -msgid "Label Definitions" -msgstr "" - -#. DLG_Styles_ModifyLanguage -#. DLG_Options_Label_Language -#. FIELD_Document_Language -#: po/tmp/ap_String_Id.h.h:1475 -msgid "Language" -msgstr "" - -#. DLG_Options_Label_LangSettings -#: po/tmp/ap_String_Id.h.h:1477 -msgid "Language settings" -msgstr "" - -#. DLG_MetaData_Languages_LBL -#: po/tmp/ap_String_Id.h.h:1479 -msgid "Language(s):" -msgstr "" - -#. DLG_Options_Label_Layout -#: po/tmp/ap_String_Id.h.h:1481 -msgid "Layout" -msgstr "" - -#. DLG_FormatTOC_LayoutDetails -#: po/tmp/ap_String_Id.h.h:1483 -msgid "Layout Details" -msgstr "" - -#. DLG_Tab_Label_Leader -#: po/tmp/ap_String_Id.h.h:1485 -msgid "Leader" -msgstr "" - -#. DLG_Para_AlignLeft -#. DLG_Tab_Radio_Left -#. DLG_PageNumbers_Left -#. TOOLBAR_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1490 -msgid "Left" -msgstr "" - -#. LeftIndentStatus -#: po/tmp/ap_String_Id.h.h:1492 -#, c-format -msgid "Left Indent [%s]" -msgstr "" - -#. LeftIndentTextIndentStatus -#: po/tmp/ap_String_Id.h.h:1494 -#, c-format -msgid "Left Indent [%s] First Line Indent [%s]" -msgstr "" - -#. LeftMarginStatus -#: po/tmp/ap_String_Id.h.h:1496 -#, c-format -msgid "Left Margin [%s]" -msgstr "" - -#. TabToggleLeftTab -#: po/tmp/ap_String_Id.h.h:1498 -msgid "Left Tab" -msgstr "" - -#. TOOLBAR_STATUSLINE_ALIGN_LEFT -#. TOOLBAR_TOOLTIP_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1501 -msgid "Left alignment" -msgstr "" - -#. MENU_STATUSLINE_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1503 -msgid "Left-align the paragraph" -msgstr "" - -#. DLG_FormatTOC_Level1 -#: po/tmp/ap_String_Id.h.h:1505 -msgid "Level 1" -msgstr "" - -#. DLG_FormatTOC_Level2 -#: po/tmp/ap_String_Id.h.h:1507 -msgid "Level 2" -msgstr "" - -#. DLG_FormatTOC_Level3 -#: po/tmp/ap_String_Id.h.h:1509 -msgid "Level 3" -msgstr "" - -#. DLG_FormatTOC_Level4 -#: po/tmp/ap_String_Id.h.h:1511 -msgid "Level 4" -msgstr "" - -#. DLG_Lists_DelimiterString -#: po/tmp/ap_String_Id.h.h:1513 -msgid "Level Delimiter:" -msgstr "" - -#. DLG_Lists_Level -#: po/tmp/ap_String_Id.h.h:1515 -msgid "Level:" -msgstr "" - -#. DLG_Para_LabelLineSpacing -#: po/tmp/ap_String_Id.h.h:1517 -msgid "Li&ne spacing:" -msgstr "" - -#. DLG_Goto_Target_Line -#: po/tmp/ap_String_Id.h.h:1519 -msgid "Line" -msgstr "" - -#. FIELD_Numbers_LineCount -#: po/tmp/ap_String_Id.h.h:1521 -msgid "Line Count" -msgstr "" - -#. MENU_STATUSLINE_FMT_TOPLINE -#: po/tmp/ap_String_Id.h.h:1523 -msgid "Line above the selection (toggle)" -msgstr "" - -#. DLG_Para_TabLabelLineAndPageBreaks -#: po/tmp/ap_String_Id.h.h:1525 -msgid "Line and Page Breaks" -msgstr "" - -#. MENU_STATUSLINE_FMT_BOTTOMLINE -#: po/tmp/ap_String_Id.h.h:1527 -msgid "Line below the selection (toggle)" -msgstr "" - -#. DLG_Column_Line_Between -#: po/tmp/ap_String_Id.h.h:1529 -msgid "Line between" -msgstr "" - -#. DLG_WordCount_Lines -#: po/tmp/ap_String_Id.h.h:1531 -msgid "Lines:" -msgstr "" - -#. DLG_Styles_List -#: po/tmp/ap_String_Id.h.h:1533 -msgid "List" -msgstr "" - -#. FIELD_Numbers_ListLabel -#: po/tmp/ap_String_Id.h.h:1535 -msgid "List Label" -msgstr "" - -#. DLG_Lists_PageProperties -#: po/tmp/ap_String_Id.h.h:1537 -msgid "List Properties" -msgstr "" - -#. DLG_Stylist_ListStyles -#: po/tmp/ap_String_Id.h.h:1539 -msgid "List Styles" -msgstr "" - -#. DLG_Lists_Title -#: po/tmp/ap_String_Id.h.h:1541 -msgid "Lists for " -msgstr "" - -#. MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1543 -msgid "Lock the layout of the current toolbars" -msgstr "" - -#. DLG_Lists_Lower_Case_List -#. STYLE_LOWERCASELIST -#: po/tmp/ap_String_Id.h.h:1545 po/tmp/xap_String_Id.h.h:512 -msgid "Lower Case List" -msgstr "" - -#. DLG_Lists_Lower_Roman_List -#. STYLE_LOWERROMANLIST -#: po/tmp/ap_String_Id.h.h:1547 po/tmp/xap_String_Id.h.h:514 -msgid "Lower Roman List" -msgstr "" - -#. FIELD_Application_MailMerge -#. MENU_STATUSLINE_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1550 -msgid "Mail Merge" -msgstr "" - -#. MENU_STATUSLINE_FMT_BOLD -#: po/tmp/ap_String_Id.h.h:1552 -msgid "Make the selection bold (toggle)" -msgstr "" - -#. MENU_STATUSLINE_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:1554 -msgid "Make the selection italic (toggle)" -msgstr "" - -#. MENU_STATUSLINE_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:1556 -msgid "Make the selection subscript (toggle)" -msgstr "" - -#. MENU_STATUSLINE_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:1558 -msgid "Make the selection superscript (toggle)" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:1560 -msgid "Manage changes in document" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:1562 -msgid "Manage plugins" -msgstr "" - -#. DLG_PageSetup_Margin -#: po/tmp/ap_String_Id.h.h:1564 -msgid "Margin" -msgstr "" - -#. DLG_MarkRevisions_Title -#: po/tmp/ap_String_Id.h.h:1566 -msgid "Mark Revisions" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:1568 -msgid "Mark changes as you type" -msgstr "" - -#. FIELD_PieceTable_MartinTest -#: po/tmp/ap_String_Id.h.h:1570 -msgid "Martins Test" -msgstr "" - -#. DLG_Column_Size -#: po/tmp/ap_String_Id.h.h:1572 -msgid "Max Column size" -msgstr "" - -#. TOOLBAR_LABEL_MENU -#. TOOLBAR_STATUSLINE_MENU -#. TOOLBAR_TOOLTIP_MENU -#: po/tmp/ap_String_Id.h.h:1576 -msgid "Menu" -msgstr "" - -#. DLG_MergeCells_Above -#: po/tmp/ap_String_Id.h.h:1578 -msgid "Merge Above" -msgstr "" - -#. DLG_MergeCells_Below -#: po/tmp/ap_String_Id.h.h:1580 -msgid "Merge Below" -msgstr "" - -#. DLG_MergeCellsTitle -#. DLG_MergeCells_Frame -#. MENU_STATUSLINE_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1584 -msgid "Merge Cells" -msgstr "" - -#. DLG_MergeCells_Left -#: po/tmp/ap_String_Id.h.h:1586 -msgid "Merge Left" -msgstr "" - -#. DLG_MergeCells_Right -#: po/tmp/ap_String_Id.h.h:1588 -msgid "Merge Right" -msgstr "" - -#. TOOLBAR_LABEL_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1590 -msgid "Merge above" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1592 -msgid "Merge another document into the active document using revision marks" -msgstr "" - -#. TOOLBAR_LABEL_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1594 -msgid "Merge below" -msgstr "" - -#. TOOLBAR_LABEL_MERGE_CELLS -#. TOOLBAR_STATUSLINE_MERGE_CELLS -#. TOOLBAR_TOOLTIP_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1598 -msgid "Merge cells" -msgstr "" - -#. TOOLBAR_LABEL_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1600 -msgid "Merge left" -msgstr "" - -#. TOOLBAR_LABEL_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1602 -msgid "Merge right" -msgstr "" - -#. TOOLBAR_STATUSLINE_MERGEABOVE -#. TOOLBAR_TOOLTIP_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1605 -msgid "Merge with cell above" -msgstr "" - -#. TOOLBAR_STATUSLINE_MERGEBELOW -#. TOOLBAR_TOOLTIP_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1608 -msgid "Merge with cell below" -msgstr "" - -#. TOOLBAR_STATUSLINE_MERGELEFT -#. TOOLBAR_TOOLTIP_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1611 -msgid "Merge with left cell" -msgstr "" - -#. TOOLBAR_STATUSLINE_MERGERIGHT -#. TOOLBAR_TOOLTIP_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1614 -msgid "Merge with right cell" -msgstr "" - -#. FIELD_DateTime_MilTime -#: po/tmp/ap_String_Id.h.h:1616 -msgid "Military Time" -msgstr "" - -#. DLG_Options_TabLabel_Misc -#: po/tmp/ap_String_Id.h.h:1618 -msgid "Misc." -msgstr "" - -#. DLG_Stylist_MiscStyles -#: po/tmp/ap_String_Id.h.h:1620 -msgid "Miscellaneous Styles" -msgstr "" - -#. DLG_Styles_ModifyTitle -#: po/tmp/ap_String_Id.h.h:1622 -msgid "Modify Styles" -msgstr "" - -#. DLG_Styles_Modify -#: po/tmp/ap_String_Id.h.h:1624 -msgid "Modify..." -msgstr "" - -#. FIELD_DateTime_MonthDayYear -#: po/tmp/ap_String_Id.h.h:1626 -msgid "Month Day, Year" -msgstr "" - -#. MENU_STATUSLINE_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:1628 -msgid "Move the insertion point to a specific location" -msgstr "" - -#. FIELD_DateTime_MthDayYear -#: po/tmp/ap_String_Id.h.h:1630 -msgid "Mth. Day, Year" -msgstr "" - -#. DLG_Para_SpacingMultiple -#: po/tmp/ap_String_Id.h.h:1632 -msgid "Multiple" -msgstr "" - -#. TOOLBAR_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:1634 -msgid "New" -msgstr "" - -#. DLG_NEW_Title -#: po/tmp/ap_String_Id.h.h:1636 -msgid "New Document" -msgstr "" - -#. DLG_Lists_New_List_Label -#: po/tmp/ap_String_Id.h.h:1638 -msgid "New List Label" -msgstr "" - -#. DLG_Lists_New_List_Type -#: po/tmp/ap_String_Id.h.h:1640 -msgid "" -"New List \n" -"Type" -msgstr "" - -#. DLG_Lists_Starting_Value -#: po/tmp/ap_String_Id.h.h:1642 -msgid "" -"New Starting \n" -"Value" -msgstr "" - -#. DLG_Styles_NewTitle -#: po/tmp/ap_String_Id.h.h:1644 -msgid "New Style" -msgstr "" - -#. DLG_Styles_New -#: po/tmp/ap_String_Id.h.h:1646 -msgid "New..." -msgstr "" - -#. DLG_Goto_Btn_Next -#: po/tmp/ap_String_Id.h.h:1648 -msgid "Next >>" -msgstr "" - -#. DLG_NEW_NoFile -#: po/tmp/ap_String_Id.h.h:1650 -msgid "No File" -msgstr "" - -#. DLG_Lists_FoldingLevel0 -#: po/tmp/ap_String_Id.h.h:1652 -msgid "No Folding" -msgstr "" - -#. DLG_Styles_ErrNoStyle -#: po/tmp/ap_String_Id.h.h:1654 -msgid "" -"No Style selected \n" -" so it cannot be modified" -msgstr "" - -#. SCRIPT_NOSCRIPTS -#: po/tmp/ap_String_Id.h.h:1656 -msgid "No scripts found" -msgstr "" - -#. DLG_FormatTOC_None -#. DLG_Styles_DefNone -#. DLG_Tab_Radio_NoAlign -#. DLG_Lists_Type_none -#: po/tmp/ap_String_Id.h.h:1661 -msgid "None" -msgstr "" - -#. TOOLBAR_LABEL_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:1663 -msgid "None before" -msgstr "" - -#. MENU_STATUSLINE_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:1665 -msgid "Normal View" -msgstr "" - -#. DLG_Spell_UnknownWord -#: po/tmp/ap_String_Id.h.h:1667 -msgid "Not in dictionary&:" -msgstr "" - -#. DLG_Stylist_FootnoteStyles -#: po/tmp/ap_String_Id.h.h:1669 -msgid "Note Styles" -msgstr "" - -#. DLG_Column_Number_Cols -#: po/tmp/ap_String_Id.h.h:1671 -msgid "Number of Columns" -msgstr "" - -#. FIELD_Numbers_PagesCount -#: po/tmp/ap_String_Id.h.h:1673 -msgid "Number of Pages" -msgstr "" - -#. DLG_Column_Number -#: po/tmp/ap_String_Id.h.h:1675 -msgid "Number of columns" -msgstr "" - -#. DLG_InsertTable_NumCols -#: po/tmp/ap_String_Id.h.h:1677 -msgid "Number of columns:" -msgstr "" - -#. DLG_InsertTable_NumRows -#: po/tmp/ap_String_Id.h.h:1679 -msgid "Number of rows:" -msgstr "" - -#. DLG_Lists_Type_numbered -#: po/tmp/ap_String_Id.h.h:1681 -msgid "Numbered" -msgstr "" - -#. DLG_Lists_Numbered_List -#. STYLE_NUMBER_LIST -#: po/tmp/ap_String_Id.h.h:1683 po/tmp/xap_String_Id.h.h:558 -msgid "Numbered List" -msgstr "" - -#. DLG_FormatFootnotes_FootnoteRestart -#. DLG_Styles_ModifyNumbering -#. TOOLBAR_LABEL_LISTS_NUMBERS -#. TOOLBAR_STATUSLINE_LISTS_NUMBERS -#. TOOLBAR_TOOLTIP_LISTS_NUMBERS -#: po/tmp/ap_String_Id.h.h:1689 -msgid "Numbering" -msgstr "" - -#. FIELD_Type_Numbers -#: po/tmp/ap_String_Id.h.h:1691 -msgid "Numbers" -msgstr "" - -#. InsertModeFieldOVR -#: po/tmp/ap_String_Id.h.h:1693 -msgid "OVR" -msgstr "" - -#. DLG_Column_One -#: po/tmp/ap_String_Id.h.h:1695 -msgid "One" -msgstr "" - -#. MENU_LABEL_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1697 -msgid "Op&en Copy" -msgstr "" - -#. TOOLBAR_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1699 -msgid "Open" -msgstr "" - -#. MENU_LABEL_OPEN_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1701 -msgid "Open Template" -msgstr "" - -#. MENU_STATUSLINE_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1703 -msgid "Open a document by making a copy" -msgstr "" - -#. MENU_STATUSLINE_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1705 -msgid "Open a recently used document" -msgstr "" - -#. DLG_NEW_Open -#. MENU_STATUSLINE_FILE_OPEN -#. TOOLBAR_STATUSLINE_FILE_OPEN -#. TOOLBAR_TOOLTIP_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1710 -msgid "Open an existing document" -msgstr "" - -#. MENU_STATUSLINE_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:1712 -msgid "Open another window for the document" -msgstr "" - -#. MENU_STATUSLINE_FILE_RECENT_1 -#. MENU_STATUSLINE_FILE_RECENT_2 -#. MENU_STATUSLINE_FILE_RECENT_3 -#. MENU_STATUSLINE_FILE_RECENT_4 -#. MENU_STATUSLINE_FILE_RECENT_5 -#. MENU_STATUSLINE_FILE_RECENT_6 -#. MENU_STATUSLINE_FILE_RECENT_7 -#. MENU_STATUSLINE_FILE_RECENT_8 -#. MENU_STATUSLINE_FILE_RECENT_9 -#: po/tmp/ap_String_Id.h.h:1722 -msgid "Open this document" -msgstr "" - -#. DLG_PageSetup_Orient -#: po/tmp/ap_String_Id.h.h:1724 -msgid "Orientation..." -msgstr "" - -#. DLG_Options_TabLabel_Other -#: po/tmp/ap_String_Id.h.h:1726 -msgid "Other" -msgstr "" - -#. MSG_IE_NoMemory -#: po/tmp/ap_String_Id.h.h:1728 -#, c-format -msgid "Out of memory attempting to open %s" -msgstr "" - -#. TOOLBAR_LABEL_FMT_OVERLINE -#. TOOLBAR_STATUSLINE_FMT_OVERLINE -#. TOOLBAR_TOOLTIP_FMT_OVERLINE -#. DLG_UFS_OverlineCheck -#: po/tmp/ap_String_Id.h.h:1732 po/tmp/xap_String_Id.h.h:572 -msgid "Overline" -msgstr "" - -#. MENU_STATUSLINE_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:1734 -msgid "Overline the selection (toggle)" -msgstr "" - -#. MENU_LABEL_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:1736 -msgid "P&roperties" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1738 -msgid "P&urge revisions" -msgstr "" - -#. MENU_LABEL_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1740 -msgid "Pa&ste Unformatted" -msgstr "" - -#. DLG_Goto_Target_Page -#. DLG_PageSetup_Page -#: po/tmp/ap_String_Id.h.h:1743 -msgid "Page" -msgstr "" - -#. DLG_Para_PushPageBreakBefore -#: po/tmp/ap_String_Id.h.h:1745 -msgid "Page &break before" -msgstr "" - -#. MENU_LABEL_FMT_BACKGROUND -#: po/tmp/ap_String_Id.h.h:1747 -msgid "Page Background" -msgstr "" - -#. MENU_LABEL_FMT_BACKGROUND_PAGE_COLOR -#: po/tmp/ap_String_Id.h.h:1749 -msgid "Page C&olor" -msgstr "" - -#. MENU_LABEL_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:1751 -msgid "Page Image" -msgstr "" - -#. MENU_LABEL_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1753 -msgid "Page N&umbers" -msgstr "" - -#. FIELD_Numbers_PageNumber -#: po/tmp/ap_String_Id.h.h:1755 -msgid "Page Number" -msgstr "" - -#. DLG_HdrFtr_PageNumberProperties -#: po/tmp/ap_String_Id.h.h:1757 -msgid "Page Number Properties" -msgstr "" - -#. DLG_PageNumbers_Title -#: po/tmp/ap_String_Id.h.h:1759 -msgid "Page Numbers" -msgstr "" - -#. FIELD_Numbers_PageReference -#: po/tmp/ap_String_Id.h.h:1761 -msgid "Page Reference" -msgstr "" - -#. MENU_LABEL_FILE_PAGESETUP -#: po/tmp/ap_String_Id.h.h:1763 -msgid "Page Set&up" -msgstr "" - -#. DLG_PageSetup_Title -#: po/tmp/ap_String_Id.h.h:1765 -msgid "Page Setup" -msgstr "" - -#. PageInfoField -#: po/tmp/ap_String_Id.h.h:1767 -#, c-format -msgid "Page: %d/%d" -msgstr "" - -#. DLG_WordCount_Pages -#: po/tmp/ap_String_Id.h.h:1769 -msgid "Pages:" -msgstr "" - -#. DLG_Para_LabelPagination -#: po/tmp/ap_String_Id.h.h:1771 -msgid "Pagination" -msgstr "" - -#. DLG_PageSetup_Paper_Size -#: po/tmp/ap_String_Id.h.h:1773 -msgid "Paper Si&ze:" -msgstr "" - -#. DLG_PageSetup_Paper -#: po/tmp/ap_String_Id.h.h:1775 -msgid "Paper..." -msgstr "" - -#. DLG_Styles_ModifyParagraph -#. DLG_Para_ParaTitle -#: po/tmp/ap_String_Id.h.h:1778 -msgid "Paragraph" -msgstr "" - -#. FIELD_Numbers_ParaCount -#: po/tmp/ap_String_Id.h.h:1780 -msgid "Paragraph Count" -msgstr "" - -#. TOOLBAR_LABEL_FMT_DOM_DIRECTION -#: po/tmp/ap_String_Id.h.h:1782 -msgid "Paragraph Direction" -msgstr "" - -#. DLG_Styles_ParaPrev -#: po/tmp/ap_String_Id.h.h:1784 -msgid "Paragraph Preview" -msgstr "" - -#. DLG_WordCount_Paragraphs -#: po/tmp/ap_String_Id.h.h:1786 -msgid "Paragraphs:" -msgstr "" - -#. WORD_PassRequired -#: po/tmp/ap_String_Id.h.h:1788 -msgid "Password required, this is an encrypted document" -msgstr "" - -#. TOOLBAR_LABEL_EDIT_PASTE -#. TOOLBAR_STATUSLINE_EDIT_PASTE -#. TOOLBAR_TOOLTIP_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1792 -msgid "Paste" -msgstr "" - -#. DLG_MetaData_TAB_Permission -#: po/tmp/ap_String_Id.h.h:1794 -msgid "Permissions" -msgstr "" - -#. DLG_Goto_Target_Picture -#: po/tmp/ap_String_Id.h.h:1796 -msgid "Picture" -msgstr "" - -#. FIELD_Type_PieceTable -#: po/tmp/ap_String_Id.h.h:1798 -msgid "Piece Table" -msgstr "" - -#. DLG_FormatFootnotes_EndPlaceEndDoc -#: po/tmp/ap_String_Id.h.h:1800 -msgid "Place at end of document" -msgstr "" - -#. DLG_FormatFootnotes_EndPlaceEndSec -#: po/tmp/ap_String_Id.h.h:1802 -msgid "Place at end of section" -msgstr "" - -#. DLG_FormatFootnotes_EndPlacement -#: po/tmp/ap_String_Id.h.h:1804 -msgid "Placement" -msgstr "" - -#. DLG_Tab_Label_Position -#. DLG_PageNumbers_Position_No_Colon -#: po/tmp/ap_String_Id.h.h:1807 -msgid "Position" -msgstr "" - -#. DLG_FormatFrame_PositionTo -#: po/tmp/ap_String_Id.h.h:1809 -msgid "Position Text Box" -msgstr "" - -#. DLG_FormatFrame_SetToColumn -#: po/tmp/ap_String_Id.h.h:1811 -msgid "Position to Column" -msgstr "" - -#. DLG_FormatFrame_SetToPage -#: po/tmp/ap_String_Id.h.h:1813 -msgid "Position to Page" -msgstr "" - -#. DLG_FormatFrame_SetToParagraph -#: po/tmp/ap_String_Id.h.h:1815 -msgid "Position to Paragraph" -msgstr "" - -#. DLG_PageNumbers_Position -#: po/tmp/ap_String_Id.h.h:1817 -msgid "Position:" -msgstr "" - -#. MENU_LABEL_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:1819 -msgid "Pr&eferences" -msgstr "" - -#. DLG_Options_TabLabel_Preferences -#. DLG_Options_Label_Schemes -#: po/tmp/ap_String_Id.h.h:1822 -msgid "Preference Schemes" -msgstr "" - -#. DLG_Options_OptionsTitle -#: po/tmp/ap_String_Id.h.h:1824 -msgid "Preferences" -msgstr "" - -#. DLG_Styles_ModifyPreview -#. DLG_Para_LabelPreview -#. DLG_Column_Preview -#. DLG_FormatFrame_Preview -#. DLG_FormatTable_Preview -#. DLG_Lists_Preview -#. DLG_PageNumbers_Preview -#. DLG_Zoom_PreviewFrame -#: po/tmp/ap_String_Id.h.h:1832 po/tmp/xap_String_Id.h.h:604 -msgid "Preview" -msgstr "" - -#. MENU_STATUSLINE_WEB_WEBPREVIEW -#. MENU_STATUSLINE_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:1835 -msgid "Preview the document as a web page" -msgstr "" - -#. MENU_STATUSLINE_FILE_PRINT_PREVIEW -#. TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW -#. TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1839 -msgid "Preview the document before printing" -msgstr "" - -#. DLG_Para_PreviewPrevParagraph -#: po/tmp/ap_String_Id.h.h:1841 -msgid "" -"Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph " -"Previous Paragraph Previous Paragraph Previous Paragraph" -msgstr "" - -#. TOOLBAR_LABEL_FILE_PRINT -#. DLG_UP_PrintTitle -#. DLG_UP_PrintButton -#: po/tmp/ap_String_Id.h.h:1843 po/tmp/xap_String_Id.h.h:609 -msgid "Print" -msgstr "" - -#. MENU_LABEL_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1845 -msgid "Print &directly" -msgstr "" - -#. MENU_STATUSLINE_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:1847 -msgid "Print Layout" -msgstr "" - -#. MENU_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1849 -msgid "Print P&review" -msgstr "" - -#. TOOLBAR_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1851 -msgid "Print Preview" -msgstr "" - -#. MENU_STATUSLINE_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1853 -msgid "Print all or part of the document" -msgstr "" - -#. TOOLBAR_STATUSLINE_FILE_PRINT -#. TOOLBAR_TOOLTIP_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1856 -msgid "Print the document" -msgstr "" - -#. MENU_STATUSLINE_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1858 -msgid "Print using the internal PS driver" -msgstr "" - -#. MSG_PrintingDoc -#: po/tmp/ap_String_Id.h.h:1860 -msgid "Printing Document.." -msgstr "" - -#. MSG_PrintStatus -#: po/tmp/ap_String_Id.h.h:1862 -#, c-format -msgid "Printing page %d of %d" -msgstr "" - -#. FIELD_Document_Publisher -#: po/tmp/ap_String_Id.h.h:1864 -msgid "Publisher" -msgstr "" - -#. DLG_MetaData_Publisher_LBL -#: po/tmp/ap_String_Id.h.h:1866 -msgid "Publisher:" -msgstr "" - -#. MENU_LABEL_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1868 -msgid "R&eplace" -msgstr "" - -#. MENU_LABEL_FMT_DIRECTION_DOCD_RTL -#: po/tmp/ap_String_Id.h.h:1870 -msgid "RTL &Document" -msgstr "" - -#. MENU_LABEL_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:1872 -msgid "RTL &Paragraph" -msgstr "" - -#. MENU_LABEL_FMT_DIRECTION_SD_RTL -#: po/tmp/ap_String_Id.h.h:1874 -msgid "RTL &Section" -msgstr "" - -#. DLG_FR_ReplaceWithLabel -#: po/tmp/ap_String_Id.h.h:1876 -msgid "Re&place with:" -msgstr "" - -#. DLG_FR_ReverseFind -#: po/tmp/ap_String_Id.h.h:1878 -msgid "Re&verse find" -msgstr "" - -#. MENU_LABEL_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1880 -msgid "Re&vert" -msgstr "" - -#. MENU_LABEL_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1882 -msgid "Recent &Files" -msgstr "" - -#. TOOLBAR_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1884 -msgid "Redo" -msgstr "" - -#. TOOLBAR_STATUSLINE_EDIT_REDO -#. TOOLBAR_TOOLTIP_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1887 -msgid "Redo editing" -msgstr "" - -#. MENU_STATUSLINE_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1889 -msgid "Redo previously undone editing" -msgstr "" - -#. MENU_STATUSLINE_VIEW_ZOOM_MENU -#. MENU_STATUSLINE_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:1892 -msgid "Reduce or enlarge the document display" -msgstr "" - -#. DLG_MetaData_Relation_LBL -#: po/tmp/ap_String_Id.h.h:1894 -msgid "Relation:" -msgstr "" - -#. DLG_Styles_RemoveButton -#: po/tmp/ap_String_Id.h.h:1896 -msgid "Remove" -msgstr "" - -#. MENU_LABEL_EDIT_REMOVEFOOTER -#. TOOLBAR_LABEL_EDIT_REMOVEFOOTER -#. TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER -#. TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1901 -msgid "Remove Footer" -msgstr "" - -#. MENU_LABEL_EDIT_REMOVEHEADER -#. TOOLBAR_LABEL_EDIT_REMOVEHEADER -#. TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER -#. TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1906 -msgid "Remove Header" -msgstr "" - -#. DLG_Styles_RemoveLab -#: po/tmp/ap_String_Id.h.h:1908 -msgid "Remove Property from Style" -msgstr "" - -#. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1910 -msgid "Remove Row as Heading" -msgstr "" - -#. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1912 -msgid "Remove Row as the page Heading" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1914 -msgid "Remove all revision information from the document" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:1916 -msgid "Remove full document history from the document" -msgstr "" - -#. MENU_STATUSLINE_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1918 -msgid "Remove the Footer on this page from the Document" -msgstr "" - -#. MENU_STATUSLINE_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1920 -msgid "Remove the Header on this page from the Document" -msgstr "" - -#. MENU_STATUSLINE_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:1922 -msgid "Remove the Image and save a copy on the clipboard" -msgstr "" - -#. MENU_STATUSLINE_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:1924 -msgid "Remove the Image from the Document" -msgstr "" - -#. MENU_STATUSLINE_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:1926 -msgid "Remove the Text Box from the Document" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:1928 -msgid "Remove the suggested change" -msgstr "" - -#. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1930 -msgid "Repeat Row as Heading" -msgstr "" - -#. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1932 -msgid "Repeat Row as Heading on each new page" -msgstr "" - -#. DLG_FR_ReplaceTitle -#: po/tmp/ap_String_Id.h.h:1934 -msgid "Replace" -msgstr "" - -#. DLG_FR_ReplaceAllButton -#: po/tmp/ap_String_Id.h.h:1936 -msgid "Replace &All" -msgstr "" - -#. MENU_STATUSLINE_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1938 -msgid "Replace the specified text with different text" -msgstr "" - -#. MENU_LABEL_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1940 -msgid "Report a &Bug" -msgstr "" - -#. MENU_STATUSLINE_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1942 -msgid "Report a bug and help AbiWord become a better product" -msgstr "" - -#. MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1944 -msgid "Reset the current toolbar layout to its defaults" -msgstr "" - -#. MENU_STATUSLINE_FMT_IMAGE -#: po/tmp/ap_String_Id.h.h:1946 -msgid "Resize this image" -msgstr "" - -#. DLG_HdrFtr_RestartNumbers -#: po/tmp/ap_String_Id.h.h:1948 -msgid "Restart numbering at:" -msgstr "" - -#. DLG_FormatFootnotes_FootRestartPage -#: po/tmp/ap_String_Id.h.h:1950 -msgid "Restart on each page" -msgstr "" - -#. DLG_FormatFootnotes_FootRestartSec -#. DLG_FormatFootnotes_EndRestartSec -#: po/tmp/ap_String_Id.h.h:1953 -msgid "Restart on each section" -msgstr "" - -#. DLG_HdrFtr_RestartCheck -#: po/tmp/ap_String_Id.h.h:1955 -msgid "Restart page numbers on new sections" -msgstr "" - -#. DLG_Lists_Resume_Previous_List -#: po/tmp/ap_String_Id.h.h:1957 -msgid "Resume Previous List" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:1959 -msgid "Retain all document changes" -msgstr "" - -#. MSG_RevertFile -#: po/tmp/ap_String_Id.h.h:1961 -msgid "Revert file to last saved state?" -msgstr "" - -#. MENU_STATUSLINE_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1963 -msgid "Revert the document to the last saved state" -msgstr "" - -#. MSG_RevertBuffer -#: po/tmp/ap_String_Id.h.h:1965 -#, c-format -msgid "Revert to saved copy of %s?" -msgstr "" - -#. DLG_ListRevisions_Column1Label -#: po/tmp/ap_String_Id.h.h:1967 -msgid "Revision ID" -msgstr "" - -#. DLG_Para_AlignRight -#. DLG_Tab_Radio_Right -#. DLG_PageNumbers_Right -#. TOOLBAR_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1972 -msgid "Right" -msgstr "" - -#. RightIndentStatus -#: po/tmp/ap_String_Id.h.h:1974 -#, c-format -msgid "Right Indent [%s]" -msgstr "" - -#. RightMarginStatus -#: po/tmp/ap_String_Id.h.h:1976 -#, c-format -msgid "Right Margin [%s]" -msgstr "" - -#. TabToggleRightTab -#: po/tmp/ap_String_Id.h.h:1978 -msgid "Right Tab" -msgstr "" - -#. TOOLBAR_STATUSLINE_ALIGN_RIGHT -#. TOOLBAR_TOOLTIP_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1981 -msgid "Right alignment" -msgstr "" - -#. MENU_STATUSLINE_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1983 -msgid "Right-align the paragraph" -msgstr "" - -#. DLG_Para_DomDirection -#: po/tmp/ap_String_Id.h.h:1985 -msgid "Right-to-left &dominant" -msgstr "" - -#. FIELD_Document_Rights -#: po/tmp/ap_String_Id.h.h:1987 -msgid "Rights" -msgstr "" - -#. DLG_MetaData_Rights_LBL -#: po/tmp/ap_String_Id.h.h:1989 -msgid "Rights:" -msgstr "" - -#. DLG_FormatTable_Apply_To_Row -#: po/tmp/ap_String_Id.h.h:1991 -msgid "Row" -msgstr "" - -#. MENU_LABEL_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1993 -msgid "Rows &Above" -msgstr "" - -#. MENU_LABEL_TABLE_INSERT_ROWS_AFTER -#: po/tmp/ap_String_Id.h.h:1995 -msgid "Rows &Below" -msgstr "" - -#. MENU_LABEL_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1997 -msgid "S&cripts" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:1999 -msgid "S&how revisions" -msgstr "" - -#. MENU_LABEL_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2001 -msgid "S&plit Cells" -msgstr "" - -#. DLG_Options_Btn_Save -#: po/tmp/ap_String_Id.h.h:2003 -msgid "Sa&ve" -msgstr "" - -#. MENU_LABEL_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:2005 -msgid "Sav&e Copy" -msgstr "" - -#. TOOLBAR_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:2007 -msgid "Save" -msgstr "" - -#. MENU_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:2009 -msgid "Save &As" -msgstr "" - -#. MENU_LABEL_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:2011 -msgid "Save &Template" -msgstr "" - -#. TOOLBAR_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:2013 -msgid "Save As" -msgstr "" - -#. MENU_STATUSLINE_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:2015 -msgid "Save a copy of the image on the clipboard" -msgstr "" - -#. MSG_ConfirmSave -#: po/tmp/ap_String_Id.h.h:2017 -#, c-format -msgid "Save changes to document %s before closing?" -msgstr "" - -#. MENU_STATUSLINE_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:2019 -msgid "Save the Embedded Object" -msgstr "" - -#. MENU_STATUSLINE_FILE_SAVE -#. TOOLBAR_STATUSLINE_FILE_SAVE -#. TOOLBAR_TOOLTIP_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:2023 -msgid "Save the document" -msgstr "" - -#. MENU_STATUSLINE_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:2025 -msgid "Save the document as a template" -msgstr "" - -#. MENU_STATUSLINE_FILE_SAVEAS -#. TOOLBAR_STATUSLINE_FILE_SAVEAS -#. TOOLBAR_TOOLTIP_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:2029 -msgid "Save the document under a different name" -msgstr "" - -#. MENU_STATUSLINE_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:2031 -msgid "Save the document without changing the current name" -msgstr "" - -#. MENU_STATUSLINE_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:2033 -msgid "Save the selected image to a file" -msgstr "" - -#. MENU_LABEL_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:2035 -msgid "Save to file" -msgstr "" - -#. DLG_PageSetup_Scale -#: po/tmp/ap_String_Id.h.h:2037 -msgid "Scale..." -msgstr "" - -#. MENU_STATUSLINE_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:2039 -msgid "Search for help about..." -msgstr "" - -#. DLG_WordCount_Update_Rate -#: po/tmp/ap_String_Id.h.h:2041 -msgid "Seconds between updates" -msgstr "" - -#. FIELD_DateTime_Epoch -#: po/tmp/ap_String_Id.h.h:2043 -msgid "Seconds since the epoch" -msgstr "" - -#. DLG_Break_SectionBreaks_Capital -#: po/tmp/ap_String_Id.h.h:2045 -msgid "Section Breaks" -msgstr "" - -#. DLG_Break_SectionBreaks -#: po/tmp/ap_String_Id.h.h:2047 -msgid "Section breaks" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_HISTORY -#: po/tmp/ap_String_Id.h.h:2049 -msgid "See history of the current document" -msgstr "" - -#. MENU_STATUSLINE_TABLE_SELECT -#. DLG_Select -#: po/tmp/ap_String_Id.h.h:2051 po/tmp/xap_String_Id.h.h:667 -msgid "Select" -msgstr "" - -#. MENU_LABEL_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2053 -msgid "Select A&ll" -msgstr "" - -#. MENU_STATUSLINE_TABLE_SELECT_CELL -#: po/tmp/ap_String_Id.h.h:2055 -msgid "Select Cell" -msgstr "" - -#. MENU_STATUSLINE_TABLE_SELECT_COLUMN -#: po/tmp/ap_String_Id.h.h:2057 -msgid "Select Column" -msgstr "" - -#. TOOLBAR_TOOLTIP_FMT_CHOOSE -#: po/tmp/ap_String_Id.h.h:2059 -msgid "Select Font" -msgstr "" - -#. DLG_ListRevisions_Title -#: po/tmp/ap_String_Id.h.h:2061 -msgid "Select Revision" -msgstr "" - -#. MENU_STATUSLINE_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:2063 -msgid "Select Row" -msgstr "" - -#. MENU_STATUSLINE_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:2065 -msgid "Select Table" -msgstr "" - -#. MENU_LABEL_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2067 -msgid "Select Text Box" -msgstr "" - -#. DLG_InsertHyperlink_Msg -#: po/tmp/ap_String_Id.h.h:2069 -msgid "Select a target bookmark from the list." -msgstr "" - -#. DLG_FormatFrame_SelectImage -#. DLG_FormatTable_SelectImage -#: po/tmp/ap_String_Id.h.h:2072 -msgid "Select image from File" -msgstr "" - -#. MENU_STATUSLINE_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2074 -msgid "Select the Text Box" -msgstr "" - -#. MENU_STATUSLINE_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2076 -msgid "Select the entire document" -msgstr "" - -#. DLG_FormatTable_Apply_To_Selection -#. DLG_UP_Selection -#: po/tmp/ap_String_Id.h.h:2078 po/tmp/xap_String_Id.h.h:675 -msgid "Selection" -msgstr "" - -#. DLG_ToggleCase_SentenceCase -#: po/tmp/ap_String_Id.h.h:2080 -msgid "Sentence case" -msgstr "" - -#. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2082 -msgid "Separate table items with commas" -msgstr "" - -#. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2084 -msgid "Separate table items with commas and tabs" -msgstr "" - -#. MENU_STATUSLINE_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2086 -msgid "Separate table items with tabs" -msgstr "" - -#. MENU_LABEL_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2088 -msgid "Separate with commas" -msgstr "" - -#. MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2090 -msgid "Separate with commas and tabs" -msgstr "" - -#. MENU_LABEL_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2092 -msgid "Separate with tabs" -msgstr "" - -#. DLG_Tab_Button_Set -#: po/tmp/ap_String_Id.h.h:2094 -msgid "Set" -msgstr "" - -#. MENU_LABEL_FMT_LANGUAGE -#: po/tmp/ap_String_Id.h.h:2096 -msgid "Set &Language" -msgstr "" - -#. DLG_Lists_SetDefault -#: po/tmp/ap_String_Id.h.h:2098 -msgid "Set Default Values" -msgstr "" - -#. DLG_FormatFrame_SetImage -#. DLG_FormatTable_SetImage -#: po/tmp/ap_String_Id.h.h:2101 -msgid "Set Image" -msgstr "" - -#. MENU_LABEL_FMT_SETPOSIMAGE -#: po/tmp/ap_String_Id.h.h:2103 -msgid "Set Positioned Image" -msgstr "" - -#. DLG_FormatFrame_SetTextWrapping -#: po/tmp/ap_String_Id.h.h:2105 -msgid "Set Text Wrapping" -msgstr "" - -#. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:2107 -msgid "Set an image as a background for your page" -msgstr "" - -#. MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL -#: po/tmp/ap_String_Id.h.h:2109 -msgid "Set dominant direction of document to RTL" -msgstr "" - -#. MENU_STATUSLINE_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:2111 -msgid "Set dominant direction of paragraph to RTL" -msgstr "" - -#. MENU_STATUSLINE_FMT_DIRECTION_SD_RTL -#: po/tmp/ap_String_Id.h.h:2113 -msgid "Set dominant direction of section to RTL" -msgstr "" - -#. MENU_STATUSLINE_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:2115 -msgid "Set meta-data properties" -msgstr "" - -#. DLG_Tab_Label_New -#: po/tmp/ap_String_Id.h.h:2117 -msgid "Set new Tab" -msgstr "" - -#. DLG_FormatFrame_NoImageBackground -#. DLG_FormatTable_NoImageBackground -#: po/tmp/ap_String_Id.h.h:2120 -msgid "Set no image" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:2122 -msgid "Set preferences" -msgstr "" - -#. MENU_STATUSLINE_FMT_TABS -#: po/tmp/ap_String_Id.h.h:2124 -msgid "Set tab stops" -msgstr "" - -#. MENU_STATUSLINE_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2126 -msgid "Set the type and styles of the Table of Contents" -msgstr "" - -#. MENU_STATUSLINE_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:2128 -msgid "Set the types of Footnotes and Endnotes" -msgstr "" - -#. MENU_STATUSLINE_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:2130 -msgid "Set the types of Headers and Footers" -msgstr "" - -#. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2132 -msgid "Set this Row as Heading" -msgstr "" - -#. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2134 -msgid "Set this Row as the Heading on each page" -msgstr "" - -#. MENU_STATUSLINE_FMT_SETPOSIMAGE -#: po/tmp/ap_String_Id.h.h:2136 -msgid "Set this image to be positioned" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2138 -msgid "Set your spelling preferences" -msgstr "" - -#. MENU_STATUSLINE_FMT_DOCUMENT -#: po/tmp/ap_String_Id.h.h:2140 -msgid "Setup your document's page properties such as page size and margins" -msgstr "" - -#. DLG_Styles_ModifyShortCut -#: po/tmp/ap_String_Id.h.h:2142 -msgid "Shortcut Key" -msgstr "" - -#. DLG_Options_Label_Show -#. DLG_Show -#: po/tmp/ap_String_Id.h.h:2144 po/tmp/xap_String_Id.h.h:687 -msgid "Show" -msgstr "" - -#. MENU_LABEL_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2146 -msgid "Show &Ruler" -msgstr "" - -#. TOOLBAR_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2148 -msgid "Show All" -msgstr "" - -#. MENU_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2150 -msgid "Show For&matting Marks" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2152 -msgid "Show document &before revisions" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2154 -msgid "Show document a&fter revisions" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2156 -msgid "Show document after &previous revisions" -msgstr "" - -#. MENU_STATUSLINE_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:2158 -msgid "Show full list of documents" -msgstr "" - -#. MENU_STATUSLINE_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2160 -msgid "Show or hide the rulers" -msgstr "" - -#. MENU_STATUSLINE_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:2162 -msgid "Show or hide the status bar" -msgstr "" - -#. MENU_STATUSLINE_VIEW_TB_1 -#. MENU_STATUSLINE_VIEW_TB_2 -#. MENU_STATUSLINE_VIEW_TB_3 -#. MENU_STATUSLINE_VIEW_TB_4 -#: po/tmp/ap_String_Id.h.h:2167 -msgid "Show or hide the toolbar" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:2169 -msgid "Show revisions that are present in document" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2171 -msgid "Show what the document looks like after previous revisions" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2173 -msgid "Show what the document looks like after revisions" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2175 -msgid "Show what the document looks like before revisions" -msgstr "" - -#. DLG_Options_Label_ViewShowHide -#: po/tmp/ap_String_Id.h.h:2177 -msgid "Show..." -msgstr "" - -#. TOOLBAR_STATUSLINE_VIEW_SHOWPARA -#. TOOLBAR_TOOLTIP_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2180 -msgid "Show/hide formatting marks" -msgstr "" - -#. TB_Simple -#: po/tmp/ap_String_Id.h.h:2182 -msgid "Simple" -msgstr "" - -#. DLG_Options_Label_ViewSimpleTB -#: po/tmp/ap_String_Id.h.h:2184 -msgid "Simple Toolbar" -msgstr "" - -#. DLG_Para_SpacingSingle -#: po/tmp/ap_String_Id.h.h:2186 -msgid "Single" -msgstr "" - -#. TOOLBAR_LABEL_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2188 -msgid "Single Spacing" -msgstr "" - -#. TOOLBAR_STATUSLINE_SINGLE_SPACE -#. TOOLBAR_TOOLTIP_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2191 -msgid "Single spacing" -msgstr "" - -#. MENU_LABEL_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2193 -msgid "So&rt Table" -msgstr "" - -#. MENU_LABEL_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2195 -msgid "Sort Columns in Ascending Order" -msgstr "" - -#. MENU_STATUSLINE_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2197 -msgid "Sort Columns in Ascending Order based on Selected Row" -msgstr "" - -#. MENU_LABEL_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2199 -msgid "Sort Columns in Descending Order" -msgstr "" - -#. MENU_STATUSLINE_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2201 -msgid "Sort Columns in Descending Order based on Selected Row" -msgstr "" - -#. MENU_LABEL_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2203 -msgid "Sort Rows in Ascending Order" -msgstr "" - -#. MENU_STATUSLINE_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2205 -msgid "Sort Rows in Ascending Order based on selected Column" -msgstr "" - -#. MENU_LABEL_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2207 -msgid "Sort Rows in Descending Order" -msgstr "" - -#. MENU_STATUSLINE_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2209 -msgid "Sort Rows in Descending Order based on Selected Column" -msgstr "" - -#. MENU_STATUSLINE_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2211 -msgid "Sort Table" -msgstr "" - -#. DLG_MetaData_Source_LBL -#: po/tmp/ap_String_Id.h.h:2213 -msgid "Source:" -msgstr "" - -#. DLG_Column_Space_After -#: po/tmp/ap_String_Id.h.h:2215 -msgid "Space after Column" -msgstr "" - -#. TOOLBAR_STATUSLINE_PARA_12BEFORE -#. TOOLBAR_TOOLTIP_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:2218 -msgid "Space before: 12 pt" -msgstr "" - -#. TOOLBAR_STATUSLINE_PARA_0BEFORE -#. TOOLBAR_TOOLTIP_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:2221 -msgid "Space before: None" -msgstr "" - -#. DLG_Para_LabelSpacing -#: po/tmp/ap_String_Id.h.h:2223 -msgid "Spacing" -msgstr "" - -#. DLG_Options_SpellCheckingTitle -#: po/tmp/ap_String_Id.h.h:2225 -msgid "Spell Checking" -msgstr "" - -#. TOOLBAR_LABEL_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2227 -msgid "Spellcheck" -msgstr "" - -#. TOOLBAR_STATUSLINE_SPELLCHECK -#. TOOLBAR_TOOLTIP_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2230 -msgid "Spellcheck the document" -msgstr "" - -#. DLG_Spell_SpellTitle -#. DLG_Options_TabLabel_Spelling -#: po/tmp/ap_String_Id.h.h:2233 -msgid "Spelling" -msgstr "" - -#. MENU_LABEL_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2235 -msgid "Spelling &Options" -msgstr "" - -#. MENU_LABEL_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2237 -msgid "Spli&t Table" -msgstr "" - -#. DLG_SplitCellsTitle -#. DLG_SplitCells_Frame -#. MENU_STATUSLINE_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2241 -msgid "Split Cells" -msgstr "" - -#. MENU_STATUSLINE_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2243 -msgid "Split Table" -msgstr "" - -#. TOOLBAR_LABEL_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2245 -msgid "Split cells" -msgstr "" - -#. DLG_SplitCells_HoriMid -#. DLG_SplitCells_VertMid -#: po/tmp/ap_String_Id.h.h:2248 -msgid "Split in Middle" -msgstr "" - -#. DLG_SplitCells_Below -#: po/tmp/ap_String_Id.h.h:2250 -msgid "Split on Bottom Side" -msgstr "" - -#. DLG_SplitCells_Left -#: po/tmp/ap_String_Id.h.h:2252 -msgid "Split on Left Side" -msgstr "" - -#. DLG_SplitCells_Right -#: po/tmp/ap_String_Id.h.h:2254 -msgid "Split on Right Side" -msgstr "" - -#. DLG_SplitCells_Above -#: po/tmp/ap_String_Id.h.h:2256 -msgid "Split on Top Side" -msgstr "" - -#. MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2258 -msgid "Split on all delimiters except spaces" -msgstr "" - -#. MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2260 -msgid "Split on all word delimiters including spaces" -msgstr "" - -#. MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2262 -msgid "Split text at commas or tabs" -msgstr "" - -#. MENU_LABEL_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2264 -msgid "Split text at spaces, commas, or tabs" -msgstr "" - -#. TOOLBAR_STATUSLINE_SPLIT_CELLS -#. TOOLBAR_TOOLTIP_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2267 -msgid "Split this cell" -msgstr "" - -#. DLG_Lists_Square_List -#. STYLE_SQUARELIST -#: po/tmp/ap_String_Id.h.h:2269 po/tmp/xap_String_Id.h.h:699 -msgid "Square List" -msgstr "" - -#. MENU_LABEL_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2271 -msgid "St&yle" -msgstr "" - -#. TB_Standard -#: po/tmp/ap_String_Id.h.h:2273 -msgid "Standard" -msgstr "" - -#. DLG_Options_Label_ViewStandardTB -#: po/tmp/ap_String_Id.h.h:2275 -msgid "Standard Toolbar" -msgstr "" - -#. DLG_Lists_Star_List -#. STYLE_STARLIST -#: po/tmp/ap_String_Id.h.h:2277 po/tmp/xap_String_Id.h.h:703 -msgid "Star List" -msgstr "" - -#. DLG_Lists_Start -#: po/tmp/ap_String_Id.h.h:2279 -msgid "Start At:" -msgstr "" - -#. DLG_Lists_Start_New_List -#. DLG_Lists_Start_New -#: po/tmp/ap_String_Id.h.h:2282 -msgid "Start New List" -msgstr "" - -#. DLG_Lists_Start_Sub -#: po/tmp/ap_String_Id.h.h:2284 -msgid "Start Sublist" -msgstr "" - -#. DLG_MarkRevisions_Check2Label -#: po/tmp/ap_String_Id.h.h:2286 -msgid "Start a new revision" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2288 -msgid "Start ne&w revision" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2290 -msgid "Start revision distinct from the current one" -msgstr "" - -#. DLG_WordCount_Statistics -#: po/tmp/ap_String_Id.h.h:2292 -msgid "Statistics:" -msgstr "" - -#. DLG_Lists_Stop_Current_List -#: po/tmp/ap_String_Id.h.h:2294 -msgid "Stop Current List" -msgstr "" - -#. MENU_LABEL_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2296 -msgid "Stri&ke" -msgstr "" - -#. TOOLBAR_LABEL_FMT_STRIKE -#. TOOLBAR_STATUSLINE_FMT_STRIKE -#. TOOLBAR_TOOLTIP_FMT_STRIKE -#. DLG_UFS_StrikeoutCheck -#: po/tmp/ap_String_Id.h.h:2300 po/tmp/xap_String_Id.h.h:705 -msgid "Strike" -msgstr "" - -#. MENU_STATUSLINE_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2302 -msgid "Strikeout the selection (toggle)" -msgstr "" - -#. MENU_LABEL_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:2304 -msgid "Sty&list" -msgstr "" - -#. TOOLBAR_LABEL_FMT_STYLE -#. TOOLBAR_STATUSLINE_FMT_STYLE -#. TOOLBAR_TOOLTIP_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2308 -msgid "Style" -msgstr "" - -#. DLG_Styles_ErrNotTitle1 -#: po/tmp/ap_String_Id.h.h:2310 -msgid "Style Name - " -msgstr "" - -#. DLG_Styles_ModifyName -#: po/tmp/ap_String_Id.h.h:2312 -msgid "Style Name:" -msgstr "" - -#. DLG_Styles_ModifyType -#: po/tmp/ap_String_Id.h.h:2314 -msgid "Style Type" -msgstr "" - -#. DLG_Styles_ModifyFollowing -#: po/tmp/ap_String_Id.h.h:2316 -msgid "Style for following paragraph" -msgstr "" - -#. DLG_Styles_ErrBlankName -#: po/tmp/ap_String_Id.h.h:2318 -msgid "Style name cannot be left blank" -msgstr "" - -#. DLG_Lists_Style -#. DLG_UFS_StyleLabel -#: po/tmp/ap_String_Id.h.h:2320 po/tmp/xap_String_Id.h.h:707 -msgid "Style:" -msgstr "" - -#. DLG_Styles_StylesTitle -#. DLG_Stylist_Styles -#: po/tmp/ap_String_Id.h.h:2323 -msgid "Styles" -msgstr "" - -#. DLG_Stylist_Title -#: po/tmp/ap_String_Id.h.h:2325 -msgid "Stylist" -msgstr "" - -#. FIELD_Document_Subject -#: po/tmp/ap_String_Id.h.h:2327 -msgid "Subject" -msgstr "" - -#. DLG_MetaData_Subject_LBL -#: po/tmp/ap_String_Id.h.h:2329 -msgid "Subject:" -msgstr "" - -#. TOOLBAR_LABEL_FMT_SUBSCRIPT -#. TOOLBAR_STATUSLINE_FMT_SUBSCRIPT -#. TOOLBAR_TOOLTIP_FMT_SUBSCRIPT -#. DLG_UFS_SubScript -#: po/tmp/ap_String_Id.h.h:2333 po/tmp/xap_String_Id.h.h:711 -msgid "Subscript" -msgstr "" - -#. DLG_Spell_Suggestions -#: po/tmp/ap_String_Id.h.h:2335 -msgid "Sugg&estions:" -msgstr "" - -#. DLG_Options_Label_SpellMainOnly -#: po/tmp/ap_String_Id.h.h:2337 -msgid "Suggest from &main dictionary only" -msgstr "" - -#. MENU_LABEL_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:2339 -msgid "Sum a Column" -msgstr "" - -#. MENU_LABEL_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:2341 -msgid "Sum a Row" -msgstr "" - -#. FIELD_Numbers_TableSumRows -#: po/tmp/ap_String_Id.h.h:2343 -msgid "Sum a Table Column" -msgstr "" - -#. FIELD_Numbers_TableSumCols -#: po/tmp/ap_String_Id.h.h:2345 -msgid "Sum a Table Row" -msgstr "" - -#. DLG_MetaData_TAB_Summary -#: po/tmp/ap_String_Id.h.h:2347 -msgid "Summary" -msgstr "" - -#. MENU_LABEL_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:2349 -msgid "Supe&rscript" -msgstr "" - -#. TOOLBAR_LABEL_FMT_SUPERSCRIPT -#. TOOLBAR_STATUSLINE_FMT_SUPERSCRIPT -#. TOOLBAR_TOOLTIP_FMT_SUPERSCRIPT -#. DLG_UFS_SuperScript -#: po/tmp/ap_String_Id.h.h:2353 po/tmp/xap_String_Id.h.h:713 -msgid "Superscript" -msgstr "" - -#. MENU_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2355 -msgid "Sy&mbol" -msgstr "" - -#. TOOLBAR_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2357 -msgid "Symbol" -msgstr "" - -#. MENU_LABEL_TABLE -#: po/tmp/ap_String_Id.h.h:2359 -msgid "T&able" -msgstr "" - -#. TabStopStatus -#: po/tmp/ap_String_Id.h.h:2361 -#, c-format -msgid "Tab Stop [%s]" -msgstr "" - -#. DLG_Tab_Label_TabPosition -#: po/tmp/ap_String_Id.h.h:2363 -msgid "Tab stop position:" -msgstr "" - -#. DLG_Tab_Label_TabToClear -#: po/tmp/ap_String_Id.h.h:2365 -msgid "Tab stops to be cleared:" -msgstr "" - -#. DLG_FormatTable_Apply_To_Table -#. MENU_STATUSLINE_TABLE -#. TB_Table -#: po/tmp/ap_String_Id.h.h:2369 po/tmp/xap_String_Id.h.h:723 -msgid "Table" -msgstr "" - -#. DLG_InsertTable_TableSize_Capital -#: po/tmp/ap_String_Id.h.h:2371 -msgid "Table Size" -msgstr "" - -#. DLG_Options_Label_ViewTableTB -#: po/tmp/ap_String_Id.h.h:2373 -msgid "Table Toolbar" -msgstr "" - -#. MENU_LABEL_INSERT_TABLEOFCONTENTS -#. MENU_LABEL_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2376 -msgid "Table of Contents" -msgstr "" - -#. FIELD_Numbers_TOCListLabel -#: po/tmp/ap_String_Id.h.h:2378 -msgid "Table of Contents List Label" -msgstr "" - -#. FIELD_Numbers_TOCPageNumber -#: po/tmp/ap_String_Id.h.h:2380 -msgid "Table of Contents Page" -msgstr "" - -#. DLG_InsertTable_TableSize -#: po/tmp/ap_String_Id.h.h:2382 -msgid "Table size" -msgstr "" - -#. DLG_Styles_ModifyTabs -#. DLG_Tab_TabTitle -#: po/tmp/ap_String_Id.h.h:2385 -msgid "Tabs" -msgstr "" - -#. DLG_FormatTOC_DetailsTabPage -#: po/tmp/ap_String_Id.h.h:2387 -msgid "Tabs and Page Numbering" -msgstr "" - -#. MENU_LABEL_FMT -#: po/tmp/ap_String_Id.h.h:2389 -msgid "Te&xt Formatting" -msgstr "" - -#. DLG_Options_Label_Text -#: po/tmp/ap_String_Id.h.h:2391 -msgid "Text" -msgstr "" - -#. DLG_FormatTOC_TextAfter -#: po/tmp/ap_String_Id.h.h:2393 -msgid "Text &after:" -msgstr "" - -#. DLG_FormatTOC_TextBefore -#: po/tmp/ap_String_Id.h.h:2395 -msgid "Text &before:" -msgstr "" - -#. DLG_Lists_Align -#: po/tmp/ap_String_Id.h.h:2397 -msgid "Text Align:" -msgstr "" - -#. MENU_LABEL_INSERT_TEXTBOX -#. MENU_LABEL_FMT_FRAME -#: po/tmp/ap_String_Id.h.h:2400 -msgid "Text Box" -msgstr "" - -#. DLG_Lists_PageFolding -#: po/tmp/ap_String_Id.h.h:2402 -msgid "Text Folding" -msgstr "" - -#. DLG_FormatFrame_TextWrapping -#: po/tmp/ap_String_Id.h.h:2404 -msgid "Text Wrapping" -msgstr "" - -#. DLG_Options_Label_Both -#: po/tmp/ap_String_Id.h.h:2406 -msgid "Text and Icon" -msgstr "" - -#. DLG_PageSetup_ErrBigMargins -#: po/tmp/ap_String_Id.h.h:2408 -msgid "The margins selected are too large to fit on the page." -msgstr "" - -#. DLG_Options_Prompt_YouMustRestart -#: po/tmp/ap_String_Id.h.h:2410 -msgid "" -"The new user interface language will take effect the next time that you " -"start the application" -msgstr "" - -#. MSG_SpellDone -#: po/tmp/ap_String_Id.h.h:2412 -msgid "The spelling check is complete." -msgstr "" - -#. MSG_HyperlinkCrossesBoundaries -#: po/tmp/ap_String_Id.h.h:2414 -msgid "" -"The text to which the hyperlink is to be attached must be within a single " -"paragraph." -msgstr "" - -#. FIELD_DateTime_Wkday -#: po/tmp/ap_String_Id.h.h:2416 -msgid "The weekday" -msgstr "" - -#. DLG_FormatTable_Thickness -#: po/tmp/ap_String_Id.h.h:2418 -msgid "Thickness:" -msgstr "" - -#. MSG_AfterRestartNew -#: po/tmp/ap_String_Id.h.h:2420 -msgid "" -"This change will only take effect when you restart AbiWord or create a new " -"document." -msgstr "" - -#. MSG_HiddenRevisions -#: po/tmp/ap_String_Id.h.h:2422 -msgid "" -"This document contains revisions which are currently hidden from view. " -"Please see AbiWord documentation for information on working with revisions." -msgstr "" - -#. DLG_Para_PreviewSampleFallback -#: po/tmp/ap_String_Id.h.h:2424 -msgid "" -"This paragraph represents words as they might appear in your document. To " -"see text from your document used in this preview, position your cursor in a " -"document paragraph with some text in it and open this dialog." -msgstr "" - -#. DLG_Styles_ErrStyleNot -#: po/tmp/ap_String_Id.h.h:2426 -msgid "" -"This style does not exist \n" -" so it cannot be modified" -msgstr "" - -#. DLG_Column_Three -#: po/tmp/ap_String_Id.h.h:2428 -msgid "Three" -msgstr "" - -#. DLG_Lists_Tick_List -#. STYLE_TICKLIST -#: po/tmp/ap_String_Id.h.h:2430 po/tmp/xap_String_Id.h.h:757 -msgid "Tick List" -msgstr "" - -#. FIELD_DateTime_TimeZone -#: po/tmp/ap_String_Id.h.h:2432 -msgid "Time Zone" -msgstr "" - -#. FIELD_Document_Title -#: po/tmp/ap_String_Id.h.h:2434 -msgid "Title" -msgstr "" - -#. DLG_ToggleCase_TitleCase -#: po/tmp/ap_String_Id.h.h:2436 -msgid "Title Case" -msgstr "" - -#. DLG_MetaData_Title_LBL -#. DLG_Image_LblTitle -#: po/tmp/ap_String_Id.h.h:2438 po/tmp/xap_String_Id.h.h:761 -msgid "Title:" -msgstr "" - -#. DLG_Options_Label_Toolbars -#: po/tmp/ap_String_Id.h.h:2440 -msgid "Toolbars" -msgstr "" - -#. TopMarginStatus -#: po/tmp/ap_String_Id.h.h:2442 -#, c-format -msgid "Top Margin [%s]" -msgstr "" - -#. MENU_LABEL_FMT_TOPLINE -#. TOOLBAR_LABEL_FMT_TOPLINE -#. TOOLBAR_STATUSLINE_FMT_TOPLINE -#. TOOLBAR_TOOLTIP_FMT_TOPLINE -#. DLG_UFS_ToplineCheck -#: po/tmp/ap_String_Id.h.h:2447 po/tmp/xap_String_Id.h.h:767 -msgid "Topline" -msgstr "" - -#. DLG_Lists_Triangle_List -#. STYLE_TRIANGLELIST -#: po/tmp/ap_String_Id.h.h:2449 po/tmp/xap_String_Id.h.h:769 -msgid "Triangle List" -msgstr "" - -#. DLG_Column_Two -#: po/tmp/ap_String_Id.h.h:2451 -msgid "Two" -msgstr "" - -#. FIELD_Document_Type -#: po/tmp/ap_String_Id.h.h:2453 -msgid "Type" -msgstr "" - -#. DLG_InsertBookmark_Msg -#: po/tmp/ap_String_Id.h.h:2455 -msgid "Type a name for the bookmark, or select an existing from the list." -msgstr "" - -#. DLG_Lists_Type -#: po/tmp/ap_String_Id.h.h:2457 -msgid "Type:" -msgstr "" - -#. DLG_ToggleCase_UpperCase -#: po/tmp/ap_String_Id.h.h:2459 -msgid "UPPERCASE" -msgstr "" - -#. TOOLBAR_LABEL_FMT_UNDERLINE -#. TOOLBAR_STATUSLINE_FMT_UNDERLINE -#. TOOLBAR_TOOLTIP_FMT_UNDERLINE -#. DLG_UFS_UnderlineCheck -#: po/tmp/ap_String_Id.h.h:2463 po/tmp/xap_String_Id.h.h:789 -msgid "Underline" -msgstr "" - -#. MENU_STATUSLINE_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:2465 -msgid "Underline the selection (toggle)" -msgstr "" - -#. TOOLBAR_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2467 -msgid "Undo" -msgstr "" - -#. MENU_STATUSLINE_EDIT_UNDO -#. TOOLBAR_STATUSLINE_EDIT_UNDO -#. TOOLBAR_TOOLTIP_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2471 -msgid "Undo editing" -msgstr "" - -#. DLG_Lists_Upper_Case_List -#. STYLE_UPPERCASTELIST -#: po/tmp/ap_String_Id.h.h:2473 po/tmp/xap_String_Id.h.h:823 -msgid "Upper Case List" -msgstr "" - -#. DLG_Lists_Upper_Roman_List -#. STYLE_UPPERROMANLIST -#: po/tmp/ap_String_Id.h.h:2475 po/tmp/xap_String_Id.h.h:825 -msgid "Upper Roman List" -msgstr "" - -#. DLG_Column_RtlOrder -#: po/tmp/ap_String_Id.h.h:2477 -msgid "Use RTL Order" -msgstr "" - -#. DLG_Options_Label_HebrewContextGlyphs -#: po/tmp/ap_String_Id.h.h:2479 -msgid "Use glyph shaping for Hebrew" -msgstr "" - -#. DLG_Options_Label_UI -#: po/tmp/ap_String_Id.h.h:2481 -msgid "User Interface" -msgstr "" - -#. DLG_Options_Label_UILang -#: po/tmp/ap_String_Id.h.h:2483 -msgid "User Interface Language" -msgstr "" - -#. DLG_Stylist_UserStyles -#: po/tmp/ap_String_Id.h.h:2485 -msgid "User defined Styles" -msgstr "" - -#. DLG_Tab_Label_Existing -#: po/tmp/ap_String_Id.h.h:2487 -msgid "User-defined Tabs" -msgstr "" - -#. DLG_Styles_LBL_UserDefined -#: po/tmp/ap_String_Id.h.h:2489 -msgid "User-defined styles" -msgstr "" - -#. FIELD_Application_Version -#. DLG_History_Version_Version -#: po/tmp/ap_String_Id.h.h:2491 po/tmp/xap_String_Id.h.h:833 -msgid "Version" -msgstr "" - -#. DLG_Options_TabLabel_View -#: po/tmp/ap_String_Id.h.h:2493 -msgid "View" -msgstr "" - -#. MENU_STATUSLINE_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:2495 -msgid "View document history" -msgstr "" - -#. MENU_STATUSLINE_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:2497 -msgid "View the document in full screen mode" -msgstr "" - -#. MENU_STATUSLINE_WINDOW_1 -#. MENU_STATUSLINE_WINDOW_2 -#. MENU_STATUSLINE_WINDOW_3 -#. MENU_STATUSLINE_WINDOW_4 -#. MENU_STATUSLINE_WINDOW_5 -#. MENU_STATUSLINE_WINDOW_6 -#. MENU_STATUSLINE_WINDOW_7 -#. MENU_STATUSLINE_WINDOW_8 -#. MENU_STATUSLINE_WINDOW_9 -#: po/tmp/ap_String_Id.h.h:2507 -msgid "View this document" -msgstr "" - -#. DLG_Options_Label_ViewTooltips -#: po/tmp/ap_String_Id.h.h:2509 -msgid "View tooltips" -msgstr "" - -#. DLG_Options_Label_ViewViewFrame -#: po/tmp/ap_String_Id.h.h:2511 -msgid "View..." -msgstr "" - -#. DLG_Options_Label_Visible -#: po/tmp/ap_String_Id.h.h:2513 -msgid "Visible" -msgstr "" - -#. MSG_HyperlinkNoBookmark -#: po/tmp/ap_String_Id.h.h:2515 -#, c-format -msgid "Warning: the bookmark you provided [%s] does not exist." -msgstr "" - -#. MENU_STATUSLINE_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:2517 -msgid "Web Layout" -msgstr "" - -#. DLG_Styles_LBL_TxtMsg -#: po/tmp/ap_String_Id.h.h:2519 -msgid "What Hath God Wrought" -msgstr "" - -#. DLG_Options_Label_WithExtension -#: po/tmp/ap_String_Id.h.h:2521 -msgid "With extension:" -msgstr "" - -#. DLG_WordCount_WordCountTitle -#. FIELD_Numbers_WordCount -#: po/tmp/ap_String_Id.h.h:2524 -msgid "Word Count" -msgstr "" - -#. DLG_NEW_Tab1 -#: po/tmp/ap_String_Id.h.h:2526 -msgid "Wordprocessing" -msgstr "" - -#. DLG_WordCount_Words_No_Notes -#: po/tmp/ap_String_Id.h.h:2528 -msgid "Words (no footnotes/endnotes):" -msgstr "" - -#. DLG_Options_Label_SpellUppercase -#: po/tmp/ap_String_Id.h.h:2530 -msgid "Words in &UPPERCASE" -msgstr "" - -#. DLG_Options_Label_SpellNumbers -#: po/tmp/ap_String_Id.h.h:2532 -msgid "Words with num&bers" -msgstr "" - -#. DLG_WordCount_Words -#: po/tmp/ap_String_Id.h.h:2534 -msgid "Words:" -msgstr "" - -#. MSG_SaveFailedWrite -#: po/tmp/ap_String_Id.h.h:2536 -#, c-format -msgid "Writing error when attempting to save %s" -msgstr "" - -#. MSG_DefaultDirectionChg -#: po/tmp/ap_String_Id.h.h:2538 -msgid "You have changed the default direction." -msgstr "" - -#. MSG_DirectionModeChg -#: po/tmp/ap_String_Id.h.h:2540 -msgid "You have changed the direction mode." -msgstr "" - -#. MSG_HyperlinkNoSelection -#: po/tmp/ap_String_Id.h.h:2542 -msgid "You must select a portion of the document before inserting a hyperlink." -msgstr "" - -#. DLG_Options_Label_InvalidRangeForAutoSave -#: po/tmp/ap_String_Id.h.h:2544 -msgid "You should choose a range from 1 to 120 for the auto save frequency" -msgstr "" - -#. MSG_ConfirmSaveSecondary -#: po/tmp/ap_String_Id.h.h:2546 -msgid "Your changes will be lost if you don't save them." -msgstr "" - -#. TOOLBAR_LABEL_ZOOM -#. TOOLBAR_STATUSLINE_ZOOM -#. TOOLBAR_TOOLTIP_ZOOM -#. DLG_Zoom_ZoomTitle -#: po/tmp/ap_String_Id.h.h:2550 po/tmp/xap_String_Id.h.h:882 -msgid "Zoom" -msgstr "" - -#. MENU_LABEL_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2552 -msgid "Zoom to &100%" -msgstr "" - -#. MENU_LABEL_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2554 -msgid "Zoom to &200%" -msgstr "" - -#. MENU_LABEL_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2556 -msgid "Zoom to &50%" -msgstr "" - -#. MENU_LABEL_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2558 -msgid "Zoom to &75%" -msgstr "" - -#. MENU_STATUSLINE_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2560 -msgid "Zoom to 100%" -msgstr "" - -#. MENU_STATUSLINE_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2562 -msgid "Zoom to 200%" -msgstr "" - -#. MENU_STATUSLINE_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2564 -msgid "Zoom to 50%" -msgstr "" - -#. MENU_STATUSLINE_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2566 -msgid "Zoom to 75%" -msgstr "" - -#. MENU_STATUSLINE_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:2568 -msgid "Zoom to page width" -msgstr "" - -#. MENU_STATUSLINE_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:2570 -msgid "Zoom to whole page" -msgstr "" - -#. DLG_Options_Label_CustomDict -#: po/tmp/ap_String_Id.h.h:2572 -msgid "custom.dic" -msgstr "" - -#. FIELD_DateTime_DDMMYY -#: po/tmp/ap_String_Id.h.h:2574 -msgid "dd/mm/yy" -msgstr "" - -#. DLG_ToggleCase_LowerCase -#: po/tmp/ap_String_Id.h.h:2576 -msgid "lowercase" -msgstr "" - -#. DLG_Options_Label_Minutes -#: po/tmp/ap_String_Id.h.h:2578 -msgid "minutes" -msgstr "" - -#. FIELD_DateTime_MMDDYY -#: po/tmp/ap_String_Id.h.h:2580 -msgid "mm/dd/yy" -msgstr "" - -#. DLG_ToggleCase_ToggleCase -#: po/tmp/ap_String_Id.h.h:2582 -msgid "tOGGLE cASE" -msgstr "" - -#. -#. * Translatable strings file generated by extract-ui. -#. * DO NOT compile this file as part of your application. -#. -#. DLG_UP_To -#: po/tmp/xap_String_Id.h.h:7 -msgid " to " -msgstr "" - -#. DLG_Zoom_100 -#: po/tmp/xap_String_Id.h.h:9 -msgid "&100%" -msgstr "" - -#. DLG_Zoom_200 -#: po/tmp/xap_String_Id.h.h:11 -msgid "&200%" -msgstr "" - -#. DLG_Zoom_75 -#: po/tmp/xap_String_Id.h.h:13 -msgid "&75%" -msgstr "" - -#. DLG_Zoom_PageWidth -#: po/tmp/xap_String_Id.h.h:17 -msgid "&Page width" -msgstr "" - -#. DLG_ULANG_SetLangButton -#: po/tmp/xap_String_Id.h.h:19 -msgid "&Set Language" -msgstr "" - -#. DLG_Zoom_WholePage -#: po/tmp/xap_String_Id.h.h:23 -msgid "&Whole page" -msgstr "" - -#. LANG_0 -#: po/tmp/xap_String_Id.h.h:25 -msgid "(no proofing)" -msgstr "" - -#. DLG_DocComparison_TestSkipped -#: po/tmp/xap_String_Id.h.h:27 -msgid "(test skipped)" -msgstr "" - -#. DLG_NoSaveFile_DirNotExist -#: po/tmp/xap_String_Id.h.h:29 -msgid "A directory in the given pathname does not exist." -msgstr "" - -#. DLG_PLUGIN_MANAGER_TITLE -#: po/tmp/xap_String_Id.h.h:31 -msgid "AbiWord Plugin Manager" -msgstr "" - -#. SPELL_CANTLOAD_DLL -#: po/tmp/xap_String_Id.h.h:33 -#, c-format -msgid "" -"AbiWord cannot find the spelling file %s.dll\n" -"Please download and install Aspell from http://aspell.net/win32/" -msgstr "" - -#. MSG_HistoryPartRestore1 -#: po/tmp/xap_String_Id.h.h:35 -#, c-format -msgid "" -"AbiWord cannot fully restore version %d of the document because the version " -"information is incomplete." -msgstr "" - -#. MSG_HistoryNoRestore -#: po/tmp/xap_String_Id.h.h:37 -#, c-format -msgid "" -"AbiWord cannot restore version %d of the document because the version " -"information is missing." -msgstr "" - -#. DLG_UP_PrintPreviewTitle -#: po/tmp/xap_String_Id.h.h:39 -msgid "AbiWord: Print Preview" -msgstr "" - -#. DLG_ABOUT_Title -#: po/tmp/xap_String_Id.h.h:41 -#, c-format -msgid "About %s" -msgstr "" - -#. DLG_PLUGIN_MANAGER_ACTIVE -#: po/tmp/xap_String_Id.h.h:43 -msgid "Active Plugins" -msgstr "" - -#. LANG_AF_ZA -#: po/tmp/xap_String_Id.h.h:45 -msgid "Afrikaans" -msgstr "" - -#. LANG_AK_GH -#: po/tmp/xap_String_Id.h.h:47 -msgid "Akan" -msgstr "" - -#. LANG_SQ_AL -#: po/tmp/xap_String_Id.h.h:49 -msgid "Albanian" -msgstr "" - -#. DLG_FOSA_ALL -#: po/tmp/xap_String_Id.h.h:53 -msgid "All (*.*)" -msgstr "" - -#. DLG_FOSA_ALLDOCS -#: po/tmp/xap_String_Id.h.h:55 -msgid "All Documents" -msgstr "" - -#. DLG_FOSA_ALLIMAGES -#: po/tmp/xap_String_Id.h.h:57 -msgid "All Image Files" -msgstr "" - -#. DLG_HTMLOPT_ExpAllowAWML -#: po/tmp/xap_String_Id.h.h:59 -msgid "Allow extra markup in AWML namespace" -msgstr "" - -#. LANG_AM_ET -#: po/tmp/xap_String_Id.h.h:61 -msgid "Amharic (Ethiopia)" -msgstr "" - -#. LANG_AR -#: po/tmp/xap_String_Id.h.h:65 -msgid "Arabic" -msgstr "" - -#. LANG_AR_EG -#: po/tmp/xap_String_Id.h.h:67 -msgid "Arabic (Egypt)" -msgstr "" - -#. LANG_AR_SA -#: po/tmp/xap_String_Id.h.h:69 -msgid "Arabic (Saudi Arabia)" -msgstr "" - -#. ENC_ARAB_ISO -#: po/tmp/xap_String_Id.h.h:71 -msgid "Arabic, ISO-8859-6" -msgstr "" - -#. ENC_ARAB_MAC -#: po/tmp/xap_String_Id.h.h:73 -msgid "Arabic, Macintosh" -msgstr "" - -#. ENC_ARAB_WIN -#: po/tmp/xap_String_Id.h.h:75 -msgid "Arabic, Windows Code Page 1256" -msgstr "" - -#. LANG_HY_AM -#: po/tmp/xap_String_Id.h.h:77 -msgid "Armenian" -msgstr "" - -#. ENC_ARME_ARMSCII -#: po/tmp/xap_String_Id.h.h:79 -msgid "Armenian, ARMSCII-8" -msgstr "" - -#. LANG_AS_IN -#: po/tmp/xap_String_Id.h.h:81 -msgid "Assamese" -msgstr "" - -#. LANG_AST_ES -#: po/tmp/xap_String_Id.h.h:83 -msgid "Asturian (Spain)" -msgstr "" - -#. DLG_Options_Label_DirMarkerAfterClosingParenthesis -#: po/tmp/xap_String_Id.h.h:87 -msgid "Auto-insert direction markers" -msgstr "" - -#. DLG_History_Version_AutoRevisioned -#: po/tmp/xap_String_Id.h.h:89 -msgid "Auto-revision" -msgstr "" - -#. DLG_FOSA_FileTypeAutoDetect -#: po/tmp/xap_String_Id.h.h:91 -msgid "Automatically Detected" -msgstr "" - -#. MSG_AutoRevision -#: po/tmp/xap_String_Id.h.h:93 -msgid "Autorevision" -msgstr "" - -#. DLG_MW_AvailableDocuments -#: po/tmp/xap_String_Id.h.h:95 -msgid "Available Documents" -msgstr "" - -#. DLG_ULANG_AvailableLanguages -#: po/tmp/xap_String_Id.h.h:97 -msgid "Available Languages" -msgstr "" - -#. LANG_AYM_BO -#: po/tmp/xap_String_Id.h.h:99 -msgid "Aymara (La Paz)" -msgstr "" - -#. LANG_AYC_BO -#: po/tmp/xap_String_Id.h.h:101 -msgid "Aymara (Oruro)" -msgstr "" - -#. ENC_BALT_ISO -#: po/tmp/xap_String_Id.h.h:103 -msgid "Baltic, ISO-8859-4" -msgstr "" - -#. ENC_BALT_WIN -#: po/tmp/xap_String_Id.h.h:105 -msgid "Baltic, Windows Code Page 1257" -msgstr "" - -#. LANG_EU_ES -#: po/tmp/xap_String_Id.h.h:107 -msgid "Basque" -msgstr "" - -#. LANG_BE_BY -#: po/tmp/xap_String_Id.h.h:109 -msgid "Belarusian" -msgstr "" - -#. LANG_BE_LATIN -#: po/tmp/xap_String_Id.h.h:111 -msgid "Belarusian, Latin" -msgstr "" - -#. LANG_BN_IN -#: po/tmp/xap_String_Id.h.h:113 -msgid "Bengali" -msgstr "" - -#. DLG_UP_BlackWhite -#: po/tmp/xap_String_Id.h.h:115 -msgid "Black & White" -msgstr "" - -#. STYLE_BLOCKTEXT -#: po/tmp/xap_String_Id.h.h:117 -msgid "Block Text" -msgstr "" - -#. DLG_UFS_StyleBoldItalic -#: po/tmp/xap_String_Id.h.h:121 -msgid "Bold Italic" -msgstr "" - -#. LANG_BR_FR -#: po/tmp/xap_String_Id.h.h:127 -msgid "Breton" -msgstr "" - -#. MSG_BuildingDoc -#: po/tmp/xap_String_Id.h.h:129 -msgid "Building Document:" -msgstr "" - -#. LANG_BG_BG -#: po/tmp/xap_String_Id.h.h:131 -msgid "Bulgarian" -msgstr "" - -#. DLG_Cancel -#: po/tmp/xap_String_Id.h.h:135 -msgid "Cancel" -msgstr "" - -#. LANG_CA_ES -#: po/tmp/xap_String_Id.h.h:137 -msgid "Catalan" -msgstr "" - -#. LANG_AYR -#: po/tmp/xap_String_Id.h.h:139 -msgid "Central Aymara" -msgstr "" - -#. ENC_CENT_ISO -#: po/tmp/xap_String_Id.h.h:141 -msgid "Central European, ISO-8859-2" -msgstr "" - -#. ENC_CENT_MAC -#: po/tmp/xap_String_Id.h.h:143 -msgid "Central European, Macintosh" -msgstr "" - -#. ENC_CENT_WIN -#: po/tmp/xap_String_Id.h.h:145 -msgid "Central European, Windows Code Page 1250" -msgstr "" - -#. DLG_Options_Label_LangWithKeyboard -#: po/tmp/xap_String_Id.h.h:147 -msgid "Change Language when changing keyboard" -msgstr "" - -#. STYLE_CHAPHEADING -#: po/tmp/xap_String_Id.h.h:149 -msgid "Chapter Heading" -msgstr "" - -#. LANG_ZH_HK -#: po/tmp/xap_String_Id.h.h:151 -msgid "Chinese (Hong Kong)" -msgstr "" - -#. LANG_ZH_CN -#: po/tmp/xap_String_Id.h.h:153 -msgid "Chinese (PRC)" -msgstr "" - -#. LANG_ZH_SG -#: po/tmp/xap_String_Id.h.h:155 -msgid "Chinese (Singapore)" -msgstr "" - -#. LANG_ZH_TW -#: po/tmp/xap_String_Id.h.h:157 -msgid "Chinese (Taiwan)" -msgstr "" - -#. ENC_CHSI_EUC -#: po/tmp/xap_String_Id.h.h:159 -msgid "Chinese Simplified, EUC-CN (GB2312)" -msgstr "" - -#. ENC_CHSI_GB -#: po/tmp/xap_String_Id.h.h:161 -msgid "Chinese Simplified, GB_2312-80" -msgstr "" - -#. ENC_CHSI_HZ -#: po/tmp/xap_String_Id.h.h:163 -msgid "Chinese Simplified, HZ" -msgstr "" - -#. ENC_CHSI_WIN -#: po/tmp/xap_String_Id.h.h:165 -msgid "Chinese Simplified, Windows Code Page 936" -msgstr "" - -#. ENC_CHTR_BIG5 -#: po/tmp/xap_String_Id.h.h:167 -msgid "Chinese Traditional, BIG5" -msgstr "" - -#. ENC_CHTR_BIG5HKSCS -#: po/tmp/xap_String_Id.h.h:169 -msgid "Chinese Traditional, BIG5-HKSCS" -msgstr "" - -#. ENC_CHTR_EUC -#: po/tmp/xap_String_Id.h.h:171 -msgid "Chinese Traditional, EUC-TW" -msgstr "" - -#. ENC_CHTR_WIN -#: po/tmp/xap_String_Id.h.h:173 -msgid "Chinese Traditional, Windows Code Page 950" -msgstr "" - -#. DLG_LISTDOCS_Heading1 -#: po/tmp/xap_String_Id.h.h:175 -msgid "Choose document from the list:" -msgstr "" - -#. TB_ClearBackground -#: po/tmp/xap_String_Id.h.h:177 -msgid "Clear Background" -msgstr "" - -#. DLG_CLIPART_Title -#: po/tmp/xap_String_Id.h.h:179 -msgid "Clip Art" -msgstr "" - -#. DLG_CLIPART_Error -#: po/tmp/xap_String_Id.h.h:181 -msgid "Clip Art could not be loaded" -msgstr "" - -#. DLG_Close -#: po/tmp/xap_String_Id.h.h:183 -msgid "Close" -msgstr "" - -#. DLG_Exit_CloseWithoutSaving -#: po/tmp/xap_String_Id.h.h:185 -msgid "Close &Without Saving" -msgstr "" - -#. DLG_UP_Collate -#: po/tmp/xap_String_Id.h.h:187 -msgid "Collate" -msgstr "" - -#. DLG_UP_Color -#: po/tmp/xap_String_Id.h.h:189 -msgid "Color" -msgstr "" - -#. DLG_Compare -#: po/tmp/xap_String_Id.h.h:193 -msgid "Compare" -msgstr "" - -#. DLG_DocComparison_Content -#: po/tmp/xap_String_Id.h.h:195 -msgid "Content:" -msgstr "" - -#. STYLE_TOCHEADING1 -#: po/tmp/xap_String_Id.h.h:197 -msgid "Contents 1" -msgstr "" - -#. STYLE_TOCHEADING2 -#: po/tmp/xap_String_Id.h.h:199 -msgid "Contents 2" -msgstr "" - -#. STYLE_TOCHEADING3 -#: po/tmp/xap_String_Id.h.h:201 -msgid "Contents 3" -msgstr "" - -#. STYLE_TOCHEADING4 -#: po/tmp/xap_String_Id.h.h:203 -msgid "Contents 4" -msgstr "" - -#. STYLE_TOCHEADING -#: po/tmp/xap_String_Id.h.h:205 -msgid "Contents Header" -msgstr "" - -#. DLG_UP_Copies -#: po/tmp/xap_String_Id.h.h:207 -msgid "Copies: " -msgstr "" - -#. LANG_COP_EG -#: po/tmp/xap_String_Id.h.h:209 -msgid "Coptic" -msgstr "" - -#. LANG_KW_GB -#: po/tmp/xap_String_Id.h.h:211 -msgid "Cornish" -msgstr "" - -#. LANG_CO_FR -#: po/tmp/xap_String_Id.h.h:213 -msgid "Corsican" -msgstr "" - -#. DLG_PLUGIN_MANAGER_COULDNT_LOAD -#: po/tmp/xap_String_Id.h.h:215 -msgid "Could not activate/load plugin" -msgstr "" - -#. DLG_PLUGIN_MANAGER_COULDNT_UNLOAD -#: po/tmp/xap_String_Id.h.h:217 -msgid "Could not deactivate plugin" -msgstr "" - -#. SPELL_CANTLOAD_DICT -#: po/tmp/xap_String_Id.h.h:219 -#, c-format -msgid "Could not load the dictionary for the %s language" -msgstr "" - -#. DLG_History_Version_Started -#: po/tmp/xap_String_Id.h.h:221 -msgid "Created" -msgstr "" - -#. DLG_History_Created -#: po/tmp/xap_String_Id.h.h:223 -msgid "Created:" -msgstr "" - -#. LANG_HR_HR -#: po/tmp/xap_String_Id.h.h:225 -msgid "Croatian" -msgstr "" - -#. ENC_CROA_MAC -#: po/tmp/xap_String_Id.h.h:227 -msgid "Croatian, Macintosh" -msgstr "" - -#. ENC_CYRL_ISO -#: po/tmp/xap_String_Id.h.h:229 -msgid "Cyrillic, ISO-8859-5" -msgstr "" - -#. ENC_CYRL_KOI -#: po/tmp/xap_String_Id.h.h:231 -msgid "Cyrillic, KOI8-R" -msgstr "" - -#. ENC_CYRL_MAC -#: po/tmp/xap_String_Id.h.h:233 -msgid "Cyrillic, Macintosh" -msgstr "" - -#. ENC_CYRL_WIN -#: po/tmp/xap_String_Id.h.h:235 -msgid "Cyrillic, Windows Code Page 1251" -msgstr "" - -#. LANG_CS_CZ -#: po/tmp/xap_String_Id.h.h:237 -msgid "Czech" -msgstr "" - -#. LANG_DA_DK -#: po/tmp/xap_String_Id.h.h:239 -msgid "Danish" -msgstr "" - -#. DLG_PLUGIN_MANAGER_DEACTIVATE_ALL -#: po/tmp/xap_String_Id.h.h:243 -msgid "Deactivate all plugins" -msgstr "" - -#. DLG_PLUGIN_MANAGER_DEACTIVATE -#: po/tmp/xap_String_Id.h.h:245 -msgid "Deactivate plugin" -msgstr "" - -#. DLG_HTMLOPT_ExpDeclareXML -#: po/tmp/xap_String_Id.h.h:247 -msgid "Declare as XML (version 1.0)" -msgstr "" - -#. DLG_ULANG_DefaultLangLabel -#: po/tmp/xap_String_Id.h.h:249 -msgid "Default language: " -msgstr "" - -#. DLG_Image_Placement -#: po/tmp/xap_String_Id.h.h:251 -msgid "Define Image Placement" -msgstr "" - -#. DLG_Image_TextWrapping -#: po/tmp/xap_String_Id.h.h:253 -msgid "Define Text Wrapping" -msgstr "" - -#. DLG_Remove_Icon -#: po/tmp/xap_String_Id.h.h:262 -msgid "Do you want to remove this icon from the toolbar?" -msgstr "" - -#. DLG_DocComparison_WindowLabel -#: po/tmp/xap_String_Id.h.h:264 -msgid "Document Comparison" -msgstr "" - -#. DLG_History_DocumentDetails -#: po/tmp/xap_String_Id.h.h:266 -msgid "Document Details" -msgstr "" - -#. DLG_History_WindowLabel -#: po/tmp/xap_String_Id.h.h:268 -msgid "Document History" -msgstr "" - -#. DLG_History_Path -#: po/tmp/xap_String_Id.h.h:270 -msgid "Document name:" -msgstr "" - -#. DLG_DocComparison_DocsCompared -#: po/tmp/xap_String_Id.h.h:272 -msgid "Documents compared" -msgstr "" - -#. LANG_NL_NL -#: po/tmp/xap_String_Id.h.h:274 -msgid "Dutch (Netherlands)" -msgstr "" - -#. DLG_History_EditTime -#: po/tmp/xap_String_Id.h.h:276 -msgid "Editing time:" -msgstr "" - -#. DLG_UFS_EffectsFrameLabel -#: po/tmp/xap_String_Id.h.h:278 -msgid "Effects" -msgstr "" - -#. DLG_HTMLOPT_ExpEmbedCSS -#: po/tmp/xap_String_Id.h.h:280 -msgid "Embed (CSS) style sheet" -msgstr "" - -#. DLG_UP_EmbedFonts -#: po/tmp/xap_String_Id.h.h:282 -msgid "Embed Fonts" -msgstr "" - -#. DLG_HTMLOPT_ExpEmbedImages -#: po/tmp/xap_String_Id.h.h:284 -msgid "Embed images in URLs (Base64-encoded)" -msgstr "" - -#. DLG_UENC_EncTitle -#: po/tmp/xap_String_Id.h.h:286 -msgid "Encoding" -msgstr "" - -#. DLG_UFS_EncodingLabel -#: po/tmp/xap_String_Id.h.h:288 -msgid "Encoding:" -msgstr "" - -#. STYLE_ENDREFERENCE -#: po/tmp/xap_String_Id.h.h:290 -msgid "Endnote Reference" -msgstr "" - -#. STYLE_ENDTEXT -#: po/tmp/xap_String_Id.h.h:292 -msgid "Endnote Text" -msgstr "" - -#. LANG_EN_AU -#: po/tmp/xap_String_Id.h.h:294 -msgid "English (Australia)" -msgstr "" - -#. LANG_EN_CA -#: po/tmp/xap_String_Id.h.h:296 -msgid "English (Canada)" -msgstr "" - -#. LANG_EN_IE -#: po/tmp/xap_String_Id.h.h:298 -msgid "English (Ireland)" -msgstr "" - -#. LANG_EN_NZ -#: po/tmp/xap_String_Id.h.h:300 -msgid "English (New Zealand)" -msgstr "" - -#. LANG_EN_ZA -#: po/tmp/xap_String_Id.h.h:302 -msgid "English (South Africa)" -msgstr "" - -#. LANG_EN_GB -#: po/tmp/xap_String_Id.h.h:304 -msgid "English (UK)" -msgstr "" - -#. LANG_EN_US -#: po/tmp/xap_String_Id.h.h:306 -msgid "English (US)" -msgstr "" - -#. DLG_Password_Title -#: po/tmp/xap_String_Id.h.h:308 -msgid "Enter Password" -msgstr "" - -#. LANG_EO -#: po/tmp/xap_String_Id.h.h:310 -msgid "Esperanto" -msgstr "" - -#. LANG_ET -#: po/tmp/xap_String_Id.h.h:312 -msgid "Estonian" -msgstr "" - -#. DLG_FOSA_ExportTitle -#: po/tmp/xap_String_Id.h.h:314 -msgid "Export File" -msgstr "" - -#. DLG_HTMLOPT_ExpIs4 -#: po/tmp/xap_String_Id.h.h:316 -msgid "Export as HTML 4.01" -msgstr "" - -#. DLG_HTMLOPT_ExpAbiWebDoc -#: po/tmp/xap_String_Id.h.h:318 -msgid "Export with PHP instructions" -msgstr "" - -#. LANG_FA_IR -#: po/tmp/xap_String_Id.h.h:320 -msgid "Farsi" -msgstr "" - -#. DLG_UP_File -#: po/tmp/xap_String_Id.h.h:322 -msgid "File" -msgstr "" - -#. DLG_OverwriteFile -#: po/tmp/xap_String_Id.h.h:324 -#, c-format -msgid "File already exists. Overwrite file '%s'?" -msgstr "" - -#. DLG_FOSA_RecordToFileLabel -#: po/tmp/xap_String_Id.h.h:326 -msgid "File to record editing:" -msgstr "" - -#. DLG_FOSA_ReplayFromFileLabel -#: po/tmp/xap_String_Id.h.h:328 -msgid "File to replay editing:" -msgstr "" - -#. LANG_FI_FI -#: po/tmp/xap_String_Id.h.h:330 -msgid "Finnish" -msgstr "" - -#. LANG_NL_BE -#: po/tmp/xap_String_Id.h.h:332 -msgid "Flemish (Belgium)" -msgstr "" - -#. STYLE_FOOTREFERENCE -#: po/tmp/xap_String_Id.h.h:339 -msgid "Footnote Reference" -msgstr "" - -#. STYLE_FOOTTEXT -#: po/tmp/xap_String_Id.h.h:341 -msgid "Footnote Text" -msgstr "" - -#. LANG_FR_BE -#: po/tmp/xap_String_Id.h.h:345 -msgid "French (Belgium)" -msgstr "" - -#. LANG_FR_CA -#: po/tmp/xap_String_Id.h.h:347 -msgid "French (Canada)" -msgstr "" - -#. LANG_FR_FR -#: po/tmp/xap_String_Id.h.h:349 -msgid "French (France)" -msgstr "" - -#. LANG_FR_CH -#: po/tmp/xap_String_Id.h.h:351 -msgid "French (Switzerland)" -msgstr "" - -#. LANG_FY_NL -#: po/tmp/xap_String_Id.h.h:353 -msgid "Frisian" -msgstr "" - -#. DLG_UP_From -#: po/tmp/xap_String_Id.h.h:355 -msgid "From: " -msgstr "" - -#. LANG_GL -#: po/tmp/xap_String_Id.h.h:357 -msgid "Galician (Galego)" -msgstr "" - -#. LANG_KA_GE -#: po/tmp/xap_String_Id.h.h:359 -msgid "Georgian" -msgstr "" - -#. ENC_GEOR_ACADEMY -#: po/tmp/xap_String_Id.h.h:361 -msgid "Georgian, Academy" -msgstr "" - -#. ENC_GEOR_PS -#: po/tmp/xap_String_Id.h.h:363 -msgid "Georgian, PS" -msgstr "" - -#. LANG_DE_AT -#: po/tmp/xap_String_Id.h.h:365 -msgid "German (Austria)" -msgstr "" - -#. LANG_DE_DE -#: po/tmp/xap_String_Id.h.h:367 -msgid "German (Germany)" -msgstr "" - -#. LANG_DE_CH -#: po/tmp/xap_String_Id.h.h:369 -msgid "German (Switzerland)" -msgstr "" - -#. DLG_UP_Grayscale -#: po/tmp/xap_String_Id.h.h:371 -msgid "Grayscale" -msgstr "" - -#. LANG_EL_GR -#: po/tmp/xap_String_Id.h.h:373 -msgid "Greek" -msgstr "" - -#. ENC_GREE_ISO -#: po/tmp/xap_String_Id.h.h:375 -msgid "Greek, ISO-8859-7" -msgstr "" - -#. ENC_GREE_MAC -#: po/tmp/xap_String_Id.h.h:377 -msgid "Greek, Macintosh" -msgstr "" - -#. ENC_GREE_WIN -#: po/tmp/xap_String_Id.h.h:379 -msgid "Greek, Windows Code Page 1253" -msgstr "" - -#. DLG_HTMLOPT_ExpTitle -#: po/tmp/xap_String_Id.h.h:381 -msgid "HTML Export Options" -msgstr "" - -#. LANG_HA_NE -#: po/tmp/xap_String_Id.h.h:385 -msgid "Hausa (Niger)" -msgstr "" - -#. LANG_HA_NG -#: po/tmp/xap_String_Id.h.h:387 -msgid "Hausa (Nigeria)" -msgstr "" - -#. LANG_HAW_US -#: po/tmp/xap_String_Id.h.h:389 -msgid "Hawaiian" -msgstr "" - -#. STYLE_HEADING1 -#: po/tmp/xap_String_Id.h.h:391 -msgid "Heading 1" -msgstr "" - -#. STYLE_HEADING2 -#: po/tmp/xap_String_Id.h.h:393 -msgid "Heading 2" -msgstr "" - -#. STYLE_HEADING3 -#: po/tmp/xap_String_Id.h.h:395 -msgid "Heading 3" -msgstr "" - -#. STYLE_HEADING4 -#: po/tmp/xap_String_Id.h.h:397 -msgid "Heading 4" -msgstr "" - -#. LANG_HE_IL -#: po/tmp/xap_String_Id.h.h:401 -msgid "Hebrew" -msgstr "" - -#. ENC_HEBR_ISO -#: po/tmp/xap_String_Id.h.h:403 -msgid "Hebrew, ISO-8859-8" -msgstr "" - -#. ENC_HEBR_MAC -#: po/tmp/xap_String_Id.h.h:405 -msgid "Hebrew, Macintosh" -msgstr "" - -#. ENC_HEBR_WIN -#: po/tmp/xap_String_Id.h.h:407 -msgid "Hebrew, Windows Code Page 1255" -msgstr "" - -#. DLG_Image_Height -#: po/tmp/xap_String_Id.h.h:409 -msgid "Height:" -msgstr "" - -#. DLG_IP_Height_Label -#: po/tmp/xap_String_Id.h.h:411 -msgid "Height: " -msgstr "" - -#. DLG_UFS_HiddenCheck -#: po/tmp/xap_String_Id.h.h:413 -msgid "Hidden" -msgstr "" - -#. DLG_UFS_BGColorTab -#: po/tmp/xap_String_Id.h.h:415 -msgid "HighLight Color" -msgstr "" - -#. LANG_HI_IN -#: po/tmp/xap_String_Id.h.h:417 -msgid "Hindi" -msgstr "" - -#. LANG_HU_HU -#: po/tmp/xap_String_Id.h.h:419 -msgid "Hungarian" -msgstr "" - -#. LANG_IS_IS -#: po/tmp/xap_String_Id.h.h:421 -msgid "Icelandic" -msgstr "" - -#. ENC_ICEL_MAC -#: po/tmp/xap_String_Id.h.h:423 -msgid "Icelandic, Macintosh" -msgstr "" - -#. DLG_History_Id -#: po/tmp/xap_String_Id.h.h:425 -msgid "Identifier:" -msgstr "" - -#. DLG_Image_Title -#: po/tmp/xap_String_Id.h.h:427 -msgid "Image Properties" -msgstr "" - -#. DLG_Image_WrappedNone -#: po/tmp/xap_String_Id.h.h:429 -msgid "Image floats above text" -msgstr "" - -#. DLG_Image_InLine -#: po/tmp/xap_String_Id.h.h:431 -msgid "Image placed in-line (no text wrapping)" -msgstr "" - -#. DLG_FOSA_ImportTitle -#: po/tmp/xap_String_Id.h.h:435 -msgid "Import File" -msgstr "" - -#. MSG_ImportingDoc -#: po/tmp/xap_String_Id.h.h:437 -msgid "Importing Document..." -msgstr "" - -#. LANG_ID_ID -#: po/tmp/xap_String_Id.h.h:439 -msgid "Indonesian" -msgstr "" - -#. XIM_Methods -#: po/tmp/xap_String_Id.h.h:441 -msgid "Input Methods" -msgstr "" - -#. DLG_FOSA_InsertObject -#: po/tmp/xap_String_Id.h.h:445 -msgid "Insert Embeddable Object" -msgstr "" - -#. DLG_FOSA_FileInsertObject -#: po/tmp/xap_String_Id.h.h:447 -msgid "Insert Embeddable Object file:" -msgstr "" - -#. DLG_FOSA_InsertTitle -#: po/tmp/xap_String_Id.h.h:449 -msgid "Insert File" -msgstr "" - -#. DLG_FOSA_InsertMath -#: po/tmp/xap_String_Id.h.h:451 -msgid "Insert Math File" -msgstr "" - -#. DLG_FOSA_FileInsertMath -#: po/tmp/xap_String_Id.h.h:453 -msgid "Insert MathML file:" -msgstr "" - -#. TB_InsertNewTable -#: po/tmp/xap_String_Id.h.h:455 -msgid "Insert New Table" -msgstr "" - -#. DLG_IP_Title -#: po/tmp/xap_String_Id.h.h:457 -msgid "Insert Picture" -msgstr "" - -#. DLG_Insert_SymbolTitle -#: po/tmp/xap_String_Id.h.h:459 -msgid "Insert Symbol" -msgstr "" - -#. DLG_PLUGIN_MANAGER_INSTALL -#: po/tmp/xap_String_Id.h.h:461 -msgid "Install new plugin" -msgstr "" - -#. LANG_IA -#: po/tmp/xap_String_Id.h.h:463 -msgid "Interlingua" -msgstr "" - -#. LANG_IU_CA -#: po/tmp/xap_String_Id.h.h:465 -msgid "Inuktitut" -msgstr "" - -#. DLG_InvalidPathname -#: po/tmp/xap_String_Id.h.h:467 -msgid "Invalid pathname." -msgstr "" - -#. LANG_GA_IE -#: po/tmp/xap_String_Id.h.h:469 -msgid "Irish" -msgstr "" - -#. LANG_IT_IT -#: po/tmp/xap_String_Id.h.h:471 -msgid "Italian (Italy)" -msgstr "" - -#. LANG_JA_JP -#: po/tmp/xap_String_Id.h.h:475 -msgid "Japanese" -msgstr "" - -#. ENC_JAPN_EUC -#: po/tmp/xap_String_Id.h.h:477 -msgid "Japanese, EUC-JP" -msgstr "" - -#. ENC_JAPN_ISO -#: po/tmp/xap_String_Id.h.h:479 -msgid "Japanese, ISO-2022-JP" -msgstr "" - -#. ENC_JAPN_SJIS -#: po/tmp/xap_String_Id.h.h:481 -msgid "Japanese, Shift-JIS" -msgstr "" - -#. ENC_JAPN_WIN -#: po/tmp/xap_String_Id.h.h:483 -msgid "Japanese, Windows Code Page 932" -msgstr "" - -#. LANG_KN_IN -#: po/tmp/xap_String_Id.h.h:485 -msgid "Kannada" -msgstr "" - -#. LANG_KO_KR -#. LANG_KO -#: po/tmp/xap_String_Id.h.h:488 -msgid "Korean" -msgstr "" - -#. ENC_KORE_EUC -#: po/tmp/xap_String_Id.h.h:490 -msgid "Korean, EUC-KR" -msgstr "" - -#. ENC_KORE_JOHAB -#: po/tmp/xap_String_Id.h.h:492 -msgid "Korean, Johab" -msgstr "" - -#. ENC_KORE_KSC -#: po/tmp/xap_String_Id.h.h:494 -msgid "Korean, KSC_5601" -msgstr "" - -#. ENC_KORE_WIN -#: po/tmp/xap_String_Id.h.h:496 -msgid "Korean, Windows Code Page 949" -msgstr "" - -#. LANG_KU -#: po/tmp/xap_String_Id.h.h:498 -msgid "Kurdish" -msgstr "" - -#. LANG_LO_LA -#: po/tmp/xap_String_Id.h.h:500 -msgid "Lao" -msgstr "" - -#. DLG_History_LastSaved -#: po/tmp/xap_String_Id.h.h:502 -msgid "Last saved:" -msgstr "" - -#. LANG_LA_IT -#: po/tmp/xap_String_Id.h.h:504 -msgid "Latin (Renaissance)" -msgstr "" - -#. LANG_LV_LV -#: po/tmp/xap_String_Id.h.h:506 -msgid "Latvian" -msgstr "" - -#. LANG_LT_LT -#: po/tmp/xap_String_Id.h.h:508 -msgid "Lithuanian" -msgstr "" - -#. DLG_CLIPART_Loading -#: po/tmp/xap_String_Id.h.h:510 -msgid "Loading Clip Art" -msgstr "" - -#. LANG_MK -#: po/tmp/xap_String_Id.h.h:516 -msgid "Macedonian" -msgstr "" - -#. DLG_ULANG_DefaultLangChkbox -#: po/tmp/xap_String_Id.h.h:518 -msgid "Make default for document" -msgstr "" - -#. LANG_MS_MY -#: po/tmp/xap_String_Id.h.h:520 -msgid "Malay" -msgstr "" - -#. LANG_MI_NZ -#: po/tmp/xap_String_Id.h.h:522 -msgid "Maori" -msgstr "" - -#. LANG_MR_IN -#: po/tmp/xap_String_Id.h.h:524 -msgid "Marathi" -msgstr "" - -#. LANG_MH_MH -#: po/tmp/xap_String_Id.h.h:526 -msgid "Marshallese (Marshall Islands)" -msgstr "" - -#. LANG_MH_NR -#: po/tmp/xap_String_Id.h.h:528 -msgid "Marshallese (Nauru)" -msgstr "" - -#. DLG_Merge -#: po/tmp/xap_String_Id.h.h:530 -msgid "Merge" -msgstr "" - -#. LANG_MN_MN -#: po/tmp/xap_String_Id.h.h:532 -msgid "Mongolian" -msgstr "" - -#. DLG_PLUGIN_MANAGER_NAME -#: po/tmp/xap_String_Id.h.h:534 -msgid "Name:" -msgstr "" - -#. LANG_NE_NP -#: po/tmp/xap_String_Id.h.h:536 -msgid "Nepali (Nepal)" -msgstr "" - -#. DLG_QNXMB_No -#: po/tmp/xap_String_Id.h.h:538 -msgid "No" -msgstr "" - -#. DLG_IP_No_Picture_Label -#: po/tmp/xap_String_Id.h.h:540 -msgid "No Picture" -msgstr "" - -#. DLG_PLUGIN_MANAGER_NONE_SELECTED -#: po/tmp/xap_String_Id.h.h:542 -msgid "No plugin selected" -msgstr "" - -#. STYLE_NORMAL -#: po/tmp/xap_String_Id.h.h:544 -msgid "Normal" -msgstr "" - -#. LANG_NB_NO -#: po/tmp/xap_String_Id.h.h:546 -msgid "Norwegian Bokmal" -msgstr "" - -#. LANG_NN_NO -#: po/tmp/xap_String_Id.h.h:548 -msgid "Norwegian Nynorsk" -msgstr "" - -#. DLG_PLUGIN_MANAGER_NOT_AVAILABLE -#: po/tmp/xap_String_Id.h.h:550 -msgid "Not available" -msgstr "" - -#. STYLE_NUMHEAD1 -#: po/tmp/xap_String_Id.h.h:552 -msgid "Numbered Heading 1" -msgstr "" - -#. STYLE_NUMHEAD2 -#: po/tmp/xap_String_Id.h.h:554 -msgid "Numbered Heading 2" -msgstr "" - -#. STYLE_NUMHEAD3 -#: po/tmp/xap_String_Id.h.h:556 -msgid "Numbered Heading 3" -msgstr "" - -#. DLG_OK -#: po/tmp/xap_String_Id.h.h:560 -msgid "OK" -msgstr "" - -#. LANG_OC_FR -#: po/tmp/xap_String_Id.h.h:562 -msgid "Occitan" -msgstr "" - -#. DLG_FOSA_OpenTitle -#: po/tmp/xap_String_Id.h.h:564 -msgid "Open File" -msgstr "" - -#. DLG_FOSA_FileOpenTypeLabel -#: po/tmp/xap_String_Id.h.h:566 -msgid "Open file as type:" -msgstr "" - -#. DLG_LISTDOCS_Title -#: po/tmp/xap_String_Id.h.h:568 -msgid "Opened Documents" -msgstr "" - -#. TB_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:570 -msgid "Other..." -msgstr "" - -#. DLG_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:574 -msgid "P&ercent:" -msgstr "" - -#. TB_Zoom_PageWidth -#: po/tmp/xap_String_Id.h.h:576 -msgid "Page Width" -msgstr "" - -#. DLG_UP_PageRanges -#: po/tmp/xap_String_Id.h.h:578 -msgid "Page ranges:" -msgstr "" - -#. LANG_PS -#: po/tmp/xap_String_Id.h.h:580 -msgid "Pashto" -msgstr "" - -#. DLG_Password_Password -#: po/tmp/xap_String_Id.h.h:582 -msgid "Password:" -msgstr "" - -#. STYLE_PLAIN_TEXT -#: po/tmp/xap_String_Id.h.h:584 -msgid "Plain Text" -msgstr "" - -#. DLG_PLUGIN_MANAGER_DETAILS -#: po/tmp/xap_String_Id.h.h:586 -msgid "Plugin Details:" -msgstr "" - -#. DLG_PLUGIN_MANAGER_LIST -#: po/tmp/xap_String_Id.h.h:588 -msgid "Plugin List" -msgstr "" - -#. LANG_PL_PL -#: po/tmp/xap_String_Id.h.h:590 -msgid "Polish" -msgstr "" - -#. LANG_PT_BR -#: po/tmp/xap_String_Id.h.h:592 -msgid "Portuguese (Brazil)" -msgstr "" - -#. LANG_PT_PT -#: po/tmp/xap_String_Id.h.h:594 -msgid "Portuguese (Portugal)" -msgstr "" - -#. DLG_Image_PlaceColumn -#: po/tmp/xap_String_Id.h.h:596 -msgid "Position relative to its Column" -msgstr "" - -#. DLG_Image_PlacePage -#: po/tmp/xap_String_Id.h.h:598 -msgid "Position relative to its Page" -msgstr "" - -#. DLG_Image_PlaceParagraph -#: po/tmp/xap_String_Id.h.h:600 -msgid "Position relative to nearest paragraph" -msgstr "" - -#. DLG_Image_Aspect -#: po/tmp/xap_String_Id.h.h:602 -msgid "Preserve aspect ratio" -msgstr "" - -#. DLG_IP_Activate_Label -#: po/tmp/xap_String_Id.h.h:606 -msgid "Preview Picture" -msgstr "" - -#. DLG_FOSA_PrintToFileTitle -#: po/tmp/xap_String_Id.h.h:611 -msgid "Print To File" -msgstr "" - -#. DLG_FOSA_FilePrintTypeLabel -#: po/tmp/xap_String_Id.h.h:613 -msgid "Print file as type:" -msgstr "" - -#. DLG_UP_PrintIn -#: po/tmp/xap_String_Id.h.h:615 -msgid "Print in: " -msgstr "" - -#. DLG_UP_PrintTo -#: po/tmp/xap_String_Id.h.h:617 -msgid "Print to: " -msgstr "" - -#. DLG_UP_Printer -#: po/tmp/xap_String_Id.h.h:619 -msgid "Printer" -msgstr "" - -#. DLG_UP_PrinterCommand -#: po/tmp/xap_String_Id.h.h:621 -msgid "Printer command: " -msgstr "" - -#. LANG_PA_IN -#: po/tmp/xap_String_Id.h.h:623 -msgid "Punjabi (Gurmukhi)" -msgstr "" - -#. LANG_PA_PK -#: po/tmp/xap_String_Id.h.h:625 -msgid "Punjabi (Shahmukhi)" -msgstr "" - -#. LANG_QU_BO -#: po/tmp/xap_String_Id.h.h:627 -msgid "Quechua" -msgstr "" - -#. LANG_QUH_BO -#: po/tmp/xap_String_Id.h.h:629 -msgid "Quechua (3 vowels)" -msgstr "" - -#. LANG_QUL_BO -#: po/tmp/xap_String_Id.h.h:631 -msgid "Quechua (5 vowels)" -msgstr "" - -#. DLG_FOSA_RecordToFileTitle -#: po/tmp/xap_String_Id.h.h:633 -msgid "Record Editing to File" -msgstr "" - -#. DLG_UFS_StyleRegular -#: po/tmp/xap_String_Id.h.h:635 -msgid "Regular" -msgstr "" - -#. DLG_DocComparison_Relationship -#: po/tmp/xap_String_Id.h.h:637 -msgid "Relationship:" -msgstr "" - -#. DLG_FOSA_ReplayFromFileTitle -#: po/tmp/xap_String_Id.h.h:639 -msgid "Replay Editing from File" -msgstr "" - -#. DLG_Restore -#: po/tmp/xap_String_Id.h.h:641 -msgid "Restore" -msgstr "" - -#. DLG_HTMLOPT_ExpRestore -#: po/tmp/xap_String_Id.h.h:643 -msgid "Restore Settings" -msgstr "" - -#. DLG_DocComparison_Results -#: po/tmp/xap_String_Id.h.h:645 -msgid "Results" -msgstr "" - -#. LANG_RO_RO -#: po/tmp/xap_String_Id.h.h:647 -msgid "Romanian" -msgstr "" - -#. ENC_ROMA_MAC -#: po/tmp/xap_String_Id.h.h:649 -msgid "Romanian, Macintosh" -msgstr "" - -#. LANG_RU_RU -#: po/tmp/xap_String_Id.h.h:651 -msgid "Russian (Russia)" -msgstr "" - -#. DLG_UFS_SampleFrameLabel -#: po/tmp/xap_String_Id.h.h:653 -msgid "Sample" -msgstr "" - -#. LANG_SC_IT -#: po/tmp/xap_String_Id.h.h:655 -msgid "Sardinian" -msgstr "" - -#. DLG_FOSA_SaveAsTitle -#: po/tmp/xap_String_Id.h.h:657 -msgid "Save File As" -msgstr "" - -#. DLG_HTMLOPT_ExpSave -#: po/tmp/xap_String_Id.h.h:659 -msgid "Save Settings" -msgstr "" - -#. DLG_FOSA_FileSaveTypeLabel -#: po/tmp/xap_String_Id.h.h:661 -msgid "Save file as type:" -msgstr "" - -#. DLG_UFS_ScriptLabel -#: po/tmp/xap_String_Id.h.h:663 -msgid "Script:" -msgstr "" - -#. STYLE_SECTHEADING -#: po/tmp/xap_String_Id.h.h:665 -msgid "Section Heading" -msgstr "" - -#. DLG_UENC_EncLabel -#: po/tmp/xap_String_Id.h.h:669 -msgid "Select Encoding:" -msgstr "" - -#. DLG_HTMLOPT_ExpLabel -#: po/tmp/xap_String_Id.h.h:671 -msgid "Select HTML export options:" -msgstr "" - -#. DLG_ULANG_LangLabel -#: po/tmp/xap_String_Id.h.h:673 -msgid "Select Language:" -msgstr "" - -#. LANG_SR -#: po/tmp/xap_String_Id.h.h:677 -msgid "Serbian" -msgstr "" - -#. DLG_Image_ImageDesc -#: po/tmp/xap_String_Id.h.h:679 -msgid "Set Image Name" -msgstr "" - -#. DLG_Image_ImageSize -#: po/tmp/xap_String_Id.h.h:681 -msgid "Set Image Size" -msgstr "" - -#. DLG_ULANG_LangTitle -#: po/tmp/xap_String_Id.h.h:683 -msgid "Set Language" -msgstr "" - -#. DLG_UFS_TransparencyCheck -#: po/tmp/xap_String_Id.h.h:685 -msgid "Set no Highlight Color" -msgstr "" - -#. DLG_UFS_SizeLabel -#: po/tmp/xap_String_Id.h.h:689 -msgid "Size:" -msgstr "" - -#. LANG_SK_SK -#: po/tmp/xap_String_Id.h.h:691 -msgid "Slovak" -msgstr "" - -#. LANG_SL_SI -#: po/tmp/xap_String_Id.h.h:693 -msgid "Slovenian" -msgstr "" - -#. LANG_ES_MX -#: po/tmp/xap_String_Id.h.h:695 -msgid "Spanish (Mexico)" -msgstr "" - -#. LANG_ES_ES -#: po/tmp/xap_String_Id.h.h:697 -msgid "Spanish (Spain)" -msgstr "" - -#. DLG_Image_SquareWrap -#: po/tmp/xap_String_Id.h.h:701 -msgid "Square text wrapping" -msgstr "" - -#. DLG_DocComparison_Styles -#: po/tmp/xap_String_Id.h.h:709 -msgid "Styles:" -msgstr "" - -#. LANG_SW -#: po/tmp/xap_String_Id.h.h:715 -msgid "Swahili" -msgstr "" - -#. LANG_SV_SE -#: po/tmp/xap_String_Id.h.h:717 -msgid "Swedish" -msgstr "" - -#. TB_Font_Symbol -#: po/tmp/xap_String_Id.h.h:719 -msgid "Symbols" -msgstr "" - -#. LANG_SYR -#: po/tmp/xap_String_Id.h.h:721 -msgid "Syriac" -msgstr "" - -#. LANG_TL_PH -#: po/tmp/xap_String_Id.h.h:725 -msgid "Tagalog" -msgstr "" - -#. LANG_TA_IN -#: po/tmp/xap_String_Id.h.h:727 -msgid "Tamil" -msgstr "" - -#. LANG_TE_IN -#: po/tmp/xap_String_Id.h.h:729 -msgid "Telugu" -msgstr "" - -#. DLG_UFS_ColorTab -#: po/tmp/xap_String_Id.h.h:731 -msgid "Text Color" -msgstr "" - -#. DLG_Image_WrappedBoth -#: po/tmp/xap_String_Id.h.h:733 -msgid "Text wrapped on both sides of the Image" -msgstr "" - -#. DLG_Image_WrappedLeft -#: po/tmp/xap_String_Id.h.h:735 -msgid "Text wrapped to the Left of the Image" -msgstr "" - -#. DLG_Image_WrappedRight -#: po/tmp/xap_String_Id.h.h:737 -msgid "Text wrapped to the Right of the Image" -msgstr "" - -#. LANG_TH_TH -#: po/tmp/xap_String_Id.h.h:739 -msgid "Thai" -msgstr "" - -#. ENC_THAI_MAC -#: po/tmp/xap_String_Id.h.h:741 -msgid "Thai, Macintosh" -msgstr "" - -#. ENC_THAI_TIS -#: po/tmp/xap_String_Id.h.h:743 -msgid "Thai, TIS-620" -msgstr "" - -#. ENC_THAI_WIN -#: po/tmp/xap_String_Id.h.h:745 -msgid "Thai, Windows Code Page 874" -msgstr "" - -#. DLG_NoSaveFile_DirNotWriteable -#: po/tmp/xap_String_Id.h.h:747 -#, c-format -msgid "The directory '%s' is write-protected." -msgstr "" - -#. DLG_FOSA_ExtensionDoesNotMatch -#: po/tmp/xap_String_Id.h.h:749 -msgid "" -"The given file extension does not match the chosen file type. Do you want to " -"use this name anyway?" -msgstr "" - -#. MSG_HistoryPartRestore2 -#: po/tmp/xap_String_Id.h.h:751 -#, c-format -msgid "" -"The nearest version that can be restored fully is %d. Would you like to " -"restore this version instead? To partially restore version %d press No." -msgstr "" - -#. DLG_UP_InvalidPrintString -#: po/tmp/xap_String_Id.h.h:753 -msgid "The print command string is not valid." -msgstr "" - -#. MSG_NoUndo -#: po/tmp/xap_String_Id.h.h:755 -msgid "This operation cannot be undone. Are you sure you want to proceed?" -msgstr "" - -#. DLG_Image_TightWrap -#: po/tmp/xap_String_Id.h.h:759 -msgid "Tight text wrapping" -msgstr "" - -#. MSG_HistoryPartRestore3 -#: po/tmp/xap_String_Id.h.h:763 -msgid "To continue anyway, press OK." -msgstr "" - -#. MSG_HistoryPartRestore4 -#: po/tmp/xap_String_Id.h.h:765 -msgid "To quit the restoration attempt, press Cancel." -msgstr "" - -#. LANG_TR_TR -#: po/tmp/xap_String_Id.h.h:771 -msgid "Turkish" -msgstr "" - -#. ENC_TURK_ISO -#: po/tmp/xap_String_Id.h.h:773 -msgid "Turkish, ISO-8859-9" -msgstr "" - -#. ENC_TURK_MAC -#: po/tmp/xap_String_Id.h.h:775 -msgid "Turkish, Macintosh" -msgstr "" - -#. ENC_TURK_WIN -#: po/tmp/xap_String_Id.h.h:777 -msgid "Turkish, Windows Code Page 1254" -msgstr "" - -#. DLG_Image_WrapType -#: po/tmp/xap_String_Id.h.h:779 -msgid "Type of text wrapping" -msgstr "" - -#. ENC_WEST_ASCII -#: po/tmp/xap_String_Id.h.h:781 -msgid "US-ASCII" -msgstr "" - -#. LANG_UK_UA -#: po/tmp/xap_String_Id.h.h:783 -msgid "Ukrainian" -msgstr "" - -#. ENC_UKRA_KOI -#: po/tmp/xap_String_Id.h.h:785 -msgid "Ukrainian, KOI8-U" -msgstr "" - -#. ENC_UKRA_MAC -#: po/tmp/xap_String_Id.h.h:787 -msgid "Ukrainian, Macintosh" -msgstr "" - -#. ENC_UNIC_UCS2 -#: po/tmp/xap_String_Id.h.h:791 -msgid "Unicode UCS-2" -msgstr "" - -#. ENC_UNIC_UCS_2BE -#: po/tmp/xap_String_Id.h.h:793 -msgid "Unicode UCS-2 Big Endian" -msgstr "" - -#. ENC_UNIC_UCS_2LE -#: po/tmp/xap_String_Id.h.h:795 -msgid "Unicode UCS-2 Little Endian" -msgstr "" - -#. ENC_UNIC_UCS4 -#: po/tmp/xap_String_Id.h.h:797 -msgid "Unicode UCS-4" -msgstr "" - -#. ENC_UNIC_UCS_4BE -#: po/tmp/xap_String_Id.h.h:799 -msgid "Unicode UCS-4 Big Endian" -msgstr "" - -#. ENC_UNIC_UCS_4LE -#: po/tmp/xap_String_Id.h.h:801 -msgid "Unicode UCS-4 Little Endian" -msgstr "" - -#. ENC_UNIC_UTF_16 -#: po/tmp/xap_String_Id.h.h:803 -msgid "Unicode UTF-16" -msgstr "" - -#. ENC_UNIC_UTF_16BE -#: po/tmp/xap_String_Id.h.h:805 -msgid "Unicode UTF-16 Big Endian" -msgstr "" - -#. ENC_UNIC_UTF_16LE -#: po/tmp/xap_String_Id.h.h:807 -msgid "Unicode UTF-16 Little Endian" -msgstr "" - -#. ENC_UNIC_UTF_32 -#: po/tmp/xap_String_Id.h.h:809 -msgid "Unicode UTF-32" -msgstr "" - -#. ENC_UNIC_UTF_32BE -#: po/tmp/xap_String_Id.h.h:811 -msgid "Unicode UTF-32 Big Endian" -msgstr "" - -#. ENC_UNIC_UTF_32LE -#: po/tmp/xap_String_Id.h.h:813 -msgid "Unicode UTF-32 Little Endian" -msgstr "" - -#. ENC_UNIC_UTF_7 -#: po/tmp/xap_String_Id.h.h:815 -msgid "Unicode UTF-7" -msgstr "" - -#. ENC_UNIC_UTF_8 -#: po/tmp/xap_String_Id.h.h:817 -msgid "Unicode UTF-8" -msgstr "" - -#. UntitledDocument -#: po/tmp/xap_String_Id.h.h:819 -#, c-format -msgid "Untitled%d" -msgstr "" - -#. DLG_Update -#: po/tmp/xap_String_Id.h.h:821 -msgid "Update" -msgstr "" - -#. LANG_UR -#: po/tmp/xap_String_Id.h.h:827 -msgid "Urdu" -msgstr "" - -#. LANG_UR_PK -#: po/tmp/xap_String_Id.h.h:829 -msgid "Urdu (Pakistan)" -msgstr "" - -#. LANG_UZ_UZ -#: po/tmp/xap_String_Id.h.h:831 -msgid "Uzbek" -msgstr "" - -#. DLG_History_List_Title -#: po/tmp/xap_String_Id.h.h:835 -msgid "Version history" -msgstr "" - -#. DLG_PLUGIN_MANAGER_VERSION -#. DLG_History_Version -#: po/tmp/xap_String_Id.h.h:838 -msgid "Version:" -msgstr "" - -#. LANG_VI_VN -#: po/tmp/xap_String_Id.h.h:840 -msgid "Vietnamese" -msgstr "" - -#. ENC_VIET_TCVN -#: po/tmp/xap_String_Id.h.h:842 -msgid "Vietnamese, TCVN" -msgstr "" - -#. ENC_VIET_VISCII -#: po/tmp/xap_String_Id.h.h:844 -msgid "Vietnamese, VISCII" -msgstr "" - -#. ENC_VIET_WIN -#: po/tmp/xap_String_Id.h.h:846 -msgid "Vietnamese, Windows Code Page 1258" -msgstr "" - -#. DLG_MW_MoreWindows -#: po/tmp/xap_String_Id.h.h:848 -msgid "View Document" -msgstr "" - -#. DLG_MW_Activate -#: po/tmp/xap_String_Id.h.h:850 -msgid "View:" -msgstr "" - -#. LANG_CY_GB -#: po/tmp/xap_String_Id.h.h:852 -msgid "Welsh" -msgstr "" - -#. ENC_US_DOS -#: po/tmp/xap_String_Id.h.h:854 -msgid "Western European, DOS/Windows Code Page 437" -msgstr "" - -#. ENC_MLNG_DOS -#: po/tmp/xap_String_Id.h.h:856 -msgid "Western European, DOS/Windows Code Page 850" -msgstr "" - -#. ENC_WEST_HP -#: po/tmp/xap_String_Id.h.h:858 -msgid "Western European, HP" -msgstr "" - -#. ENC_WEST_ISO -#: po/tmp/xap_String_Id.h.h:860 -msgid "Western European, ISO-8859-1" -msgstr "" - -#. ENC_WEST_MAC -#: po/tmp/xap_String_Id.h.h:862 -msgid "Western European, Macintosh" -msgstr "" - -#. ENC_WEST_NXT -#: po/tmp/xap_String_Id.h.h:864 -msgid "Western European, NeXT" -msgstr "" - -#. ENC_WEST_WIN -#: po/tmp/xap_String_Id.h.h:866 -msgid "Western European, Windows Code Page 1252" -msgstr "" - -#. TB_Zoom_WholePage -#: po/tmp/xap_String_Id.h.h:868 -msgid "Whole Page" -msgstr "" - -#. DLG_Image_Width -#: po/tmp/xap_String_Id.h.h:870 -msgid "Width:" -msgstr "" - -#. DLG_IP_Width_Label -#: po/tmp/xap_String_Id.h.h:872 -msgid "Width: " -msgstr "" - -#. LANG_WO_SN -#: po/tmp/xap_String_Id.h.h:874 -msgid "Wolof (Senegal)" -msgstr "" - -#. DLG_QNXMB_Yes -#: po/tmp/xap_String_Id.h.h:876 -msgid "Yes" -msgstr "" - -#. LANG_YI -#: po/tmp/xap_String_Id.h.h:878 -msgid "Yiddish" -msgstr "" - -#. MSG_HistoryConfirmSave -#: po/tmp/xap_String_Id.h.h:880 -#, c-format -msgid "You have to save changes to document %s before proceeding. Save now?" -msgstr "" - -#. DLG_Zoom_RadioFrameCaption -#: po/tmp/xap_String_Id.h.h:884 -msgid "Zoom to" -msgstr "" - -#. DLG_UnixMB_No -#: po/tmp/xap_String_Id.h.h:886 -msgid "_No" -msgstr "" - -#. DLG_UnixMB_Yes -#: po/tmp/xap_String_Id.h.h:888 -msgid "_Yes" -msgstr "" - -#. DLG_Unit_cm -#: po/tmp/xap_String_Id.h.h:890 -msgid "cm" -msgstr "" - -#. DLG_DocComparison_Different -#: po/tmp/xap_String_Id.h.h:892 -msgid "different" -msgstr "" - -#. DLG_DocComparison_DivergingPos -#: po/tmp/xap_String_Id.h.h:894 -#, c-format -msgid "diverging after document position %d" -msgstr "" - -#. DLG_DocComparison_Diverging -#: po/tmp/xap_String_Id.h.h:896 -#, c-format -msgid "diverging after version %d of %s" -msgstr "" - -#. DLG_DocComparison_Identical -#: po/tmp/xap_String_Id.h.h:898 -msgid "identical" -msgstr "" - -#. DLG_Unit_inch -#: po/tmp/xap_String_Id.h.h:900 -msgid "inch" -msgstr "" - -#. DLG_Unit_mm -#: po/tmp/xap_String_Id.h.h:902 -msgid "mm" -msgstr "" - -#. DLG_Unit_pica -#: po/tmp/xap_String_Id.h.h:904 -msgid "pica" -msgstr "" - -#. DLG_Unit_points -#: po/tmp/xap_String_Id.h.h:906 -msgid "points" -msgstr "" - -#. DLG_DocComparison_Siblings -#: po/tmp/xap_String_Id.h.h:908 -msgid "siblings" -msgstr "" - -#. DLG_DocComparison_Unrelated -#: po/tmp/xap_String_Id.h.h:910 -msgid "unrelated" -msgstr "" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/po/ast-ES.po /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/po/ast-ES.po --- abiword-2.6.2/abiword/po/ast-ES.po 2008-04-06 17:00:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword/po/ast-ES.po 2009-07-15 16:56:23.000000000 +0100 @@ -1,19 +1,19 @@ -# translation of es-ES.po to Spanish -# translation of abiword to Spanish -# This file is distributed under the same license as the PACKAGE package. -# Copyright (C) 2003 -# Francisco Javier F. Serrador , 2003. +# Copyright (C) 2003-2008 Xosé Carrero Alea, Esbardu +# +# Coordination project: Softastur (http://wiki.altuxa.com/softastur/Portada) msgid "" msgstr "" "Project-Id-Version: ast-ES\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-11 02:34+0200\n" -"PO-Revision-Date: 2004-10-22 01:56+0100\n" -"Last-Translator: Xosé Carrero Alea \n" +"POT-Creation-Date: 2008-08-01 05:26+0200\n" +"PO-Revision-Date: 2008-09-17 02:33+0100\n" +"Last-Translator: esbardu \n" "Language-Team: Softastur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Asturian\n" +"X-Poedit-Country: SPAIN\n" # * Translatable strings file generated by extract-ui. # * DO NOT compile this file as part of your application. @@ -110,8 +110,8 @@ " - Reserved. \n" " You cannot use this name. Choose Another \n" msgstr "" -" - Reservau. \n" -" Nun pues usar esti nome. Escueye otru \n" +" - Acutao. \n" +" Nun pues usar esti nome. Escueyi otru \n" # DLG_WordCount_Auto_Update #. DLG_WordCount_Auto_Update @@ -122,9 +122,8 @@ # DLG_PageSetup_Percent #. DLG_PageSetup_Percent #: po/tmp/ap_String_Id.h.h:29 -#, c-format msgid "% of normal size" -msgstr "% of normal size" +msgstr "% del tamañu normal" # MENU_LABEL_SPELL_SUGGEST_1 # MENU_LABEL_SPELL_SUGGEST_2 @@ -199,6 +198,14 @@ "\n" "Otherwise, please be patient." msgstr "" +"%s tovía nun ta implementao.\n" +"\n" +"Si yes un programador, añadi códigu llibremente en %s, llinia %d\n" +"y unvia per corréu los parches a:\n" +"\n" +"\tabiword-dev@abisource.com\n" +"\n" +"D'otru mou, por favor ten paciencia." # MENU_LABEL_FILE_RECENT_1 # MENU_LABEL_VIEW_TB_1 @@ -215,7 +222,7 @@ #. DLG_Tab_Radio_None #: po/tmp/ap_String_Id.h.h:47 msgid "&1 None" -msgstr "" +msgstr "&1 Nengún" # MENU_LABEL_FILE_RECENT_2 # MENU_LABEL_VIEW_TB_2 @@ -305,13 +312,13 @@ #: po/tmp/ap_String_Id.h.h:82 #, c-format msgid "&About %s" -msgstr "&Al rodiu %s" +msgstr "&Tocante a %s" # MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION #. MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION #: po/tmp/ap_String_Id.h.h:84 msgid "&Accept revision" -msgstr "&Aceptar revisión" +msgstr "&Aceutar revisión" # DLG_Spell_AddToDict # MENU_LABEL_SPELL_ADD @@ -319,13 +326,13 @@ #. MENU_LABEL_SPELL_ADD #: po/tmp/ap_String_Id.h.h:87 msgid "&Add" -msgstr "&Amestar" +msgstr "&Añader" # DLG_PageSetup_Adjust #. DLG_PageSetup_Adjust #: po/tmp/ap_String_Id.h.h:89 msgid "&Adjust to:" -msgstr "&Axustar a " +msgstr "&Axustar a:" # MENU_LABEL_ALIGN #. MENU_LABEL_ALIGN @@ -337,57 +344,56 @@ #. DLG_Options_Label_ViewAll #: po/tmp/ap_String_Id.h.h:93 msgid "&All" -msgstr "&tou" +msgstr "&Too" # DLG_Options_Btn_Apply # DLG_Apply #. DLG_ApplyButton #: po/tmp/ap_String_Id.h.h:95 -#, fuzzy msgid "&Apply" -msgstr "Aplicar" +msgstr "&Aplicar" # DLG_Para_LabelAt #. DLG_Para_LabelAt #: po/tmp/ap_String_Id.h.h:97 msgid "&At:" -msgstr "" +msgstr "&En:" # MENU_LABEL_TOOLS_AUTOSPELL #. MENU_LABEL_TOOLS_AUTOSPELL #: po/tmp/ap_String_Id.h.h:99 msgid "&Auto Spellcheck" -msgstr "" +msgstr "&Correición ortográfica automática" # MENU_LABEL_TABLE_AUTOFIT #. MENU_LABEL_TABLE_AUTOFIT #: po/tmp/ap_String_Id.h.h:101 msgid "&Autofit Table" -msgstr "" +msgstr "&Autoaxustar tabla" # DLG_Options_Label_PrefsAutoSave #. DLG_Options_Label_PrefsAutoSave #: po/tmp/ap_String_Id.h.h:103 msgid "&Automatically save this Scheme" -msgstr "" +msgstr "&Guardar automáticamente esti esquema" # DLG_DateTime_AvailableFormats #. DLG_DateTime_AvailableFormats #: po/tmp/ap_String_Id.h.h:105 msgid "&Available formats:" -msgstr "&Formatos disponibles" +msgstr "&Formatos disponibles:" # DLG_Para_LabelBefore #. DLG_Para_LabelBefore #: po/tmp/ap_String_Id.h.h:107 msgid "&Before:" -msgstr "&Enantes" +msgstr "&Enantes:" # MENU_LABEL_FMT_BOLD #. MENU_LABEL_FMT_BOLD #: po/tmp/ap_String_Id.h.h:109 msgid "&Bold" -msgstr "&Negrita" +msgstr "&Negrina" # DLG_PageSetup_Bottom #. DLG_PageSetup_Bottom @@ -399,7 +405,7 @@ #. MENU_LABEL_INSERT_BREAK #: po/tmp/ap_String_Id.h.h:113 msgid "&Break" -msgstr "&Romper" +msgstr "&Saltu" # MENU_LABEL_TABLE_SELECT_CELL #. MENU_LABEL_TABLE_SELECT_CELL @@ -419,7 +425,7 @@ #. MENU_LABEL_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:120 msgid "&Center" -msgstr "&Centráu" +msgstr "&Centrar" # DLG_Spell_Change #. DLG_Spell_Change @@ -450,7 +456,7 @@ #. DLG_Break_ColumnBreak #: po/tmp/ap_String_Id.h.h:131 msgid "&Column break" -msgstr "" +msgstr "&Saltu de columna" # MENU_LABEL_FMT_COLUMNS #. MENU_LABEL_FMT_COLUMNS @@ -461,9 +467,8 @@ # MENU_STATUSLINE_FILE_CLOSE #. MENU_LABEL_TOOLS_REVISIONS_COMPARE_DOCUMENTS #: po/tmp/ap_String_Id.h.h:135 -#, fuzzy msgid "&Compare documents" -msgstr "Pesllar el documentu" +msgstr "&Comparar documentos" # MENU_LABEL_EDIT_COPY #. MENU_LABEL_EDIT_COPY @@ -474,27 +479,26 @@ # DLG_Styles_ModifyTitle #. MENU_LABEL_FMT_STYLE_DEFINE #: po/tmp/ap_String_Id.h.h:139 -#, fuzzy msgid "&Create and Modify Styles" -msgstr "CAmudar estilos" +msgstr "&Crear y modificar estilos" # DLG_Options_Label_PrefsCurrentScheme #. DLG_Options_Label_PrefsCurrentScheme #: po/tmp/ap_String_Id.h.h:141 msgid "&Current Preferences Scheme" -msgstr "" +msgstr "&Esquema de preferencies actual" # MENU_LABEL_TABLE_DELETE #. MENU_LABEL_TABLE_DELETE #: po/tmp/ap_String_Id.h.h:143 msgid "&Delete" -msgstr "&Esborrar" +msgstr "&Borrar" # MENU_LABEL_INSERT_DELETE_HYPERLINK #. MENU_LABEL_INSERT_DELETE_HYPERLINK #: po/tmp/ap_String_Id.h.h:145 msgid "&Delete hyperlink" -msgstr "&Borrar enllaz" +msgstr "&Borrar hiperenllaz" # DLG_Options_Btn_CustomDict #. DLG_Options_Btn_CustomDict @@ -506,7 +510,7 @@ #. MENU_LABEL_INSERT_DIRECTIONMARKER #: po/tmp/ap_String_Id.h.h:149 msgid "&Direction Marker" -msgstr "" +msgstr "&Marcador de direición" # MENU_LABEL_FMT_DOCUMENT #. MENU_LABEL_FMT_DOCUMENT @@ -517,9 +521,8 @@ # MENU_LABEL_WINDOW #. MENU_LABEL_TOOLS_HISTORY #: po/tmp/ap_String_Id.h.h:153 -#, fuzzy msgid "&Document History" -msgstr "&Documentos" +msgstr "&Historial del documentu" # MENU_LABEL_WINDOW #. MENU_LABEL_WINDOW @@ -531,7 +534,7 @@ #. DLG_Para_PushNoHyphenate #: po/tmp/ap_String_Id.h.h:157 msgid "&Don't hyphenate" -msgstr "" +msgstr "&Nun usar guiones" # DLG_Options_Btn_IgnoreEdit # MENU_LABEL_EDIT @@ -544,27 +547,26 @@ # MENU_LABEL_INSERT_DELETE_HYPERLINK #. MENU_LABEL_INSERT_EDIT_HYPERLINK #: po/tmp/ap_String_Id.h.h:162 -#, fuzzy msgid "&Edit hyperlink" -msgstr "&Borrar enllaz" +msgstr "&Editar hiperenllaz" # DLG_Options_Label_SmartQuotesEnable #. DLG_Options_Label_SmartQuotesEnable #: po/tmp/ap_String_Id.h.h:164 msgid "&Enable smart quotes" -msgstr "" +msgstr "&Activar comines elegantes" # MENU_LABEL_INSERT_ENDNOTE #. MENU_LABEL_INSERT_ENDNOTE #: po/tmp/ap_String_Id.h.h:166 msgid "&Endnote" -msgstr "" +msgstr "&Nota a lo cabero" # DLG_Break_EvenPage #. DLG_Break_EvenPage #: po/tmp/ap_String_Id.h.h:168 msgid "&Even page" -msgstr "" +msgstr "&Páxina par" # MENU_LABEL_INSERT_FIELD #. MENU_LABEL_INSERT_FIELD @@ -593,9 +595,8 @@ # DLG_Options_Label_WithExtension #. DLG_Options_Label_FileExtension #: po/tmp/ap_String_Id.h.h:178 -#, fuzzy msgid "&File extension:" -msgstr "Cola estensión:" +msgstr "&Estensión d'archivu:" # MENU_LABEL_EDIT_FIND #. MENU_LABEL_EDIT_FIND @@ -607,7 +608,7 @@ #. DLG_FR_FindNextButton #: po/tmp/ap_String_Id.h.h:182 msgid "&Find Next" -msgstr "&Atopar Siguiente" +msgstr "&Buscar siguiente" # MENU_LABEL_FMT_FONT #. MENU_LABEL_FMT_FONT @@ -619,7 +620,7 @@ #. DLG_PageSetup_Footer #: po/tmp/ap_String_Id.h.h:186 msgid "&Footer:" -msgstr "Pie de páxina (&f)" +msgstr "&Pie de páxina:" # MENU_LABEL_TABLE_FORMAT #. MENU_LABEL_TABLE_FORMAT @@ -627,104 +628,95 @@ msgid "&Format Table" msgstr "&Formatu de tabla" -# MENU_LABEL_INSERT_GRAPHIC -#. MENU_LABEL_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:190 -msgid "&From File" -msgstr "&Dende archivu" - # MENU_LABEL_EDIT_GOTO #. MENU_LABEL_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:192 +#: po/tmp/ap_String_Id.h.h:190 msgid "&Go To" msgstr "&Dir a" # STYLE_HEADING3 #. DLG_FormatTOC_HasHeading -#: po/tmp/ap_String_Id.h.h:194 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:192 msgid "&Has Heading" -msgstr "Cabecera 3" +msgstr "&Tien encabezáu" # MENU_LABEL_VIEW_HEADFOOT #. MENU_LABEL_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:196 +#: po/tmp/ap_String_Id.h.h:194 msgid "&Header and Footer" -msgstr "Cabecera y pie de páxina (&h)" +msgstr "&Encabezáu y pie de páxina" # DLG_PageSetup_Header #. DLG_PageSetup_Header -#: po/tmp/ap_String_Id.h.h:198 +#: po/tmp/ap_String_Id.h.h:196 msgid "&Header:" -msgstr "&Cabecera" +msgstr "&Encabezáu" # DLG_PageSetup_Height #. DLG_PageSetup_Height -#: po/tmp/ap_String_Id.h.h:200 +#: po/tmp/ap_String_Id.h.h:198 msgid "&Height:" -msgstr "&Altu:" +msgstr "&Altor:" # MENU_LABEL_HELP #. DLG_HelpButton #. MENU_LABEL_HELP -#: po/tmp/ap_String_Id.h.h:203 +#: po/tmp/ap_String_Id.h.h:201 msgid "&Help" -msgstr "A&yuda" +msgstr "&Aida" # DLG_Options_Label_ViewHiddenText #. DLG_Options_Label_ViewHiddenText -#: po/tmp/ap_String_Id.h.h:205 +#: po/tmp/ap_String_Id.h.h:203 msgid "&Hidden Text" -msgstr "Testu ocultu (&h)" +msgstr "&Testu ocultu" #. DLG_Options_Label_SpellHighlightMisspelledWords -#: po/tmp/ap_String_Id.h.h:207 +#: po/tmp/ap_String_Id.h.h:205 msgid "&Highlight misspelled words" -msgstr "" +msgstr "&Resaltar les pallabres errónees" # MENU_LABEL_INSERT_HYPERLINK #. MENU_LABEL_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:209 +#: po/tmp/ap_String_Id.h.h:207 msgid "&Hyperlink" -msgstr "&Enllaz" +msgstr "&Hiperenllaz" # DLG_Spell_Ignore #. DLG_Spell_Ignore -#: po/tmp/ap_String_Id.h.h:211 +#: po/tmp/ap_String_Id.h.h:209 msgid "&Ignore" -msgstr "" +msgstr "&Inorar" # MENU_LABEL_SPELL_IGNOREALL #. MENU_LABEL_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:213 +#: po/tmp/ap_String_Id.h.h:211 msgid "&Ignore All" -msgstr "" +msgstr "&Inorar too" # MENU_LABEL_FMT_IMAGE #. MENU_LABEL_FMT_IMAGE #. MENU_LABEL_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:216 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:214 msgid "&Image" -msgstr "Redimensionar imaxe" +msgstr "&Imaxe" # MENU_LABEL_FMT_IMPORTSTYLES #. MENU_LABEL_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:218 +#: po/tmp/ap_String_Id.h.h:216 msgid "&Import Styles" msgstr "&Importar estilos" #. MENU_LABEL_WEB_WEBPREVIEW -#: po/tmp/ap_String_Id.h.h:220 +#: po/tmp/ap_String_Id.h.h:218 msgid "&In web browser" -msgstr "" +msgstr "&En navegador web" # TOOLBAR_LABEL_INSERT_TABLE #. DLG_FormatTOC_InheritLabel -#: po/tmp/ap_String_Id.h.h:222 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:220 msgid "&Inherit label" -msgstr "Amestar tabla" +msgstr "&Heredar etiqueta" # DLG_InsertButton # MENU_LABEL_INSERT @@ -734,165 +726,164 @@ #. MENU_LABEL_INSERT #. MENU_LABEL_TABLE_INSERT #. DLG_Insert -#: po/tmp/ap_String_Id.h.h:226 po/tmp/xap_String_Id.h.h:15 +#: po/tmp/ap_String_Id.h.h:224 +#: po/tmp/xap_String_Id.h.h:15 msgid "&Insert" -msgstr "&Inxertar" +msgstr "&Enxertar" #. DLG_Options_Label_AutoSaveInterval -#: po/tmp/ap_String_Id.h.h:228 +#: po/tmp/ap_String_Id.h.h:226 msgid "&Interval:" -msgstr "" +msgstr "&Intervalu:" # MENU_LABEL_FMT_ITALIC #. MENU_LABEL_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:230 +#: po/tmp/ap_String_Id.h.h:228 msgid "&Italic" -msgstr "&Italic" +msgstr "&Cursiva" # MENU_LABEL_INSERT_DELETE_HYPERLINK #. MENU_LABEL_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:232 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:230 msgid "&Jump to hyperlink" -msgstr "&Borrar enllaz" +msgstr "&Saltar a hiperenllaz" # MENU_LABEL_ALIGN_JUSTIFY #. MENU_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:234 +#: po/tmp/ap_String_Id.h.h:232 msgid "&Justify" msgstr "&Xustificar" # DLG_Para_PushKeepLinesTogether #. DLG_Para_PushKeepLinesTogether -#: po/tmp/ap_String_Id.h.h:236 +#: po/tmp/ap_String_Id.h.h:234 msgid "&Keep lines together" -msgstr "" +msgstr "&Caltener les llinies xuntes" # MENU_LABEL_INSERT_DIRECTIONMARKER_LRM #. MENU_LABEL_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:238 +#: po/tmp/ap_String_Id.h.h:236 msgid "&LRM" -msgstr "" +msgstr "&Mou E-D" # DLG_PageSetup_Landscape #. DLG_PageSetup_Landscape -#: po/tmp/ap_String_Id.h.h:240 +#: po/tmp/ap_String_Id.h.h:238 msgid "&Landscape" -msgstr "Pasaxe (&L)" +msgstr "&Apaisao" # MENU_LABEL_TOOLS_LANGUAGE #. MENU_LABEL_TOOLS_LANGUAGE -#: po/tmp/ap_String_Id.h.h:242 +#: po/tmp/ap_String_Id.h.h:240 msgid "&Language" msgstr "&Llingua" # MENU_LABEL_ALIGN_LEFT #. MENU_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:244 +#: po/tmp/ap_String_Id.h.h:242 msgid "&Left" -msgstr "&Dizquierda" +msgstr "&Esquierda" # MENU_LABEL_FMT_DIRECTION_DO_LTR #. MENU_LABEL_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:246 +#: po/tmp/ap_String_Id.h.h:244 msgid "&Left-to-right text" -msgstr "" +msgstr "Testu d'&esquierda a drecha" # DLG_Para_LabelLeft # DLG_PageSetup_Left #. DLG_Para_LabelLeft #. DLG_PageSetup_Left -#: po/tmp/ap_String_Id.h.h:249 +#: po/tmp/ap_String_Id.h.h:247 msgid "&Left:" -msgstr "&Dizquierda:" +msgstr "&Esquierda:" # MENU_LABEL_VIEW_LOCK_TB_LAYOUT #. MENU_LABEL_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:251 +#: po/tmp/ap_String_Id.h.h:249 msgid "&Lock layout" -msgstr "" +msgstr "&Candar diseñu" # MENU_LABEL_TOOLS_MAILMERGE #. MENU_LABEL_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:253 +#: po/tmp/ap_String_Id.h.h:251 msgid "&Mail Merge" -msgstr "" +msgstr "&Combinar corréu" # MENU_LABEL_INSERT_MAILMERGE #. MENU_LABEL_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:255 +#: po/tmp/ap_String_Id.h.h:253 msgid "&Mail Merge Field" -msgstr "" +msgstr "&Campu de combinación de corréu" #. MENU_LABEL_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:257 +#: po/tmp/ap_String_Id.h.h:255 msgid "&Maintain Full History" -msgstr "" +msgstr "&Caltener historial completu" # MENU_LABEL_TOOLS_REVISIONS_MARK #. MENU_LABEL_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:259 +#: po/tmp/ap_String_Id.h.h:257 msgid "&Mark revisions while typing" -msgstr "" +msgstr "&Marcar revisiones mentes s'escribe" # DLG_FR_MatchCase #. DLG_FR_MatchCase -#: po/tmp/ap_String_Id.h.h:261 +#: po/tmp/ap_String_Id.h.h:259 msgid "&Match case" -msgstr "" +msgstr "&Concueyar capitalización" # MENU_LABEL_TABLE_MERGE_CELLS #. MENU_LABEL_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:263 +#: po/tmp/ap_String_Id.h.h:261 msgid "&Merge Cells" -msgstr "" +msgstr "&Amestar celdes" # MENU_LABEL_WINDOW_MORE #. MENU_LABEL_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:265 +#: po/tmp/ap_String_Id.h.h:263 msgid "&More Documents" -msgstr "" +msgstr "&Más documentos" # DLG_Goto_Label_Name #. DLG_Goto_Label_Name -#: po/tmp/ap_String_Id.h.h:267 +#: po/tmp/ap_String_Id.h.h:265 msgid "&Name:" msgstr "&Nome:" # MENU_LABEL_FILE_NEW #. MENU_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:269 +#: po/tmp/ap_String_Id.h.h:267 msgid "&New" -msgstr "&Nueu" +msgstr "&Nuevu" # MENU_LABEL_WINDOW_NEW #. MENU_LABEL_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:271 +#: po/tmp/ap_String_Id.h.h:269 msgid "&New Window" -msgstr "&Nueu ventanu" +msgstr "&Nueva ventana" # MENU_LABEL_OPEN_TEMPLATE #. MENU_LABEL_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:273 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:271 msgid "&New using Template" -msgstr "Abrir plantilla" +msgstr "&Nuevu usando plantía" # DLG_Break_NextPage #. DLG_Break_NextPage -#: po/tmp/ap_String_Id.h.h:275 +#: po/tmp/ap_String_Id.h.h:273 msgid "&Next page" msgstr "&Paxina siguiente" # MENU_LABEL_VIEW_NORMAL #. MENU_LABEL_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:277 +#: po/tmp/ap_String_Id.h.h:275 msgid "&Normal Layout" -msgstr "" +msgstr "&Diseñu normal" # DLG_Goto_Label_Number #. DLG_Goto_Label_Number -#: po/tmp/ap_String_Id.h.h:279 +#: po/tmp/ap_String_Id.h.h:277 msgid "&Number:" msgstr "&Númberu:" @@ -902,275 +893,270 @@ # TOOLBAR_STATUSLINE_LISTS_NUMBERS # TOOLBAR_TOOLTIP_LISTS_NUMBERS #. DLG_FormatTOC_NumberingType -#: po/tmp/ap_String_Id.h.h:281 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:279 msgid "&Numbering type:" -msgstr "Númberando" +msgstr "&Triba de numberación:" # DLG_Break_OddPage #. DLG_Break_OddPage -#: po/tmp/ap_String_Id.h.h:283 +#: po/tmp/ap_String_Id.h.h:281 msgid "&Odd page" -msgstr "" +msgstr "&Páxina impar" # MENU_LABEL_FILE_OPEN #. MENU_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:285 +#: po/tmp/ap_String_Id.h.h:283 msgid "&Open" msgstr "&Abrir" # DLG_MailMerge_OpenFile #. DLG_MailMerge_OpenFile -#: po/tmp/ap_String_Id.h.h:287 +#: po/tmp/ap_String_Id.h.h:285 msgid "&Open File" msgstr "&Abrir archivu" # MENU_LABEL_FMT_OVERLINE #. MENU_LABEL_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:289 +#: po/tmp/ap_String_Id.h.h:287 msgid "&Overline" -msgstr "" +msgstr "&Sobrelliniáu" # MENU_LABEL_VIEW_ZOOM_WIDTH #. MENU_LABEL_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:291 +#: po/tmp/ap_String_Id.h.h:289 msgid "&Page Width" -msgstr "&Anchu de la páxina" +msgstr "&Anchor de páxina" # DLG_Break_PageBreak #. DLG_Break_PageBreak -#: po/tmp/ap_String_Id.h.h:293 +#: po/tmp/ap_String_Id.h.h:291 msgid "&Page break" -msgstr "" +msgstr "&Saltu de páxina" # FIELD_Numbers_PageNumber #. DLG_FormatTOC_PageNumbering -#: po/tmp/ap_String_Id.h.h:295 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:293 msgid "&Page numbering:" -msgstr "Númberos de páxina" +msgstr "&Numberación de páxina:" # MENU_LABEL_FMT_PARAGRAPH #. MENU_LABEL_FMT_PARAGRAPH -#: po/tmp/ap_String_Id.h.h:297 +#: po/tmp/ap_String_Id.h.h:295 msgid "&Paragraph" -msgstr "&Parrafu" +msgstr "&Parrágrafu" # MENU_LABEL_EDIT_PASTE #. MENU_LABEL_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:299 +#: po/tmp/ap_String_Id.h.h:297 msgid "&Paste" msgstr "&Apegar" # MENU_LABEL_INSERT_PICTURE -#. MENU_LABEL_INSERT_PICTURE -#: po/tmp/ap_String_Id.h.h:301 +#. MENU_LABEL_INSERT_GRAPHIC +#: po/tmp/ap_String_Id.h.h:299 msgid "&Picture" -msgstr "&Semeya" +msgstr "&Imaxe" # MENU_LABEL_TOOLS_PLUGINS #. MENU_LABEL_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:303 +#: po/tmp/ap_String_Id.h.h:301 msgid "&Plugins" -msgstr "" +msgstr "&Plugins" # DLG_PageSetup_Portrait #. DLG_PageSetup_Portrait -#: po/tmp/ap_String_Id.h.h:305 +#: po/tmp/ap_String_Id.h.h:303 msgid "&Portrait" -msgstr "Retratu (&P)" +msgstr "&Vertical" # MENU_LABEL_FILE_PRINT #. MENU_LABEL_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:307 +#: po/tmp/ap_String_Id.h.h:305 msgid "&Print" msgstr "&Imprentar" # MENU_LABEL_VIEW_PRINT #. MENU_LABEL_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:309 +#: po/tmp/ap_String_Id.h.h:307 msgid "&Print Layout" -msgstr "" +msgstr "&Diseñu d'imprentación" # MENU_LABEL_WINDOW #. MENU_LABEL_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:311 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:309 msgid "&Purge History" -msgstr "&Documentos" +msgstr "&Purgar historial" # MENU_LABEL_FILE_EXIT #. MENU_LABEL_FILE_EXIT -#: po/tmp/ap_String_Id.h.h:313 +#: po/tmp/ap_String_Id.h.h:311 msgid "&Quit" msgstr "&Colar" # MENU_LABEL_INSERT_DIRECTIONMARKER_RLM #. MENU_LABEL_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:315 +#: po/tmp/ap_String_Id.h.h:313 msgid "&RLM" -msgstr "" +msgstr "&Mou D-E" # MENU_LABEL_EDIT_REDO #. MENU_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:317 +#: po/tmp/ap_String_Id.h.h:315 msgid "&Redo" -msgstr "Face&r de nueu" +msgstr "&Refacer" # MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION #. MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:319 +#: po/tmp/ap_String_Id.h.h:317 msgid "&Reject revision" -msgstr "" +msgstr "&Refugar revisión" # DLG_FR_ReplaceButton #. DLG_FR_ReplaceButton -#: po/tmp/ap_String_Id.h.h:321 +#: po/tmp/ap_String_Id.h.h:319 msgid "&Replace" msgstr "&Reemplazar" # DLG_Options_Btn_IgnoreReset #. DLG_Options_Btn_IgnoreReset -#: po/tmp/ap_String_Id.h.h:323 +#: po/tmp/ap_String_Id.h.h:321 msgid "&Reset" -msgstr "Reaxustar" +msgstr "&Restablecer" # MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT #. MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:325 +#: po/tmp/ap_String_Id.h.h:323 msgid "&Reset to default layout" -msgstr "" +msgstr "&Restablecer al diseñu por defeutu" # MENU_LABEL_TOOLS_REVISIONS #. MENU_LABEL_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:327 +#: po/tmp/ap_String_Id.h.h:325 msgid "&Revisions" -msgstr "&Reviones" +msgstr "&Revisiones" # MENU_LABEL_ALIGN_RIGHT #. MENU_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:329 +#: po/tmp/ap_String_Id.h.h:327 msgid "&Right" -msgstr "&Mandrecha" +msgstr "&Drecha" # MENU_LABEL_FMT_DIRECTION_DO_RTL #. MENU_LABEL_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:331 +#: po/tmp/ap_String_Id.h.h:329 msgid "&Right-to-left text" -msgstr "" +msgstr "Testu de &drecha a esquierda" # DLG_Para_LabelRight # DLG_PageSetup_Right #. DLG_Para_LabelRight #. DLG_PageSetup_Right -#: po/tmp/ap_String_Id.h.h:334 +#: po/tmp/ap_String_Id.h.h:332 msgid "&Right:" -msgstr "&Mandrecha" +msgstr "&Drecha:" # MENU_LABEL_TABLE_DELETE_ROWS # MENU_LABEL_TABLE_SELECT_ROW #. MENU_LABEL_TABLE_DELETE_ROWS #. MENU_LABEL_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:337 +#: po/tmp/ap_String_Id.h.h:335 msgid "&Row" -msgstr "&Fila" +msgstr "&Filera" # DLG_Options_Label_ViewRuler #. DLG_Options_Label_ViewRuler -#: po/tmp/ap_String_Id.h.h:339 +#: po/tmp/ap_String_Id.h.h:337 msgid "&Ruler" msgstr "&Regla" # MENU_LABEL_FILE_SAVE #. MENU_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:341 +#: po/tmp/ap_String_Id.h.h:339 msgid "&Save" msgstr "&Guardar" # MENU_LABEL_FILE_SAVEIMAGE #. MENU_LABEL_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:343 +#: po/tmp/ap_String_Id.h.h:341 msgid "&Save Image As" -msgstr "&Guardar semeya como" +msgstr "&Guardar imaxe como" # MENU_LABEL_WEB_SAVEASWEB #. MENU_LABEL_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:345 +#: po/tmp/ap_String_Id.h.h:343 msgid "&Save web page" msgstr "&Guardar como páxina web" # MENU_LABEL_HELP_SEARCH #. MENU_LABEL_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:347 +#: po/tmp/ap_String_Id.h.h:345 msgid "&Search for Help" -msgstr "&Atopar ayuda" +msgstr "&Buscar aida" # MENU_LABEL_TABLE_SELECT #. MENU_LABEL_TABLE_SELECT -#: po/tmp/ap_String_Id.h.h:349 +#: po/tmp/ap_String_Id.h.h:347 msgid "&Select" msgstr "&Seleicionar" # MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL #. MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL -#: po/tmp/ap_String_Id.h.h:351 +#: po/tmp/ap_String_Id.h.h:349 msgid "&Select revision" -msgstr "&Seleicionar la revisión" +msgstr "&Seleicionar revisión" #. MENU_LABEL_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:353 +#: po/tmp/ap_String_Id.h.h:351 msgid "&Show History" -msgstr "" +msgstr "&Amosar historial" # MENU_LABEL_VIEW_STATUSBAR #. MENU_LABEL_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:355 +#: po/tmp/ap_String_Id.h.h:353 msgid "&Show Status Bar" -msgstr "" +msgstr "&Amosar barra d'estáu" # DLG_Para_LabelSpecial #. DLG_Para_LabelSpecial -#: po/tmp/ap_String_Id.h.h:357 +#: po/tmp/ap_String_Id.h.h:355 msgid "&Special:" msgstr "&Especial:" # MENU_LABEL_TOOLS_SPELLING #. MENU_LABEL_TOOLS_SPELLING -#: po/tmp/ap_String_Id.h.h:359 +#: po/tmp/ap_String_Id.h.h:357 msgid "&Spelling" -msgstr "" +msgstr "&Ortografía" # DLG_Lists_Start #. DLG_FormatTOC_StartAt -#: po/tmp/ap_String_Id.h.h:361 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:359 msgid "&Start at:" -msgstr "Entamar en:" +msgstr "&Emprimar en:" # DLG_Options_Label_ViewStatusBar #. DLG_Options_Label_ViewStatusBar -#: po/tmp/ap_String_Id.h.h:363 +#: po/tmp/ap_String_Id.h.h:361 msgid "&Status bar" -msgstr "" +msgstr "&Barra d'estáu" # MENU_LABEL_FMT_SUBSCRIPT #. MENU_LABEL_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:365 +#: po/tmp/ap_String_Id.h.h:363 msgid "&Subscript" msgstr "&Subíndiz" # DLG_Para_PushSuppressLineNumbers #. DLG_Para_PushSuppressLineNumbers -#: po/tmp/ap_String_Id.h.h:367 +#: po/tmp/ap_String_Id.h.h:365 msgid "&Suppress line numbers" -msgstr "" +msgstr "&Suprimir númberos de llinia" # DLG_PageSetup_Header #. DLG_FormatTOC_TabLeader -#: po/tmp/ap_String_Id.h.h:369 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:367 msgid "&Tab leader:" -msgstr "&Cabecera" +msgstr "&Tabulador maestru:" # MENU_LABEL_TABLE_INSERT_TABLE # MENU_LABEL_TABLE_DELETE_TABLE @@ -1178,139 +1164,140 @@ #. MENU_LABEL_TABLE_INSERT_TABLE #. MENU_LABEL_TABLE_DELETE_TABLE #. MENU_LABEL_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:373 +#: po/tmp/ap_String_Id.h.h:371 msgid "&Table" msgstr "&Tabla" # MENU_LABEL_FMT_TABS #. MENU_LABEL_FMT_TABS -#: po/tmp/ap_String_Id.h.h:375 +#: po/tmp/ap_String_Id.h.h:373 msgid "&Tabs" -msgstr "" +msgstr "&Tabuladores" # DLG_Para_ButtonTabs #. DLG_Para_ButtonTabs -#: po/tmp/ap_String_Id.h.h:377 +#: po/tmp/ap_String_Id.h.h:375 msgid "&Tabs..." -msgstr "" +msgstr "&Tabuladores..." # MENU_LABEL_VIEW_TOOLBARS #. MENU_LABEL_VIEW_TOOLBARS -#: po/tmp/ap_String_Id.h.h:379 +#: po/tmp/ap_String_Id.h.h:377 msgid "&Toolbars" -msgstr "&Barra de ferramientes" +msgstr "&Barres de ferramientes" # MENU_LABEL_TOOLS #. MENU_LABEL_TOOLS -#: po/tmp/ap_String_Id.h.h:381 +#: po/tmp/ap_String_Id.h.h:379 msgid "&Tools" msgstr "&Ferramientes" # DLG_PageSetup_Top #. DLG_PageSetup_Top -#: po/tmp/ap_String_Id.h.h:383 +#: po/tmp/ap_String_Id.h.h:381 msgid "&Top:" -msgstr "" +msgstr "&Superior:" # DLG_Field_Types_No_Colon #. DLG_Field_Types_No_Colon -#: po/tmp/ap_String_Id.h.h:385 +#: po/tmp/ap_String_Id.h.h:383 msgid "&Types" -msgstr "&Tipos" +msgstr "&Tribes" # DLG_Field_Types #. DLG_Field_Types -#: po/tmp/ap_String_Id.h.h:387 +#: po/tmp/ap_String_Id.h.h:385 msgid "&Types:" -msgstr "&Tipos:" +msgstr "&Tribes:" # MENU_LABEL_FMT_UNDERLINE #. MENU_LABEL_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:389 +#: po/tmp/ap_String_Id.h.h:387 msgid "&Underline" -msgstr "" +msgstr "&Sorrayar" # MENU_LABEL_EDIT_UNDO #. MENU_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:391 +#: po/tmp/ap_String_Id.h.h:389 msgid "&Undo" -msgstr "&Volver" +msgstr "&Esfacer" # DLG_Options_Label_ViewUnits # DLG_PageSetup_Units #. DLG_Options_Label_ViewUnits #. DLG_PageSetup_Units -#: po/tmp/ap_String_Id.h.h:394 +#: po/tmp/ap_String_Id.h.h:392 msgid "&Units:" -msgstr "&unidaes:" +msgstr "&Unidaes:" # MENU_LABEL_VIEW # DLG_MW_ViewButton #. MENU_LABEL_VIEW #. DLG_MW_ViewButton -#: po/tmp/ap_String_Id.h.h:396 po/tmp/xap_String_Id.h.h:21 +#: po/tmp/ap_String_Id.h.h:394 +#: po/tmp/xap_String_Id.h.h:21 msgid "&View" msgstr "&Ver" # MENU_LABEL_VIEW_WEB #. MENU_LABEL_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:398 +#: po/tmp/ap_String_Id.h.h:396 msgid "&Web Layout" -msgstr "" +msgstr "&Diseñu Web" # MENU_LABEL_VIEW_ZOOM_WHOLE #. MENU_LABEL_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:400 +#: po/tmp/ap_String_Id.h.h:398 msgid "&Whole Page" -msgstr "To la fueya (&W)" +msgstr "&Tola páxina" # DLG_FR_WholeWord #. DLG_FR_WholeWord -#: po/tmp/ap_String_Id.h.h:402 +#: po/tmp/ap_String_Id.h.h:400 msgid "&Whole word" -msgstr "To la pallabra (&W)" +msgstr "&Tola pallabra" # DLG_Para_PushWidowOrphanControl #. DLG_Para_PushWidowOrphanControl -#: po/tmp/ap_String_Id.h.h:404 +#: po/tmp/ap_String_Id.h.h:402 msgid "&Widow/Orphan control" -msgstr "" +msgstr "&Control de vilbes/güérfanes" # DLG_PageSetup_Width #. DLG_PageSetup_Width -#: po/tmp/ap_String_Id.h.h:406 +#: po/tmp/ap_String_Id.h.h:404 msgid "&Width:" -msgstr "&Anchu:" +msgstr "&Anchor:" # MENU_LABEL_TOOLS_WORDCOUNT #. MENU_LABEL_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:408 +#: po/tmp/ap_String_Id.h.h:406 msgid "&Word Count" -msgstr "&Contar Pallabres" +msgstr "&Cuntar pallabres" # MENU_LABEL_VIEW_ZOOM_MENU # MENU_LABEL_VIEW_ZOOM #. MENU_LABEL_VIEW_ZOOM_MENU #. MENU_LABEL_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:411 +#: po/tmp/ap_String_Id.h.h:409 msgid "&Zoom" -msgstr "&Apurrir / Alexar" +msgstr "&Zoom" # DLG_ListRevisions_LevelZero #. DLG_ListRevisions_LevelZero -#: po/tmp/ap_String_Id.h.h:413 +#: po/tmp/ap_String_Id.h.h:411 msgid "(All revisions visible)" -msgstr "" +msgstr "(Toles revisiones visibles)" # DLG_Spell_NoSuggestions #. DLG_Spell_NoSuggestions -#: po/tmp/ap_String_Id.h.h:415 +#: po/tmp/ap_String_Id.h.h:413 msgid "(no spelling suggestions)" -msgstr "" +msgstr "(ensin suxerencies d'ortografía)" # DLG_Para_SpecialNone #. DLG_Para_SpecialNone -#: po/tmp/ap_String_Id.h.h:417 +#: po/tmp/ap_String_Id.h.h:415 msgid "(none)" msgstr "(nengún)" @@ -1320,33 +1307,33 @@ #. TOOLBAR_LABEL_1COLUMN #. TOOLBAR_STATUSLINE_1COLUMN #. TOOLBAR_TOOLTIP_1COLUMN -#: po/tmp/ap_String_Id.h.h:421 +#: po/tmp/ap_String_Id.h.h:419 msgid "1 Column" -msgstr "1 Columna" +msgstr "1 columna" # TOOLBAR_LABEL_MIDDLE_SPACE #. TOOLBAR_LABEL_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:423 +#: po/tmp/ap_String_Id.h.h:421 msgid "1.5 Spacing" -msgstr "" +msgstr "Espaciáu a 1,5" # DLG_Para_SpacingHalf #. DLG_Para_SpacingHalf -#: po/tmp/ap_String_Id.h.h:425 +#: po/tmp/ap_String_Id.h.h:423 msgid "1.5 lines" -msgstr "1.5 llinies" +msgstr "1,5 llinies" # TOOLBAR_STATUSLINE_MIDDLE_SPACE # TOOLBAR_TOOLTIP_MIDDLE_SPACE #. TOOLBAR_STATUSLINE_MIDDLE_SPACE #. TOOLBAR_TOOLTIP_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:428 +#: po/tmp/ap_String_Id.h.h:426 msgid "1.5 spacing" -msgstr "" +msgstr "espaciáu a 1,5" # TOOLBAR_LABEL_PARA_12BEFORE #. TOOLBAR_LABEL_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:430 +#: po/tmp/ap_String_Id.h.h:428 msgid "12 pt before" msgstr "12 pt enantes" @@ -1356,9 +1343,9 @@ #. TOOLBAR_LABEL_2COLUMN #. TOOLBAR_STATUSLINE_2COLUMN #. TOOLBAR_TOOLTIP_2COLUMN -#: po/tmp/ap_String_Id.h.h:434 +#: po/tmp/ap_String_Id.h.h:432 msgid "2 Columns" -msgstr "2 Columnes" +msgstr "2 columnes" # TOOLBAR_LABEL_3COLUMN # TOOLBAR_STATUSLINE_3COLUMN @@ -1366,193 +1353,188 @@ #. TOOLBAR_LABEL_3COLUMN #. TOOLBAR_STATUSLINE_3COLUMN #. TOOLBAR_TOOLTIP_3COLUMN -#: po/tmp/ap_String_Id.h.h:438 +#: po/tmp/ap_String_Id.h.h:436 msgid "3 Columns" -msgstr "3 Columnes" +msgstr "3 columnes" # DLG_Goto_Btn_Prev #. DLG_Goto_Btn_Prev -#: po/tmp/ap_String_Id.h.h:440 +#: po/tmp/ap_String_Id.h.h:438 msgid "<< Prev" -msgstr "" +msgstr "<< Anterior" # MSG_Exception #. MSG_Exception -#: po/tmp/ap_String_Id.h.h:442 +#: po/tmp/ap_String_Id.h.h:440 msgid "" -"A fatal error has just occurred. Abiword is going to shutdown.\n" +"A fatal error has just occurred. AbiWord is going to shutdown.\n" "The current document has been saved to disc with a \".saved\" extension." msgstr "" -"Pasó un error pergrande. Abiword va a pesllase.\n" -"El documentu actual ta salvandose nel discu con una estensón \".saved\"." +"Acaba asoceder un error fatal. AbiWord va pesllase.\n" +"El documentu actual guardóse nel discu duru con una estensión \".saved\"." # DLG_Options_Label_SpellSuggest #. DLG_Options_Label_SpellSuggest -#: po/tmp/ap_String_Id.h.h:444 +#: po/tmp/ap_String_Id.h.h:442 msgid "A&lways suggest corrections" -msgstr "Siempre proponer correiciones" +msgstr "&Proponer correiciones siempre" # FIELD_DateTime_AMPM #. FIELD_DateTime_AMPM -#: po/tmp/ap_String_Id.h.h:446 +#: po/tmp/ap_String_Id.h.h:444 msgid "AM/PM" msgstr "AM/PM" # MSG_IE_BogusDocument #. MSG_IE_BogusDocument -#: po/tmp/ap_String_Id.h.h:448 +#: po/tmp/ap_String_Id.h.h:446 #, c-format msgid "AbiWord cannot open %s. It appears to be an invalid document" -msgstr "AbiWord nun pue abrir %s. Esti paez que ye un documentu nun válidu." +msgstr "AbiWord nun ye p'abrir %s. Paez que ye un documentu non válidu" # MSG_SpellSelectionDone #. MSG_SpellSelectionDone -#: po/tmp/ap_String_Id.h.h:450 +#: po/tmp/ap_String_Id.h.h:448 msgid "AbiWord finished checking the selection." -msgstr "Abiwor ya finó de checkear la seleición" +msgstr "Abiwor finó de comprobar la seleición." # DLG_FR_FinishedReplace #. DLG_FR_FinishedReplace -#: po/tmp/ap_String_Id.h.h:452 +#: po/tmp/ap_String_Id.h.h:450 #, c-format -msgid "" -"AbiWord has finished its search of the document and has made %d replacements." -msgstr "AbiWord ya finó la so busqueda nel documentu y fizo %d reemplazos" +msgid "AbiWord has finished its search of the document and has made %d replacements." +msgstr "AbiWord finó la so busca nel documentu y fizo %d reemplazos." # DLG_FR_FinishedFind #. DLG_FR_FinishedFind -#: po/tmp/ap_String_Id.h.h:454 +#: po/tmp/ap_String_Id.h.h:452 msgid "AbiWord has finished searching the document." -msgstr "Abiword ya finó de atopar nel documentu" +msgstr "Abiword finó de buscar nel documentu." # WINDOWS_COMCTL_WARNING #. WINDOWS_COMCTL_WARNING -#: po/tmp/ap_String_Id.h.h:456 +#: po/tmp/ap_String_Id.h.h:454 msgid "" "AbiWord is designed for a newer version of the system file COMCTL32.DLL\n" "than the one currently on your system. (COMCTL32.DLL version 4.72 or newer)\n" -"A solution to this problem is explained in the FAQ on the AbiSource web " -"site\n" +"A solution to this problem is explained in the FAQ on the AbiSource web site\n" "\n" "\thttp://www.abisource.com\n" "\n" "You can use the program, but the toolbar may be missing." msgstr "" -"Abiword ta diseñau pa una versión mas reciente del ficheru de sistema " -"COMCTL32.DLL\n" -" que ta usandose actualmente. (COMCTL32.DLL versión 4.72 o mas reciente) La " -"solución a esti problema esplicase nel FAQ onel sitiu web d'AbiSource\n" -" \n" -" \thttp://www.abisource.com \n" -" \n" -" Pues usar el programa pero la barra de ferramientes pue desaparecer." +"Abiword ta diseñáu pa una versión mas recién del ficheru de sistema COMCTL32.DLL\n" +"que la qu'hai nel to sistema. (COMCTL32.DLL versión 4.72 ó mas recién)\n" +"Una solución a esti problema desplícase nel FAQ nel sitiu web d'AbiSource\n" +"\n" +"\thttp://www.abisource.com \n" +"\n" +" Pues usar el programa, pero seique falte la barra de ferramientes." # WINDOWS_NEED_UNICOWS #. WINDOWS_NEED_UNICOWS -#: po/tmp/ap_String_Id.h.h:458 +#: po/tmp/ap_String_Id.h.h:456 #, c-format msgid "" "AbiWord needs the file %s.dll\n" -"Please download and install it from http://www.microsoft.com/msdownload/" -"platformsdk/sdkupdate/psdkredist.htm" +"Please download and install it from http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdkredist.htm" msgstr "" -"AbiWord necesita'l archivu %s.dll\n" -"Por favor baxalu e intalalu de http://www.microsoft.com/msdownload/" -"platformsdk/sdkupdate/psdkredist.htm" +"AbiWord necesita l'archivu %s.dll\n" +"Por favor descárgalu y instálalu en http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdkredist.htm" # MENU_LABEL_HELP_ABOUT_GNOMEOFFICE #. MENU_LABEL_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:460 +#: po/tmp/ap_String_Id.h.h:458 msgid "About G&NOME Office" -msgstr "Al rodiu G&NOME Office" +msgstr "Tocante a G&NOME Office" # MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE #. MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:462 +#: po/tmp/ap_String_Id.h.h:460 msgid "About the GNOME Office project" -msgstr "Al rodiu del proyeutu GNOME Office" +msgstr "Tocante al proyeutu GNOME Office" # MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION #. MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION -#: po/tmp/ap_String_Id.h.h:464 +#: po/tmp/ap_String_Id.h.h:462 msgid "Accept the suggested change" -msgstr "Aceptar el cambiu propuestu" +msgstr "Aceutar el cambéu suxeríu" # TOOLBAR_STATUSLINE_ADD_COLUMN # TOOLBAR_TOOLTIP_ADD_COLUMN #. TOOLBAR_STATUSLINE_ADD_COLUMN #. TOOLBAR_TOOLTIP_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:467 +#: po/tmp/ap_String_Id.h.h:465 msgid "Add a column to this table after the current column" -msgstr "Amestar una columna a esta tabla dempués de la columna activa" +msgstr "Añader una columna a esta tabla tres de la columna activa" # TOOLBAR_STATUSLINE_ADD_ROW # TOOLBAR_TOOLTIP_ADD_ROW #. TOOLBAR_STATUSLINE_ADD_ROW #. TOOLBAR_TOOLTIP_ADD_ROW -#: po/tmp/ap_String_Id.h.h:470 +#: po/tmp/ap_String_Id.h.h:468 msgid "Add a row to this table after the current row" -msgstr "Amestar una fila a esta tabla dempués de la columna activa" +msgstr "Añader una filera a esta tabla tres de la filera activa" # MENU_STATUSLINE_FMT_BORDERS #. MENU_STATUSLINE_FMT_BORDERS -#: po/tmp/ap_String_Id.h.h:472 +#: po/tmp/ap_String_Id.h.h:470 msgid "Add borders and shading to the selection" -msgstr "Amestar bordes y solombra a la seleición" +msgstr "Añader llendes y solombra a la seleición" # TOOLBAR_LABEL_ADD_COLUMN #. TOOLBAR_LABEL_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:474 +#: po/tmp/ap_String_Id.h.h:472 msgid "Add column after" -msgstr "Amestar una columna dempués" +msgstr "Añader columna detrás" # MENU_STATUSLINE_FMT_BULLETS #. MENU_STATUSLINE_FMT_BULLETS -#: po/tmp/ap_String_Id.h.h:476 +#: po/tmp/ap_String_Id.h.h:474 msgid "Add or modify bullets and numbering for selected paragraphs" -msgstr "" +msgstr "Añader o modificar viñetes y numberación nos parágrafos seleicionaos" # TOOLBAR_LABEL_ADD_ROW #. TOOLBAR_LABEL_ADD_ROW -#: po/tmp/ap_String_Id.h.h:478 +#: po/tmp/ap_String_Id.h.h:476 msgid "Add row after" -msgstr "Amestar fila dempués" +msgstr "Añader filera detrás" # MENU_STATUSLINE_SPELL_ADD #. MENU_STATUSLINE_SPELL_ADD -#: po/tmp/ap_String_Id.h.h:480 +#: po/tmp/ap_String_Id.h.h:478 msgid "Add this word to the custom dictionary" -msgstr "Amestar esta pallabra al diccionariu personalizáu" +msgstr "Añader esta pallabra al diccionariu personalizáu" # DLG_Styles_ModifyTemplate #. DLG_Styles_ModifyTemplate -#: po/tmp/ap_String_Id.h.h:482 +#: po/tmp/ap_String_Id.h.h:480 msgid "Add to template" -msgstr "Amestar a plantilla" +msgstr "Añader a la plantía" # DLG_Para_LabelAfter #. DLG_Para_LabelAfter -#: po/tmp/ap_String_Id.h.h:484 +#: po/tmp/ap_String_Id.h.h:482 msgid "Aft&er:" -msgstr "D&empués:" +msgstr "D&epués:" # DLG_Para_LabelAlignment #. DLG_Para_LabelAlignment -#: po/tmp/ap_String_Id.h.h:486 +#: po/tmp/ap_String_Id.h.h:484 msgid "Ali&gnment:" -msgstr "Alliniamientu (&G)" +msgstr "All&iniamientu:" # DLG_Tab_Label_Alignment # DLG_PageNumbers_Alignment_No_Colon #. DLG_Tab_Label_Alignment #. DLG_PageNumbers_Alignment_No_Colon -#: po/tmp/ap_String_Id.h.h:489 +#: po/tmp/ap_String_Id.h.h:487 msgid "Alignment" msgstr "Alliniamientu" # DLG_PageNumbers_Alignment #. DLG_PageNumbers_Alignment -#: po/tmp/ap_String_Id.h.h:491 +#: po/tmp/ap_String_Id.h.h:489 msgid "Alignment:" msgstr "Alliniamientu:" @@ -1560,27 +1542,34 @@ # DLG_UP_All #. DLG_Styles_LBL_All #. DLG_UP_All -#: po/tmp/ap_String_Id.h.h:493 po/tmp/xap_String_Id.h.h:51 +#: po/tmp/ap_String_Id.h.h:491 +#: po/tmp/xap_String_Id.h.h:51 msgid "All" -msgstr "" +msgstr "Too" # DLG_Options_Label_CheckAllowCustomToolbars #. DLG_Options_Label_CheckAllowCustomToolbars -#: po/tmp/ap_String_Id.h.h:495 +#: po/tmp/ap_String_Id.h.h:493 msgid "Allow Custom Toolbars" msgstr "Permitir barres personalizaes" # MENU_STATUSLINE_VIEW_LOCKSTYLES #. MENU_STATUSLINE_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:497 +#: po/tmp/ap_String_Id.h.h:495 msgid "Allow formatting using styles only" -msgstr "" +msgstr "Permitir formatu usando estilos namái" # DLG_Options_Label_CheckWhiteForTransparent #. DLG_Options_Label_CheckWhiteForTransparent -#: po/tmp/ap_String_Id.h.h:499 +#: po/tmp/ap_String_Id.h.h:497 msgid "Allow screen colors other than white" -msgstr "" +msgstr "Permitir otros colores de pantalla distintos del blancu" + +# DLG_Para_LabelPagination +#. MENU_LABEL_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:499 +msgid "Annotation" +msgstr "Anotación" # FIELD_Application #. FIELD_Application @@ -1591,15 +1580,15 @@ # FIELD_Application #. DLG_Options_Label_AppStartup #: po/tmp/ap_String_Id.h.h:503 -#, fuzzy msgid "Application Startup" -msgstr "Aplicación" +msgstr "Aniciu de l'aplicación" # DLG_Options_Btn_Apply # DLG_Apply #. DLG_Options_Btn_Apply #. DLG_Apply -#: po/tmp/ap_String_Id.h.h:505 po/tmp/xap_String_Id.h.h:63 +#: po/tmp/ap_String_Id.h.h:505 +#: po/tmp/xap_String_Id.h.h:63 msgid "Apply" msgstr "Aplicar" @@ -1609,7 +1598,7 @@ #. TOOLBAR_TOOLTIP_FMTPAINTER #: po/tmp/ap_String_Id.h.h:508 msgid "Apply the previously copied paragraph formatting onto the selected text" -msgstr "" +msgstr "Aplica'l formatu del parágrafu previamente copiáu nel testu seleicionáu" # DLG_Lists_Apply_Current #. DLG_Lists_Apply_Current @@ -1627,114 +1616,111 @@ #. DLG_Lists_Arabic_List #: po/tmp/ap_String_Id.h.h:514 msgid "Arabic List" -msgstr "Llista mora" +msgstr "Llista árabe" #. MSG_AutoRevisionOffWarning #: po/tmp/ap_String_Id.h.h:516 -msgid "" -"Are you sure you do not want to maintain full history record? If you " -"proceed, you will not be able to restore earlier versions of this document." -msgstr "" +msgid "Are you sure you do not want to maintain full history record? If you proceed, you will not be able to restore earlier versions of this document." +msgstr "¿Tas seguru de que nun quies caltener el rexistru completu del historial? Si sigues, nun vas poder restaurar versiones previes d'esti documentu." # DLG_Para_SpacingAtLeast #. DLG_Para_SpacingAtLeast #: po/tmp/ap_String_Id.h.h:518 msgid "At least" -msgstr "" +msgstr "A lo menos" # DLG_Lists_Resume #. DLG_Lists_Resume #: po/tmp/ap_String_Id.h.h:520 msgid "Attach to Previous List" -msgstr "" +msgstr "Axuntar a la llista anterior" # DLG_MetaData_Author_LBL # DLG_PLUGIN_MANAGER_AUTHOR #. DLG_MetaData_Author_LBL #. DLG_PLUGIN_MANAGER_AUTHOR -#: po/tmp/ap_String_Id.h.h:522 po/tmp/xap_String_Id.h.h:83 +#: po/tmp/ap_String_Id.h.h:522 +#: po/tmp/xap_String_Id.h.h:85 msgid "Author:" msgstr "Autor:" # DLG_Options_Label_AutoSave #. DLG_Options_Label_AutoSaveUnderline #: po/tmp/ap_String_Id.h.h:524 -#, fuzzy msgid "Auto &Save" -msgstr "Autoguardáu:" +msgstr "Auto&guardar" # DLG_Options_Label_AutoSaveCurrent #. DLG_Options_Label_AutoSaveCurrent #: po/tmp/ap_String_Id.h.h:526 msgid "Auto &save current file every" -msgstr "Autoguardar el documentu actual siempre." +msgstr "Au&toguardar el documentu actual cada" # DLG_Options_Label_AutoSave #. DLG_Options_Label_AutoSave #: po/tmp/ap_String_Id.h.h:528 msgid "Auto Save" -msgstr "Autoguardáu:" +msgstr "Autoguardar" # DLG_Options_Label_SpellAutoReplace #. DLG_Options_Label_SpellAutoReplace #: po/tmp/ap_String_Id.h.h:530 msgid "Auto replace misspelled words" -msgstr "" +msgstr "Autorreemplazar les pallabres mal escrites" # DLG_InsertTable_AutoFit_Capital #. DLG_InsertTable_AutoFit_Capital #: po/tmp/ap_String_Id.h.h:532 msgid "AutoFit Behavior" -msgstr "" +msgstr "Comportamientu del autoaxuste" # DLG_InsertTable_AutoFit #. DLG_InsertTable_AutoFit #: po/tmp/ap_String_Id.h.h:534 msgid "AutoFit behavior" -msgstr "" +msgstr "Comportamientu del autoaxuste" # MENU_STATUSLINE_TABLE_AUTOFIT #. MENU_STATUSLINE_TABLE_AUTOFIT #: po/tmp/ap_String_Id.h.h:536 msgid "Autofit Table" -msgstr "" +msgstr "Autoaxustar tabla" #. DLG_Options_Label_Grammar #: po/tmp/ap_String_Id.h.h:538 msgid "Automatic Grammar Checking" -msgstr "" +msgstr "Comprobación automática de gramática" # DLG_InsertTable_AutoColSize #. DLG_InsertTable_AutoColSize #: po/tmp/ap_String_Id.h.h:540 msgid "Automatic column size" -msgstr "" +msgstr "Tamañu automáticu de columna" # DLG_Options_Label_CheckAutoLoadPlugins #. DLG_Options_Label_CheckAutoLoadPlugins #: po/tmp/ap_String_Id.h.h:542 msgid "Automatically load all plugins found" -msgstr "" +msgstr "Cargar automáticamente tolos plugins atopaos" # MENU_STATUSLINE_TOOLS_AUTOSPELL #. MENU_STATUSLINE_TOOLS_AUTOSPELL #: po/tmp/ap_String_Id.h.h:544 msgid "Automatically spell-check the document" -msgstr "" +msgstr "Comprueba automáticamente la ortografía del documentu" # DLG_Styles_ModifyAutomatic #. DLG_Styles_ModifyAutomatic #: po/tmp/ap_String_Id.h.h:546 msgid "Automatically update" -msgstr "" +msgstr "Actualizar automáticamente" # DLG_MetaData_Author_LBL # DLG_PLUGIN_MANAGER_AUTHOR #. MSG_AutoMerge #: po/tmp/ap_String_Id.h.h:548 -#, fuzzy msgid "Automerge" -msgstr "Autor:" +msgstr "Autoamestar" # DLG_MailMerge_AvailableFields #. DLG_MailMerge_AvailableFields @@ -1765,14 +1751,14 @@ #. DLG_FormatTable_Background #: po/tmp/ap_String_Id.h.h:559 msgid "Background" -msgstr "Fondu:" +msgstr "Fondu" # DLG_FormatTable_Background_Color #. DLG_FormatFrame_Background_Color #. DLG_FormatTable_Background_Color #: po/tmp/ap_String_Id.h.h:562 msgid "Background color:" -msgstr "Collor fonderu:" +msgstr "Color del fondu:" # DLG_Tab_Radio_Bar #. DLG_Tab_Radio_Bar @@ -1784,19 +1770,19 @@ #. TabToggleBarTab #: po/tmp/ap_String_Id.h.h:566 msgid "Bar Tab" -msgstr "" +msgstr "Tabulador de barra" # DLG_Styles_ModifyBasedOn #. DLG_Styles_ModifyBasedOn #: po/tmp/ap_String_Id.h.h:568 msgid "Based On:" -msgstr "Basáu'n:" +msgstr "Basáu en:" # DLG_Options_Label_BiDiOptions #. DLG_Options_Label_BiDiOptions #: po/tmp/ap_String_Id.h.h:570 msgid "Bi-Directional Options" -msgstr "" +msgstr "Opciones bidireicionales" # TOOLBAR_LABEL_FMT_BOLD # TOOLBAR_STATUSLINE_FMT_BOLD @@ -1806,55 +1792,56 @@ #. TOOLBAR_STATUSLINE_FMT_BOLD #. TOOLBAR_TOOLTIP_FMT_BOLD #. DLG_UFS_StyleBold -#: po/tmp/ap_String_Id.h.h:574 po/tmp/xap_String_Id.h.h:111 +#: po/tmp/ap_String_Id.h.h:574 +#: po/tmp/xap_String_Id.h.h:119 msgid "Bold" -msgstr "Negrita" +msgstr "Negrina" # MENU_LABEL_INSERT_BOOKMARK #. MENU_LABEL_INSERT_BOOKMARK #: po/tmp/ap_String_Id.h.h:576 msgid "Boo&kmark" -msgstr "Mar&caor" +msgstr "Mar&cador" # DLG_Goto_Target_Bookmark #. DLG_Goto_Target_Bookmark #: po/tmp/ap_String_Id.h.h:578 msgid "Bookmark" -msgstr "Marcaor" +msgstr "Marcador" # MSG_BookmarkNotFound #. MSG_BookmarkNotFound #: po/tmp/ap_String_Id.h.h:580 #, c-format msgid "Bookmark \"%s\" was not found in this document." -msgstr "El marcaor \"%s\" nun atopose n'esti documentu." +msgstr "Nun s'atopó'l marcador \"%s\" nesti documentu." # DLG_FormatTable_Border_Color #. DLG_FormatFrame_Border_Color #. DLG_FormatTable_Border_Color #: po/tmp/ap_String_Id.h.h:583 msgid "Border color:" -msgstr "Collor de la llinde." +msgstr "Color de la llende:" # DLG_FormatTable_Borders #. DLG_FormatFrame_Borders #. DLG_FormatTable_Borders #: po/tmp/ap_String_Id.h.h:586 msgid "Borders" -msgstr "Borders" +msgstr "Llendes" # MENU_LABEL_FMT_BORDERS #. MENU_LABEL_FMT_BORDERS #: po/tmp/ap_String_Id.h.h:588 msgid "Borders and Shading" -msgstr "" +msgstr "Llendes y solombres" # BottomMarginStatus #. BottomMarginStatus #: po/tmp/ap_String_Id.h.h:590 #, c-format msgid "Bottom Margin [%s]" -msgstr "" +msgstr "Marxe inferior [%s]" # MENU_LABEL_FMT_BOTTOMLINE # TOOLBAR_LABEL_FMT_BOTTOMLINE @@ -1866,49 +1853,52 @@ #. TOOLBAR_STATUSLINE_FMT_BOTTOMLINE #. TOOLBAR_TOOLTIP_FMT_BOTTOMLINE #. DLG_UFS_BottomlineCheck -#: po/tmp/ap_String_Id.h.h:595 po/tmp/xap_String_Id.h.h:115 +#: po/tmp/ap_String_Id.h.h:595 +#: po/tmp/xap_String_Id.h.h:123 msgid "Bottomline" -msgstr "" +msgstr "Llinia inferior" # DLG_Lists_Box_List # STYLE_BOXLIST #. DLG_Lists_Box_List #. STYLE_BOXLIST -#: po/tmp/ap_String_Id.h.h:597 po/tmp/xap_String_Id.h.h:117 +#: po/tmp/ap_String_Id.h.h:597 +#: po/tmp/xap_String_Id.h.h:125 msgid "Box List" -msgstr "" +msgstr "Llista de caxes" # FIELD_Application_BuildId #. FIELD_Application_BuildId #: po/tmp/ap_String_Id.h.h:599 msgid "Build Id." -msgstr "" +msgstr "Id. de compilación" # FIELD_Application_Options #. FIELD_Application_Options #: po/tmp/ap_String_Id.h.h:601 msgid "Build Options" -msgstr "" +msgstr "Opciones de compilación" # FIELD_Application_Target #. FIELD_Application_Target #: po/tmp/ap_String_Id.h.h:603 msgid "Build Target" -msgstr "" +msgstr "Oxetivu de compilación" # DLG_Lists_Type_bullet #. DLG_Lists_Type_bullet #: po/tmp/ap_String_Id.h.h:605 msgid "Bullet" -msgstr "Puntu" +msgstr "Viñeta" # DLG_Lists_Bullet_List # STYLE_BULLETLIST #. DLG_Lists_Bullet_List #. STYLE_BULLETLIST -#: po/tmp/ap_String_Id.h.h:607 po/tmp/xap_String_Id.h.h:125 +#: po/tmp/ap_String_Id.h.h:607 +#: po/tmp/xap_String_Id.h.h:133 msgid "Bullet List" -msgstr "Llista de puntos" +msgstr "Llista de viñetes" # TOOLBAR_LABEL_LISTS_BULLETS # TOOLBAR_STATUSLINE_LISTS_BULLETS @@ -1918,13 +1908,13 @@ #. TOOLBAR_TOOLTIP_LISTS_BULLETS #: po/tmp/ap_String_Id.h.h:611 msgid "Bullets" -msgstr "Puntos" +msgstr "Viñetes" # MENU_LABEL_FMT_BULLETS #. MENU_LABEL_FMT_BULLETS #: po/tmp/ap_String_Id.h.h:613 msgid "Bullets and &Numbering" -msgstr "Puntos y &Numberaición" +msgstr "Viñetes y &Numberaición" # DLG_Options_Label_Look #. DLG_Options_Label_Look @@ -1936,47 +1926,47 @@ #. MENU_LABEL_FMT_TOGGLECASE #: po/tmp/ap_String_Id.h.h:617 msgid "C&hange Case" -msgstr "Camudar casu (&h)" +msgstr "C&amudar capitalización" #. MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION #: po/tmp/ap_String_Id.h.h:619 msgid "C&opy hyperlink location" -msgstr "" +msgstr "C&opiar l'allugamientu del hiperenllaz" # MENU_LABEL_HELP_CREDITS #. MENU_LABEL_HELP_CREDITS #: po/tmp/ap_String_Id.h.h:621 msgid "C&redits" -msgstr "C&éditos" +msgstr "C&reitos" # MSG_NoBreakInsideTable #. MSG_NoBreakInsideTable #: po/tmp/ap_String_Id.h.h:623 msgid "Can not insert a Break inside a table" -msgstr "" +msgstr "Nun se pue enxertar un saltu dientro d'una tabla" #. MSG_NoBreakInsideFrame #: po/tmp/ap_String_Id.h.h:625 msgid "Can not insert a Break inside a text box" -msgstr "" +msgstr "Nun se pue enxertar un saltu dientro d'una caxa de testu" # DLG_Styles_ErrStyleCantDelete #. DLG_Styles_ErrStyleCantDelete #: po/tmp/ap_String_Id.h.h:627 msgid "Cannot delete this style" -msgstr "Nun pue borrase esti estilu" +msgstr "Nun se pue borrar esti estilu" # DLG_Styles_ErrStyleBuiltin #. DLG_Styles_ErrStyleBuiltin #: po/tmp/ap_String_Id.h.h:629 msgid "Cannot modify a builtin style" -msgstr "" +msgstr "Nun se pue camudar un estilu incorporáu" # PRINT_CANNOTSTARTPRINTJOB #. PRINT_CANNOTSTARTPRINTJOB #: po/tmp/ap_String_Id.h.h:631 msgid "Cannot start print job" -msgstr "Nun pue entamase el trabayu de impresión" +msgstr "Nun pue emprimar el trabayu d'imprentación" # DLG_MetaData_Category_LBL #. DLG_MetaData_Category_LBL @@ -1992,13 +1982,13 @@ #. TOOLBAR_LABEL_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:637 msgid "Center" -msgstr "Centar" +msgstr "Centrar" # TabToggleCenterTab #. TabToggleCenterTab #: po/tmp/ap_String_Id.h.h:639 msgid "Center Tab" -msgstr "" +msgstr "Tabulador central" # TOOLBAR_STATUSLINE_ALIGN_CENTER # TOOLBAR_TOOLTIP_ALIGN_CENTER @@ -2006,13 +1996,13 @@ #. TOOLBAR_TOOLTIP_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:642 msgid "Center alignment" -msgstr "" +msgstr "Alliniamientu centráu" # MENU_STATUSLINE_ALIGN_CENTER #. MENU_STATUSLINE_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:644 msgid "Center-align the paragraph" -msgstr "Alliniar el parrafu al centru" +msgstr "Alliniar el parágrafu al centru" # DLG_Para_AlignCentered #. DLG_Para_AlignCentered @@ -2024,25 +2014,25 @@ #. DLG_Spell_ChangeTo #: po/tmp/ap_String_Id.h.h:648 msgid "Change &to:" -msgstr "" +msgstr "Camudar &a:" # DLG_Spell_ChangeAll #. DLG_Spell_ChangeAll #: po/tmp/ap_String_Id.h.h:650 msgid "Change A&ll" -msgstr "Camudar t&oos" +msgstr "Camudar t&oo" # DLG_Background_Title #. DLG_Background_Title #: po/tmp/ap_String_Id.h.h:652 msgid "Change Background Color" -msgstr "Camudar collor fonderu" +msgstr "Camudar color del fondu" # DLG_ToggleCase_Title #. DLG_ToggleCase_Title #: po/tmp/ap_String_Id.h.h:654 msgid "Change Case" -msgstr "Camudar casu" +msgstr "Camudar capitalización" # DLG_Lists_Cur_Change_Start #. DLG_Lists_Cur_Change_Start @@ -2051,31 +2041,32 @@ "Change Current \n" "List" msgstr "" +"Camudar llista \n" +"actual" # DLG_Background_TitleHighlight #. DLG_Background_TitleHighlight #: po/tmp/ap_String_Id.h.h:658 msgid "Change Highlight Color" -msgstr "Camudar collor del testu" +msgstr "Camudar color del resaltáu" # DLG_ToggleCase_Title #. DLG_FormatTOC_ChangeStyle #: po/tmp/ap_String_Id.h.h:660 -#, fuzzy msgid "Change Style" -msgstr "Camudar casu" +msgstr "Camudar estilu" # DLG_Background_TitleFore #. DLG_Background_TitleFore #: po/tmp/ap_String_Id.h.h:662 msgid "Change Text Color" -msgstr "Camudar collor de testu" +msgstr "Camudar color del testu" # MENU_STATUSLINE_FMT_DIRECTION #. MENU_STATUSLINE_FMT_DIRECTION #: po/tmp/ap_String_Id.h.h:664 msgid "Change directional properties of text" -msgstr "Camudar les propiedaes de dirección del testu" +msgstr "Camudar les propiedaes de direición del testu" # TOOLBAR_STATUSLINE_FMT_DOM_DIRECTION # TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION @@ -2083,25 +2074,25 @@ #. TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION #: po/tmp/ap_String_Id.h.h:667 msgid "Change dominant direction of paragraph" -msgstr "Camudar la dirección dominante del testu" +msgstr "Camudar la direición dominante del testu" # MENU_STATUSLINE_FMT_TOGGLECASE #. MENU_STATUSLINE_FMT_TOGGLECASE #: po/tmp/ap_String_Id.h.h:669 msgid "Change the case of the selected text" -msgstr "Camudar el casu del testu esbilláu" +msgstr "Camudar la capitalización del testu seleicionáu" # MENU_STATUSLINE_FMT_FONT #. MENU_STATUSLINE_FMT_FONT #: po/tmp/ap_String_Id.h.h:671 msgid "Change the font of the selected text" -msgstr "Camudar el tipu onte del testu esbilláu" +msgstr "Camudar la fonte del testu seleicionáu" # MENU_STATUSLINE_FMT_PARAGRAPH #. MENU_STATUSLINE_FMT_PARAGRAPH #: po/tmp/ap_String_Id.h.h:673 msgid "Change the format of the selected paragraph" -msgstr "Camudar el formatu del testu esbilláu" +msgstr "Camudar el formatu del parágrafu seleicionáu" # MENU_STATUSLINE_FMT_LANGUAGE # MENU_STATUSLINE_TOOLS_LANGUAGE @@ -2109,7 +2100,7 @@ #. MENU_STATUSLINE_TOOLS_LANGUAGE #: po/tmp/ap_String_Id.h.h:676 msgid "Change the language of the selected text" -msgstr "Camudar el llenguaxe del testu esbillau" +msgstr "Camudar la llingua del testu seleicionáu" # MENU_STATUSLINE_FMT_COLUMNS #. MENU_STATUSLINE_FMT_COLUMNS @@ -2121,14 +2112,13 @@ #. MENU_STATUSLINE_FILE_PAGESETUP #: po/tmp/ap_String_Id.h.h:680 msgid "Change the printing options" -msgstr "Camudar les opciones de imprentación" +msgstr "Camudar les opciones d'imprentación" # MENU_STATUSLINE_FMT_DIRECTION #. MENU_STATUSLINE_FMT_FRAME #: po/tmp/ap_String_Id.h.h:682 -#, fuzzy msgid "Change the properties of the Text Box" -msgstr "Camudar les propiedaes de dirección del testu" +msgstr "Camudar les propiedaes de la caxa de testu" # MENU_STATUSLINE_SPELL_SUGGEST_1 # MENU_STATUSLINE_SPELL_SUGGEST_2 @@ -2150,91 +2140,89 @@ #. MENU_STATUSLINE_SPELL_SUGGEST_9 #: po/tmp/ap_String_Id.h.h:692 msgid "Change to this suggested spelling" -msgstr "" +msgstr "Camudar a esta pallabra suxerida" # MENU_STATUSLINE_FMT_BACKGROUND #. MENU_STATUSLINE_FMT_BACKGROUND #: po/tmp/ap_String_Id.h.h:694 -#, fuzzy msgid "Change your document's page background" -msgstr "Camudar el collor de páxina del documentu" +msgstr "Camudar el fondu de páxina del documentu" # MENU_STATUSLINE_FMT_BACKGROUND #. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_COLOR #: po/tmp/ap_String_Id.h.h:696 msgid "Change your document's page color" -msgstr "Camudar el collor de páxina del documentu" +msgstr "Camudar el color de páxina del to documentu" # DLG_Styles_ModifyCharacter #. DLG_Styles_ModifyCharacter #: po/tmp/ap_String_Id.h.h:698 msgid "Character" -msgstr "Carácter" +msgstr "Caráuter" # FIELD_Numbers_CharCount #. FIELD_Numbers_CharCount #: po/tmp/ap_String_Id.h.h:700 msgid "Character Count" -msgstr "Contar carauteres" +msgstr "Cuntar carauteres" # FIELD_Numbers_NbspCount #. FIELD_Numbers_NbspCount #: po/tmp/ap_String_Id.h.h:702 msgid "Character Count (w/o spaces)" -msgstr "Contar carauteres (con o ensin espacios)" +msgstr "Cuntar carauteres (con/ensin espacios)" # DLG_Styles_CharPrev #. DLG_Styles_CharPrev #: po/tmp/ap_String_Id.h.h:704 msgid "Character Preview" -msgstr "" +msgstr "Previsualizar caráuter" # DLG_WordCount_Characters_No #. DLG_WordCount_Characters_No #: po/tmp/ap_String_Id.h.h:706 msgid "Characters (no spaces):" -msgstr "Carauteres (ensin espacios)" +msgstr "Carauteres (ensin espacios):" # DLG_WordCount_Characters_Sp #. DLG_WordCount_Characters_Sp #: po/tmp/ap_String_Id.h.h:708 msgid "Characters (with spaces):" -msgstr "Carauteres (con espacios)" +msgstr "Carauteres (con espacios):" # MENU_LABEL_TOOLS_SPELL #. MENU_LABEL_TOOLS_SPELL #: po/tmp/ap_String_Id.h.h:710 msgid "Check &Spelling" -msgstr "" +msgstr "Comprobar &ortografía" #. DLG_Options_Label_GrammarCheck #: po/tmp/ap_String_Id.h.h:712 msgid "Check &grammar as you type" -msgstr "" +msgstr "Comprobar &gramática mentes s'escribe" # DLG_WordCount_Auto_Update #. MENU_LABEL_HELP_CHECKVER #: po/tmp/ap_String_Id.h.h:714 -#, fuzzy msgid "Check for &Updates" -msgstr "Actualizar automáticamente" +msgstr "Comprobar &actualizaciones" #. MENU_STATUSLINE_HELP_CHECKVER #: po/tmp/ap_String_Id.h.h:716 msgid "Check online for newer versions of AbiWord" -msgstr "" +msgstr "Comprueba si hai versiones nueves d'AbiWord" # DLG_Options_Label_SpellCheckAsType #. DLG_Options_Label_SpellCheckAsType #: po/tmp/ap_String_Id.h.h:718 msgid "Check s&pelling as you type" -msgstr "" +msgstr "Comprobar &ortografía mentes s'escribe" # MENU_STATUSLINE_TOOLS_SPELL #. MENU_STATUSLINE_TOOLS_SPELL #: po/tmp/ap_String_Id.h.h:720 msgid "Check the document for incorrect spelling" -msgstr "" +msgstr "Comprobar errores ortográficos nel documentu" # DLG_NEW_Choose #. DLG_NEW_Choose @@ -2246,30 +2234,29 @@ #. DLG_Options_Label_ChooseForTransparent #: po/tmp/ap_String_Id.h.h:724 msgid "Choose Screen Color" -msgstr "Camudar collor de pantalla" +msgstr "Escoyer color de la pantalla" # DLG_Options_Label_ColorChooserLabel #. DLG_Options_Label_ColorChooserLabel #: po/tmp/ap_String_Id.h.h:726 msgid "Choose screen color for AbiWord" -msgstr "Camudar collor de pantalla d'AbiWord" +msgstr "Escoyer color de la pantalla d'AbiWord" # MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL #. MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL #: po/tmp/ap_String_Id.h.h:728 msgid "Choose which revision you wish to view" -msgstr "" +msgstr "Escueyi qué revisión quies visualizar" # DLG_Goto_Label_Help #. DLG_Goto_Label_Help #: po/tmp/ap_String_Id.h.h:730 msgid "" "Choose your target in the left side.\n" -"If you want to use the \"Go To\" button, just fill the Number Entry with the " -"desired number. You can use + and - to perform relative movement.\tI.e., if " -"you write \"+2\" and you select \"Line\", the \"Go To\" will go 2 lines " -"below your current position." +"If you want to use the \"Go To\" button, just fill the Number Entry with the desired number. You can use + and - to perform relative movement.\tI.e., if you write \"+2\" and you select \"Line\", the \"Go To\" will go 2 lines below your current position." msgstr "" +"Escueyi'l to destín a manzorga.\n" +"Si quies usar el botón \"Dir a\", rellena'l campu Númberu cola cifra deseada. Pues usar + y - pa facer movimientos relativos./tEx: Si escribes \"+2\" y seleiciones \"Llinia\", el botón \"Dir a\" avanzará 2 llinies perbaxo del to allugamientu actual." # MENU_LABEL_EDIT_CLEAR #. MENU_LABEL_EDIT_CLEAR @@ -2287,31 +2274,31 @@ #. DLG_Tab_Button_ClearAll #: po/tmp/ap_String_Id.h.h:736 msgid "Clear &All" -msgstr "Llimpiar tou" +msgstr "Llimpiar too" # DLG_Background_ClearClr #. DLG_Background_ClearClr #: po/tmp/ap_String_Id.h.h:738 msgid "Clear Background Color" -msgstr "Llimpiar collor fonderu" +msgstr "Llimpiar color del fondu" # DLG_Background_ClearHighlight #. DLG_Background_ClearHighlight #: po/tmp/ap_String_Id.h.h:740 msgid "Clear Highlight Color" -msgstr "" +msgstr "Llimpiar color de resaltáu" # MSG_QueryExit #. MSG_QueryExit #: po/tmp/ap_String_Id.h.h:742 msgid "Close all windows and exit?" -msgstr "¿Quies pesllar toos los ventanos y colar?" +msgstr "¿Pesllar toles ventanes y colar?" # MENU_STATUSLINE_FILE_EXIT #. MENU_STATUSLINE_FILE_EXIT #: po/tmp/ap_String_Id.h.h:744 msgid "Close all windows in the application and exit" -msgstr "Pesllar toos los ventanos de l'aplicación y colar" +msgstr "Pesllar toles ventanes de l'aplicación y colar" # MENU_STATUSLINE_FILE_CLOSE #. MENU_STATUSLINE_FILE_CLOSE @@ -2330,9 +2317,10 @@ #. DLG_FormatFrame_Color #. DLG_FormatTable_Color #. DLG_UFS_ColorLabel -#: po/tmp/ap_String_Id.h.h:751 po/tmp/xap_String_Id.h.h:177 +#: po/tmp/ap_String_Id.h.h:751 +#: po/tmp/xap_String_Id.h.h:191 msgid "Color:" -msgstr "Collor:" +msgstr "Color:" # DLG_FormatTable_Apply_To_Column #. DLG_FormatTable_Apply_To_Column @@ -2345,7 +2333,7 @@ #: po/tmp/ap_String_Id.h.h:755 #, c-format msgid "Column Gap [%s]" -msgstr "" +msgstr "Güecu de columna [%s]" # ColumnStatus #. ColumnStatus @@ -2364,13 +2352,13 @@ #. MENU_LABEL_TABLE_INSERT_COLUMNS_BEFORE #: po/tmp/ap_String_Id.h.h:761 msgid "Columns &Left" -msgstr "Columnes &Dizquierda" +msgstr "Columnes &Esquierda" # MENU_LABEL_TABLE_INSERT_COLUMNS_AFTER #. MENU_LABEL_TABLE_INSERT_COLUMNS_AFTER #: po/tmp/ap_String_Id.h.h:763 msgid "Columns &Right" -msgstr "Columnes &Mandrecha" +msgstr "Columnes &Drecha" # DLG_ListRevisions_Column2Label #. DLG_ListRevisions_Column3Label @@ -2382,79 +2370,80 @@ #. DLG_MarkRevisions_Comment2Label #: po/tmp/ap_String_Id.h.h:767 msgid "Comment to be associated with the revision:" -msgstr "" +msgstr "Comentariu pa ser asociáu cola revisión:" # MENU_STATUSLINE_FILE_EXPORT #. MENU_STATUSLINE_TOOLS_REVISIONS_COMPARE_DOCUMENTS #: po/tmp/ap_String_Id.h.h:769 -#, fuzzy msgid "Compare active document to another document" -msgstr "Guardar el documentu ensin camudar el nome actual" +msgstr "Comparar el documentu activu con otru documentu" # FIELD_Application_CompileDate #. FIELD_Application_CompileDate #: po/tmp/ap_String_Id.h.h:771 msgid "Compile Date" -msgstr "" +msgstr "Data de compilación" # FIELD_Application_CompileTime #. FIELD_Application_CompileTime #: po/tmp/ap_String_Id.h.h:773 msgid "Compile Time" -msgstr "" +msgstr "Hora de compilación" # DLG_Break_Continuous #. DLG_Break_Continuous #: po/tmp/ap_String_Id.h.h:775 msgid "Con&tinuous" -msgstr "" +msgstr "Con&tinuu" + +# DLG_ListRevisions_Column2Label +#. TOC_TocHeading +#: po/tmp/ap_String_Id.h.h:777 +msgid "Contents" +msgstr "Conteníu" # DLG_MarkRevisions_Check1Label #. DLG_MarkRevisions_Check1Label -#: po/tmp/ap_String_Id.h.h:777 +#: po/tmp/ap_String_Id.h.h:779 #, c-format msgid "Continue previous revision (number %d)" -msgstr "" +msgstr "Continuar la revisión anterior (númberu %d)" # FIELD_Document_Contributor #. FIELD_Document_Contributor -#: po/tmp/ap_String_Id.h.h:779 +#: po/tmp/ap_String_Id.h.h:781 msgid "Contributor" -msgstr "" +msgstr "Contribuidor" # DLG_MetaData_CoAuthor_LBL #. DLG_MetaData_CoAuthor_LBL -#: po/tmp/ap_String_Id.h.h:781 +#: po/tmp/ap_String_Id.h.h:783 msgid "Contributor(s):" -msgstr "" +msgstr "Contribuidor(es):" # MENU_STATUSLINE_FILE_SAVEIMAGE #. MENU_STATUSLINE_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:783 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:785 msgid "Convert Selected Text to a Table" -msgstr "Guardar la imaxe esbillá nun archivu" +msgstr "Covertir testu seleicionáu a tabla" # TB_InsertNewTable #. MENU_LABEL_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:785 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:787 msgid "Convert Table to Text" -msgstr "Amestar nua tabla" +msgstr "Convertir tabla a testu" # TB_InsertNewTable #. MENU_LABEL_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:787 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:789 msgid "Convert Text to Table" -msgstr "Amestar nua tabla" +msgstr "Convertir testu a tabla" # TB_InsertNewTable #. MENU_STATUSLINE_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:789 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:791 msgid "Convert from a Table to Text" -msgstr "Amestar nua tabla" +msgstr "Convertir dende una tabla a testu" # TOOLBAR_LABEL_EDIT_COPY # TOOLBAR_STATUSLINE_EDIT_COPY @@ -2462,112 +2451,110 @@ #. TOOLBAR_LABEL_EDIT_COPY #. TOOLBAR_STATUSLINE_EDIT_COPY #. TOOLBAR_TOOLTIP_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:793 +#: po/tmp/ap_String_Id.h.h:795 msgid "Copy" msgstr "Copiar" #. MENU_STATUSLINE_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:795 +#: po/tmp/ap_String_Id.h.h:797 msgid "Copy Embedded Object" -msgstr "" +msgstr "Copiar oxetu encrustáu" # TOOLBAR_LABEL_IMG #. MENU_LABEL_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:797 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:799 msgid "Copy Image" -msgstr "Amestar imaxe" +msgstr "Copiar imaxe" #. MENU_LABEL_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:799 +#: po/tmp/ap_String_Id.h.h:801 msgid "Copy Object" -msgstr "" +msgstr "Copiar oxetu" #. MENU_LABEL_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:801 +#: po/tmp/ap_String_Id.h.h:803 msgid "Copy Text Box" -msgstr "" +msgstr "Copiar caxa de testu" #. MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION -#: po/tmp/ap_String_Id.h.h:803 +#: po/tmp/ap_String_Id.h.h:805 msgid "Copy hyperlink location" -msgstr "" +msgstr "Copiar l'allugamientu del hiperenllaz" # MENU_STATUSLINE_EDIT_CUT #. MENU_STATUSLINE_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:805 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:807 msgid "Copy the Text Box to the clipboard" -msgstr "Cortar la seleición y pegala nel cortapapelos" +msgstr "Copiar la caxa de testu al cartafueyu" #. MENU_STATUSLINE_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:807 +#: po/tmp/ap_String_Id.h.h:809 msgid "Copy the Text Box to the clipboard then remove it" -msgstr "" +msgstr "Copiar la caxa de testu nel cartafueyu y depués eliminala" # MENU_STATUSLINE_EDIT_COPY #. MENU_STATUSLINE_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:809 +#: po/tmp/ap_String_Id.h.h:811 msgid "Copy the selection and put it on the Clipboard" -msgstr "" +msgstr "Copiar la seleición y ponela nel cartafueyu" # MSG_IE_CouldNotOpen #. MSG_IE_CouldNotOpen -#: po/tmp/ap_String_Id.h.h:811 +#: po/tmp/ap_String_Id.h.h:813 #, c-format msgid "Could not open file %s for writing" -msgstr "Nun pudo abrirse l'archivu %s p'escritura" +msgstr "Nun pudo abrise l'archivu %s pa escribilu" # MSG_OpenFailed #. MSG_OpenFailed -#: po/tmp/ap_String_Id.h.h:813 +#: po/tmp/ap_String_Id.h.h:815 #, c-format msgid "Could not open file %s." -msgstr "Nun pudo abrirse l'archivu %s" +msgstr "Nun pudo abrirse l'archivu %s." # MSG_IE_CouldNotWrite #. MSG_IE_CouldNotWrite -#: po/tmp/ap_String_Id.h.h:815 +#: po/tmp/ap_String_Id.h.h:817 #, c-format msgid "Could not write to file %s" -msgstr "Nun pue escribise nel archivu %s" +msgstr "Nun pudo escribise nel archivu %s" # MSG_SaveFailed #. MSG_SaveFailed -#: po/tmp/ap_String_Id.h.h:817 +#: po/tmp/ap_String_Id.h.h:819 #, c-format msgid "Could not write to the file %s." -msgstr "Nun pue escribise nel archivu %s" +msgstr "Nun pudo escribise nel archivu %s." # MENU_STATUSLINE_TOOLS_WORDCOUNT #. MENU_STATUSLINE_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:819 +#: po/tmp/ap_String_Id.h.h:821 msgid "Count the number of words in the document" -msgstr "Cuntar cuantes pallabres tien el documentu" +msgstr "Cuntar les pallabres del documentu" # FIELD_Document_Coverage #. FIELD_Document_Coverage -#: po/tmp/ap_String_Id.h.h:821 +#: po/tmp/ap_String_Id.h.h:823 msgid "Coverage" msgstr "Cobertura" # DLG_MetaData_Coverage_LBL #. DLG_MetaData_Coverage_LBL -#: po/tmp/ap_String_Id.h.h:823 +#: po/tmp/ap_String_Id.h.h:825 msgid "Coverage:" msgstr "Cobertura:" # DLG_NEW_Tab1_FAX1 #. DLG_NEW_Tab1_FAX1 -#: po/tmp/ap_String_Id.h.h:825 +#: po/tmp/ap_String_Id.h.h:827 msgid "Create a fax" -msgstr "Facer un fax" +msgstr "Crear un fax" # DLG_NEW_Tab1_WP1 #. DLG_NEW_Tab1_WP1 -#: po/tmp/ap_String_Id.h.h:827 +#: po/tmp/ap_String_Id.h.h:829 msgid "Create a new blank document" -msgstr "Crear un documentu'n blanco" +msgstr "Crear un documentu en blanco" # MENU_STATUSLINE_FILE_NEW # TOOLBAR_STATUSLINE_FILE_NEW @@ -2575,106 +2562,105 @@ #. MENU_STATUSLINE_FILE_NEW #. TOOLBAR_STATUSLINE_FILE_NEW #. TOOLBAR_TOOLTIP_FILE_NEW -#: po/tmp/ap_String_Id.h.h:831 +#: po/tmp/ap_String_Id.h.h:833 msgid "Create a new document" -msgstr "Crear un documentu nueu" +msgstr "Crear un documentu nuevu" # DLG_NEW_Create #. DLG_NEW_Create -#: po/tmp/ap_String_Id.h.h:833 +#: po/tmp/ap_String_Id.h.h:835 msgid "Create a new document from a template" -msgstr "Crear un documentu dende una plantilla" +msgstr "Crear un documentu nuevu a partir d'una plantía" # DLG_NEW_Create #. MENU_STATUSLINE_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:835 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:837 msgid "Create a new document using a template" -msgstr "Crear un documentu dende una plantilla" +msgstr "Crear un documentu nuevu usando una plantía" # DLG_NEW_StartEmpty #. DLG_NEW_StartEmpty -#: po/tmp/ap_String_Id.h.h:837 +#: po/tmp/ap_String_Id.h.h:839 msgid "Create an empty document" msgstr "Crear un documentu vaciu" # FIELD_Document_Creator #. FIELD_Document_Creator -#: po/tmp/ap_String_Id.h.h:839 +#: po/tmp/ap_String_Id.h.h:841 msgid "Creator" msgstr "Creador" # MENU_LABEL_EDIT_CUT #. MENU_LABEL_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:841 +#: po/tmp/ap_String_Id.h.h:843 msgid "Cu&t" msgstr "Cor&tar" # FIELD_Datetime_CurrentDate #. FIELD_Datetime_CurrentDate -#: po/tmp/ap_String_Id.h.h:843 +#: po/tmp/ap_String_Id.h.h:845 msgid "Current Date" -msgstr "Fecha actual" +msgstr "Data actual" # DLG_Lists_Current_Font #. DLG_Lists_Current_Font -#: po/tmp/ap_String_Id.h.h:845 +#: po/tmp/ap_String_Id.h.h:847 msgid "Current Font" msgstr "Fonte actual" # DLG_Lists_Current_List_Label #. DLG_Lists_Current_List_Label -#: po/tmp/ap_String_Id.h.h:847 +#: po/tmp/ap_String_Id.h.h:849 msgid "Current List Label" -msgstr "Etiqueta actual de la llista" +msgstr "Etiqueta de llista actual" # DLG_Lists_Current_List_Type #. DLG_Lists_Current_List_Type -#: po/tmp/ap_String_Id.h.h:849 +#: po/tmp/ap_String_Id.h.h:851 msgid "Current List Type" -msgstr "Tipu de la llista actual" +msgstr "Triba de llista actual" # MSG_EmptySelection #. MSG_EmptySelection -#: po/tmp/ap_String_Id.h.h:851 +#: po/tmp/ap_String_Id.h.h:853 msgid "Current Selection is Empty" msgstr "La seleición actual ta vacia" # DLG_Styles_DefCurrent #. DLG_Styles_DefCurrent -#: po/tmp/ap_String_Id.h.h:853 +#: po/tmp/ap_String_Id.h.h:855 msgid "Current Settings" -msgstr "Configuraciones actuales" +msgstr "Configuración actual" # FIELD_Datetime_CurrentTime #. FIELD_Datetime_CurrentTime -#: po/tmp/ap_String_Id.h.h:855 +#: po/tmp/ap_String_Id.h.h:857 msgid "Current Time" msgstr "Hora actual" # DLG_Options_Label_ViewCursorBlink #. DLG_Options_Label_ViewCursorBlink -#: po/tmp/ap_String_Id.h.h:857 +#: po/tmp/ap_String_Id.h.h:859 msgid "Cursor &blink" -msgstr "Cursor ciegu (&b)" +msgstr "Parpagar del &cursor" # DLG_Options_Label_SpellCustomDict #. DLG_Options_Label_SpellCustomDict -#: po/tmp/ap_String_Id.h.h:859 +#: po/tmp/ap_String_Id.h.h:861 msgid "Custom Dictionary:" -msgstr "Diccinariu personalizáu:" +msgstr "Diccionariu personalizáu:" # FIELD_DateTime_Custom #. FIELD_DateTime_Custom -#: po/tmp/ap_String_Id.h.h:861 +#: po/tmp/ap_String_Id.h.h:863 msgid "Customizable date/time" -msgstr "" +msgstr "Data/hora personalizable" # DLG_Lists_Customize #. DLG_Lists_Customize -#: po/tmp/ap_String_Id.h.h:863 +#: po/tmp/ap_String_Id.h.h:865 msgid "Customized List" -msgstr "Llista personalizá" +msgstr "Llista personalizada" # TOOLBAR_LABEL_EDIT_CUT # TOOLBAR_STATUSLINE_EDIT_CUT @@ -2682,97 +2668,96 @@ #. TOOLBAR_LABEL_EDIT_CUT #. TOOLBAR_STATUSLINE_EDIT_CUT #. TOOLBAR_TOOLTIP_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:867 +#: po/tmp/ap_String_Id.h.h:869 msgid "Cut" msgstr "Cortar" #. MENU_STATUSLINE_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:869 +#: po/tmp/ap_String_Id.h.h:871 msgid "Cut Embedded Object" -msgstr "" +msgstr "Cortar oxetu encrustáu" # TOOLBAR_LABEL_IMG #. MENU_LABEL_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:871 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:873 msgid "Cut Image" -msgstr "Amestar imaxe" +msgstr "Cortar imaxe" # FIELD_Document_Subject # AUTOTEXT_SUBJECT_1 #. MENU_LABEL_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:873 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:875 msgid "Cut Object" -msgstr "Asuntu" +msgstr "Cortar oxetu" #. MENU_LABEL_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:875 +#: po/tmp/ap_String_Id.h.h:877 msgid "Cut Text Box" -msgstr "" +msgstr "Cortar caxa de testu" # MENU_STATUSLINE_EDIT_CUT #. MENU_STATUSLINE_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:877 +#: po/tmp/ap_String_Id.h.h:879 msgid "Cut the selection and put it on the Clipboard" -msgstr "Cortar la seleición y pegala nel cortapapelos" +msgstr "Cortar la seleición y pasala al cartafueyu" # MENU_LABEL_FMT_DIRECTION #. MENU_LABEL_FMT_DIRECTION -#: po/tmp/ap_String_Id.h.h:879 +#: po/tmp/ap_String_Id.h.h:881 msgid "D&irectional" -msgstr "" +msgstr "D&ireicional" # DLG_Lists_Dashed_List # STYLE_DASHEDLIST #. DLG_Lists_Dashed_List #. STYLE_DASHEDLIST -#: po/tmp/ap_String_Id.h.h:881 po/tmp/xap_String_Id.h.h:225 +#: po/tmp/ap_String_Id.h.h:883 +#: po/tmp/xap_String_Id.h.h:241 msgid "Dashed List" -msgstr "" +msgstr "Llista de guiones" # FIELD_Document_Date #. FIELD_Document_Date #. DLG_ListRevisions_Column2Label -#: po/tmp/ap_String_Id.h.h:884 +#: po/tmp/ap_String_Id.h.h:886 msgid "Date" -msgstr "Fecha" +msgstr "Data" # MENU_LABEL_INSERT_DATETIME #. MENU_LABEL_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:886 +#: po/tmp/ap_String_Id.h.h:888 msgid "Date and &Time" -msgstr "Fecha y &Hora" +msgstr "Data y &Hora" # FIELD_Type_Datetime #. FIELD_Type_Datetime -#: po/tmp/ap_String_Id.h.h:888 +#: po/tmp/ap_String_Id.h.h:890 msgid "Date and Time" -msgstr "Fecha y Hora" +msgstr "Data y Hora" # FIELD_DateTime_DOY #. FIELD_DateTime_DOY -#: po/tmp/ap_String_Id.h.h:890 +#: po/tmp/ap_String_Id.h.h:892 msgid "Day # in the year" -msgstr "Dia # nel añu" +msgstr "Númberu de día del añu" # DLG_Options_Btn_Default #. DLG_Options_Btn_Default -#: po/tmp/ap_String_Id.h.h:892 +#: po/tmp/ap_String_Id.h.h:894 msgid "De&faults" msgstr "Por &defeutu" # DLG_Tab_Radio_Decimal #. DLG_Tab_Radio_Decimal -#: po/tmp/ap_String_Id.h.h:894 +#: po/tmp/ap_String_Id.h.h:896 msgid "Decimal" msgstr "Decimal" # TabToggleDecimalTab #. TabToggleDecimalTab -#: po/tmp/ap_String_Id.h.h:896 +#: po/tmp/ap_String_Id.h.h:898 msgid "Decimal Tab" -msgstr "" +msgstr "Tabulador decimal" # TOOLBAR_LABEL_UNINDENT # TOOLBAR_STATUSLINE_UNINDENT @@ -2780,54 +2765,53 @@ #. TOOLBAR_LABEL_UNINDENT #. TOOLBAR_STATUSLINE_UNINDENT #. TOOLBAR_TOOLTIP_UNINDENT -#: po/tmp/ap_String_Id.h.h:900 +#: po/tmp/ap_String_Id.h.h:902 msgid "Decrease indent" -msgstr "" +msgstr "Amenorgar indentación" # FIELD_DateTime_DefaultDateNoTime #. FIELD_DateTime_DefaultDateNoTime -#: po/tmp/ap_String_Id.h.h:902 +#: po/tmp/ap_String_Id.h.h:904 msgid "Default date (w/o time)" -msgstr "" +msgstr "Data por defeutu (ensin hora)" # FIELD_DateTime_DefaultDate #. FIELD_DateTime_DefaultDate -#: po/tmp/ap_String_Id.h.h:904 +#: po/tmp/ap_String_Id.h.h:906 msgid "Default date representation" -msgstr "" +msgstr "Representación de data por defeutu" # DLG_Options_Label_DefaultPageSize #. DLG_Options_Label_DefaultPageSize -#: po/tmp/ap_String_Id.h.h:906 +#: po/tmp/ap_String_Id.h.h:908 msgid "Default page size" -msgstr "tamañu de páxina por defeutu" +msgstr "Tamañu de páxina por defeutu" # DLG_Tab_Label_DefaultTS #. DLG_Tab_Label_DefaultTS -#: po/tmp/ap_String_Id.h.h:908 +#: po/tmp/ap_String_Id.h.h:910 msgid "Default tab stops:" -msgstr "" +msgstr "Tabuladores por defeutu:" # DLG_Options_Label_DirectionRtl #. DLG_Options_Label_DirectionRtl -#: po/tmp/ap_String_Id.h.h:910 +#: po/tmp/ap_String_Id.h.h:912 msgid "Default to right-to-left direction of text" -msgstr "" +msgstr "Direición de testu por defeutu de drecha a esquierda" # DLG_MetaData_Title #. DLG_FormatTOC_LevelDefs -#: po/tmp/ap_String_Id.h.h:912 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:914 msgid "Define Main Properties" -msgstr "Propiedaes del documentu" +msgstr "Definir les propiedaes principales" # MENU_STATUSLINE_FMT_STYLE # MENU_STATUSLINE_FMT_STYLE_DEFINE #. MENU_STATUSLINE_FMT_STYLE #. MENU_STATUSLINE_FMT_STYLE_DEFINE -#: po/tmp/ap_String_Id.h.h:915 +#: po/tmp/ap_String_Id.h.h:917 msgid "Define or apply style for the selection" -msgstr "" +msgstr "Definir o aplicar l'estilu pa la seleición" # DLG_Styles_Delete # MENU_STATUSLINE_TABLE_DELETE @@ -2835,125 +2819,123 @@ #. DLG_Styles_Delete #. MENU_STATUSLINE_TABLE_DELETE #. DLG_Delete -#: po/tmp/ap_String_Id.h.h:918 po/tmp/xap_String_Id.h.h:239 +#: po/tmp/ap_String_Id.h.h:920 +#: po/tmp/xap_String_Id.h.h:255 msgid "Delete" -msgstr "Esborrar" +msgstr "Borrar" # MENU_STATUSLINE_TABLE_DELETE_CELLS #. MENU_STATUSLINE_TABLE_DELETE_CELLS -#: po/tmp/ap_String_Id.h.h:920 +#: po/tmp/ap_String_Id.h.h:922 msgid "Delete Cells" -msgstr "Esborrar celdes" +msgstr "Borrar celdes" # MENU_LABEL_TABLE_DELETECOLUMN #. MENU_LABEL_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:922 +#: po/tmp/ap_String_Id.h.h:924 msgid "Delete Co&lumn" -msgstr "Esborrar co&lumna" +msgstr "Borrar co&lumna" # MENU_STATUSLINE_TABLE_DELETE_COLUMNS # MENU_STATUSLINE_TABLE_DELETECOLUMN #. MENU_STATUSLINE_TABLE_DELETE_COLUMNS #. MENU_STATUSLINE_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:925 +#: po/tmp/ap_String_Id.h.h:927 msgid "Delete Column" -msgstr "Esborrar columna" +msgstr "Borrar columna" #. MENU_STATUSLINE_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:927 +#: po/tmp/ap_String_Id.h.h:929 msgid "Delete Embedded Object" -msgstr "" +msgstr "Eliminar oxetu encrustáu" # TOOLBAR_LABEL_IMG #. MENU_LABEL_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:929 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:931 msgid "Delete Image" -msgstr "Amestar imaxe" +msgstr "Eliminar imaxe" # MENU_STATUSLINE_TABLE_DELETE_TABLE # MENU_STATUSLINE_TABLE_DELETETABLE #. MENU_LABEL_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:931 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:933 msgid "Delete Object" -msgstr "Esborrar tabla" +msgstr "Eliminar oxetu" # MENU_LABEL_TABLE_DELETEROW #. MENU_LABEL_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:933 +#: po/tmp/ap_String_Id.h.h:935 msgid "Delete Ro&w" -msgstr "Esborrar &fila" +msgstr "Borrar &filera" # MENU_STATUSLINE_TABLE_DELETE_ROWS # MENU_STATUSLINE_TABLE_DELETEROW #. MENU_STATUSLINE_TABLE_DELETE_ROWS #. MENU_STATUSLINE_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:936 +#: po/tmp/ap_String_Id.h.h:938 msgid "Delete Row" -msgstr "Esborrar fila" +msgstr "Borrar filera" # MENU_LABEL_TABLE_DELETETABLE #. MENU_LABEL_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:938 +#: po/tmp/ap_String_Id.h.h:940 msgid "Delete Tabl&e" -msgstr "Esborrar Tabl&a" +msgstr "Borrar tabl&a" # MENU_STATUSLINE_TABLE_DELETE_TABLE # MENU_STATUSLINE_TABLE_DELETETABLE #. MENU_STATUSLINE_TABLE_DELETE_TABLE #. MENU_STATUSLINE_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:941 +#: po/tmp/ap_String_Id.h.h:943 msgid "Delete Table" -msgstr "Esborrar tabla" +msgstr "Borrar tabla" # MENU_STATUSLINE_TABLE_DELETE_TABLE # MENU_STATUSLINE_TABLE_DELETETABLE #. MENU_LABEL_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:943 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:945 msgid "Delete Text Box" -msgstr "Esborrar tabla" +msgstr "Eliminar caxa de testu" # TOOLBAR_LABEL_DELETE_COLUMN #. TOOLBAR_LABEL_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:945 +#: po/tmp/ap_String_Id.h.h:947 msgid "Delete column" -msgstr "Esborrar columna" +msgstr "Borrar columna" # MENU_STATUSLINE_INSERT_DELETE_HYPERLINK #. MENU_STATUSLINE_INSERT_DELETE_HYPERLINK -#: po/tmp/ap_String_Id.h.h:947 +#: po/tmp/ap_String_Id.h.h:949 msgid "Delete hyperlink" -msgstr "Esborrar enllaz" +msgstr "Borrar hiperenllaz" # TOOLBAR_LABEL_DELETE_ROW #. TOOLBAR_LABEL_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:949 +#: po/tmp/ap_String_Id.h.h:951 msgid "Delete row" -msgstr "Esborar fila" +msgstr "Borrar filera" # MENU_STATUSLINE_EDIT_CLEAR #. MENU_STATUSLINE_EDIT_CLEAR -#: po/tmp/ap_String_Id.h.h:951 +#: po/tmp/ap_String_Id.h.h:953 msgid "Delete the selection" -msgstr "Quitar seleición" +msgstr "Borrar seleición" # TOOLBAR_STATUSLINE_DELETE_COLUMN # TOOLBAR_TOOLTIP_DELETE_COLUMN #. TOOLBAR_STATUSLINE_DELETE_COLUMN #. TOOLBAR_TOOLTIP_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:954 +#: po/tmp/ap_String_Id.h.h:956 msgid "Delete this column from its table" -msgstr "Esborrar esta columna d'esta fila" +msgstr "Borrar esta columna de la tabla" # TOOLBAR_STATUSLINE_DELETE_ROW # TOOLBAR_TOOLTIP_DELETE_ROW #. TOOLBAR_STATUSLINE_DELETE_ROW #. TOOLBAR_TOOLTIP_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:957 +#: po/tmp/ap_String_Id.h.h:959 msgid "Delete this row from its table" -msgstr "Esborrar esta fila de la so tabla" +msgstr "Borrar esta filera de la tabla" # DLG_Styles_Description # DLG_Styles_ModifyDescription @@ -2961,7 +2943,7 @@ #. DLG_Styles_Description #. DLG_Styles_ModifyDescription #. FIELD_Document_Description -#: po/tmp/ap_String_Id.h.h:961 +#: po/tmp/ap_String_Id.h.h:963 msgid "Description" msgstr "Descripción" @@ -2970,7 +2952,8 @@ #. DLG_MetaData_Description_LBL #. DLG_PLUGIN_MANAGER_DESC #. DLG_Image_LblDescription -#: po/tmp/ap_String_Id.h.h:963 po/tmp/xap_String_Id.h.h:242 +#: po/tmp/ap_String_Id.h.h:965 +#: po/tmp/xap_String_Id.h.h:258 msgid "Description:" msgstr "Descripción:" @@ -2978,152 +2961,156 @@ # STYLE_DIAMONLIST #. DLG_Lists_Diamond_List #. STYLE_DIAMONLIST -#: po/tmp/ap_String_Id.h.h:965 po/tmp/xap_String_Id.h.h:244 +#: po/tmp/ap_String_Id.h.h:967 +#: po/tmp/xap_String_Id.h.h:260 msgid "Diamond List" msgstr "Llista de rombos" # DLG_Options_Btn_CustomDict #. DLG_Options_Label_SpellDictionaries -#: po/tmp/ap_String_Id.h.h:967 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:969 msgid "Dictionaries" -msgstr "&Diccionariu..." +msgstr "Diccionarios" # DLG_HdrFtr_FooterEven #. DLG_HdrFtr_FooterEven -#: po/tmp/ap_String_Id.h.h:969 +#: po/tmp/ap_String_Id.h.h:971 msgid "Different footer on facing pages" -msgstr "" +msgstr "Pie de páxina distintu pa les portaes" # DLG_HdrFtr_FooterFirst #. DLG_HdrFtr_FooterFirst -#: po/tmp/ap_String_Id.h.h:971 +#: po/tmp/ap_String_Id.h.h:973 msgid "Different footer on first page" -msgstr "Pie de páxina distintu na primera páxina" +msgstr "Pie de páxina distintu na primer páxina" # DLG_HdrFtr_FooterLast #. DLG_HdrFtr_FooterLast -#: po/tmp/ap_String_Id.h.h:973 +#: po/tmp/ap_String_Id.h.h:975 msgid "Different footer on last page" -msgstr "Pie de páxina distintu na cabera páxina" +msgstr "Pie de páxina distintu na postrer páxina" # DLG_HdrFtr_HeaderEven #. DLG_HdrFtr_HeaderEven -#: po/tmp/ap_String_Id.h.h:975 +#: po/tmp/ap_String_Id.h.h:977 msgid "Different header on facing pages" -msgstr "" +msgstr "Encabezáu distintu pa les portaes" # DLG_HdrFtr_HeaderFirst #. DLG_HdrFtr_HeaderFirst -#: po/tmp/ap_String_Id.h.h:977 +#: po/tmp/ap_String_Id.h.h:979 msgid "Different header on first page" -msgstr "" +msgstr "Encabezáu distintu pa la primer páxina" # DLG_HdrFtr_HeaderLast #. DLG_HdrFtr_HeaderLast -#: po/tmp/ap_String_Id.h.h:979 +#: po/tmp/ap_String_Id.h.h:981 msgid "Different header on last page" -msgstr "" +msgstr "Encabezáu distintu pa la postrer páxina" # DLG_Styles_StylesLocked #. DLG_Styles_StylesLocked -#: po/tmp/ap_String_Id.h.h:981 +#: po/tmp/ap_String_Id.h.h:983 msgid "Disable all formatting commands, except styles" -msgstr "" +msgstr "Desactivar tolos comandos de formatu, sacantes los estilos" # MENU_STATUSLINE_HELP_CREDITS #. MENU_STATUSLINE_HELP_CREDITS -#: po/tmp/ap_String_Id.h.h:983 +#: po/tmp/ap_String_Id.h.h:985 msgid "Display Credits" -msgstr "Amosar créditos" +msgstr "Amosar creitos" # MENU_STATUSLINE_HELP_CONTENTS #. MENU_STATUSLINE_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:985 +#: po/tmp/ap_String_Id.h.h:987 msgid "Display Help Contents" -msgstr "Amosar los contenios de l'ayuda" +msgstr "Amosar los conteníos d'aida" # MENU_STATUSLINE_HELP_INDEX #. MENU_STATUSLINE_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:987 +#: po/tmp/ap_String_Id.h.h:989 msgid "Display Help Index" -msgstr "Amosar l'indiz d'ayuda" +msgstr "Amosar l'índiz d'aida" # MENU_STATUSLINE_VIEW_SHOWPARA #. MENU_STATUSLINE_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:989 +#: po/tmp/ap_String_Id.h.h:991 msgid "Display non-printing characters" -msgstr "Amosar carauteres nun imprentables" +msgstr "Amosar carauteres non imprentables" # MENU_STATUSLINE_HELP_ABOUT #. MENU_STATUSLINE_HELP_ABOUT -#: po/tmp/ap_String_Id.h.h:991 +#: po/tmp/ap_String_Id.h.h:993 msgid "Display program information, version number, and copyright" -msgstr "Amosar información del programa, númberu de la versión y copyright" +msgstr "Amosar información del programa, númberu de versión y copyright" # MENU_STATUSLINE_HELP_INDEX #. DLG_FormatTOC_DispStyle -#: po/tmp/ap_String_Id.h.h:993 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:995 msgid "Display style:" -msgstr "Amosar l'indiz d'ayuda" +msgstr "Amosar estilu:" # DLG_Options_Prompt_IgnoreResetAll #. DLG_Options_Prompt_IgnoreResetAll -#: po/tmp/ap_String_Id.h.h:995 +#: po/tmp/ap_String_Id.h.h:997 msgid "Do you want to reset ignored words in all the documents?" -msgstr "¿Quiés reaxustar les pallabres ignoraes en toos los documentos?" +msgstr "¿Quies restablecer les pallabres inoraes en tolos documentos?" # DLG_Options_Prompt_IgnoreResetCurrent #. DLG_Options_Prompt_IgnoreResetCurrent -#: po/tmp/ap_String_Id.h.h:997 +#: po/tmp/ap_String_Id.h.h:999 msgid "Do you want to reset ignored words in the current document?" -msgstr "¿Quiés reaxustar les pallabres ignoraes nel documentu actual?" +msgstr "¿Quies restablecer les pallabres inoraes nel documentu actual?" # FIELD_Type_Document #. FIELD_Type_Document -#: po/tmp/ap_String_Id.h.h:999 +#: po/tmp/ap_String_Id.h.h:1001 msgid "Document" msgstr "Documentu" # DLG_MetaData_Title #. DLG_MetaData_Title -#: po/tmp/ap_String_Id.h.h:1001 +#: po/tmp/ap_String_Id.h.h:1003 msgid "Document Properties" msgstr "Propiedaes del documentu" # MENU_LABEL_WINDOW #. DLG_Options_Label_Documents -#: po/tmp/ap_String_Id.h.h:1003 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1005 msgid "Documents" -msgstr "&Documentos" +msgstr "Documentos" # DLG_FormatFootnotes_FootRestartNone #. DLG_FormatFootnotes_FootRestartNone -#: po/tmp/ap_String_Id.h.h:1005 +#: po/tmp/ap_String_Id.h.h:1007 msgid "Don't restart" -msgstr "Nun reentamar" +msgstr "Nun reempecipiar" # DLG_Para_SpacingDouble #. DLG_Para_SpacingDouble -#: po/tmp/ap_String_Id.h.h:1007 +#: po/tmp/ap_String_Id.h.h:1009 msgid "Double" msgstr "Doble" # TOOLBAR_LABEL_DOUBLE_SPACE #. TOOLBAR_LABEL_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1009 +#: po/tmp/ap_String_Id.h.h:1011 msgid "Double Spacing" -msgstr "Doble espaciáu" +msgstr "Espaciáu doble" # TOOLBAR_STATUSLINE_DOUBLE_SPACE # TOOLBAR_TOOLTIP_DOUBLE_SPACE #. TOOLBAR_STATUSLINE_DOUBLE_SPACE #. TOOLBAR_TOOLTIP_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1012 +#: po/tmp/ap_String_Id.h.h:1014 msgid "Double spacing" -msgstr "Doble espaciáu" +msgstr "Espaciáu doble" + +# MENU_LABEL_AUTOTEXT_SALUTATION +#. MENU_LABEL_EDIT_LATEXEQUATION +#: po/tmp/ap_String_Id.h.h:1016 +msgid "Edit Equation" +msgstr "Editar ecuación" # MENU_LABEL_EDIT_EDITFOOTER # TOOLBAR_LABEL_EDIT_FOOTER @@ -3133,7 +3120,7 @@ #. TOOLBAR_LABEL_EDIT_FOOTER #. TOOLBAR_STATUSLINE_EDIT_FOOTER #. TOOLBAR_TOOLTIP_EDIT_FOOTER -#: po/tmp/ap_String_Id.h.h:1017 +#: po/tmp/ap_String_Id.h.h:1021 msgid "Edit Footer" msgstr "Editar pìe de páxina" @@ -3145,328 +3132,331 @@ #. TOOLBAR_LABEL_EDIT_HEADER #. TOOLBAR_STATUSLINE_EDIT_HEADER #. TOOLBAR_TOOLTIP_EDIT_HEADER -#: po/tmp/ap_String_Id.h.h:1022 +#: po/tmp/ap_String_Id.h.h:1026 msgid "Edit Header" -msgstr "Editar cabecera" +msgstr "Editar encabezáu" + +#. MENU_STATUSLINE_EDIT_LATEXEQUATION +#: po/tmp/ap_String_Id.h.h:1028 +msgid "Edit Latex Equation" +msgstr "Editar ecuación LaTeX" # MENU_STATUSLINE_INSERT_HYPERLINK #. MENU_STATUSLINE_INSERT_EDIT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1024 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1030 msgid "Edit hyperlink" -msgstr "Amestar enllaz" +msgstr "Editar hiperenllaz" # MENU_STATUSLINE_VIEW_HEADFOOT #. MENU_STATUSLINE_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:1026 +#: po/tmp/ap_String_Id.h.h:1032 msgid "Edit text at the top or bottom of every page" -msgstr "Editar testu arriba y abaxo de cada páxina" +msgstr "Editar testu no cimero y no fondero de cada páxina" # MENU_STATUSLINE_EDIT_EDITFOOTER #. MENU_STATUSLINE_EDIT_EDITFOOTER -#: po/tmp/ap_String_Id.h.h:1028 +#: po/tmp/ap_String_Id.h.h:1034 msgid "Edit the Footer on the current page" -msgstr "Editar píe de páxina de la páxina actual" +msgstr "Editar el pie de páxina de la páxina actual" # MENU_STATUSLINE_EDIT_EDITHEADER #. MENU_STATUSLINE_EDIT_EDITHEADER -#: po/tmp/ap_String_Id.h.h:1030 +#: po/tmp/ap_String_Id.h.h:1036 msgid "Edit the Header on the current page" -msgstr "Editar cabecera de la páxina actual" +msgstr "Editar l'encabezáu de la páxina actual" + +# DLG_Lists_Type_numbered +#. TB_Embedded +#: po/tmp/ap_String_Id.h.h:1038 +msgid "Embedded" +msgstr "Encrustáu" # MENU_LABEL_VIEW_LOCKSTYLES #. MENU_LABEL_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:1032 +#: po/tmp/ap_String_Id.h.h:1040 msgid "Enable F&ormatting Tools" msgstr "Activar les ferramientes de &formatu" # DLG_Options_Label_CheckEnableSmoothScrolling #. DLG_Options_Label_CheckEnableSmoothScrolling -#: po/tmp/ap_String_Id.h.h:1034 +#: po/tmp/ap_String_Id.h.h:1042 msgid "Enable Smooth Scrolling" -msgstr "Activar el scroll sele" +msgstr "Activar desplazamientu suave" # FIELD_Numbers_EndnoteAnchor #. FIELD_Numbers_EndnoteAnchor -#: po/tmp/ap_String_Id.h.h:1036 +#: po/tmp/ap_String_Id.h.h:1044 msgid "Endnote anchor" -msgstr "Ancla de la nota cabera" +msgstr "Ancla de nota a lo cabero" # FIELD_Numbers_EndnoteReference #. FIELD_Numbers_EndnoteReference -#: po/tmp/ap_String_Id.h.h:1038 +#: po/tmp/ap_String_Id.h.h:1046 msgid "Endnote reference" -msgstr "Referencia de la nota cabera" +msgstr "Referencia de la nota a lo cabero" # DLG_FormatFootnotes_EndStyle #. DLG_FormatFootnotes_EndStyle -#: po/tmp/ap_String_Id.h.h:1040 +#: po/tmp/ap_String_Id.h.h:1048 msgid "Endnote style" -msgstr "Estilu de la nota cabera" +msgstr "Estilu de la nota a lo cabero" # MENU_LABEL_AUTOTEXT_SALUTATION #. MENU_LABEL_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1042 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1050 msgid "Equation" -msgstr "Saludu:" +msgstr "Ecuación" # FIELD_Error #. FIELD_Error -#: po/tmp/ap_String_Id.h.h:1044 +#: po/tmp/ap_String_Id.h.h:1052 msgid "Error calculating value!" -msgstr "¡Error calculando el valor!" +msgstr "¡Error calculando'l valor!" # SCRIPT_CANTRUN #. SCRIPT_CANTRUN -#: po/tmp/ap_String_Id.h.h:1046 +#: po/tmp/ap_String_Id.h.h:1054 #, c-format msgid "Error executing script %s" msgstr "Error executando'l script %s" # MSG_ImportError #. MSG_ImportError -#: po/tmp/ap_String_Id.h.h:1048 +#: po/tmp/ap_String_Id.h.h:1056 #, c-format msgid "Error importing file %s." -msgstr "Error importando'l archivu %s." +msgstr "Error al importar l'archivu %s." # MSG_SaveFailedExport #. MSG_SaveFailedExport -#: po/tmp/ap_String_Id.h.h:1050 +#: po/tmp/ap_String_Id.h.h:1058 #, c-format msgid "Error while attempting to save %s: could not construct exporter" -msgstr "" +msgstr "Error al tentar de guardar %s: nun se pudo construyir l'esportador" # MSG_SaveFailedName #. MSG_SaveFailedName -#: po/tmp/ap_String_Id.h.h:1052 +#: po/tmp/ap_String_Id.h.h:1060 #, c-format msgid "Error while attempting to save %s: invalid name" -msgstr "" +msgstr "Error al tentar de guardar %s: nome non válidu" # TOOLBAR_LABEL_SCRIPT_PLAY #. TOOLBAR_LABEL_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1054 +#: po/tmp/ap_String_Id.h.h:1062 msgid "Ex. script" -msgstr "" +msgstr "Executar script" # DLG_Para_SpacingExactly #. DLG_Para_SpacingExactly -#: po/tmp/ap_String_Id.h.h:1056 +#: po/tmp/ap_String_Id.h.h:1064 msgid "Exactly" -msgstr "" +msgstr "Exautamente" # DLG_UFS_SampleFrameLabel #. DLG_Latex_Example -#: po/tmp/ap_String_Id.h.h:1058 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1066 msgid "Example:" -msgstr "Exemplu" +msgstr "Exemplu:" # MENU_STATUSLINE_TOOLS_SCRIPTS #. MENU_STATUSLINE_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1060 +#: po/tmp/ap_String_Id.h.h:1068 msgid "Execute helper scripts" -msgstr "" +msgstr "Executar scripts d'aida" # TOOLBAR_STATUSLINE_SCRIPT_PLAY # TOOLBAR_TOOLTIP_SCRIPT_PLAY #. TOOLBAR_STATUSLINE_SCRIPT_PLAY #. TOOLBAR_TOOLTIP_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1063 +#: po/tmp/ap_String_Id.h.h:1071 msgid "Execute script" msgstr "Executar script" # DLG_ListRevisions_Label1 #. DLG_ListRevisions_Label1 -#: po/tmp/ap_String_Id.h.h:1065 +#: po/tmp/ap_String_Id.h.h:1073 msgid "Existing revisions:" -msgstr "" +msgstr "Revisiones esistentes:" # TB_Extra #. TB_Extra -#: po/tmp/ap_String_Id.h.h:1067 +#: po/tmp/ap_String_Id.h.h:1075 msgid "Extra" -msgstr "" +msgstr "Adicional" # DLG_Field_Parameters_Capital #. DLG_Field_Parameters_Capital -#: po/tmp/ap_String_Id.h.h:1069 +#: po/tmp/ap_String_Id.h.h:1077 msgid "Extra Parameters" -msgstr "" +msgstr "Parámetros adicionales" # DLG_Options_Label_ViewExtraTB #. DLG_Options_Label_ViewExtraTB -#: po/tmp/ap_String_Id.h.h:1071 +#: po/tmp/ap_String_Id.h.h:1079 msgid "Extra Toolbar" -msgstr "" +msgstr "Barra de ferramientes adicional" # DLG_Field_Parameters #. DLG_Field_Parameters -#: po/tmp/ap_String_Id.h.h:1073 +#: po/tmp/ap_String_Id.h.h:1081 msgid "Extra parameters:" -msgstr "" +msgstr "Parámetros adicionales:" # DLG_UP_File #. MENU_LABEL_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1075 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1083 msgid "F&ile" -msgstr "Archivu" +msgstr "Ar&chivu" # MENU_LABEL_FORMAT #. MENU_LABEL_FORMAT -#: po/tmp/ap_String_Id.h.h:1077 +#: po/tmp/ap_String_Id.h.h:1085 msgid "F&ormat" msgstr "F&ormatu" # MENU_LABEL_VIEW_FULLSCREEN #. MENU_LABEL_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:1079 +#: po/tmp/ap_String_Id.h.h:1087 msgid "F&ull Screen" msgstr "P&antalla completa" # DLG_FR_FindLabel #. DLG_FR_FindLabel -#: po/tmp/ap_String_Id.h.h:1081 +#: po/tmp/ap_String_Id.h.h:1089 msgid "Fi&nd what:" -msgstr "" +msgstr "Bus&car qué:" # DLG_MailMerge_Insert_No_Colon #. DLG_MailMerge_Insert_No_Colon -#: po/tmp/ap_String_Id.h.h:1083 +#: po/tmp/ap_String_Id.h.h:1091 msgid "Field Name" msgstr "Nome de campu" # DLG_MailMerge_Insert #. DLG_MailMerge_Insert -#: po/tmp/ap_String_Id.h.h:1085 +#: po/tmp/ap_String_Id.h.h:1093 msgid "Field Name:" -msgstr "Nome de campu" +msgstr "Nome de campu:" # MSG_IE_UnsupportedType #. MSG_IE_UnsupportedType -#: po/tmp/ap_String_Id.h.h:1087 +#: po/tmp/ap_String_Id.h.h:1095 #, c-format msgid "File %s is not of a currently supported file type" msgstr "L'archivu %s nun ye un formatu d'archivu soportáu" # MSG_IE_FakeType #. MSG_IE_FakeType -#: po/tmp/ap_String_Id.h.h:1089 +#: po/tmp/ap_String_Id.h.h:1097 #, c-format msgid "File %s is not of the type it claims to be" -msgstr "" +msgstr "L'archivu %s nun ye de la triba que paez ser" # MSG_IE_UnknownType #. MSG_IE_UnknownType -#: po/tmp/ap_String_Id.h.h:1091 +#: po/tmp/ap_String_Id.h.h:1099 #, c-format msgid "File %s is of unknown type" -msgstr "L'archivu %s ye d'un tipu desconociu" +msgstr "L'archivu %s ye d'una triba desconocida" # MSG_IE_FileNotFound #. MSG_IE_FileNotFound -#: po/tmp/ap_String_Id.h.h:1093 +#: po/tmp/ap_String_Id.h.h:1101 #, c-format msgid "File %s not found" -msgstr "Nun atopose l'achivu %s" +msgstr "Archivu %s non atopáu" # FIELD_Application_Filename #. FIELD_Application_Filename -#: po/tmp/ap_String_Id.h.h:1095 +#: po/tmp/ap_String_Id.h.h:1103 msgid "File Name" msgstr "Nome d'archivu" #. DLG_FormatTOC_FillStyle -#: po/tmp/ap_String_Id.h.h:1097 +#: po/tmp/ap_String_Id.h.h:1105 msgid "Fill style:" -msgstr "" +msgstr "Estilu de rellenu:" # DLG_FR_FindTitle #. DLG_FR_FindTitle -#: po/tmp/ap_String_Id.h.h:1099 +#: po/tmp/ap_String_Id.h.h:1107 msgid "Find" msgstr "Buscar" # MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION #. MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1101 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1109 msgid "Find &next revision" -msgstr "&Aceptar revisión" +msgstr "Buscar &siguiente revisión" #. MENU_LABEL_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1103 +#: po/tmp/ap_String_Id.h.h:1111 msgid "Find &previous revision" -msgstr "" +msgstr "Buscar revisión &anterior" # TOOLBAR_STATUSLINE_FMT_HYPERLINK # TOOLBAR_TOOLTIP_FMT_HYPERLINK #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1105 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1113 msgid "Find next visible revision in the document" -msgstr "Insertar un hiperenllaz nel documentu" +msgstr "Buscar la siguiente revisión visible del documentu" #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1107 +#: po/tmp/ap_String_Id.h.h:1115 msgid "Find previous visible revision in the document" -msgstr "" +msgstr "Buscar la anterior revisión visible del documentu" # MENU_STATUSLINE_EDIT_FIND #. MENU_STATUSLINE_EDIT_FIND -#: po/tmp/ap_String_Id.h.h:1109 +#: po/tmp/ap_String_Id.h.h:1117 msgid "Find the specified text" -msgstr "Atopar el testu especificáu" +msgstr "Buscar el testu especificáu" # FirstLineIndentStatus #. FirstLineIndentStatus -#: po/tmp/ap_String_Id.h.h:1111 +#: po/tmp/ap_String_Id.h.h:1119 #, c-format msgid "First Line Indent [%s]" -msgstr "" +msgstr "Indentación de primer llinia [%s]" # DLG_Para_SpecialFirstLine #. DLG_Para_SpecialFirstLine -#: po/tmp/ap_String_Id.h.h:1113 +#: po/tmp/ap_String_Id.h.h:1121 msgid "First line" -msgstr "Primera llinia" +msgstr "Primer llinia" # DLG_InsertTable_FixedColSize #. DLG_InsertTable_FixedColSize -#: po/tmp/ap_String_Id.h.h:1115 +#: po/tmp/ap_String_Id.h.h:1123 msgid "Fixed column size:" -msgstr "" +msgstr "Tamañu de columna fixu:" #. DLG_Lists_FoldingLevel1 -#: po/tmp/ap_String_Id.h.h:1117 +#: po/tmp/ap_String_Id.h.h:1125 msgid "Fold below level 1" -msgstr "" +msgstr "Plegar baxo'l nivel 1" #. DLG_Lists_FoldingLevel2 -#: po/tmp/ap_String_Id.h.h:1119 +#: po/tmp/ap_String_Id.h.h:1127 msgid "Fold below level 2" -msgstr "" +msgstr "Plegar baxo'l nivel 2" #. DLG_Lists_FoldingLevel3 -#: po/tmp/ap_String_Id.h.h:1121 +#: po/tmp/ap_String_Id.h.h:1129 msgid "Fold below level 3" -msgstr "" +msgstr "Plegar baxo'l nivel 3" #. DLG_Lists_FoldingLevel4 -#: po/tmp/ap_String_Id.h.h:1123 +#: po/tmp/ap_String_Id.h.h:1131 msgid "Fold below level 4" -msgstr "" +msgstr "Plegar baxo'l nivel 4" # DLG_Para_PreviewFollowParagraph #. DLG_Para_PreviewFollowParagraph -#: po/tmp/ap_String_Id.h.h:1125 -msgid "" -"Following Paragraph Following Paragraph Following Paragraph Following " -"Paragraph Following Paragraph Following Paragraph Following Paragraph" -msgstr "" +#: po/tmp/ap_String_Id.h.h:1133 +msgid "Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph" +msgstr "Parágrafu siguiente Parágrafu siguiente Parágrafu siguiente Parágrafu siguiente Parágrafu siguiente Parágrafu siguiente Parágrafu siguiente " # DLG_Styles_ModifyFont # TOOLBAR_LABEL_FMT_FONT @@ -3479,33 +3469,48 @@ #. TOOLBAR_TOOLTIP_FMT_FONT #. DLG_UFS_FontTitle #. DLG_UFS_FontTab -#: po/tmp/ap_String_Id.h.h:1130 po/tmp/xap_String_Id.h.h:315 +#: po/tmp/ap_String_Id.h.h:1138 +#: po/tmp/xap_String_Id.h.h:335 msgid "Font" msgstr "Fonte" +# DLG_NEW_Choose +#. TOOLBAR_STATUSLINE_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:1140 +msgid "Font Choose" +msgstr "Eleición de fonte" + # TOOLBAR_LABEL_FMT_SIZE # TOOLBAR_STATUSLINE_FMT_SIZE # TOOLBAR_TOOLTIP_FMT_SIZE #. TOOLBAR_LABEL_FMT_SIZE #. TOOLBAR_STATUSLINE_FMT_SIZE #. TOOLBAR_TOOLTIP_FMT_SIZE -#: po/tmp/ap_String_Id.h.h:1134 +#: po/tmp/ap_String_Id.h.h:1144 msgid "Font Size" msgstr "Tamañu de fonte" # TOOLBAR_LABEL_COLOR_FORE # TOOLBAR_STATUSLINE_COLOR_FORE # TOOLBAR_TOOLTIP_COLOR_FORE +#. TOOLBAR_LABEL_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:1146 +msgid "Font choose" +msgstr "Eleición de fonte" + +# TOOLBAR_LABEL_COLOR_FORE +# TOOLBAR_STATUSLINE_COLOR_FORE +# TOOLBAR_TOOLTIP_COLOR_FORE #. TOOLBAR_LABEL_COLOR_FORE #. TOOLBAR_STATUSLINE_COLOR_FORE #. TOOLBAR_TOOLTIP_COLOR_FORE -#: po/tmp/ap_String_Id.h.h:1138 +#: po/tmp/ap_String_Id.h.h:1150 msgid "Font color" -msgstr "Collor de fonte" +msgstr "Color de fonte" # DLG_Lists_ButtonFont #. DLG_Lists_ButtonFont -#: po/tmp/ap_String_Id.h.h:1140 +#: po/tmp/ap_String_Id.h.h:1152 msgid "Font..." msgstr "Fonte..." @@ -3513,330 +3518,335 @@ # DLG_UFS_FontLabel #. DLG_Lists_Font #. DLG_UFS_FontLabel -#: po/tmp/ap_String_Id.h.h:1142 po/tmp/xap_String_Id.h.h:317 +#: po/tmp/ap_String_Id.h.h:1154 +#: po/tmp/xap_String_Id.h.h:337 msgid "Font:" msgstr "Fonte:" # MENU_LABEL_INSERT_FOOTNOTE #. MENU_LABEL_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1144 +#: po/tmp/ap_String_Id.h.h:1156 msgid "Foot¬e" -msgstr "" +msgstr "Nota al &pie" # DLG_PageNumbers_Footer #. DLG_PageNumbers_Footer #. MENU_LABEL_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1147 +#: po/tmp/ap_String_Id.h.h:1159 msgid "Footer" -msgstr "" +msgstr "Pie de páxina" # DLG_HdrFtr_FooterFrame #. DLG_HdrFtr_FooterFrame -#: po/tmp/ap_String_Id.h.h:1149 +#: po/tmp/ap_String_Id.h.h:1161 msgid "Footer Properties" -msgstr "Propiedaes del pie de páxina" +msgstr "Propiedaes de pie de páxina" # FooterStatus #. FooterStatus -#: po/tmp/ap_String_Id.h.h:1151 +#: po/tmp/ap_String_Id.h.h:1163 #, c-format msgid "Footer [%s]" -msgstr "" +msgstr "Pie de páxina [%s]" # FIELD_Numbers_FootnoteAnchor #. FIELD_Numbers_FootnoteAnchor -#: po/tmp/ap_String_Id.h.h:1153 +#: po/tmp/ap_String_Id.h.h:1165 msgid "Footnote anchor" -msgstr "" +msgstr "Anchor de nota al pie" # FIELD_Numbers_FootnoteReference #. FIELD_Numbers_FootnoteReference -#: po/tmp/ap_String_Id.h.h:1155 +#: po/tmp/ap_String_Id.h.h:1167 msgid "Footnote reference" -msgstr "" +msgstr "Referencia de nota al pie" # DLG_FormatFootnotes_FootStyle #. DLG_FormatFootnotes_FootStyle -#: po/tmp/ap_String_Id.h.h:1157 +#: po/tmp/ap_String_Id.h.h:1169 msgid "Footnote style" -msgstr "" +msgstr "Estilu de nota al pie" # MENU_LABEL_FMT_FOOTNOTES #. MENU_LABEL_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:1159 +#: po/tmp/ap_String_Id.h.h:1171 msgid "Footnotes and Endnotes" -msgstr "" +msgstr "Notes al pie y a lo cabero" # TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR # TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1162 +#: po/tmp/ap_String_Id.h.h:1174 msgid "Force LTR direction of text" -msgstr "" +msgstr "Forciar direición del testu d'E-D" # TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_RTL # TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_RTL #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_RTL #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1165 +#: po/tmp/ap_String_Id.h.h:1177 msgid "Force RTL direction of text" -msgstr "" +msgstr "Forciar direición del testu de D-E" # MENU_STATUSLINE_FMT_DIRECTION_DO_LTR #. MENU_STATUSLINE_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:1167 +#: po/tmp/ap_String_Id.h.h:1179 msgid "Force left-to-right direction of text" -msgstr "" +msgstr "Forciar direición del testu de drecha a esquierda" # MENU_STATUSLINE_FMT_DIRECTION_DO_RTL #. MENU_STATUSLINE_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:1169 +#: po/tmp/ap_String_Id.h.h:1181 msgid "Force right-to-left direction of text" -msgstr "" +msgstr "Forciar direición del testu d'esquierda a drecha" # TOOLBAR_LABEL_FMT_DIR_OVERRIDE_LTR #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1171 +#: po/tmp/ap_String_Id.h.h:1183 msgid "Force text LTR" -msgstr "" +msgstr "Forciar testu E-D" # TOOLBAR_LABEL_FMT_DIR_OVERRIDE_RTL #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1173 +#: po/tmp/ap_String_Id.h.h:1185 msgid "Force text RTL" -msgstr "" +msgstr "Forciar testu D-E" # DLG_Styles_ModifyFormat # TB_Format #. DLG_Styles_ModifyFormat #. TB_Format -#: po/tmp/ap_String_Id.h.h:1176 +#: po/tmp/ap_String_Id.h.h:1188 msgid "Format" msgstr "Formatu" #. MENU_STATUSLINE_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1178 +#: po/tmp/ap_String_Id.h.h:1190 msgid "Format Embedded Object" -msgstr "" +msgstr "Formatiar oxetu encrustáu" # DLG_FormatFootnotes_Endnotes #. DLG_FormatFootnotes_Endnotes -#: po/tmp/ap_String_Id.h.h:1180 +#: po/tmp/ap_String_Id.h.h:1192 msgid "Format Endnotes" -msgstr "" +msgstr "Formatiar notes a lo cabero" # DLG_FormatFootnotes_Footnotes #. DLG_FormatFootnotes_Footnotes -#: po/tmp/ap_String_Id.h.h:1182 +#: po/tmp/ap_String_Id.h.h:1194 msgid "Format Footnotes" -msgstr "" +msgstr "Formatiar notes al pie" # DLG_FormatFootnotes_Title #. DLG_FormatFootnotes_Title -#: po/tmp/ap_String_Id.h.h:1184 +#: po/tmp/ap_String_Id.h.h:1196 msgid "Format Footnotes and Endnotes" -msgstr "" +msgstr "Formatiar notes a lo cabero y al pie" # DLG_HdrFtr_Title #. DLG_HdrFtr_Title -#: po/tmp/ap_String_Id.h.h:1186 +#: po/tmp/ap_String_Id.h.h:1198 msgid "Format Header/Footers" -msgstr "" +msgstr "Formatiar Encabezaos/Pies de páxina" # DLG_FormatTableTitle # MENU_STATUSLINE_TABLE_FORMAT #. MENU_LABEL_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1188 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1200 msgid "Format Object" -msgstr "Formatu de tabla" +msgstr "Formatiar oxetu" # TOOLBAR_LABEL_FMTPAINTER #. TOOLBAR_LABEL_FMTPAINTER -#: po/tmp/ap_String_Id.h.h:1190 +#: po/tmp/ap_String_Id.h.h:1202 msgid "Format Painter" -msgstr "" +msgstr "Formatiar brocha" # DLG_FormatTableTitle # MENU_STATUSLINE_TABLE_FORMAT #. DLG_FormatTableTitle #. MENU_STATUSLINE_TABLE_FORMAT -#: po/tmp/ap_String_Id.h.h:1193 +#: po/tmp/ap_String_Id.h.h:1205 msgid "Format Table" -msgstr "Formatu de tabla" +msgstr "Formatiar tabla" # DLG_FormatTableTitle # MENU_STATUSLINE_TABLE_FORMAT #. DLG_FormatTOC_Title -#: po/tmp/ap_String_Id.h.h:1195 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1207 msgid "Format Table of Contents" -msgstr "Formatu de tabla" +msgstr "Formatiar índiz" # DLG_FormatTableTitle # MENU_STATUSLINE_TABLE_FORMAT #. DLG_FormatFrameTitle -#: po/tmp/ap_String_Id.h.h:1197 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1209 msgid "Format Text Box" -msgstr "Formatu de tabla" +msgstr "Formatiar caxa de testu" # DLG_Options_Label_ViewFormatTB #. DLG_Options_Label_ViewFormatTB -#: po/tmp/ap_String_Id.h.h:1199 +#: po/tmp/ap_String_Id.h.h:1211 msgid "Format Toolbar" -msgstr "" +msgstr "Formatiar barra de ferramientes" # MENU_STATUSLINE_FMT_IMAGE #. MENU_STATUSLINE_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:1201 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1213 msgid "Format this image" -msgstr "Redimensionar esta imaxe" +msgstr "Formatiar esta imaxe" #. MENU_STATUSLINE_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:1203 +#: po/tmp/ap_String_Id.h.h:1215 msgid "Format your document using styles" -msgstr "" +msgstr "Formatiar el to documentu usando estilos" # DLG_Lists_Format #. DLG_Lists_Format #. DLG_DocComparison_Fmt -#: po/tmp/ap_String_Id.h.h:1205 po/tmp/xap_String_Id.h.h:323 +#: po/tmp/ap_String_Id.h.h:1217 +#: po/tmp/xap_String_Id.h.h:343 msgid "Format:" msgstr "Formatu:" # MENU_LABEL_INSERT_GRAPHIC #. MENU_LABEL_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1207 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1219 msgid "From File" -msgstr "&Dende archivu" +msgstr "Dende archivu" # DLG_UP_From #. MENU_LABEL_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1209 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1221 msgid "From LaTeX" -msgstr "de:" +msgstr "Dende LaTeX" + +# MENU_LABEL_VIEW_FULLSCREEN +#. TOOLBAR_LABEL_VIEW_FULL_SCREEN +#. TOOLBAR_STATUSLINE_VIEW_FULL_SCREEN +#. TOOLBAR_TOOLTIP_VIEW_FULL_SCREEN +#: po/tmp/ap_String_Id.h.h:1225 +msgid "Full Screen" +msgstr "Pantalla completa" # DLG_Options_Label_General # DLG_MetaData_TAB_General #. DLG_FormatTOC_General #. DLG_Options_Label_General #. DLG_MetaData_TAB_General -#: po/tmp/ap_String_Id.h.h:1213 +#: po/tmp/ap_String_Id.h.h:1229 msgid "General" msgstr "Xeneral" # DLG_Goto_Btn_Goto #. DLG_Goto_Btn_Goto -#: po/tmp/ap_String_Id.h.h:1215 +#: po/tmp/ap_String_Id.h.h:1231 msgid "Go To" -msgstr "Dia a" +msgstr "Dir a" # DLG_Goto_Label_What #. DLG_Goto_Label_What -#: po/tmp/ap_String_Id.h.h:1217 +#: po/tmp/ap_String_Id.h.h:1233 msgid "Go To &What:" -msgstr "Dir a que (&W): " +msgstr "Dir a &qué: " # DLG_Goto_Title #. DLG_Goto_Title -#: po/tmp/ap_String_Id.h.h:1219 +#: po/tmp/ap_String_Id.h.h:1235 msgid "Go to..." msgstr "Dir a ..." #. DLG_FormatTOC_HasLabel -#: po/tmp/ap_String_Id.h.h:1221 +#: po/tmp/ap_String_Id.h.h:1237 msgid "H&as label" -msgstr "" +msgstr "Tien &etiqueta" # STYLE_HEADING3 #. DLG_FormatTOC_HeadingText -#: po/tmp/ap_String_Id.h.h:1223 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1239 msgid "H&eading text:" -msgstr "Cabecera 3" +msgstr "Testu d'&encabezáu:" # DLG_Lists_Hand_List # STYLE_HANDLIST #. DLG_Lists_Hand_List #. STYLE_HANDLIST -#: po/tmp/ap_String_Id.h.h:1225 po/tmp/xap_String_Id.h.h:363 +#: po/tmp/ap_String_Id.h.h:1241 +#: po/tmp/xap_String_Id.h.h:383 msgid "Hand List" -msgstr "" +msgstr "Llista de manes" # DLG_Para_SpecialHanging #. DLG_Para_SpecialHanging -#: po/tmp/ap_String_Id.h.h:1227 +#: po/tmp/ap_String_Id.h.h:1243 msgid "Hanging" -msgstr "" +msgstr "Colgando" # DLG_PageNumbers_Header #. DLG_PageNumbers_Header #. MENU_LABEL_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1230 +#: po/tmp/ap_String_Id.h.h:1246 msgid "Header" -msgstr "Cabecera" +msgstr "Encabezáu" # DLG_HdrFtr_HeaderFrame #. DLG_HdrFtr_HeaderFrame -#: po/tmp/ap_String_Id.h.h:1232 +#: po/tmp/ap_String_Id.h.h:1248 msgid "Header Properties" -msgstr "Propiedaes de la cabecera" +msgstr "Propiedaes d'encabezáu" # HeaderStatus #. HeaderStatus -#: po/tmp/ap_String_Id.h.h:1234 +#: po/tmp/ap_String_Id.h.h:1250 #, c-format msgid "Header [%s]" -msgstr "Cabecera [%s]" +msgstr "Encabezáu [%s]" # MENU_LABEL_FMT_HDRFTR #. MENU_LABEL_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:1236 +#: po/tmp/ap_String_Id.h.h:1252 msgid "Header/Footers" -msgstr "" +msgstr "Encabezaos/Pies de páxina" # MSG_CHECK_PRINT_MODE #. MSG_CHECK_PRINT_MODE -#: po/tmp/ap_String_Id.h.h:1238 +#: po/tmp/ap_String_Id.h.h:1254 msgid "" -"Headers and Footers can only be created and edited while in Print View " -"Mode. \n" +"Headers and Footers can only be created and edited while in Print View Mode. \n" " To enter this mode choose View then Print Layout from the Menus. \n" " Would you like to enter Print Layout mode right now?" msgstr "" +"Los encabezaos y los pies de páxina namái puen crease y editase nel mou de visualización d'imprentación. \n" +" Pa entrar nesti mou escueyi Ver / Diseñu d'imprentación nel menú. \n" +" ¿Quies entrar nel mou de diseñu d'imprentación agora?" # STYLE_HEADING3 #. DLG_Stylist_HeadingStyles -#: po/tmp/ap_String_Id.h.h:1240 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1256 msgid "Heading Styles" -msgstr "Cabecera 3" +msgstr "Estilos d'encabezáu" # STYLE_HEADING3 #. DLG_FormatTOC_HeadingStyle -#: po/tmp/ap_String_Id.h.h:1242 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1258 msgid "Heading style:" -msgstr "Cabecera 3" +msgstr "Estilu d'encabezáu:" # DLG_Lists_Heart_List # STYLE_HEARTLIST #. DLG_Lists_Heart_List #. STYLE_HEARTLIST -#: po/tmp/ap_String_Id.h.h:1244 po/tmp/xap_String_Id.h.h:379 +#: po/tmp/ap_String_Id.h.h:1260 +#: po/tmp/xap_String_Id.h.h:399 msgid "Heart List" -msgstr "" +msgstr "Llista de corazones" # DLG_Lists_Hebrew_List #. DLG_Lists_Hebrew_List -#: po/tmp/ap_String_Id.h.h:1246 +#: po/tmp/ap_String_Id.h.h:1262 msgid "Hebrew List" -msgstr "Llista Hebrea" +msgstr "Llista hebrea" # TOOLBAR_LABEL_HELP # TOOLBAR_STATUSLINE_HELP @@ -3844,38 +3854,38 @@ #. TOOLBAR_LABEL_HELP #. TOOLBAR_STATUSLINE_HELP #. TOOLBAR_TOOLTIP_HELP -#: po/tmp/ap_String_Id.h.h:1250 +#: po/tmp/ap_String_Id.h.h:1266 msgid "Help" -msgstr "Ayuda" +msgstr "Aida" # MENU_LABEL_HELP_CONTENTS #. MENU_LABEL_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:1252 +#: po/tmp/ap_String_Id.h.h:1268 msgid "Help &Contents" -msgstr "" +msgstr "Aida y conteníos" # MENU_LABEL_HELP_INDEX #. MENU_LABEL_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:1254 +#: po/tmp/ap_String_Id.h.h:1270 msgid "Help &Introduction" -msgstr "&Introducción de l'ayuda" +msgstr "&Introducción de l'aida" # DLG_Options_Label_Hide #. DLG_Options_Label_Hide -#: po/tmp/ap_String_Id.h.h:1256 +#: po/tmp/ap_String_Id.h.h:1272 msgid "Hide" -msgstr "Esconder" +msgstr "Ocultar" # DLG_Options_Label_SpellHideErrors #. DLG_Options_Label_SpellHideErrors -#: po/tmp/ap_String_Id.h.h:1258 +#: po/tmp/ap_String_Id.h.h:1274 msgid "Hide &spelling errors in the document" -msgstr "" +msgstr "Ocultar errores &ortográficos nel documentu" #. DLG_Lists_FoldingLevelexp -#: po/tmp/ap_String_Id.h.h:1260 +#: po/tmp/ap_String_Id.h.h:1276 msgid "Hide text below List Levels" -msgstr "" +msgstr "Ocultar testu embaxo los niveles de llistes" # TOOLBAR_LABEL_COLOR_BACK # TOOLBAR_STATUSLINE_COLOR_BACK @@ -3883,93 +3893,91 @@ #. TOOLBAR_LABEL_COLOR_BACK #. TOOLBAR_STATUSLINE_COLOR_BACK #. TOOLBAR_TOOLTIP_COLOR_BACK -#: po/tmp/ap_String_Id.h.h:1264 +#: po/tmp/ap_String_Id.h.h:1280 msgid "Highlight" -msgstr "" +msgstr "Resaltar" # DLG_Spell_IgnoreAll #. DLG_Spell_IgnoreAll -#: po/tmp/ap_String_Id.h.h:1266 +#: po/tmp/ap_String_Id.h.h:1282 msgid "I&gnore All" -msgstr "" +msgstr "I&norar too" # DLG_Para_LabelAlignment #. DLG_FormatTOC_Indent -#: po/tmp/ap_String_Id.h.h:1268 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1284 msgid "I&ndent:" -msgstr "Alliniamientu (&G)" +msgstr "I&ndentar:" # InsertModeFieldINS #. InsertModeFieldINS -#: po/tmp/ap_String_Id.h.h:1270 +#: po/tmp/ap_String_Id.h.h:1286 msgid "INS" -msgstr "" +msgstr "INS" # DLG_Options_Label_Icons #. DLG_Options_Label_Icons -#: po/tmp/ap_String_Id.h.h:1272 +#: po/tmp/ap_String_Id.h.h:1288 msgid "Icons" msgstr "Iconos" # DLG_Options_Label_Ignore #. DLG_Options_Label_Ignore -#: po/tmp/ap_String_Id.h.h:1274 +#: po/tmp/ap_String_Id.h.h:1290 msgid "Ignore" -msgstr "" +msgstr "Inorar" # WORD_PassInvalid #. DLG_Options_Label_SpellIgnoreWords -#: po/tmp/ap_String_Id.h.h:1276 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1292 msgid "Ignore Words" -msgstr "Contraseña incorreuta" +msgstr "Inorar pallabres" # MENU_STATUSLINE_SPELL_IGNOREALL #. MENU_STATUSLINE_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:1278 +#: po/tmp/ap_String_Id.h.h:1294 msgid "Ignore all occurrences of this word in the document" -msgstr "" +msgstr "Inorar toles apaiciones d'esta pallabra nel documentu" # DLG_Options_Label_SpellIgnoredWord #. DLG_Options_Label_SpellIgnoredWord -#: po/tmp/ap_String_Id.h.h:1280 +#: po/tmp/ap_String_Id.h.h:1296 msgid "Ignored words:" -msgstr "" +msgstr "Pallabres inoraes:" # DLG_FormatTable_Background #. DLG_FormatFrame_SetImageBackground #. DLG_FormatTable_SetImageBackground -#: po/tmp/ap_String_Id.h.h:1283 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1299 msgid "Image For Background" -msgstr "Fondu:" +msgstr "Imaxe pal fondu" # DLG_Lists_Implies_List # STYLE_IMPLIES_LIST #. DLG_Lists_Implies_List #. STYLE_IMPLIES_LIST -#: po/tmp/ap_String_Id.h.h:1285 po/tmp/xap_String_Id.h.h:413 +#: po/tmp/ap_String_Id.h.h:1301 +#: po/tmp/xap_String_Id.h.h:433 msgid "Implies List" -msgstr "" +msgstr "Llista d'implicaciones" # MENU_STATUSLINE_FMT_IMPORTSTYLES #. MENU_STATUSLINE_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:1287 +#: po/tmp/ap_String_Id.h.h:1303 msgid "Import style definitions from a document" -msgstr "" +msgstr "Importar definiciones d'estilu dende un documentu" # DLG_Styles_LBL_InUse #. DLG_Styles_LBL_InUse -#: po/tmp/ap_String_Id.h.h:1289 +#: po/tmp/ap_String_Id.h.h:1305 msgid "In Use" msgstr "N'usu" # WORD_PassInvalid #. WORD_PassInvalid -#: po/tmp/ap_String_Id.h.h:1291 +#: po/tmp/ap_String_Id.h.h:1307 msgid "Incorrect Password" -msgstr "Contraseña incorreuta" +msgstr "Clave incorreuta" # TOOLBAR_LABEL_INDENT # TOOLBAR_STATUSLINE_INDENT @@ -3977,41 +3985,40 @@ #. TOOLBAR_LABEL_INDENT #. TOOLBAR_STATUSLINE_INDENT #. TOOLBAR_TOOLTIP_INDENT -#: po/tmp/ap_String_Id.h.h:1295 +#: po/tmp/ap_String_Id.h.h:1311 msgid "Increase indent" -msgstr "" +msgstr "Aumentar indentación" # DLG_Para_LabelIndentation #. DLG_Para_LabelIndentation -#: po/tmp/ap_String_Id.h.h:1297 +#: po/tmp/ap_String_Id.h.h:1313 msgid "Indentation" -msgstr "" +msgstr "Indentación" # TOOLBAR_LABEL_SINGLE_SPACE #. DLG_Para_TabLabelIndentsAndSpacing -#: po/tmp/ap_String_Id.h.h:1299 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1315 msgid "Indents and Spacing" -msgstr "Espaciau cenciellu" +msgstr "Indentaciones y espaciáu" # Se dejan ambas en mayúscula # DLG_ToggleCase_FirstUpperCase #. DLG_ToggleCase_FirstUpperCase -#: po/tmp/ap_String_Id.h.h:1301 +#: po/tmp/ap_String_Id.h.h:1317 msgid "Initial Caps" -msgstr "" +msgstr "Mayúscules aniciales" # DLG_FormatFootnotes_EndInitialVal #. DLG_FormatFootnotes_EndInitialVal -#: po/tmp/ap_String_Id.h.h:1303 +#: po/tmp/ap_String_Id.h.h:1319 msgid "Initial Endnote value" -msgstr "" +msgstr "Valor anicial de la nota a lo cabero" # DLG_FormatFootnotes_FootInitialVal #. DLG_FormatFootnotes_FootInitialVal -#: po/tmp/ap_String_Id.h.h:1305 +#: po/tmp/ap_String_Id.h.h:1321 msgid "Initial Footnote value" -msgstr "" +msgstr "Valor anicial de la nota al pie" # DLG_Break_Insert # MENU_STATUSLINE_TABLE_INSERT @@ -4019,104 +4026,103 @@ #. DLG_Break_Insert #. MENU_STATUSLINE_TABLE_INSERT #. DLG_IP_Button_Label -#: po/tmp/ap_String_Id.h.h:1308 po/tmp/xap_String_Id.h.h:423 +#: po/tmp/ap_String_Id.h.h:1324 +#: po/tmp/xap_String_Id.h.h:443 msgid "Insert" -msgstr "Amestar" +msgstr "Enxertar" # MENU_LABEL_TABLE_INSERTCOLUMN #. MENU_LABEL_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1310 +#: po/tmp/ap_String_Id.h.h:1326 msgid "Insert &Columns" -msgstr "Amestar &columnes" +msgstr "Enxertar &columnes" # MENU_LABEL_TABLE_INSERTROW #. MENU_LABEL_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1312 +#: po/tmp/ap_String_Id.h.h:1328 msgid "Insert &Rows" -msgstr "Amestar &files" +msgstr "Enxertar &fileres" # MENU_LABEL_TABLE_INSERTTABLE #. MENU_LABEL_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1314 +#: po/tmp/ap_String_Id.h.h:1330 msgid "Insert &Table" -msgstr "Amestar &tabla" +msgstr "Enxertar &tabla" # DLG_InsertBookmark_Title # TOOLBAR_LABEL_FMT_BOOKMARK #. DLG_InsertBookmark_Title #. TOOLBAR_LABEL_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1317 +#: po/tmp/ap_String_Id.h.h:1333 msgid "Insert Bookmark" -msgstr "Amestar marcaor" +msgstr "Enxertar marcador" # DLG_Break_BreakTitle_Capital #. DLG_Break_BreakTitle_Capital -#: po/tmp/ap_String_Id.h.h:1319 +#: po/tmp/ap_String_Id.h.h:1335 msgid "Insert Break" -msgstr "" +msgstr "Enxertar saltu" # MENU_STATUSLINE_TABLE_INSERT_CELLS #. MENU_STATUSLINE_TABLE_INSERT_CELLS -#: po/tmp/ap_String_Id.h.h:1321 +#: po/tmp/ap_String_Id.h.h:1337 msgid "Insert Cells" -msgstr "Amestar celdes" +msgstr "Enxertar celdes" # MENU_STATUSLINE_EDIT_PASTE #. MENU_STATUSLINE_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1323 +#: po/tmp/ap_String_Id.h.h:1339 msgid "Insert Clipboard contents" -msgstr "" +msgstr "Enxertar el conteníu del cartafueyu" # DLG_DateTime_DateTimeTitle #. DLG_DateTime_DateTimeTitle -#: po/tmp/ap_String_Id.h.h:1325 +#: po/tmp/ap_String_Id.h.h:1341 msgid "Insert Date and Time" -msgstr "Amestar hora y fecha" +msgstr "Enxertar data y hora" # MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE #. MENU_LABEL_TOOLTIP_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1327 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1343 msgid "Insert Equation" -msgstr "Inxertar una fila " +msgstr "Enxertar ecuación" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1329 +#: po/tmp/ap_String_Id.h.h:1345 msgid "Insert Equation from a LaTeX expression" -msgstr "" +msgstr "Enxertar una ecuación dende una espresión LaTeX" # DLG_Field_FieldTitle_Capital #. DLG_Field_FieldTitle_Capital -#: po/tmp/ap_String_Id.h.h:1331 +#: po/tmp/ap_String_Id.h.h:1347 msgid "Insert Field" -msgstr "Amestar campu" +msgstr "Enxertar campu" # DLG_InsertHyperlink_Title # TOOLBAR_LABEL_FMT_HYPERLINK #. DLG_InsertHyperlink_Title #. TOOLBAR_LABEL_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1334 +#: po/tmp/ap_String_Id.h.h:1350 msgid "Insert Hyperlink" -msgstr "Amestar enllaz" +msgstr "Enxertar hiperenllaz" # TOOLBAR_LABEL_IMG #. TOOLBAR_LABEL_IMG -#: po/tmp/ap_String_Id.h.h:1336 +#: po/tmp/ap_String_Id.h.h:1352 msgid "Insert Image" -msgstr "Amestar imaxe" +msgstr "Enxertar imaxe" # DLG_MailMerge_MailMergeTitle #. DLG_MailMerge_MailMergeTitle -#: po/tmp/ap_String_Id.h.h:1338 +#: po/tmp/ap_String_Id.h.h:1354 msgid "Insert Mail Merge Field" -msgstr "" +msgstr "Enxertar campu de combinación de corréu" # MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1340 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1356 msgid "Insert MathML from a file" -msgstr "Inxertar una fila " +msgstr "Enxertar MathML dende un archivu" # DLG_InsertTable_TableTitle # MENU_STATUSLINE_TABLE_INSERT_TABLE @@ -4124,247 +4130,244 @@ #. DLG_InsertTable_TableTitle #. MENU_STATUSLINE_TABLE_INSERT_TABLE #. MENU_STATUSLINE_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1344 +#: po/tmp/ap_String_Id.h.h:1360 msgid "Insert Table" -msgstr "Amestar tabla" +msgstr "Enxertar tabla" # MENU_STATUSLINE_INSERT_DIRECTIONMARKER #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER -#: po/tmp/ap_String_Id.h.h:1346 +#: po/tmp/ap_String_Id.h.h:1362 msgid "Insert Unicode direction marker into the document" -msgstr "" +msgstr "Enxertar un marcador de direición Unicode nel documentu" # MENU_STATUSLINE_INSERT_INSERTFOOTER #. MENU_STATUSLINE_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1348 +#: po/tmp/ap_String_Id.h.h:1364 msgid "Insert a Footer" -msgstr "Inxertar un pie de páxina" +msgstr "Enxertar un pie de páxina" # MENU_STATUSLINE_INSERT_INSERTHEADER #. MENU_STATUSLINE_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1350 +#: po/tmp/ap_String_Id.h.h:1366 msgid "Insert a Header" -msgstr "Amestar una cabecera" +msgstr "Enxertar un encabezáu" #. MENU_STATUSLINE_INSERT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:1352 +#: po/tmp/ap_String_Id.h.h:1368 msgid "Insert a Table of Contents based on Headings" -msgstr "" +msgstr "Enxertar un índiz basáu nos encabezaos" # MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE #. MENU_STATUSLINE_INSERT_TEXTBOX -#: po/tmp/ap_String_Id.h.h:1354 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1370 msgid "Insert a Text Box" -msgstr "Inxertar una fila " +msgstr "Enxertar una caxa de testu" # TOOLBAR_STATUSLINE_FMT_BOOKMARK # TOOLBAR_TOOLTIP_FMT_BOOKMARK #. TOOLBAR_STATUSLINE_FMT_BOOKMARK #. TOOLBAR_TOOLTIP_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1357 +#: po/tmp/ap_String_Id.h.h:1373 msgid "Insert a bookmark into the document" -msgstr "Inxertar un marcaor dientro del documentu" +msgstr "Enxertar un marcador nel documentu" # MENU_STATUSLINE_INSERT_FIELD #. MENU_STATUSLINE_INSERT_FIELD -#: po/tmp/ap_String_Id.h.h:1359 +#: po/tmp/ap_String_Id.h.h:1375 msgid "Insert a calculated field" -msgstr "" +msgstr "Enxertar un campu calculáu" # MENU_STATUSLINE_TABLE_INSERT_COLUMNS_BEFORE #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_BEFORE -#: po/tmp/ap_String_Id.h.h:1361 +#: po/tmp/ap_String_Id.h.h:1377 msgid "Insert a column to the left" -msgstr "Amestar una columna a dizquierda" +msgstr "Enxertar una columna a manzorga" # MENU_STATUSLINE_TABLE_INSERT_COLUMNS_AFTER # MENU_STATUSLINE_TABLE_INSERTCOLUMN #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_AFTER #. MENU_STATUSLINE_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1364 +#: po/tmp/ap_String_Id.h.h:1380 msgid "Insert a column to the right" -msgstr "Amestar una columna a mandrecha" +msgstr "Enxartar una columna a mandrecha" # MENU_STATUSLINE_INSERT_FOOTNOTE #. MENU_STATUSLINE_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1366 +#: po/tmp/ap_String_Id.h.h:1382 msgid "Insert a footnote" -msgstr "" +msgstr "Enxertar una nota al pie" # TOOLBAR_STATUSLINE_FMT_HYPERLINK # TOOLBAR_TOOLTIP_FMT_HYPERLINK #. TOOLBAR_STATUSLINE_FMT_HYPERLINK #. TOOLBAR_TOOLTIP_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1369 +#: po/tmp/ap_String_Id.h.h:1385 msgid "Insert a hyperlink into the document" -msgstr "Insertar un hiperenllaz nel documentu" +msgstr "Enxertar un hiperenllaz nel documentu" # MENU_STATUSLINE_INSERT_MAILMERGE #. MENU_STATUSLINE_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1371 +#: po/tmp/ap_String_Id.h.h:1387 msgid "Insert a mail merge field" -msgstr "" +msgstr "Enxertar un campu de combinación de corréu" # TOOLBAR_STATUSLINE_INSERT_TABLE # TOOLBAR_TOOLTIP_INSERT_TABLE #. TOOLBAR_STATUSLINE_INSERT_TABLE #. TOOLBAR_TOOLTIP_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1374 +#: po/tmp/ap_String_Id.h.h:1390 msgid "Insert a new table into your document" -msgstr "Inxertar un nuea tabla nel documentu" +msgstr "Enxertar una tabla nueva nel to documentu" # MENU_STATUSLINE_INSERT_BREAK #. MENU_STATUSLINE_INSERT_BREAK -#: po/tmp/ap_String_Id.h.h:1376 +#: po/tmp/ap_String_Id.h.h:1392 msgid "Insert a page, column, or section break" -msgstr "" - -# MENU_STATUSLINE_INSERT_PICTURE -#. MENU_STATUSLINE_INSERT_PICTURE -#: po/tmp/ap_String_Id.h.h:1378 -msgid "Insert a picture" -msgstr "Amestar semeya" +msgstr "Enxertar una páxina, columna o saltu de seición" # MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE #. MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1380 +#: po/tmp/ap_String_Id.h.h:1394 msgid "Insert a row above" -msgstr "Inxertar una fila " +msgstr "Enxertar una filera enriba" # MENU_STATUSLINE_TABLE_INSERT_ROWS_AFTER # MENU_STATUSLINE_TABLE_INSERTROW #. MENU_STATUSLINE_TABLE_INSERT_ROWS_AFTER #. MENU_STATUSLINE_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1383 +#: po/tmp/ap_String_Id.h.h:1397 msgid "Insert a row below" -msgstr "" +msgstr "Enxertar una filera embaxo" # MENU_STATUSLINE_INSERT_SYMBOL #. MENU_STATUSLINE_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1385 +#: po/tmp/ap_String_Id.h.h:1399 msgid "Insert a symbol or other special character" -msgstr "" +msgstr "Enxertar un símbolu o caráuter especial" + +# MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE +#. MENU_STATUSLINE_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:1401 +msgid "Insert an Annotation" +msgstr "Enxertar una anotación" # MENU_STATUSLINE_INSERT_PAGENO #. MENU_STATUSLINE_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1387 +#: po/tmp/ap_String_Id.h.h:1403 msgid "Insert an automatically-updated page number" -msgstr "" +msgstr "Enxertar un númberu de páxina autoactualizáu" # MENU_STATUSLINE_INSERT_ENDNOTE #. MENU_STATUSLINE_INSERT_ENDNOTE -#: po/tmp/ap_String_Id.h.h:1389 +#: po/tmp/ap_String_Id.h.h:1405 msgid "Insert an endnote" -msgstr "" +msgstr "Enxertar una nota a lo cabero" # MENU_STATUSLINE_INSERT_GRAPHIC #. MENU_STATUSLINE_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:1391 +#: po/tmp/ap_String_Id.h.h:1407 msgid "Insert an existing picture from another file" -msgstr "" +msgstr "Enxertar una imaxe esistente dende otru archivu" # TOOLBAR_STATUSLINE_IMG # TOOLBAR_TOOLTIP_IMG #. TOOLBAR_STATUSLINE_IMG #. TOOLBAR_TOOLTIP_IMG -#: po/tmp/ap_String_Id.h.h:1394 +#: po/tmp/ap_String_Id.h.h:1410 msgid "Insert an image into the document" -msgstr "Inxetar una imaxe nel documentu" +msgstr "Enxetar una imaxe nel documentu" # MENU_STATUSLINE_INSERT_BOOKMARK #. MENU_STATUSLINE_INSERT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1396 +#: po/tmp/ap_String_Id.h.h:1412 msgid "Insert bookmark" -msgstr "Amestar marcaor" +msgstr "Enxertar marcador" # DLG_Break_BreakTitle #. DLG_Break_BreakTitle -#: po/tmp/ap_String_Id.h.h:1398 +#: po/tmp/ap_String_Id.h.h:1414 msgid "Insert break" -msgstr "" +msgstr "Enxertar un saltu" # MENU_STATUSLINE_INSERT_CLIPART #. MENU_STATUSLINE_INSERT_CLIPART -#: po/tmp/ap_String_Id.h.h:1400 +#: po/tmp/ap_String_Id.h.h:1416 msgid "Insert clipart" -msgstr "Inxertar un clipart" +msgstr "Enxertar clipart" # DLG_Field_FieldTitle #. DLG_Field_FieldTitle -#: po/tmp/ap_String_Id.h.h:1402 +#: po/tmp/ap_String_Id.h.h:1418 msgid "Insert field" -msgstr "Amestar campu" +msgstr "Enxertar campu" # MENU_STATUSLINE_INSERT_HYPERLINK #. MENU_STATUSLINE_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1404 +#: po/tmp/ap_String_Id.h.h:1420 msgid "Insert hyperlink" -msgstr "Amestar enllaz" +msgstr "Enxertar hiperenllaz" # MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:1406 +#: po/tmp/ap_String_Id.h.h:1422 msgid "Insert left-to-right direction marker (LRM)" -msgstr "" +msgstr "Enxertar un marcador de direición esquierda-drecha (E-D)" # MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:1408 +#: po/tmp/ap_String_Id.h.h:1424 msgid "Insert right-to-left direction marker (RLM)" -msgstr "" +msgstr "Enxertar un marcador de direición drecha-esquierda (D-E)" # TOOLBAR_STATUSLINE_INSERT_SYMBOL # TOOLBAR_TOOLTIP_INSERT_SYMBOL #. TOOLBAR_STATUSLINE_INSERT_SYMBOL #. TOOLBAR_TOOLTIP_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1411 +#: po/tmp/ap_String_Id.h.h:1427 msgid "Insert symbol" -msgstr "Amestar símbolu" +msgstr "Enxertar símbolu" # TOOLBAR_LABEL_INSERT_TABLE #. TOOLBAR_LABEL_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1413 +#: po/tmp/ap_String_Id.h.h:1429 msgid "Insert table" -msgstr "Amestar tabla" +msgstr "Enxertar tabla" # MENU_STATUSLINE_FMT_COLUMNS #. MENU_STATUSLINE_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:1415 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1431 msgid "Insert the Sum of a Table Column" -msgstr "Camudar el númberu de columnes" +msgstr "Enxertar la suma de la columna d'una tabla" # TB_InsertNewTable #. MENU_STATUSLINE_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:1417 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1433 msgid "Insert the Sum of a Table Row" -msgstr "Amestar nua tabla" +msgstr "Enxertar la suma de la filera d'una tabla" # MENU_STATUSLINE_INSERT_FILE #. MENU_STATUSLINE_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1419 +#: po/tmp/ap_String_Id.h.h:1435 msgid "Insert the contents of another file" -msgstr "Inxertar los contenios d'otru archivu" +msgstr "Enxertar los conteníos d'otru archivu" # MENU_STATUSLINE_INSERT_DATETIME #. MENU_STATUSLINE_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:1421 +#: po/tmp/ap_String_Id.h.h:1437 msgid "Insert the date and/or time" -msgstr "Amestar l'hora y/o la fecha" +msgstr "Enxertar data y/o hora" # MENU_STATUSLINE_EDIT_PASTE_SPECIAL #. MENU_STATUSLINE_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1423 +#: po/tmp/ap_String_Id.h.h:1439 msgid "Insert unformatted clipboard contents" -msgstr "" +msgstr "Enxertar el conteníu del cartafueyu ensin formatu" # DLG_Options_Label_ViewUnprintable #. DLG_Options_Label_ViewUnprintable -#: po/tmp/ap_String_Id.h.h:1425 +#: po/tmp/ap_String_Id.h.h:1441 msgid "Invisible &Layout Marks" -msgstr "" +msgstr "Marques de &diseñu invisibles" # TOOLBAR_LABEL_FMT_ITALIC # TOOLBAR_STATUSLINE_FMT_ITALIC @@ -4374,26 +4377,26 @@ #. TOOLBAR_STATUSLINE_FMT_ITALIC #. TOOLBAR_TOOLTIP_FMT_ITALIC #. DLG_UFS_StyleItalic -#: po/tmp/ap_String_Id.h.h:1429 po/tmp/xap_String_Id.h.h:453 +#: po/tmp/ap_String_Id.h.h:1445 +#: po/tmp/xap_String_Id.h.h:473 msgid "Italic" msgstr "Cursiva" # MENU_STATUSLINE_INSERT_HYPERLINK #. MENU_STATUSLINE_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1431 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1447 msgid "Jump to hyperlink" -msgstr "Amestar enllaz" +msgstr "Saltar a hiperenllaz" # DLG_Para_AlignJustified #. DLG_Para_AlignJustified -#: po/tmp/ap_String_Id.h.h:1433 +#: po/tmp/ap_String_Id.h.h:1449 msgid "Justified" msgstr "Xustificáu" # TOOLBAR_LABEL_ALIGN_JUSTIFY #. TOOLBAR_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1435 +#: po/tmp/ap_String_Id.h.h:1451 msgid "Justify" msgstr "Xustificar" @@ -4401,56 +4404,56 @@ # TOOLBAR_TOOLTIP_ALIGN_JUSTIFY #. TOOLBAR_STATUSLINE_ALIGN_JUSTIFY #. TOOLBAR_TOOLTIP_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1438 +#: po/tmp/ap_String_Id.h.h:1454 msgid "Justify paragraph" -msgstr "Xustificar párrafu" +msgstr "Xustificar parágrafu" # MENU_STATUSLINE_ALIGN_JUSTIFY #. MENU_STATUSLINE_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1440 +#: po/tmp/ap_String_Id.h.h:1456 msgid "Justify the paragraph" -msgstr "Xustificar el párrafu" +msgstr "Xustificar el parágrafu" # DLG_Para_PushKeepWithNext #. DLG_Para_PushKeepWithNext -#: po/tmp/ap_String_Id.h.h:1442 +#: po/tmp/ap_String_Id.h.h:1458 msgid "Keep with ne&xt" -msgstr "" +msgstr "Caltener col &siguiente" # FIELD_PieceTable_Test #. FIELD_PieceTable_Test -#: po/tmp/ap_String_Id.h.h:1444 +#: po/tmp/ap_String_Id.h.h:1460 msgid "Kevins Test" -msgstr "" +msgstr "Test de Kevin" # FIELD_Document_Keywords #. FIELD_Document_Keywords -#: po/tmp/ap_String_Id.h.h:1446 +#: po/tmp/ap_String_Id.h.h:1462 msgid "Keywords" msgstr "Pallabres clave" # DLG_MetaData_Keywords_LBL #. DLG_MetaData_Keywords_LBL -#: po/tmp/ap_String_Id.h.h:1448 +#: po/tmp/ap_String_Id.h.h:1464 msgid "Keywords:" msgstr "Pallabres clave:" #. DLG_Latex_LatexTitle #. DLG_Latex_LatexEquation -#: po/tmp/ap_String_Id.h.h:1451 +#: po/tmp/ap_String_Id.h.h:1467 msgid "LaTeX Equation" -msgstr "" +msgstr "Ecuación LaTeX" # DLG_Lists_Indent #. DLG_Lists_Indent -#: po/tmp/ap_String_Id.h.h:1453 +#: po/tmp/ap_String_Id.h.h:1469 msgid "Label Align:" -msgstr "" +msgstr "Alliniamientu d'etiqueta:" #. DLG_FormatTOC_DetailsTop -#: po/tmp/ap_String_Id.h.h:1455 +#: po/tmp/ap_String_Id.h.h:1471 msgid "Label Definitions" -msgstr "" +msgstr "Definiciones d'etiqueta" # DLG_Styles_ModifyLanguage # DLG_Options_Label_Language @@ -4458,40 +4461,39 @@ #. DLG_Styles_ModifyLanguage #. DLG_Options_Label_Language #. FIELD_Document_Language -#: po/tmp/ap_String_Id.h.h:1459 +#: po/tmp/ap_String_Id.h.h:1475 msgid "Language" msgstr "Llingua" # DLG_Options_Label_LangSettings #. DLG_Options_Label_LangSettings -#: po/tmp/ap_String_Id.h.h:1461 +#: po/tmp/ap_String_Id.h.h:1477 msgid "Language settings" -msgstr "Configuración del llenguaxe" +msgstr "Configuración de llingua" # DLG_MetaData_Languages_LBL #. DLG_MetaData_Languages_LBL -#: po/tmp/ap_String_Id.h.h:1463 +#: po/tmp/ap_String_Id.h.h:1479 msgid "Language(s):" -msgstr "Llingua(es):" +msgstr "Llingua(ües):" # DLG_Options_Label_Layout #. DLG_Options_Label_Layout -#: po/tmp/ap_String_Id.h.h:1465 +#: po/tmp/ap_String_Id.h.h:1481 msgid "Layout" -msgstr "" +msgstr "Diseñu" # DLG_PLUGIN_MANAGER_DETAILS #. DLG_FormatTOC_LayoutDetails -#: po/tmp/ap_String_Id.h.h:1467 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1483 msgid "Layout Details" -msgstr "Detalles de plugin" +msgstr "Detalles de diseñu" # DLG_Tab_Label_Leader #. DLG_Tab_Label_Leader -#: po/tmp/ap_String_Id.h.h:1469 +#: po/tmp/ap_String_Id.h.h:1485 msgid "Leader" -msgstr "" +msgstr "Líder" # DLG_Para_AlignLeft # DLG_Tab_Radio_Left @@ -4501,285 +4503,280 @@ #. DLG_Tab_Radio_Left #. DLG_PageNumbers_Left #. TOOLBAR_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1474 +#: po/tmp/ap_String_Id.h.h:1490 msgid "Left" -msgstr "Dizquierda" +msgstr "Esquierda" # LeftIndentStatus #. LeftIndentStatus -#: po/tmp/ap_String_Id.h.h:1476 +#: po/tmp/ap_String_Id.h.h:1492 #, c-format msgid "Left Indent [%s]" -msgstr "" +msgstr "Indentación esquierda [%s]" # LeftIndentTextIndentStatus #. LeftIndentTextIndentStatus -#: po/tmp/ap_String_Id.h.h:1478 +#: po/tmp/ap_String_Id.h.h:1494 #, c-format msgid "Left Indent [%s] First Line Indent [%s]" -msgstr "" +msgstr "Indentación esquierda [%s] Indentación de primer llinia [%s]" # LeftMarginStatus #. LeftMarginStatus -#: po/tmp/ap_String_Id.h.h:1480 +#: po/tmp/ap_String_Id.h.h:1496 #, c-format msgid "Left Margin [%s]" -msgstr "Marxe dizquierdu [%s]" +msgstr "Marxe esquierdu [%s]" # TabToggleLeftTab #. TabToggleLeftTab -#: po/tmp/ap_String_Id.h.h:1482 +#: po/tmp/ap_String_Id.h.h:1498 msgid "Left Tab" -msgstr "" +msgstr "Tabulador esquierdu" # TOOLBAR_STATUSLINE_ALIGN_LEFT # TOOLBAR_TOOLTIP_ALIGN_LEFT #. TOOLBAR_STATUSLINE_ALIGN_LEFT #. TOOLBAR_TOOLTIP_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1485 +#: po/tmp/ap_String_Id.h.h:1501 msgid "Left alignment" -msgstr "Alliniar a dizquierda" +msgstr "Alliniamientu a la esquierda" # MENU_STATUSLINE_ALIGN_LEFT #. MENU_STATUSLINE_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1487 +#: po/tmp/ap_String_Id.h.h:1503 msgid "Left-align the paragraph" -msgstr "Alliniación del parrafu a l'izquierda" +msgstr "Alliniar el parágrafu a la esquierda" # DLG_Lists_Level #. DLG_FormatTOC_Level1 -#: po/tmp/ap_String_Id.h.h:1489 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1505 msgid "Level 1" -msgstr "Nivel:" +msgstr "Nivel 1" # DLG_Lists_Level #. DLG_FormatTOC_Level2 -#: po/tmp/ap_String_Id.h.h:1491 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1507 msgid "Level 2" -msgstr "Nivel:" +msgstr "Nivel 2" # DLG_Lists_Level #. DLG_FormatTOC_Level3 -#: po/tmp/ap_String_Id.h.h:1493 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1509 msgid "Level 3" -msgstr "Nivel:" +msgstr "Nivel 3" # DLG_Lists_Level #. DLG_FormatTOC_Level4 -#: po/tmp/ap_String_Id.h.h:1495 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1511 msgid "Level 4" -msgstr "Nivel:" +msgstr "Nivel 4" # DLG_Lists_DelimiterString #. DLG_Lists_DelimiterString -#: po/tmp/ap_String_Id.h.h:1497 +#: po/tmp/ap_String_Id.h.h:1513 msgid "Level Delimiter:" -msgstr "" +msgstr "Llendador de nivel:" # DLG_Lists_Level #. DLG_Lists_Level -#: po/tmp/ap_String_Id.h.h:1499 +#: po/tmp/ap_String_Id.h.h:1515 msgid "Level:" msgstr "Nivel:" # DLG_Para_LabelLineSpacing #. DLG_Para_LabelLineSpacing -#: po/tmp/ap_String_Id.h.h:1501 +#: po/tmp/ap_String_Id.h.h:1517 msgid "Li&ne spacing:" -msgstr "Espaciáu ente lli&nies" +msgstr "Espaciáu de lli&nies:" # DLG_Goto_Target_Line #. DLG_Goto_Target_Line -#: po/tmp/ap_String_Id.h.h:1503 +#: po/tmp/ap_String_Id.h.h:1519 msgid "Line" msgstr "Llinia" # FIELD_Numbers_LineCount #. FIELD_Numbers_LineCount -#: po/tmp/ap_String_Id.h.h:1505 +#: po/tmp/ap_String_Id.h.h:1521 msgid "Line Count" -msgstr "Contar llinies" +msgstr "Cuntar llinies" # MENU_STATUSLINE_FMT_TOPLINE #. MENU_STATUSLINE_FMT_TOPLINE -#: po/tmp/ap_String_Id.h.h:1507 +#: po/tmp/ap_String_Id.h.h:1523 msgid "Line above the selection (toggle)" -msgstr "" +msgstr "Llinia enriba la seleición (alternar)" #. DLG_Para_TabLabelLineAndPageBreaks -#: po/tmp/ap_String_Id.h.h:1509 +#: po/tmp/ap_String_Id.h.h:1525 msgid "Line and Page Breaks" -msgstr "" +msgstr "Saltos de llinia y de páxina" # MENU_STATUSLINE_FMT_BOTTOMLINE #. MENU_STATUSLINE_FMT_BOTTOMLINE -#: po/tmp/ap_String_Id.h.h:1511 +#: po/tmp/ap_String_Id.h.h:1527 msgid "Line below the selection (toggle)" -msgstr "" +msgstr "Llinia embaxo la seleición (alternar)" # DLG_Column_Line_Between #. DLG_Column_Line_Between -#: po/tmp/ap_String_Id.h.h:1513 +#: po/tmp/ap_String_Id.h.h:1529 msgid "Line between" msgstr "Llinia ente" # DLG_WordCount_Lines #. DLG_WordCount_Lines -#: po/tmp/ap_String_Id.h.h:1515 +#: po/tmp/ap_String_Id.h.h:1531 msgid "Lines:" msgstr "Lllinies:" # DLG_Styles_List #. DLG_Styles_List -#: po/tmp/ap_String_Id.h.h:1517 +#: po/tmp/ap_String_Id.h.h:1533 msgid "List" msgstr "Llista" # FIELD_Numbers_ListLabel #. FIELD_Numbers_ListLabel -#: po/tmp/ap_String_Id.h.h:1519 +#: po/tmp/ap_String_Id.h.h:1535 msgid "List Label" -msgstr "" +msgstr "Etiqueta de llista" # MENU_LABEL_FILE_PROPERTIES #. DLG_Lists_PageProperties -#: po/tmp/ap_String_Id.h.h:1521 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1537 msgid "List Properties" -msgstr "P&ropiedaes" +msgstr "Propiedaes de llista" # DLG_Styles_StylesTitle #. DLG_Stylist_ListStyles -#: po/tmp/ap_String_Id.h.h:1523 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1539 msgid "List Styles" -msgstr "Estilos" +msgstr "Estilos de llista" # DLG_Lists_Title #. DLG_Lists_Title -#: po/tmp/ap_String_Id.h.h:1525 +#: po/tmp/ap_String_Id.h.h:1541 msgid "Lists for " -msgstr "" +msgstr "Llistes pa" # MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT #. MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1527 +#: po/tmp/ap_String_Id.h.h:1543 msgid "Lock the layout of the current toolbars" -msgstr "" +msgstr "Candar el diseñu de les barres de ferramientes actuales" # DLG_Lists_Lower_Case_List # STYLE_LOWERCASELIST #. DLG_Lists_Lower_Case_List #. STYLE_LOWERCASELIST -#: po/tmp/ap_String_Id.h.h:1529 po/tmp/xap_String_Id.h.h:489 +#: po/tmp/ap_String_Id.h.h:1545 +#: po/tmp/xap_String_Id.h.h:512 msgid "Lower Case List" -msgstr "Llista'n minuscules" +msgstr "Llista en minúscules" # DLG_Lists_Lower_Roman_List # STYLE_LOWERROMANLIST #. DLG_Lists_Lower_Roman_List #. STYLE_LOWERROMANLIST -#: po/tmp/ap_String_Id.h.h:1531 po/tmp/xap_String_Id.h.h:491 +#: po/tmp/ap_String_Id.h.h:1547 +#: po/tmp/xap_String_Id.h.h:514 msgid "Lower Roman List" -msgstr "Llista'n romanos en minuscules" - -# MENU_LABEL_WINDOW -#. MENU_LABEL_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1533 -#, fuzzy -msgid "M&erge documents" -msgstr "&Documentos" +msgstr "Llista romana en minúscules" # FIELD_Application_MailMerge # MENU_STATUSLINE_TOOLS_MAILMERGE #. FIELD_Application_MailMerge #. MENU_STATUSLINE_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1536 +#: po/tmp/ap_String_Id.h.h:1550 msgid "Mail Merge" -msgstr "" +msgstr "Combinar corréu" # MENU_STATUSLINE_FMT_BOLD #. MENU_STATUSLINE_FMT_BOLD -#: po/tmp/ap_String_Id.h.h:1538 +#: po/tmp/ap_String_Id.h.h:1552 msgid "Make the selection bold (toggle)" -msgstr "" +msgstr "Facer selección en negrina (alternar)" # MENU_STATUSLINE_FMT_ITALIC #. MENU_STATUSLINE_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:1540 +#: po/tmp/ap_String_Id.h.h:1554 msgid "Make the selection italic (toggle)" -msgstr "" +msgstr "Facer selección en cursiva (alternar)" # MENU_STATUSLINE_FMT_SUBSCRIPT #. MENU_STATUSLINE_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:1542 +#: po/tmp/ap_String_Id.h.h:1556 msgid "Make the selection subscript (toggle)" -msgstr "" +msgstr "Facer selección en subíndiz (alternar)" # MENU_STATUSLINE_FMT_SUPERSCRIPT #. MENU_STATUSLINE_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:1544 +#: po/tmp/ap_String_Id.h.h:1558 msgid "Make the selection superscript (toggle)" -msgstr "" +msgstr "Facer selección en superíndiz (alternar)" # MENU_STATUSLINE_TOOLS_REVISIONS #. MENU_STATUSLINE_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:1546 +#: po/tmp/ap_String_Id.h.h:1560 msgid "Manage changes in document" -msgstr "" +msgstr "Remanar los cambeos del documentu" # MENU_STATUSLINE_TOOLS_PLUGINS #. MENU_STATUSLINE_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:1548 +#: po/tmp/ap_String_Id.h.h:1562 msgid "Manage plugins" -msgstr "" +msgstr "Remanar plugins" # DLG_PageSetup_Margin #. DLG_PageSetup_Margin -#: po/tmp/ap_String_Id.h.h:1550 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1564 msgid "Margin" -msgstr "&Marxe" +msgstr "Marxe" # DLG_MarkRevisions_Title #. DLG_MarkRevisions_Title -#: po/tmp/ap_String_Id.h.h:1552 +#: po/tmp/ap_String_Id.h.h:1566 msgid "Mark Revisions" -msgstr "" +msgstr "Marcar revisiones" # MENU_STATUSLINE_TOOLS_REVISIONS_MARK #. MENU_STATUSLINE_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:1554 +#: po/tmp/ap_String_Id.h.h:1568 msgid "Mark changes as you type" -msgstr "" +msgstr "Marcar cambeos mentes s'escribe" # FIELD_PieceTable_MartinTest #. FIELD_PieceTable_MartinTest -#: po/tmp/ap_String_Id.h.h:1556 +#: po/tmp/ap_String_Id.h.h:1570 msgid "Martins Test" -msgstr "" +msgstr "Test de Martin" # DLG_Column_Size #. DLG_Column_Size -#: po/tmp/ap_String_Id.h.h:1558 +#: po/tmp/ap_String_Id.h.h:1572 msgid "Max Column size" -msgstr "Tamánu máximu de la columna" +msgstr "Tamañu máximu de columna" + +#. TOOLBAR_LABEL_MENU +#. TOOLBAR_STATUSLINE_MENU +#. TOOLBAR_TOOLTIP_MENU +#: po/tmp/ap_String_Id.h.h:1576 +msgid "Menu" +msgstr "Menú" # DLG_MergeCells_Above #. DLG_MergeCells_Above -#: po/tmp/ap_String_Id.h.h:1560 +#: po/tmp/ap_String_Id.h.h:1578 msgid "Merge Above" -msgstr "" +msgstr "Amestar penriba" # DLG_MergeCells_Below #. DLG_MergeCells_Below -#: po/tmp/ap_String_Id.h.h:1562 +#: po/tmp/ap_String_Id.h.h:1580 msgid "Merge Below" -msgstr "Axuntar debaxo" +msgstr "Amestar pembaxo" # DLG_MergeCellsTitle # DLG_MergeCells_Frame @@ -4787,38 +4784,38 @@ #. DLG_MergeCellsTitle #. DLG_MergeCells_Frame #. MENU_STATUSLINE_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1566 +#: po/tmp/ap_String_Id.h.h:1584 msgid "Merge Cells" -msgstr "Axuntar a celdes" +msgstr "Amestar celdes" # DLG_MergeCells_Left #. DLG_MergeCells_Left -#: po/tmp/ap_String_Id.h.h:1568 +#: po/tmp/ap_String_Id.h.h:1586 msgid "Merge Left" -msgstr "Axuntar a dizquierda" +msgstr "Amestar a la esquierda" # DLG_MergeCells_Right #. DLG_MergeCells_Right -#: po/tmp/ap_String_Id.h.h:1570 +#: po/tmp/ap_String_Id.h.h:1588 msgid "Merge Right" -msgstr "Axuntar a mandrecha" +msgstr "Amestar a la drecha" # TOOLBAR_LABEL_MERGEABOVE #. TOOLBAR_LABEL_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1572 +#: po/tmp/ap_String_Id.h.h:1590 msgid "Merge above" -msgstr "" +msgstr "Amestar penriba" #. MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1574 +#: po/tmp/ap_String_Id.h.h:1592 msgid "Merge another document into the active document using revision marks" -msgstr "" +msgstr "Amestar otru documentu nel documentu activu usando marques de revisión" # TOOLBAR_LABEL_MERGEBELOW #. TOOLBAR_LABEL_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1576 +#: po/tmp/ap_String_Id.h.h:1594 msgid "Merge below" -msgstr "Axuntar debaxo" +msgstr "Amestar pembaxo" # TOOLBAR_LABEL_MERGE_CELLS # TOOLBAR_STATUSLINE_MERGE_CELLS @@ -4826,185 +4823,190 @@ #. TOOLBAR_LABEL_MERGE_CELLS #. TOOLBAR_STATUSLINE_MERGE_CELLS #. TOOLBAR_TOOLTIP_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1580 +#: po/tmp/ap_String_Id.h.h:1598 msgid "Merge cells" -msgstr "Axuntar celdes" +msgstr "Amestar celdes" # TOOLBAR_LABEL_MERGELEFT #. TOOLBAR_LABEL_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1582 +#: po/tmp/ap_String_Id.h.h:1600 msgid "Merge left" -msgstr "Axuntar a dizquierda" +msgstr "Amestar a la esquierda" # TOOLBAR_LABEL_MERGERIGHT #. TOOLBAR_LABEL_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1584 +#: po/tmp/ap_String_Id.h.h:1602 msgid "Merge right" -msgstr "Axuntar a mandrecha" +msgstr "Amestar a la drecha" # TOOLBAR_STATUSLINE_MERGEABOVE # TOOLBAR_TOOLTIP_MERGEABOVE #. TOOLBAR_STATUSLINE_MERGEABOVE #. TOOLBAR_TOOLTIP_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1587 +#: po/tmp/ap_String_Id.h.h:1605 msgid "Merge with cell above" -msgstr "" +msgstr "Amestar cola celda d'enriba" # TOOLBAR_STATUSLINE_MERGEBELOW # TOOLBAR_TOOLTIP_MERGEBELOW #. TOOLBAR_STATUSLINE_MERGEBELOW #. TOOLBAR_TOOLTIP_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1590 +#: po/tmp/ap_String_Id.h.h:1608 msgid "Merge with cell below" -msgstr "Axuntar cola celda d'abaxo" +msgstr "Amestar cola celda d'embaxo" # TOOLBAR_STATUSLINE_MERGELEFT # TOOLBAR_TOOLTIP_MERGELEFT #. TOOLBAR_STATUSLINE_MERGELEFT #. TOOLBAR_TOOLTIP_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1593 +#: po/tmp/ap_String_Id.h.h:1611 msgid "Merge with left cell" -msgstr "Axuntar cola celda de dizquierda" +msgstr "Amestar cola celda de la esquierda" # TOOLBAR_STATUSLINE_MERGERIGHT # TOOLBAR_TOOLTIP_MERGERIGHT #. TOOLBAR_STATUSLINE_MERGERIGHT #. TOOLBAR_TOOLTIP_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1596 +#: po/tmp/ap_String_Id.h.h:1614 msgid "Merge with right cell" -msgstr "Axuntar cola celda de mandrecha" +msgstr "Amestar cola celda de la drecha" # FIELD_DateTime_MilTime #. FIELD_DateTime_MilTime -#: po/tmp/ap_String_Id.h.h:1598 +#: po/tmp/ap_String_Id.h.h:1616 msgid "Military Time" -msgstr "" +msgstr "Hora militar" # DLG_Options_TabLabel_Misc #. DLG_Options_TabLabel_Misc -#: po/tmp/ap_String_Id.h.h:1600 +#: po/tmp/ap_String_Id.h.h:1618 msgid "Misc." -msgstr "" +msgstr "Miscelania" # DLG_Styles_Available #. DLG_Stylist_MiscStyles -#: po/tmp/ap_String_Id.h.h:1602 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1620 msgid "Miscellaneous Styles" -msgstr "Estilos disponibles" +msgstr "Otros estilos" # DLG_Styles_ModifyTitle #. DLG_Styles_ModifyTitle -#: po/tmp/ap_String_Id.h.h:1604 +#: po/tmp/ap_String_Id.h.h:1622 msgid "Modify Styles" -msgstr "CAmudar estilos" +msgstr "Camudar estilos" # DLG_Styles_Modify #. DLG_Styles_Modify -#: po/tmp/ap_String_Id.h.h:1606 +#: po/tmp/ap_String_Id.h.h:1624 msgid "Modify..." -msgstr "Camudar ..." +msgstr "Camudar..." # FIELD_DateTime_MonthDayYear #. FIELD_DateTime_MonthDayYear -#: po/tmp/ap_String_Id.h.h:1608 +#: po/tmp/ap_String_Id.h.h:1626 msgid "Month Day, Year" -msgstr "Mes dia, añu" +msgstr "Mes Día, Añu" # MENU_STATUSLINE_EDIT_GOTO #. MENU_STATUSLINE_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:1610 +#: po/tmp/ap_String_Id.h.h:1628 msgid "Move the insertion point to a specific location" -msgstr "Mover el puntu de inserción a una llocalización especifica" +msgstr "Mover el puntu d'enxetamientu a una llocalización especifica" # FIELD_DateTime_MthDayYear #. FIELD_DateTime_MthDayYear -#: po/tmp/ap_String_Id.h.h:1612 +#: po/tmp/ap_String_Id.h.h:1630 msgid "Mth. Day, Year" -msgstr "Mes, dia, añu" +msgstr "M. Día, Añu" # DLG_Para_SpacingMultiple #. DLG_Para_SpacingMultiple -#: po/tmp/ap_String_Id.h.h:1614 +#: po/tmp/ap_String_Id.h.h:1632 msgid "Multiple" -msgstr "Multiple" +msgstr "Múltiple" # TOOLBAR_LABEL_FILE_NEW #. TOOLBAR_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:1616 +#: po/tmp/ap_String_Id.h.h:1634 msgid "New" -msgstr "Nueu" +msgstr "Nuevu" # DLG_NEW_Title #. DLG_NEW_Title -#: po/tmp/ap_String_Id.h.h:1618 +#: po/tmp/ap_String_Id.h.h:1636 msgid "New Document" -msgstr "Documentu nueu" +msgstr "Documentu nuevu" # DLG_Lists_New_List_Label #. DLG_Lists_New_List_Label -#: po/tmp/ap_String_Id.h.h:1620 +#: po/tmp/ap_String_Id.h.h:1638 msgid "New List Label" -msgstr "" +msgstr "Etiqueta de llista nueva" # DLG_Lists_New_List_Type #. DLG_Lists_New_List_Type -#: po/tmp/ap_String_Id.h.h:1622 +#: po/tmp/ap_String_Id.h.h:1640 msgid "" "New List \n" "Type" msgstr "" +"Triba de \n" +"llista nueva" # DLG_Lists_Starting_Value #. DLG_Lists_Starting_Value -#: po/tmp/ap_String_Id.h.h:1624 +#: po/tmp/ap_String_Id.h.h:1642 msgid "" "New Starting \n" "Value" msgstr "" +"Valor d'aniciu \n" +"nuevu" # DLG_Styles_NewTitle #. DLG_Styles_NewTitle -#: po/tmp/ap_String_Id.h.h:1626 +#: po/tmp/ap_String_Id.h.h:1644 msgid "New Style" -msgstr "Nueu estilu" +msgstr "Estilu nuevu" # DLG_Styles_New #. DLG_Styles_New -#: po/tmp/ap_String_Id.h.h:1628 +#: po/tmp/ap_String_Id.h.h:1646 msgid "New..." -msgstr "Nueu ..." +msgstr "Nuevu..." # DLG_Goto_Btn_Next #. DLG_Goto_Btn_Next -#: po/tmp/ap_String_Id.h.h:1630 +#: po/tmp/ap_String_Id.h.h:1648 msgid "Next >>" msgstr "Siguiente >>" # DLG_NEW_NoFile #. DLG_NEW_NoFile -#: po/tmp/ap_String_Id.h.h:1632 +#: po/tmp/ap_String_Id.h.h:1650 msgid "No File" -msgstr "" +msgstr "Ensin archivu" #. DLG_Lists_FoldingLevel0 -#: po/tmp/ap_String_Id.h.h:1634 +#: po/tmp/ap_String_Id.h.h:1652 msgid "No Folding" -msgstr "" +msgstr "Ensin plegáu" # DLG_Styles_ErrNoStyle #. DLG_Styles_ErrNoStyle -#: po/tmp/ap_String_Id.h.h:1636 +#: po/tmp/ap_String_Id.h.h:1654 msgid "" "No Style selected \n" " so it cannot be modified" msgstr "" +"Nun hai nengún estilu seleicionáu,\n" +"polo que nun pue ser modificáu" # SCRIPT_NOSCRIPTS #. SCRIPT_NOSCRIPTS -#: po/tmp/ap_String_Id.h.h:1638 +#: po/tmp/ap_String_Id.h.h:1656 msgid "No scripts found" -msgstr "" +msgstr "Nun s'atoparon scripts" # DLG_Styles_DefNone # DLG_Lists_Type_none @@ -5012,78 +5014,78 @@ #. DLG_Styles_DefNone #. DLG_Tab_Radio_NoAlign #. DLG_Lists_Type_none -#: po/tmp/ap_String_Id.h.h:1643 +#: po/tmp/ap_String_Id.h.h:1661 msgid "None" msgstr "Nengún" # TOOLBAR_LABEL_PARA_0BEFORE #. TOOLBAR_LABEL_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:1645 +#: po/tmp/ap_String_Id.h.h:1663 msgid "None before" msgstr "Nengún enantes" # MENU_STATUSLINE_VIEW_NORMAL #. MENU_STATUSLINE_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:1647 +#: po/tmp/ap_String_Id.h.h:1665 msgid "Normal View" msgstr "Vista normal" # DLG_Spell_UnknownWord #. DLG_Spell_UnknownWord -#: po/tmp/ap_String_Id.h.h:1649 +#: po/tmp/ap_String_Id.h.h:1667 msgid "Not in dictionary&:" -msgstr "Nun ta nel diccionariu:" +msgstr "Nun ta en diccionariu&:" # DLG_Styles_NewTitle #. DLG_Stylist_FootnoteStyles -#: po/tmp/ap_String_Id.h.h:1651 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1669 msgid "Note Styles" -msgstr "Nueu estilu" +msgstr "Estilos de nota" # DLG_Column_Number_Cols #. DLG_Column_Number_Cols -#: po/tmp/ap_String_Id.h.h:1653 +#: po/tmp/ap_String_Id.h.h:1671 msgid "Number of Columns" msgstr "Númberu de columnes" # FIELD_Numbers_PagesCount #. FIELD_Numbers_PagesCount -#: po/tmp/ap_String_Id.h.h:1655 +#: po/tmp/ap_String_Id.h.h:1673 msgid "Number of Pages" msgstr "Númberu de páxines" # DLG_Column_Number #. DLG_Column_Number -#: po/tmp/ap_String_Id.h.h:1657 +#: po/tmp/ap_String_Id.h.h:1675 msgid "Number of columns" msgstr "Númberu de columnes" # DLG_InsertTable_NumCols #. DLG_InsertTable_NumCols -#: po/tmp/ap_String_Id.h.h:1659 +#: po/tmp/ap_String_Id.h.h:1677 msgid "Number of columns:" msgstr "Númberu de columnes:" # DLG_InsertTable_NumRows #. DLG_InsertTable_NumRows -#: po/tmp/ap_String_Id.h.h:1661 +#: po/tmp/ap_String_Id.h.h:1679 msgid "Number of rows:" -msgstr "Númberu de files:" +msgstr "Númberu de fileres:" # DLG_Lists_Type_numbered #. DLG_Lists_Type_numbered -#: po/tmp/ap_String_Id.h.h:1663 +#: po/tmp/ap_String_Id.h.h:1681 msgid "Numbered" -msgstr "Nímberaos" +msgstr "Numberáu" # DLG_Lists_Numbered_List # STYLE_NUMBER_LIST #. DLG_Lists_Numbered_List #. STYLE_NUMBER_LIST -#: po/tmp/ap_String_Id.h.h:1665 po/tmp/xap_String_Id.h.h:531 +#: po/tmp/ap_String_Id.h.h:1683 +#: po/tmp/xap_String_Id.h.h:558 msgid "Numbered List" -msgstr "Llista númberada" +msgstr "Llista numberada" # DLG_FormatFootnotes_FootnoteRestart # DLG_Styles_ModifyNumbering @@ -5095,57 +5097,57 @@ #. TOOLBAR_LABEL_LISTS_NUMBERS #. TOOLBAR_STATUSLINE_LISTS_NUMBERS #. TOOLBAR_TOOLTIP_LISTS_NUMBERS -#: po/tmp/ap_String_Id.h.h:1671 +#: po/tmp/ap_String_Id.h.h:1689 msgid "Numbering" -msgstr "Númberando" +msgstr "Numberando" # FIELD_Type_Numbers #. FIELD_Type_Numbers -#: po/tmp/ap_String_Id.h.h:1673 +#: po/tmp/ap_String_Id.h.h:1691 msgid "Numbers" msgstr "Númberos" # InsertModeFieldOVR #. InsertModeFieldOVR -#: po/tmp/ap_String_Id.h.h:1675 +#: po/tmp/ap_String_Id.h.h:1693 msgid "OVR" msgstr "OVR" # DLG_Column_One #. DLG_Column_One -#: po/tmp/ap_String_Id.h.h:1677 +#: po/tmp/ap_String_Id.h.h:1695 msgid "One" -msgstr "" +msgstr "Una" # MENU_LABEL_FILE_IMPORT #. MENU_LABEL_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1679 +#: po/tmp/ap_String_Id.h.h:1697 msgid "Op&en Copy" msgstr "Abr&ir copia" # TOOLBAR_LABEL_FILE_OPEN #. TOOLBAR_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1681 +#: po/tmp/ap_String_Id.h.h:1699 msgid "Open" msgstr "Abrir" # MENU_LABEL_OPEN_TEMPLATE #. MENU_LABEL_OPEN_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1683 +#: po/tmp/ap_String_Id.h.h:1701 msgid "Open Template" -msgstr "Abrir plantilla" +msgstr "Abrir plantía" # MENU_STATUSLINE_FILE_IMPORT #. MENU_STATUSLINE_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1685 +#: po/tmp/ap_String_Id.h.h:1703 msgid "Open a document by making a copy" -msgstr "Abrir un documentu pa facer una copia" +msgstr "Abrir un documentu faciendo una copia" # MENU_STATUSLINE_FILE_RECENT #. MENU_STATUSLINE_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1687 +#: po/tmp/ap_String_Id.h.h:1705 msgid "Open a recently used document" -msgstr "Abrir documentos recientes" +msgstr "Abrir un documentu usáu recién" # DLG_NEW_Open # MENU_STATUSLINE_FILE_OPEN @@ -5155,15 +5157,15 @@ #. MENU_STATUSLINE_FILE_OPEN #. TOOLBAR_STATUSLINE_FILE_OPEN #. TOOLBAR_TOOLTIP_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1692 +#: po/tmp/ap_String_Id.h.h:1710 msgid "Open an existing document" msgstr "Abrir un documentu esistente" # MENU_STATUSLINE_WINDOW_NEW #. MENU_STATUSLINE_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:1694 +#: po/tmp/ap_String_Id.h.h:1712 msgid "Open another window for the document" -msgstr "Abrir el documentu nun ventanu nueu" +msgstr "Abrir otra ventana pal documentu" # MENU_STATUSLINE_FILE_RECENT_1 # MENU_STATUSLINE_FILE_RECENT_2 @@ -5183,28 +5185,28 @@ #. MENU_STATUSLINE_FILE_RECENT_7 #. MENU_STATUSLINE_FILE_RECENT_8 #. MENU_STATUSLINE_FILE_RECENT_9 -#: po/tmp/ap_String_Id.h.h:1704 +#: po/tmp/ap_String_Id.h.h:1722 msgid "Open this document" msgstr "Abrir esti documentu" # DLG_PageSetup_Orient #. DLG_PageSetup_Orient -#: po/tmp/ap_String_Id.h.h:1706 +#: po/tmp/ap_String_Id.h.h:1724 msgid "Orientation..." -msgstr "Orientación ..." +msgstr "Orientación..." # DLG_Options_TabLabel_Other #. DLG_Options_TabLabel_Other -#: po/tmp/ap_String_Id.h.h:1708 +#: po/tmp/ap_String_Id.h.h:1726 msgid "Other" msgstr "Otru" # MSG_IE_NoMemory #. MSG_IE_NoMemory -#: po/tmp/ap_String_Id.h.h:1710 +#: po/tmp/ap_String_Id.h.h:1728 #, c-format msgid "Out of memory attempting to open %s" -msgstr "" +msgstr "Acabóse la memora al tentar d'abrir %s" # TOOLBAR_LABEL_FMT_OVERLINE # TOOLBAR_STATUSLINE_FMT_OVERLINE @@ -5214,179 +5216,177 @@ #. TOOLBAR_STATUSLINE_FMT_OVERLINE #. TOOLBAR_TOOLTIP_FMT_OVERLINE #. DLG_UFS_OverlineCheck -#: po/tmp/ap_String_Id.h.h:1714 po/tmp/xap_String_Id.h.h:545 +#: po/tmp/ap_String_Id.h.h:1732 +#: po/tmp/xap_String_Id.h.h:572 msgid "Overline" -msgstr "" +msgstr "Sobrelliniar" # MENU_STATUSLINE_FMT_OVERLINE #. MENU_STATUSLINE_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:1716 +#: po/tmp/ap_String_Id.h.h:1734 msgid "Overline the selection (toggle)" -msgstr "" +msgstr "Sobrelliniar la seleición (alternar)" # MENU_LABEL_FILE_PROPERTIES #. MENU_LABEL_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:1718 +#: po/tmp/ap_String_Id.h.h:1736 msgid "P&roperties" msgstr "P&ropiedaes" # MENU_LABEL_TOOLS_REVISIONS #. MENU_LABEL_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1720 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1738 msgid "P&urge revisions" -msgstr "&Reviones" +msgstr "&Purgar revisiones" # MENU_LABEL_EDIT_PASTE_SPECIAL #. MENU_LABEL_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1722 +#: po/tmp/ap_String_Id.h.h:1740 msgid "Pa&ste Unformatted" -msgstr "Apegar ensin formatu (&s)" +msgstr "Ape&gar ensin formatu" # DLG_Goto_Target_Page # DLG_PageSetup_Page #. DLG_Goto_Target_Page #. DLG_PageSetup_Page -#: po/tmp/ap_String_Id.h.h:1725 +#: po/tmp/ap_String_Id.h.h:1743 msgid "Page" msgstr "Páxina" # DLG_Para_PushPageBreakBefore #. DLG_Para_PushPageBreakBefore -#: po/tmp/ap_String_Id.h.h:1727 +#: po/tmp/ap_String_Id.h.h:1745 msgid "Page &break before" -msgstr "&Romper páxina enantes" +msgstr "&Saltu de páxina enantes" # DLG_FormatTable_Background #. MENU_LABEL_FMT_BACKGROUND -#: po/tmp/ap_String_Id.h.h:1729 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1747 msgid "Page Background" -msgstr "Fondu:" +msgstr "Fondu de páxina" # MENU_LABEL_FMT_BACKGROUND #. MENU_LABEL_FMT_BACKGROUND_PAGE_COLOR -#: po/tmp/ap_String_Id.h.h:1731 +#: po/tmp/ap_String_Id.h.h:1749 msgid "Page C&olor" -msgstr "C&ollor de páxina" +msgstr "C&olor de páxina" # DLG_UP_PageRanges #. MENU_LABEL_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:1733 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1751 msgid "Page Image" -msgstr "Rangos de páxina:" +msgstr "Imaxe de páxina" # MENU_LABEL_INSERT_PAGENO #. MENU_LABEL_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1735 +#: po/tmp/ap_String_Id.h.h:1753 msgid "Page N&umbers" msgstr "Númb&eros de páxina" # FIELD_Numbers_PageNumber #. FIELD_Numbers_PageNumber -#: po/tmp/ap_String_Id.h.h:1737 +#: po/tmp/ap_String_Id.h.h:1755 msgid "Page Number" -msgstr "Númberos de páxina" +msgstr "Númberu de páxina" # DLG_HdrFtr_PageNumberProperties #. DLG_HdrFtr_PageNumberProperties -#: po/tmp/ap_String_Id.h.h:1739 +#: po/tmp/ap_String_Id.h.h:1757 msgid "Page Number Properties" msgstr "Propiedaes de los númberos de páxina" # DLG_PageNumbers_Title #. DLG_PageNumbers_Title -#: po/tmp/ap_String_Id.h.h:1741 +#: po/tmp/ap_String_Id.h.h:1759 msgid "Page Numbers" msgstr "Númberos de páxina" # FIELD_Numbers_PageReference #. FIELD_Numbers_PageReference -#: po/tmp/ap_String_Id.h.h:1743 +#: po/tmp/ap_String_Id.h.h:1761 msgid "Page Reference" msgstr "Referencia de páxina" # MENU_LABEL_FILE_PAGESETUP #. MENU_LABEL_FILE_PAGESETUP -#: po/tmp/ap_String_Id.h.h:1745 +#: po/tmp/ap_String_Id.h.h:1763 msgid "Page Set&up" -msgstr "C&onfigurar páxina" +msgstr "C&onfiguración de páxina" # DLG_PageSetup_Title #. DLG_PageSetup_Title -#: po/tmp/ap_String_Id.h.h:1747 +#: po/tmp/ap_String_Id.h.h:1765 msgid "Page Setup" -msgstr "Configurar páxina" +msgstr "Configuración de páxina" # PageInfoField #. PageInfoField -#: po/tmp/ap_String_Id.h.h:1749 +#: po/tmp/ap_String_Id.h.h:1767 #, c-format msgid "Page: %d/%d" msgstr "Páxina: %d/%d" # DLG_WordCount_Pages #. DLG_WordCount_Pages -#: po/tmp/ap_String_Id.h.h:1751 +#: po/tmp/ap_String_Id.h.h:1769 msgid "Pages:" msgstr "Páxines:" # DLG_Para_LabelPagination #. DLG_Para_LabelPagination -#: po/tmp/ap_String_Id.h.h:1753 +#: po/tmp/ap_String_Id.h.h:1771 msgid "Pagination" msgstr "Paxinación:" # DLG_PageSetup_Paper_Size #. DLG_PageSetup_Paper_Size -#: po/tmp/ap_String_Id.h.h:1755 +#: po/tmp/ap_String_Id.h.h:1773 msgid "Paper Si&ze:" -msgstr "Tamañu del papel (&z):" +msgstr "Tamañu del &papel:" # DLG_PageSetup_Paper #. DLG_PageSetup_Paper -#: po/tmp/ap_String_Id.h.h:1757 +#: po/tmp/ap_String_Id.h.h:1775 msgid "Paper..." -msgstr "Papel ..." +msgstr "Papel..." # DLG_Styles_ModifyParagraph # DLG_Para_ParaTitle #. DLG_Styles_ModifyParagraph #. DLG_Para_ParaTitle -#: po/tmp/ap_String_Id.h.h:1760 +#: po/tmp/ap_String_Id.h.h:1778 msgid "Paragraph" -msgstr "Párrafu" +msgstr "Parágrafu" # FIELD_Numbers_ParaCount #. FIELD_Numbers_ParaCount -#: po/tmp/ap_String_Id.h.h:1762 +#: po/tmp/ap_String_Id.h.h:1780 msgid "Paragraph Count" -msgstr "Contar Párrafu" +msgstr "Cuntar parágrafos" # TOOLBAR_LABEL_FMT_DOM_DIRECTION #. TOOLBAR_LABEL_FMT_DOM_DIRECTION -#: po/tmp/ap_String_Id.h.h:1764 +#: po/tmp/ap_String_Id.h.h:1782 msgid "Paragraph Direction" -msgstr "Direición del párrafu" +msgstr "Direición del parágrafu" # DLG_Styles_ParaPrev #. DLG_Styles_ParaPrev -#: po/tmp/ap_String_Id.h.h:1766 +#: po/tmp/ap_String_Id.h.h:1784 msgid "Paragraph Preview" -msgstr "Previsualizar párrafu" +msgstr "Previsualizar parágrafu" # DLG_WordCount_Paragraphs #. DLG_WordCount_Paragraphs -#: po/tmp/ap_String_Id.h.h:1768 +#: po/tmp/ap_String_Id.h.h:1786 msgid "Paragraphs:" -msgstr "Párrafos:" +msgstr "Parágrafos:" # WORD_PassRequired #. WORD_PassRequired -#: po/tmp/ap_String_Id.h.h:1770 +#: po/tmp/ap_String_Id.h.h:1788 msgid "Password required, this is an encrypted document" -msgstr "Necesitase la contraseña, esti ye un documentu encriptáu" +msgstr "Necesítase una contraseña, esti ye un documentu encriptáu" # TOOLBAR_LABEL_EDIT_PASTE # TOOLBAR_STATUSLINE_EDIT_PASTE @@ -5394,106 +5394,102 @@ #. TOOLBAR_LABEL_EDIT_PASTE #. TOOLBAR_STATUSLINE_EDIT_PASTE #. TOOLBAR_TOOLTIP_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1774 +#: po/tmp/ap_String_Id.h.h:1792 msgid "Paste" msgstr "Apegar" # DLG_MetaData_TAB_Permission #. DLG_MetaData_TAB_Permission -#: po/tmp/ap_String_Id.h.h:1776 +#: po/tmp/ap_String_Id.h.h:1794 msgid "Permissions" msgstr "Permisos" # DLG_Goto_Target_Picture #. DLG_Goto_Target_Picture -#: po/tmp/ap_String_Id.h.h:1778 +#: po/tmp/ap_String_Id.h.h:1796 msgid "Picture" -msgstr "Semeya" +msgstr "Imaxe" # FIELD_Type_PieceTable #. FIELD_Type_PieceTable -#: po/tmp/ap_String_Id.h.h:1780 +#: po/tmp/ap_String_Id.h.h:1798 msgid "Piece Table" -msgstr "" +msgstr "Tabla de pieces" # DLG_FormatFootnotes_EndPlaceEndDoc #. DLG_FormatFootnotes_EndPlaceEndDoc -#: po/tmp/ap_String_Id.h.h:1782 +#: po/tmp/ap_String_Id.h.h:1800 msgid "Place at end of document" -msgstr "Colocar al final del documentu" +msgstr "Allugar a lo cabero'l documentu" # DLG_FormatFootnotes_EndPlaceEndSec #. DLG_FormatFootnotes_EndPlaceEndSec -#: po/tmp/ap_String_Id.h.h:1784 +#: po/tmp/ap_String_Id.h.h:1802 msgid "Place at end of section" -msgstr "Colocar al final de la seición" +msgstr "Allugar a lo cabero la seición" # DLG_FormatFootnotes_EndPlacement #. DLG_FormatFootnotes_EndPlacement -#: po/tmp/ap_String_Id.h.h:1786 +#: po/tmp/ap_String_Id.h.h:1804 msgid "Placement" -msgstr "Colocación" +msgstr "Allugamientu" # DLG_PageNumbers_Position_No_Colon #. DLG_Tab_Label_Position #. DLG_PageNumbers_Position_No_Colon -#: po/tmp/ap_String_Id.h.h:1789 +#: po/tmp/ap_String_Id.h.h:1807 msgid "Position" -msgstr "Posición" +msgstr "Allugamientu" # DLG_PageNumbers_Position_No_Colon #. DLG_FormatFrame_PositionTo -#: po/tmp/ap_String_Id.h.h:1791 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1809 msgid "Position Text Box" -msgstr "Posición" +msgstr "Allugamientu de la caxa de testu" # DLG_PageNumbers_Position_No_Colon #. DLG_FormatFrame_SetToColumn -#: po/tmp/ap_String_Id.h.h:1793 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1811 msgid "Position to Column" -msgstr "Posición" +msgstr "Allugamientu a columna" # DLG_PageNumbers_Position_No_Colon #. DLG_FormatFrame_SetToPage -#: po/tmp/ap_String_Id.h.h:1795 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1813 msgid "Position to Page" -msgstr "Posición" +msgstr "Allugamientu a páxina" # MENU_STATUSLINE_ALIGN_JUSTIFY #. DLG_FormatFrame_SetToParagraph -#: po/tmp/ap_String_Id.h.h:1797 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1815 msgid "Position to Paragraph" -msgstr "Xustificar el párrafu" +msgstr "Allugamientu a parágrafu" # DLG_PageNumbers_Position #. DLG_PageNumbers_Position -#: po/tmp/ap_String_Id.h.h:1799 +#: po/tmp/ap_String_Id.h.h:1817 msgid "Position:" -msgstr "Posición:" +msgstr "Allugamientu:" # MENU_LABEL_TOOLS_OPTIONS #. MENU_LABEL_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:1801 +#: po/tmp/ap_String_Id.h.h:1819 msgid "Pr&eferences" -msgstr "Pr&eferiencies" +msgstr "Pr&eferencies" # DLG_Options_TabLabel_Preferences # DLG_Options_Label_Schemes #. DLG_Options_TabLabel_Preferences #. DLG_Options_Label_Schemes -#: po/tmp/ap_String_Id.h.h:1804 +#: po/tmp/ap_String_Id.h.h:1822 msgid "Preference Schemes" -msgstr "" +msgstr "Esquemes de preferencia" # DLG_Options_OptionsTitle #. DLG_Options_OptionsTitle -#: po/tmp/ap_String_Id.h.h:1806 +#: po/tmp/ap_String_Id.h.h:1824 msgid "Preferences" -msgstr "Preferiencies" +msgstr "Preferencies" # DLG_Styles_ModifyPreview # DLG_Para_LabelPreview @@ -5510,7 +5506,8 @@ #. DLG_Lists_Preview #. DLG_PageNumbers_Preview #. DLG_Zoom_PreviewFrame -#: po/tmp/ap_String_Id.h.h:1814 po/tmp/xap_String_Id.h.h:575 +#: po/tmp/ap_String_Id.h.h:1832 +#: po/tmp/xap_String_Id.h.h:604 msgid "Preview" msgstr "Previsualizar" @@ -5518,7 +5515,7 @@ # MENU_STATUSLINE_WEB_SAVEASWEB #. MENU_STATUSLINE_WEB_WEBPREVIEW #. MENU_STATUSLINE_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:1817 +#: po/tmp/ap_String_Id.h.h:1835 msgid "Preview the document as a web page" msgstr "Previsualizar el documentu como una páxina web" @@ -5528,19 +5525,15 @@ #. MENU_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1821 +#: po/tmp/ap_String_Id.h.h:1839 msgid "Preview the document before printing" msgstr "Previsualizar el documentu enantes d'imprentalu" # DLG_Para_PreviewPrevParagraph #. DLG_Para_PreviewPrevParagraph -#: po/tmp/ap_String_Id.h.h:1823 -msgid "" -"Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph " -"Previous Paragraph Previous Paragraph Previous Paragraph" -msgstr "" -"Párrafu anterior Párrafu anterior Párrafu anterior Párrafu anterior Párrafu " -"anterior Párrafu anterior Párrafu anterior Párrafu anterior Párrafu anterior " +#: po/tmp/ap_String_Id.h.h:1841 +msgid "Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph" +msgstr "Parágrafu anterior Parágrafu anterior Parágrafu anterior Parágrafu anterior Parágrafu anterior Parágrafu anterior Parágrafu anterior " # TOOLBAR_LABEL_FILE_PRINT # DLG_UP_PrintTitle @@ -5548,154 +5541,168 @@ #. TOOLBAR_LABEL_FILE_PRINT #. DLG_UP_PrintTitle #. DLG_UP_PrintButton -#: po/tmp/ap_String_Id.h.h:1825 po/tmp/xap_String_Id.h.h:580 +#: po/tmp/ap_String_Id.h.h:1843 +#: po/tmp/xap_String_Id.h.h:609 msgid "Print" msgstr "Imprentar" # MENU_LABEL_FILE_PRINT_DIRECTLY #. MENU_LABEL_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1827 +#: po/tmp/ap_String_Id.h.h:1845 msgid "Print &directly" msgstr "Imprentar direutamente" # MENU_STATUSLINE_VIEW_PRINT #. MENU_STATUSLINE_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:1829 +#: po/tmp/ap_String_Id.h.h:1847 msgid "Print Layout" -msgstr "" +msgstr "Diseñu d'imprentación" # MENU_LABEL_FILE_PRINT_PREVIEW #. MENU_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1831 +#: po/tmp/ap_String_Id.h.h:1849 msgid "Print P&review" -msgstr "P&revisualización de l'imprentación" +msgstr "P&revisualización d'imprentación" # TOOLBAR_LABEL_FILE_PRINT_PREVIEW #. TOOLBAR_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1833 +#: po/tmp/ap_String_Id.h.h:1851 msgid "Print Preview" -msgstr "Previsualización de l'imprentación" +msgstr "Previsualización d'imprentación" # MENU_STATUSLINE_FILE_PRINT #. MENU_STATUSLINE_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1835 +#: po/tmp/ap_String_Id.h.h:1853 msgid "Print all or part of the document" -msgstr "Imprentar tou o una parti del documentu" +msgstr "Imprentar tol documentu o parte d'él" # TOOLBAR_STATUSLINE_FILE_PRINT # TOOLBAR_TOOLTIP_FILE_PRINT #. TOOLBAR_STATUSLINE_FILE_PRINT #. TOOLBAR_TOOLTIP_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1838 +#: po/tmp/ap_String_Id.h.h:1856 msgid "Print the document" msgstr "Imprentar el documentu" # MENU_STATUSLINE_FILE_PRINT_DIRECTLY #. MENU_STATUSLINE_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1840 +#: po/tmp/ap_String_Id.h.h:1858 msgid "Print using the internal PS driver" -msgstr "Imprentar usando'l PS driver internu" +msgstr "Imprentar usando'l controlador PS internu" # MSG_PrintingDoc #. MSG_PrintingDoc -#: po/tmp/ap_String_Id.h.h:1842 +#: po/tmp/ap_String_Id.h.h:1860 msgid "Printing Document.." -msgstr "Imprentando documentu ..." +msgstr "Imprentando documentu..." # MSG_PrintStatus #. MSG_PrintStatus -#: po/tmp/ap_String_Id.h.h:1844 +#: po/tmp/ap_String_Id.h.h:1862 #, c-format msgid "Printing page %d of %d" msgstr "Imprentando páxina %d de %d" # FIELD_Document_Publisher #. FIELD_Document_Publisher -#: po/tmp/ap_String_Id.h.h:1846 +#: po/tmp/ap_String_Id.h.h:1864 msgid "Publisher" msgstr "Editor" # DLG_MetaData_Publisher_LBL #. DLG_MetaData_Publisher_LBL -#: po/tmp/ap_String_Id.h.h:1848 +#: po/tmp/ap_String_Id.h.h:1866 msgid "Publisher:" msgstr "Editor:" # MENU_LABEL_EDIT_REPLACE #. MENU_LABEL_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1850 +#: po/tmp/ap_String_Id.h.h:1868 msgid "R&eplace" msgstr "R&eemplazar" +# MENU_LABEL_FMT_DOCUMENT +#. MENU_LABEL_FMT_DIRECTION_DOCD_RTL +#: po/tmp/ap_String_Id.h.h:1870 +msgid "RTL &Document" +msgstr "&Documentu de drecha a esquierda" + # MENU_LABEL_FMT_DIRECTION_DD_RTL #. MENU_LABEL_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:1852 +#: po/tmp/ap_String_Id.h.h:1872 msgid "RTL &Paragraph" -msgstr "" +msgstr "&Parágrafu de drecha a esquierda" + +# DLG_FormatTable_Apply_To_Selection +# DLG_UP_Selection +#. MENU_LABEL_FMT_DIRECTION_SD_RTL +#: po/tmp/ap_String_Id.h.h:1874 +msgid "RTL &Section" +msgstr "&Seición de drecha a esquierda" # DLG_FR_ReplaceWithLabel #. DLG_FR_ReplaceWithLabel -#: po/tmp/ap_String_Id.h.h:1854 +#: po/tmp/ap_String_Id.h.h:1876 msgid "Re&place with:" msgstr "Reem&plazar con:" # DLG_FR_ReverseFind #. DLG_FR_ReverseFind -#: po/tmp/ap_String_Id.h.h:1856 +#: po/tmp/ap_String_Id.h.h:1878 msgid "Re&verse find" -msgstr "" +msgstr "Busca &inversa" # MENU_LABEL_FILE_REVERT #. MENU_LABEL_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1858 +#: po/tmp/ap_String_Id.h.h:1880 msgid "Re&vert" -msgstr "" +msgstr "Re&vertir" # MENU_LABEL_FILE_RECENT #. MENU_LABEL_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1860 +#: po/tmp/ap_String_Id.h.h:1882 msgid "Recent &Files" -msgstr "" +msgstr "Archivos &recién" # TOOLBAR_LABEL_EDIT_REDO #. TOOLBAR_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1862 +#: po/tmp/ap_String_Id.h.h:1884 msgid "Redo" -msgstr "Volver" +msgstr "Refacer" # TOOLBAR_STATUSLINE_EDIT_REDO # TOOLBAR_TOOLTIP_EDIT_REDO #. TOOLBAR_STATUSLINE_EDIT_REDO #. TOOLBAR_TOOLTIP_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1865 +#: po/tmp/ap_String_Id.h.h:1887 msgid "Redo editing" -msgstr "" +msgstr "Refacer edición" # MENU_STATUSLINE_EDIT_REDO #. MENU_STATUSLINE_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1867 +#: po/tmp/ap_String_Id.h.h:1889 msgid "Redo previously undone editing" -msgstr "" +msgstr "Refacer la edición esfecha anteriormente" # MENU_STATUSLINE_VIEW_ZOOM_MENU # MENU_STATUSLINE_VIEW_ZOOM #. MENU_STATUSLINE_VIEW_ZOOM_MENU #. MENU_STATUSLINE_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:1870 +#: po/tmp/ap_String_Id.h.h:1892 msgid "Reduce or enlarge the document display" -msgstr "Agrandar o disminuir la visualización del documentu" +msgstr "Agrandar o amenorgar la visualización del documentu" # DLG_MetaData_Relation_LBL #. DLG_MetaData_Relation_LBL -#: po/tmp/ap_String_Id.h.h:1872 +#: po/tmp/ap_String_Id.h.h:1894 msgid "Relation:" -msgstr "Relación:" +msgstr "Rellación:" # DLG_Styles_RemoveButton #. DLG_Styles_RemoveButton -#: po/tmp/ap_String_Id.h.h:1874 +#: po/tmp/ap_String_Id.h.h:1896 msgid "Remove" -msgstr "Esborrar" +msgstr "Eliminar" # MENU_LABEL_EDIT_REMOVEFOOTER # TOOLBAR_LABEL_EDIT_REMOVEFOOTER @@ -5705,9 +5712,9 @@ #. TOOLBAR_LABEL_EDIT_REMOVEFOOTER #. TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER #. TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1879 +#: po/tmp/ap_String_Id.h.h:1901 msgid "Remove Footer" -msgstr "Esborrar pie" +msgstr "Eliminar pie de páxina" # MENU_LABEL_EDIT_REMOVEHEADER # TOOLBAR_LABEL_EDIT_REMOVEHEADER @@ -5717,201 +5724,193 @@ #. TOOLBAR_LABEL_EDIT_REMOVEHEADER #. TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER #. TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1884 +#: po/tmp/ap_String_Id.h.h:1906 msgid "Remove Header" -msgstr "Esborar cabecera" +msgstr "Eliminar encabezáu" # DLG_Styles_RemoveLab #. DLG_Styles_RemoveLab -#: po/tmp/ap_String_Id.h.h:1886 +#: po/tmp/ap_String_Id.h.h:1908 msgid "Remove Property from Style" -msgstr "Esborrar popiedá del estilu" +msgstr "Eliminar propiedá del estilu" # MENU_LABEL_EDIT_REMOVEHEADER # TOOLBAR_LABEL_EDIT_REMOVEHEADER # TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER # TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1888 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1910 msgid "Remove Row as Heading" -msgstr "Esborar cabecera" +msgstr "Eliminar filera como encabezáu" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1890 +#: po/tmp/ap_String_Id.h.h:1912 msgid "Remove Row as the page Heading" -msgstr "" +msgstr "Eliminar la filera como l'encabezáu de páxina" # MENU_STATUSLINE_EDIT_REMOVEHEADER #. MENU_STATUSLINE_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1892 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1914 msgid "Remove all revision information from the document" -msgstr "Esborrar cabecera'n esta páxina del documentu" +msgstr "Eliminar tola información de revisión del documentu" # MENU_STATUSLINE_EDIT_REMOVEHEADER #. MENU_STATUSLINE_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:1894 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1916 msgid "Remove full document history from the document" -msgstr "Esborrar cabecera'n esta páxina del documentu" +msgstr "Eliminar tol historial del documentu" # MENU_STATUSLINE_EDIT_REMOVEFOOTER #. MENU_STATUSLINE_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1896 +#: po/tmp/ap_String_Id.h.h:1918 msgid "Remove the Footer on this page from the Document" -msgstr "Esborrar pie'n esta páxina del documentu" +msgstr "Eliminar el pie de páxina nesta páxina del documentu" # MENU_STATUSLINE_EDIT_REMOVEHEADER #. MENU_STATUSLINE_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1898 +#: po/tmp/ap_String_Id.h.h:1920 msgid "Remove the Header on this page from the Document" -msgstr "Esborrar cabecera'n esta páxina del documentu" +msgstr "Eliminar l'encabezáu nesta páxina del documentu" # MENU_STATUSLINE_EDIT_CUT #. MENU_STATUSLINE_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:1900 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1922 msgid "Remove the Image and save a copy on the clipboard" -msgstr "Cortar la seleición y pegala nel cortapapelos" +msgstr "Eliminar la imaxe y guardar una copia nel cartafueyu" # MENU_STATUSLINE_EDIT_REMOVEHEADER #. MENU_STATUSLINE_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:1902 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1924 msgid "Remove the Image from the Document" -msgstr "Esborrar cabecera'n esta páxina del documentu" +msgstr "Eliminar la imaxe del documentu" # MENU_STATUSLINE_EDIT_REMOVEHEADER #. MENU_STATUSLINE_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:1904 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1926 msgid "Remove the Text Box from the Document" -msgstr "Esborrar cabecera'n esta páxina del documentu" +msgstr "Eliminar la caxa de testu del documentu" # MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION #. MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:1906 +#: po/tmp/ap_String_Id.h.h:1928 msgid "Remove the suggested change" -msgstr "Esborrar el cambiu recomendáu" +msgstr "Eliminar el cambéu suxeríu" # MENU_LABEL_TABLE_HEADING_ROWS_REPEAT # MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1908 +#: po/tmp/ap_String_Id.h.h:1930 msgid "Repeat Row as Heading" -msgstr "" +msgstr "Repetir la filera como encabezáu" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1910 +#: po/tmp/ap_String_Id.h.h:1932 msgid "Repeat Row as Heading on each new page" -msgstr "" +msgstr "Repetir la filera como encabezáu en toles nueves páxines" # DLG_FR_ReplaceTitle #. DLG_FR_ReplaceTitle -#: po/tmp/ap_String_Id.h.h:1912 +#: po/tmp/ap_String_Id.h.h:1934 msgid "Replace" msgstr "Reemplazar" # DLG_FR_ReplaceAllButton #. DLG_FR_ReplaceAllButton -#: po/tmp/ap_String_Id.h.h:1914 +#: po/tmp/ap_String_Id.h.h:1936 msgid "Replace &All" -msgstr "Reemplazar &tou" +msgstr "Reemplazar &too" # MENU_STATUSLINE_EDIT_REPLACE #. MENU_STATUSLINE_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1916 +#: po/tmp/ap_String_Id.h.h:1938 msgid "Replace the specified text with different text" -msgstr "" +msgstr "Reemplazar el testu especificáu con testu diferente" # MENU_LABEL_HELP_REPORT_BUG #. MENU_LABEL_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1918 +#: po/tmp/ap_String_Id.h.h:1940 msgid "Report a &Bug" -msgstr "Informar un &bug" +msgstr "Informar d'un &bug" # MENU_STATUSLINE_HELP_REPORT_BUG #. MENU_STATUSLINE_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1920 +#: po/tmp/ap_String_Id.h.h:1942 msgid "Report a bug and help AbiWord become a better product" -msgstr "Unviar un bug y ayudar a qu'AbiWord seya un productu meyor" +msgstr "Informar d'un bug y aidar a qu'AbiWord seya un productu meyor" # MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT #. MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1922 +#: po/tmp/ap_String_Id.h.h:1944 msgid "Reset the current toolbar layout to its defaults" -msgstr "" -"Reaxustar la barra de ferramientes actual a los sos valores por defeutu" +msgstr "Restablecer la barra de ferramientes actual a los sos valores por defeutu" # MENU_STATUSLINE_FMT_IMAGE #. MENU_STATUSLINE_FMT_IMAGE -#: po/tmp/ap_String_Id.h.h:1924 +#: po/tmp/ap_String_Id.h.h:1946 msgid "Resize this image" msgstr "Redimensionar esta imaxe" # DLG_HdrFtr_RestartNumbers #. DLG_HdrFtr_RestartNumbers -#: po/tmp/ap_String_Id.h.h:1926 +#: po/tmp/ap_String_Id.h.h:1948 msgid "Restart numbering at:" -msgstr "Reentamar numberación en:" +msgstr "Reempecipiar la numberación en:" # DLG_FormatFootnotes_FootRestartPage #. DLG_FormatFootnotes_FootRestartPage -#: po/tmp/ap_String_Id.h.h:1928 +#: po/tmp/ap_String_Id.h.h:1950 msgid "Restart on each page" -msgstr "Reentamar ne cada páxina" +msgstr "Reempecipiar en cada páxina" # DLG_FormatFootnotes_FootRestartSec # DLG_FormatFootnotes_EndRestartSec #. DLG_FormatFootnotes_FootRestartSec #. DLG_FormatFootnotes_EndRestartSec -#: po/tmp/ap_String_Id.h.h:1931 +#: po/tmp/ap_String_Id.h.h:1953 msgid "Restart on each section" -msgstr "Reentamar en cada seición" +msgstr "Reempecipiar en cada seición" # DLG_HdrFtr_RestartCheck #. DLG_HdrFtr_RestartCheck -#: po/tmp/ap_String_Id.h.h:1933 +#: po/tmp/ap_String_Id.h.h:1955 msgid "Restart page numbers on new sections" -msgstr "Reentamar numberación de páxina'n una nuea seición" +msgstr "Reempecipiar los númberos de páxina nes seiciones nueves" # DLG_Lists_Resume_Previous_List #. DLG_Lists_Resume_Previous_List -#: po/tmp/ap_String_Id.h.h:1935 +#: po/tmp/ap_String_Id.h.h:1957 msgid "Resume Previous List" -msgstr "" +msgstr "Continuar la llista anterior" #. MENU_STATUSLINE_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:1937 +#: po/tmp/ap_String_Id.h.h:1959 msgid "Retain all document changes" -msgstr "" +msgstr "Caltener tolos cambeos del documentu" # MSG_RevertFile #. MSG_RevertFile -#: po/tmp/ap_String_Id.h.h:1939 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1961 msgid "Revert file to last saved state?" -msgstr "¿Volver a la cabeda copia guardá del archivu?" +msgstr "¿Revertir l'archivu a la cabera versión guardada?" # MENU_STATUSLINE_FILE_REVERT #. MENU_STATUSLINE_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1941 +#: po/tmp/ap_String_Id.h.h:1963 msgid "Revert the document to the last saved state" -msgstr "" +msgstr "Revertir el documentu al postrer estáu guardáu" # MSG_RevertBuffer #. MSG_RevertBuffer -#: po/tmp/ap_String_Id.h.h:1943 +#: po/tmp/ap_String_Id.h.h:1965 #, c-format msgid "Revert to saved copy of %s?" -msgstr "" +msgstr "¿Revertir a la copia guardada de %s?" # DLG_ListRevisions_Column1Label #. DLG_ListRevisions_Column1Label -#: po/tmp/ap_String_Id.h.h:1945 +#: po/tmp/ap_String_Id.h.h:1967 msgid "Revision ID" -msgstr "" +msgstr "ID de revisión" # DLG_Para_AlignRight # DLG_Tab_Radio_Right @@ -5921,153 +5920,151 @@ #. DLG_Tab_Radio_Right #. DLG_PageNumbers_Right #. TOOLBAR_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1950 +#: po/tmp/ap_String_Id.h.h:1972 msgid "Right" msgstr "Drecha" # RightIndentStatus #. RightIndentStatus -#: po/tmp/ap_String_Id.h.h:1952 +#: po/tmp/ap_String_Id.h.h:1974 #, c-format msgid "Right Indent [%s]" -msgstr "" +msgstr "Indentación drecha [%s]" # RightMarginStatus #. RightMarginStatus -#: po/tmp/ap_String_Id.h.h:1954 +#: po/tmp/ap_String_Id.h.h:1976 #, c-format msgid "Right Margin [%s]" msgstr "Marxe drechu [%s]" # TabToggleRightTab #. TabToggleRightTab -#: po/tmp/ap_String_Id.h.h:1956 +#: po/tmp/ap_String_Id.h.h:1978 msgid "Right Tab" -msgstr "" +msgstr "Tabulador drechu" # TOOLBAR_STATUSLINE_ALIGN_RIGHT # TOOLBAR_TOOLTIP_ALIGN_RIGHT #. TOOLBAR_STATUSLINE_ALIGN_RIGHT #. TOOLBAR_TOOLTIP_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1959 +#: po/tmp/ap_String_Id.h.h:1981 msgid "Right alignment" -msgstr "Alliniar a mandrecha" +msgstr "Alliniamientu a la drecha" # MENU_STATUSLINE_ALIGN_RIGHT #. MENU_STATUSLINE_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1961 +#: po/tmp/ap_String_Id.h.h:1983 msgid "Right-align the paragraph" -msgstr "Alliniación a mandrecha del párrafu" +msgstr "Alliniar el parágrafu a la drecha" # DLG_Para_DomDirection #. DLG_Para_DomDirection -#: po/tmp/ap_String_Id.h.h:1963 +#: po/tmp/ap_String_Id.h.h:1985 msgid "Right-to-left &dominant" -msgstr "" +msgstr "&Dominante de drecha a esquierda" # FIELD_Document_Rights #. FIELD_Document_Rights -#: po/tmp/ap_String_Id.h.h:1965 +#: po/tmp/ap_String_Id.h.h:1987 msgid "Rights" msgstr "Drechos" # DLG_MetaData_Rights_LBL #. DLG_MetaData_Rights_LBL -#: po/tmp/ap_String_Id.h.h:1967 +#: po/tmp/ap_String_Id.h.h:1989 msgid "Rights:" msgstr "Drechos:" # DLG_FormatTable_Apply_To_Row #. DLG_FormatTable_Apply_To_Row -#: po/tmp/ap_String_Id.h.h:1969 +#: po/tmp/ap_String_Id.h.h:1991 msgid "Row" -msgstr "Fila" +msgstr "Filera" # MENU_LABEL_TABLE_INSERT_ROWS_BEFORE #. MENU_LABEL_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1971 +#: po/tmp/ap_String_Id.h.h:1993 msgid "Rows &Above" -msgstr "Files enrib&a" +msgstr "Fileres enri&ba" # MENU_LABEL_TABLE_INSERT_ROWS_AFTER #. MENU_LABEL_TABLE_INSERT_ROWS_AFTER -#: po/tmp/ap_String_Id.h.h:1973 +#: po/tmp/ap_String_Id.h.h:1995 msgid "Rows &Below" -msgstr "files a&baxo" +msgstr "Fileres em&baxo" # MENU_LABEL_TOOLS_SCRIPTS #. MENU_LABEL_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1975 +#: po/tmp/ap_String_Id.h.h:1997 msgid "S&cripts" -msgstr "" +msgstr "S&cripts" # MENU_LABEL_TOOLS_REVISIONS #. MENU_LABEL_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:1977 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1999 msgid "S&how revisions" -msgstr "&Reviones" +msgstr "A&mosar revisiones" # MENU_LABEL_TABLE_SPLIT_CELLS #. MENU_LABEL_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:1979 +#: po/tmp/ap_String_Id.h.h:2001 msgid "S&plit Cells" -msgstr "" +msgstr "&Dixebrar celdes" # DLG_Options_Btn_Save #. DLG_Options_Btn_Save -#: po/tmp/ap_String_Id.h.h:1981 +#: po/tmp/ap_String_Id.h.h:2003 msgid "Sa&ve" msgstr "G&uadar" # MENU_LABEL_FILE_EXPORT #. MENU_LABEL_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:1983 +#: po/tmp/ap_String_Id.h.h:2005 msgid "Sav&e Copy" -msgstr "Gua&dar una copia" +msgstr "Gua&dar copia" # TOOLBAR_LABEL_FILE_SAVE #. TOOLBAR_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:1985 +#: po/tmp/ap_String_Id.h.h:2007 msgid "Save" msgstr "Guardar" # MENU_LABEL_FILE_SAVEAS #. MENU_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:1987 +#: po/tmp/ap_String_Id.h.h:2009 msgid "Save &As" msgstr "Guardar &como" # MENU_LABEL_FILE_SAVE_TEMPLATE #. MENU_LABEL_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1989 +#: po/tmp/ap_String_Id.h.h:2011 msgid "Save &Template" -msgstr "Guardar &plantilla" +msgstr "Guardar &plantía" # TOOLBAR_LABEL_FILE_SAVEAS #. TOOLBAR_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:1991 +#: po/tmp/ap_String_Id.h.h:2013 msgid "Save As" msgstr "Guardar como" # MENU_STATUSLINE_EDIT_CUT #. MENU_STATUSLINE_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:1993 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2015 msgid "Save a copy of the image on the clipboard" -msgstr "Cortar la seleición y pegala nel cortapapelos" +msgstr "Guardar una copia de la imaxe nel cartafueyu" # MSG_ConfirmSave #. MSG_ConfirmSave -#: po/tmp/ap_String_Id.h.h:1995 +#: po/tmp/ap_String_Id.h.h:2017 #, c-format msgid "Save changes to document %s before closing?" -msgstr "" +msgstr "¿Guardar los cambeos del documentu %s enantes de pesllar?" #. MENU_STATUSLINE_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:1997 +#: po/tmp/ap_String_Id.h.h:2019 msgid "Save the Embedded Object" -msgstr "" +msgstr "Guardar l'oxetu encrustáu" # MENU_STATUSLINE_FILE_SAVE # TOOLBAR_STATUSLINE_FILE_SAVE @@ -6075,15 +6072,15 @@ #. MENU_STATUSLINE_FILE_SAVE #. TOOLBAR_STATUSLINE_FILE_SAVE #. TOOLBAR_TOOLTIP_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:2001 +#: po/tmp/ap_String_Id.h.h:2023 msgid "Save the document" msgstr "Guardar el documentu" # MENU_STATUSLINE_FILE_SAVE_TEMPLATE #. MENU_STATUSLINE_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:2003 +#: po/tmp/ap_String_Id.h.h:2025 msgid "Save the document as a template" -msgstr "Guardar el documentu como una plantilla" +msgstr "Guardar el documentu como una plantía" # MENU_STATUSLINE_FILE_SAVEAS # TOOLBAR_STATUSLINE_FILE_SAVEAS @@ -6091,380 +6088,403 @@ #. MENU_STATUSLINE_FILE_SAVEAS #. TOOLBAR_STATUSLINE_FILE_SAVEAS #. TOOLBAR_TOOLTIP_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:2007 +#: po/tmp/ap_String_Id.h.h:2029 msgid "Save the document under a different name" msgstr "Guardar el documentu con un nome distintu" # MENU_STATUSLINE_FILE_EXPORT #. MENU_STATUSLINE_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:2009 +#: po/tmp/ap_String_Id.h.h:2031 msgid "Save the document without changing the current name" msgstr "Guardar el documentu ensin camudar el nome actual" # MENU_STATUSLINE_FILE_SAVEIMAGE #. MENU_STATUSLINE_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:2011 +#: po/tmp/ap_String_Id.h.h:2033 msgid "Save the selected image to a file" -msgstr "Guardar la imaxe esbillá nun archivu" +msgstr "Guardar la imaxe seleicionada nun archivu" # DLG_FOSA_SaveAsTitle #. MENU_LABEL_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:2013 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2035 msgid "Save to file" -msgstr "Guardar Archivu Como" +msgstr "Guardar a archivu" # DLG_PageSetup_Scale #. DLG_PageSetup_Scale -#: po/tmp/ap_String_Id.h.h:2015 +#: po/tmp/ap_String_Id.h.h:2037 msgid "Scale..." msgstr "Escala..." # MENU_STATUSLINE_HELP_SEARCH #. MENU_STATUSLINE_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:2017 +#: po/tmp/ap_String_Id.h.h:2039 msgid "Search for help about..." -msgstr "" +msgstr "Buscar aida tocante a..." # DLG_WordCount_Update_Rate #. DLG_WordCount_Update_Rate -#: po/tmp/ap_String_Id.h.h:2019 +#: po/tmp/ap_String_Id.h.h:2041 msgid "Seconds between updates" -msgstr "" +msgstr "Segundos ente actualizaciones" # FIELD_DateTime_Epoch #. FIELD_DateTime_Epoch -#: po/tmp/ap_String_Id.h.h:2021 +#: po/tmp/ap_String_Id.h.h:2043 msgid "Seconds since the epoch" -msgstr "" +msgstr "Segundos dende la época" # DLG_Break_SectionBreaks_Capital #. DLG_Break_SectionBreaks_Capital -#: po/tmp/ap_String_Id.h.h:2023 +#: po/tmp/ap_String_Id.h.h:2045 msgid "Section Breaks" -msgstr "" +msgstr "Saltos de seición" # DLG_Break_SectionBreaks #. DLG_Break_SectionBreaks -#: po/tmp/ap_String_Id.h.h:2025 +#: po/tmp/ap_String_Id.h.h:2047 msgid "Section breaks" -msgstr "" +msgstr "Saltos de seición" # MENU_STATUSLINE_EDIT_SELECTALL #. MENU_STATUSLINE_TOOLS_HISTORY -#: po/tmp/ap_String_Id.h.h:2027 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2049 msgid "See history of the current document" -msgstr "Seleicionar el documentu enteru" +msgstr "Ver l'historial del documentu actual" # MENU_STATUSLINE_TABLE_SELECT #. MENU_STATUSLINE_TABLE_SELECT #. DLG_Select -#: po/tmp/ap_String_Id.h.h:2029 po/tmp/xap_String_Id.h.h:630 +#: po/tmp/ap_String_Id.h.h:2051 +#: po/tmp/xap_String_Id.h.h:667 msgid "Select" msgstr "Seleicionar" # MENU_LABEL_EDIT_SELECTALL #. MENU_LABEL_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2031 +#: po/tmp/ap_String_Id.h.h:2053 msgid "Select A&ll" -msgstr "Seleicionar &tou" +msgstr "Seleicionar &too" # MENU_STATUSLINE_TABLE_SELECT_CELL #. MENU_STATUSLINE_TABLE_SELECT_CELL -#: po/tmp/ap_String_Id.h.h:2033 +#: po/tmp/ap_String_Id.h.h:2055 msgid "Select Cell" msgstr "Seleicionar celda" # MENU_STATUSLINE_TABLE_SELECT_COLUMN #. MENU_STATUSLINE_TABLE_SELECT_COLUMN -#: po/tmp/ap_String_Id.h.h:2035 +#: po/tmp/ap_String_Id.h.h:2057 msgid "Select Column" msgstr "Seleicionar columna" +# DLG_FormatTable_Apply_To_Selection +# DLG_UP_Selection +#. TOOLBAR_TOOLTIP_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:2059 +msgid "Select Font" +msgstr "Seleicionar fonte" + # DLG_ListRevisions_Title #. DLG_ListRevisions_Title -#: po/tmp/ap_String_Id.h.h:2037 +#: po/tmp/ap_String_Id.h.h:2061 msgid "Select Revision" -msgstr "" +msgstr "Seleicionar revisión" # MENU_STATUSLINE_TABLE_SELECT_ROW #. MENU_STATUSLINE_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:2039 +#: po/tmp/ap_String_Id.h.h:2063 msgid "Select Row" -msgstr "Seleicionar fila" +msgstr "Seleicionar filera" # MENU_STATUSLINE_TABLE_SELECT_TABLE #. MENU_STATUSLINE_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:2041 +#: po/tmp/ap_String_Id.h.h:2065 msgid "Select Table" msgstr "Seleicionar tabla" # MENU_STATUSLINE_TABLE_SELECT_TABLE #. MENU_LABEL_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2043 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2067 msgid "Select Text Box" -msgstr "Seleicionar tabla" +msgstr "Seleicionar caxa de testu" # DLG_InsertHyperlink_Msg #. DLG_InsertHyperlink_Msg -#: po/tmp/ap_String_Id.h.h:2045 +#: po/tmp/ap_String_Id.h.h:2069 msgid "Select a target bookmark from the list." -msgstr "" +msgstr "Seleicionar un marcador de la llista." # MENU_STATUSLINE_FILE_SAVEIMAGE #. DLG_FormatFrame_SelectImage #. DLG_FormatTable_SelectImage -#: po/tmp/ap_String_Id.h.h:2048 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2072 msgid "Select image from File" -msgstr "Guardar la imaxe esbillá nun archivu" +msgstr "Seleicionar imaxe dende archivu" # MENU_STATUSLINE_EDIT_SELECTALL #. MENU_STATUSLINE_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2050 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2074 msgid "Select the Text Box" -msgstr "Seleicionar el documentu enteru" +msgstr "Seleicionar la caxa de testu" # MENU_STATUSLINE_EDIT_SELECTALL #. MENU_STATUSLINE_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2052 +#: po/tmp/ap_String_Id.h.h:2076 msgid "Select the entire document" -msgstr "Seleicionar el documentu enteru" +msgstr "Seleicionar tol documentu" # DLG_FormatTable_Apply_To_Selection # DLG_UP_Selection #. DLG_FormatTable_Apply_To_Selection #. DLG_UP_Selection -#: po/tmp/ap_String_Id.h.h:2054 po/tmp/xap_String_Id.h.h:638 +#: po/tmp/ap_String_Id.h.h:2078 +#: po/tmp/xap_String_Id.h.h:675 msgid "Selection" msgstr "Seleición" # DLG_ToggleCase_SentenceCase #. DLG_ToggleCase_SentenceCase -#: po/tmp/ap_String_Id.h.h:2056 +#: po/tmp/ap_String_Id.h.h:2080 msgid "Sentence case" -msgstr "" +msgstr "Capitalización de fras" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2058 +#: po/tmp/ap_String_Id.h.h:2082 msgid "Separate table items with commas" -msgstr "" +msgstr "Separtar los elementos de la talba con comes" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2060 +#: po/tmp/ap_String_Id.h.h:2084 msgid "Separate table items with commas and tabs" -msgstr "" +msgstr "Separtar los elementos de la talba con comes y tabuladores" #. MENU_STATUSLINE_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2062 +#: po/tmp/ap_String_Id.h.h:2086 msgid "Separate table items with tabs" -msgstr "" +msgstr "Separtar los elementos de la talba con tabuladores" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2064 +#: po/tmp/ap_String_Id.h.h:2088 msgid "Separate with commas" -msgstr "" +msgstr "Separtar con comes" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2066 +#: po/tmp/ap_String_Id.h.h:2090 msgid "Separate with commas and tabs" -msgstr "" +msgstr "Separtar con comes y tabuladores" # DLG_WordCount_Characters_Sp #. MENU_LABEL_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2068 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2092 msgid "Separate with tabs" -msgstr "Carauteres (con espacios)" +msgstr "Separtar con tabuladores" # DLG_Tab_Button_Set #. DLG_Tab_Button_Set -#: po/tmp/ap_String_Id.h.h:2070 +#: po/tmp/ap_String_Id.h.h:2094 msgid "Set" -msgstr "Fixar" +msgstr "Establecer" # MENU_LABEL_FMT_LANGUAGE #. MENU_LABEL_FMT_LANGUAGE -#: po/tmp/ap_String_Id.h.h:2072 +#: po/tmp/ap_String_Id.h.h:2096 msgid "Set &Language" -msgstr "Fixar &llenguaxe" +msgstr "Establecer &llingua" # DLG_Lists_SetDefault #. DLG_Lists_SetDefault -#: po/tmp/ap_String_Id.h.h:2074 +#: po/tmp/ap_String_Id.h.h:2098 msgid "Set Default Values" -msgstr "Fixar valores por defeutu" +msgstr "Establecer valores por defeutu" # TOOLBAR_LABEL_IMG #. DLG_FormatFrame_SetImage #. DLG_FormatTable_SetImage -#: po/tmp/ap_String_Id.h.h:2077 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2101 msgid "Set Image" -msgstr "Amestar imaxe" +msgstr "Establecer imaxe" + +# DLG_PageNumbers_Position_No_Colon +#. MENU_LABEL_FMT_SETPOSIMAGE +#: po/tmp/ap_String_Id.h.h:2103 +msgid "Set Positioned Image" +msgstr "Establecer l'allugamientu la imaxe " # MENU_LABEL_FMT #. DLG_FormatFrame_SetTextWrapping -#: po/tmp/ap_String_Id.h.h:2079 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2105 msgid "Set Text Wrapping" -msgstr "Formatu de testu (&x)" +msgstr "Establecer l'axuste de testu" #. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:2081 +#: po/tmp/ap_String_Id.h.h:2107 msgid "Set an image as a background for your page" -msgstr "" +msgstr "Establecer una imaxe como fondu de páxina" + +# TOOLBAR_STATUSLINE_FMT_DOM_DIRECTION +# TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION +#. MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL +#: po/tmp/ap_String_Id.h.h:2109 +msgid "Set dominant direction of document to RTL" +msgstr "Establecer la direición dominante del documentu de drecha a esquierda" # MENU_STATUSLINE_FMT_DIRECTION_DD_RTL #. MENU_STATUSLINE_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:2083 +#: po/tmp/ap_String_Id.h.h:2111 msgid "Set dominant direction of paragraph to RTL" -msgstr "" +msgstr "Establecer la direición dominante del parágrafu de drecha a esquierda" + +# TOOLBAR_STATUSLINE_FMT_DOM_DIRECTION +# TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION +#. MENU_STATUSLINE_FMT_DIRECTION_SD_RTL +#: po/tmp/ap_String_Id.h.h:2113 +msgid "Set dominant direction of section to RTL" +msgstr "Establecer la direición dominante de la seición de drecha a esquierda" # MENU_STATUSLINE_FILE_PROPERTIES #. MENU_STATUSLINE_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:2085 +#: po/tmp/ap_String_Id.h.h:2115 msgid "Set meta-data properties" -msgstr "" +msgstr "Establecer propiedaes de metadatos" # TB_InsertNewTable #. DLG_Tab_Label_New -#: po/tmp/ap_String_Id.h.h:2087 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2117 msgid "Set new Tab" -msgstr "Amestar nua tabla" +msgstr "Establecer tabulación nueva" # DLG_ULANG_LangTitle #. DLG_FormatFrame_NoImageBackground #. DLG_FormatTable_NoImageBackground -#: po/tmp/ap_String_Id.h.h:2090 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2120 msgid "Set no image" -msgstr "Poner llenguaxe" +msgstr "Nun establecer imaxe dala" # MENU_STATUSLINE_TOOLS_OPTIONS #. MENU_STATUSLINE_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:2092 +#: po/tmp/ap_String_Id.h.h:2122 msgid "Set preferences" -msgstr "Fixar preferencies" +msgstr "Establecer preferencies" # MENU_STATUSLINE_FMT_TABS #. MENU_STATUSLINE_FMT_TABS -#: po/tmp/ap_String_Id.h.h:2094 +#: po/tmp/ap_String_Id.h.h:2124 msgid "Set tab stops" -msgstr "" +msgstr "Establecer los tabuladores" #. MENU_STATUSLINE_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2096 +#: po/tmp/ap_String_Id.h.h:2126 msgid "Set the type and styles of the Table of Contents" -msgstr "" +msgstr "Establecer la triba y estilos del índiz" # MENU_STATUSLINE_FMT_FOOTNOTES #. MENU_STATUSLINE_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:2098 +#: po/tmp/ap_String_Id.h.h:2128 msgid "Set the types of Footnotes and Endnotes" -msgstr "" +msgstr "Establecer les tribes de notes al pie y a lo cabero" # MENU_STATUSLINE_FMT_HDRFTR #. MENU_STATUSLINE_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:2100 +#: po/tmp/ap_String_Id.h.h:2130 msgid "Set the types of Headers and Footers" -msgstr "" +msgstr "Establecer les tribes d'encabezaos y pie de páxina" # STYLE_SECTHEADING #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2102 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2132 msgid "Set this Row as Heading" -msgstr "Títulu de la seición" +msgstr "Establecer esta filera como encabezáu" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2104 +#: po/tmp/ap_String_Id.h.h:2134 msgid "Set this Row as the Heading on each page" -msgstr "" +msgstr "Establecer esta filera como encabezáu de cada páxina" + +#. MENU_STATUSLINE_FMT_SETPOSIMAGE +#: po/tmp/ap_String_Id.h.h:2136 +msgid "Set this image to be positioned" +msgstr "Establecer esta imaxe pa ser allugada" # MENU_STATUSLINE_TOOLS_SPELLPREFS #. MENU_STATUSLINE_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2106 +#: po/tmp/ap_String_Id.h.h:2138 msgid "Set your spelling preferences" -msgstr "" +msgstr "Establecer les tos preferencies d'ortografía" # MENU_STATUSLINE_FMT_DOCUMENT #. MENU_STATUSLINE_FMT_DOCUMENT -#: po/tmp/ap_String_Id.h.h:2108 +#: po/tmp/ap_String_Id.h.h:2140 msgid "Setup your document's page properties such as page size and margins" -msgstr "" +msgstr "Configurar les propiedaes de páxina del documentu como'l tamañu de páxina y los márxenes" # DLG_Styles_ModifyShortCut #. DLG_Styles_ModifyShortCut -#: po/tmp/ap_String_Id.h.h:2110 +#: po/tmp/ap_String_Id.h.h:2142 msgid "Shortcut Key" -msgstr "Tecla de accesu direutu" +msgstr "Tecla d'accesu direutu" # DLG_Options_Label_Show #. DLG_Options_Label_Show #. DLG_Show -#: po/tmp/ap_String_Id.h.h:2112 po/tmp/xap_String_Id.h.h:650 +#: po/tmp/ap_String_Id.h.h:2144 +#: po/tmp/xap_String_Id.h.h:687 msgid "Show" msgstr "Amosar" # MENU_LABEL_VIEW_RULER #. MENU_LABEL_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2114 +#: po/tmp/ap_String_Id.h.h:2146 msgid "Show &Ruler" msgstr "Amosar ®la" # TOOLBAR_LABEL_VIEW_SHOWPARA #. TOOLBAR_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2116 +#: po/tmp/ap_String_Id.h.h:2148 msgid "Show All" -msgstr "Amosar tou" +msgstr "Amosar too" # MENU_LABEL_VIEW_SHOWPARA #. MENU_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2118 +#: po/tmp/ap_String_Id.h.h:2150 msgid "Show For&matting Marks" -msgstr "" +msgstr "Amosar marques de &formatu" # MENU_STATUSLINE_FILE_PRINT_PREVIEW # TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW # TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW #. MENU_LABEL_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2120 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2152 msgid "Show document &before revisions" -msgstr "Previsualizar el documentu enantes d'imprentalu" +msgstr "Amosar el documentu &enantes de les revisiones" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2122 +#: po/tmp/ap_String_Id.h.h:2154 msgid "Show document a&fter revisions" -msgstr "" +msgstr "Amosar el documentu &depués de les revisiones" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2124 +#: po/tmp/ap_String_Id.h.h:2156 msgid "Show document after &previous revisions" -msgstr "" +msgstr "Amosar el documentu depués de les revisones &anteriores" # MENU_STATUSLINE_WINDOW_MORE #. MENU_STATUSLINE_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:2126 +#: po/tmp/ap_String_Id.h.h:2158 msgid "Show full list of documents" msgstr "Amosar la llista completa de documentos" # MENU_STATUSLINE_VIEW_RULER #. MENU_STATUSLINE_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2128 +#: po/tmp/ap_String_Id.h.h:2160 msgid "Show or hide the rulers" -msgstr "Amosar o esconder les regles" +msgstr "Amosar o ocultar les regles" # MENU_STATUSLINE_VIEW_STATUSBAR #. MENU_STATUSLINE_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:2130 +#: po/tmp/ap_String_Id.h.h:2162 msgid "Show or hide the status bar" -msgstr "Amosar o esconder la barra d'estau" +msgstr "Amosar o ocultar la barra d'estáu" # MENU_STATUSLINE_VIEW_TB_1 # MENU_STATUSLINE_VIEW_TB_2 @@ -6474,43 +6494,36 @@ #. MENU_STATUSLINE_VIEW_TB_2 #. MENU_STATUSLINE_VIEW_TB_3 #. MENU_STATUSLINE_VIEW_TB_4 -#: po/tmp/ap_String_Id.h.h:2135 +#: po/tmp/ap_String_Id.h.h:2167 msgid "Show or hide the toolbar" -msgstr "Amosar o esconder la barra de ferramintes" +msgstr "Amosar o ocultar la barra de ferramientes" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:2137 +#: po/tmp/ap_String_Id.h.h:2169 msgid "Show revisions that are present in document" -msgstr "" - -# DLG_Options_Label_ShowSplash -#. DLG_Options_Label_ShowSplash -#: po/tmp/ap_String_Id.h.h:2139 -msgid "Show the AbiWord splash screen on application startup" -msgstr "" +msgstr "Amosar les revisiones presentes nel documentu" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2141 +#: po/tmp/ap_String_Id.h.h:2171 msgid "Show what the document looks like after previous revisions" -msgstr "" +msgstr "Amosar l'apariencia del documentu depués de les revisiones anteriores" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2143 +#: po/tmp/ap_String_Id.h.h:2173 msgid "Show what the document looks like after revisions" -msgstr "" +msgstr "Amosar l'apariencia del documentu depués de les revisiones" # MENU_STATUSLINE_FILE_PRINT_PREVIEW # TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW # TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2145 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2175 msgid "Show what the document looks like before revisions" -msgstr "Previsualizar el documentu enantes d'imprentalu" +msgstr "Amosar cómo se ve'l documentu enantes de les revisiones" # DLG_Options_Label_ViewShowHide #. DLG_Options_Label_ViewShowHide -#: po/tmp/ap_String_Id.h.h:2147 +#: po/tmp/ap_String_Id.h.h:2177 msgid "Show..." msgstr "Amosar..." @@ -6518,257 +6531,268 @@ # TOOLBAR_TOOLTIP_VIEW_SHOWPARA #. TOOLBAR_STATUSLINE_VIEW_SHOWPARA #. TOOLBAR_TOOLTIP_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2150 +#: po/tmp/ap_String_Id.h.h:2180 msgid "Show/hide formatting marks" -msgstr "" +msgstr "Amosar/ocultar les marques de formatu" + +# DLG_UFS_SampleFrameLabel +#. TB_Simple +#: po/tmp/ap_String_Id.h.h:2182 +msgid "Simple" +msgstr "Simple" + +# DLG_Options_Label_ViewTableTB +#. DLG_Options_Label_ViewSimpleTB +#: po/tmp/ap_String_Id.h.h:2184 +msgid "Simple Toolbar" +msgstr "Barra de ferramientes simple" # DLG_Para_SpacingSingle #. DLG_Para_SpacingSingle -#: po/tmp/ap_String_Id.h.h:2152 +#: po/tmp/ap_String_Id.h.h:2186 msgid "Single" -msgstr "Cenciellu" +msgstr "Simple" # TOOLBAR_LABEL_SINGLE_SPACE #. TOOLBAR_LABEL_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2154 +#: po/tmp/ap_String_Id.h.h:2188 msgid "Single Spacing" -msgstr "Espaciau cenciellu" +msgstr "Espaciáu simple" # TOOLBAR_STATUSLINE_SINGLE_SPACE # TOOLBAR_TOOLTIP_SINGLE_SPACE #. TOOLBAR_STATUSLINE_SINGLE_SPACE #. TOOLBAR_TOOLTIP_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2157 +#: po/tmp/ap_String_Id.h.h:2191 msgid "Single spacing" -msgstr "Espaciau cenciellu" +msgstr "Espaciáu simple" # MENU_LABEL_TABLE_SORT #. MENU_LABEL_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2159 +#: po/tmp/ap_String_Id.h.h:2193 msgid "So&rt Table" msgstr "O&rdenar tabla" #. MENU_LABEL_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2161 +#: po/tmp/ap_String_Id.h.h:2195 msgid "Sort Columns in Ascending Order" -msgstr "" +msgstr "Ordenar columnes n'orde ascendente" #. MENU_STATUSLINE_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2163 +#: po/tmp/ap_String_Id.h.h:2197 msgid "Sort Columns in Ascending Order based on Selected Row" -msgstr "" +msgstr "Ordenar les columnes n'orde ascendente basándose na filera seleicionada" #. MENU_LABEL_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2165 +#: po/tmp/ap_String_Id.h.h:2199 msgid "Sort Columns in Descending Order" -msgstr "" +msgstr "Ordenar columnes n'orde descendente" #. MENU_STATUSLINE_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2167 +#: po/tmp/ap_String_Id.h.h:2201 msgid "Sort Columns in Descending Order based on Selected Row" -msgstr "" +msgstr "Ordenar les columnes n'orde descendente basándose na filera seleicionada" #. MENU_LABEL_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2169 +#: po/tmp/ap_String_Id.h.h:2203 msgid "Sort Rows in Ascending Order" -msgstr "" +msgstr "Ordenar fileres n'orde ascendente" #. MENU_STATUSLINE_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2171 +#: po/tmp/ap_String_Id.h.h:2205 msgid "Sort Rows in Ascending Order based on selected Column" -msgstr "" +msgstr "Ordenar les columnes n'orde ascendente basándose na columna seleicionada" #. MENU_LABEL_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2173 +#: po/tmp/ap_String_Id.h.h:2207 msgid "Sort Rows in Descending Order" -msgstr "" +msgstr "Ordenar fileres n'orde descendente" #. MENU_STATUSLINE_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2175 +#: po/tmp/ap_String_Id.h.h:2209 msgid "Sort Rows in Descending Order based on Selected Column" -msgstr "" +msgstr "Ordenar les columnes n'orde descendente basándose na columna seleicionada" # MENU_STATUSLINE_TABLE_SORT #. MENU_STATUSLINE_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2177 +#: po/tmp/ap_String_Id.h.h:2211 msgid "Sort Table" msgstr "Ordenar tabla" # DLG_MetaData_Source_LBL #. DLG_MetaData_Source_LBL -#: po/tmp/ap_String_Id.h.h:2179 +#: po/tmp/ap_String_Id.h.h:2213 msgid "Source:" msgstr "Fonte:" # DLG_Column_Space_After #. DLG_Column_Space_After -#: po/tmp/ap_String_Id.h.h:2181 +#: po/tmp/ap_String_Id.h.h:2215 msgid "Space after Column" -msgstr "Espaciu dempues de la columna" +msgstr "Espaciu tres de la columna" # TOOLBAR_STATUSLINE_PARA_12BEFORE # TOOLBAR_TOOLTIP_PARA_12BEFORE #. TOOLBAR_STATUSLINE_PARA_12BEFORE #. TOOLBAR_TOOLTIP_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:2184 +#: po/tmp/ap_String_Id.h.h:2218 msgid "Space before: 12 pt" -msgstr "Espaciu anantes: 12 pt" +msgstr "Espaciu enantes: 12 pt" # TOOLBAR_STATUSLINE_PARA_0BEFORE # TOOLBAR_TOOLTIP_PARA_0BEFORE #. TOOLBAR_STATUSLINE_PARA_0BEFORE #. TOOLBAR_TOOLTIP_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:2187 +#: po/tmp/ap_String_Id.h.h:2221 msgid "Space before: None" -msgstr "Espaciu anantes: nengún" +msgstr "Espaciu enantes: Nengún" # DLG_Para_LabelSpacing #. DLG_Para_LabelSpacing -#: po/tmp/ap_String_Id.h.h:2189 +#: po/tmp/ap_String_Id.h.h:2223 msgid "Spacing" -msgstr "Espaciau" +msgstr "Espaciáu" # DLG_FormatTable_Apply_To_Selection # DLG_UP_Selection #. DLG_Options_SpellCheckingTitle -#: po/tmp/ap_String_Id.h.h:2191 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2225 msgid "Spell Checking" -msgstr "Seleición" +msgstr "Revisión ortográfica" # TOOLBAR_LABEL_SPELLCHECK #. TOOLBAR_LABEL_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2193 +#: po/tmp/ap_String_Id.h.h:2227 msgid "Spellcheck" -msgstr "" +msgstr "Revisar ortografía" # TOOLBAR_STATUSLINE_SPELLCHECK # TOOLBAR_TOOLTIP_SPELLCHECK #. TOOLBAR_STATUSLINE_SPELLCHECK #. TOOLBAR_TOOLTIP_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2196 +#: po/tmp/ap_String_Id.h.h:2230 msgid "Spellcheck the document" -msgstr "" +msgstr "Revisar ortografía del documentu" # DLG_Spell_SpellTitle # DLG_Options_TabLabel_Spelling #. DLG_Spell_SpellTitle #. DLG_Options_TabLabel_Spelling -#: po/tmp/ap_String_Id.h.h:2199 +#: po/tmp/ap_String_Id.h.h:2233 msgid "Spelling" -msgstr "" +msgstr "Ortografía" # MENU_LABEL_TOOLS_SPELLPREFS #. MENU_LABEL_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2201 +#: po/tmp/ap_String_Id.h.h:2235 msgid "Spelling &Options" -msgstr "" +msgstr "&Opciones d'ortografía" # MENU_LABEL_TABLE_SPLIT_TABLE #. MENU_LABEL_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2203 +#: po/tmp/ap_String_Id.h.h:2237 msgid "Spli&t Table" -msgstr "" +msgstr "&Dixebrar tabla" # MENU_STATUSLINE_TABLE_SPLIT_CELLS #. DLG_SplitCellsTitle #. DLG_SplitCells_Frame #. MENU_STATUSLINE_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2207 +#: po/tmp/ap_String_Id.h.h:2241 msgid "Split Cells" -msgstr "Separar celdes" +msgstr "Dixebrar celdes" # MENU_STATUSLINE_TABLE_SPLIT_TABLE #. MENU_STATUSLINE_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2209 +#: po/tmp/ap_String_Id.h.h:2243 msgid "Split Table" -msgstr "Partir tabla" +msgstr "Dixebrar tabla" # TOOLBAR_LABEL_SPLIT_CELLS #. TOOLBAR_LABEL_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2211 +#: po/tmp/ap_String_Id.h.h:2245 msgid "Split cells" -msgstr "Partir celdes" +msgstr "Dixebrar celdes" # MENU_STATUSLINE_TABLE_SPLIT_TABLE #. DLG_SplitCells_HoriMid #. DLG_SplitCells_VertMid -#: po/tmp/ap_String_Id.h.h:2214 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2248 msgid "Split in Middle" -msgstr "Partir tabla" +msgstr "Dixebrar pela metada" #. DLG_SplitCells_Below -#: po/tmp/ap_String_Id.h.h:2216 +#: po/tmp/ap_String_Id.h.h:2250 msgid "Split on Bottom Side" -msgstr "" +msgstr "Dixebrar perbaxo" #. DLG_SplitCells_Left -#: po/tmp/ap_String_Id.h.h:2218 +#: po/tmp/ap_String_Id.h.h:2252 msgid "Split on Left Side" -msgstr "" +msgstr "Dixebrar pela esquierda" #. DLG_SplitCells_Right -#: po/tmp/ap_String_Id.h.h:2220 +#: po/tmp/ap_String_Id.h.h:2254 msgid "Split on Right Side" -msgstr "" +msgstr "Dixebrar pela drecha" #. DLG_SplitCells_Above -#: po/tmp/ap_String_Id.h.h:2222 +#: po/tmp/ap_String_Id.h.h:2256 msgid "Split on Top Side" -msgstr "" +msgstr "Dixebrar penriba" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2224 +#: po/tmp/ap_String_Id.h.h:2258 msgid "Split on all delimiters except spaces" -msgstr "" +msgstr "Dixebrar en tolos llendadores sacantes los espacios" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2226 +#: po/tmp/ap_String_Id.h.h:2260 msgid "Split on all word delimiters including spaces" -msgstr "" +msgstr "Dixebrar en tolos llendadores de pallabra incluyendo los espacios" #. MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2228 +#: po/tmp/ap_String_Id.h.h:2262 msgid "Split text at commas or tabs" -msgstr "" +msgstr "Dixebrar el testu nes comes o tabuladores" #. MENU_LABEL_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2230 +#: po/tmp/ap_String_Id.h.h:2264 msgid "Split text at spaces, commas, or tabs" -msgstr "" +msgstr "Dixebrar el testu nos espacios, comes o tabuladores" # TOOLBAR_STATUSLINE_SPLIT_CELLS # TOOLBAR_TOOLTIP_SPLIT_CELLS #. TOOLBAR_STATUSLINE_SPLIT_CELLS #. TOOLBAR_TOOLTIP_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2233 +#: po/tmp/ap_String_Id.h.h:2267 msgid "Split this cell" -msgstr "Separar esta celda" +msgstr "Dixebrar esta celda" # DLG_Lists_Square_List # STYLE_SQUARELIST #. DLG_Lists_Square_List #. STYLE_SQUARELIST -#: po/tmp/ap_String_Id.h.h:2235 po/tmp/xap_String_Id.h.h:662 +#: po/tmp/ap_String_Id.h.h:2269 +#: po/tmp/xap_String_Id.h.h:699 msgid "Square List" -msgstr "llista cuadrada" +msgstr "Llista de cuadros" # MENU_LABEL_FMT_STYLE #. MENU_LABEL_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2237 +#: po/tmp/ap_String_Id.h.h:2271 msgid "St&yle" -msgstr "Estilu (&Y)" +msgstr "Es&tilu" # TB_Standard #. TB_Standard -#: po/tmp/ap_String_Id.h.h:2239 +#: po/tmp/ap_String_Id.h.h:2273 msgid "Standard" msgstr "Estándar" # DLG_Options_Label_ViewStandardTB #. DLG_Options_Label_ViewStandardTB -#: po/tmp/ap_String_Id.h.h:2241 +#: po/tmp/ap_String_Id.h.h:2275 msgid "Standard Toolbar" msgstr "Barra de ferramientes estándar" @@ -6776,65 +6800,65 @@ # STYLE_STARLIST #. DLG_Lists_Star_List #. STYLE_STARLIST -#: po/tmp/ap_String_Id.h.h:2243 po/tmp/xap_String_Id.h.h:666 +#: po/tmp/ap_String_Id.h.h:2277 +#: po/tmp/xap_String_Id.h.h:703 msgid "Star List" -msgstr "Entamar llista" +msgstr "Llista d'estrelles" # DLG_Lists_Start #. DLG_Lists_Start -#: po/tmp/ap_String_Id.h.h:2245 +#: po/tmp/ap_String_Id.h.h:2279 msgid "Start At:" -msgstr "Entamar en:" +msgstr "Emprimar en:" # DLG_Lists_Start_New_List # DLG_Lists_Start_New #. DLG_Lists_Start_New_List #. DLG_Lists_Start_New -#: po/tmp/ap_String_Id.h.h:2248 +#: po/tmp/ap_String_Id.h.h:2282 msgid "Start New List" -msgstr "Entamar una llista nuea" +msgstr "Emprimar una llista nueva" # DLG_Lists_Start_Sub #. DLG_Lists_Start_Sub -#: po/tmp/ap_String_Id.h.h:2250 +#: po/tmp/ap_String_Id.h.h:2284 msgid "Start Sublist" -msgstr "" +msgstr "Emprimar subllista" # DLG_MarkRevisions_Check2Label #. DLG_MarkRevisions_Check2Label -#: po/tmp/ap_String_Id.h.h:2252 +#: po/tmp/ap_String_Id.h.h:2286 msgid "Start a new revision" -msgstr "Entamar una revisión nuea" +msgstr "Emprimar una revisión nueva" # DLG_MarkRevisions_Check2Label #. MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2254 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2288 msgid "Start ne&w revision" -msgstr "Entamar una revisión nuea" +msgstr "Emprimar revisión nueva" #. MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2256 +#: po/tmp/ap_String_Id.h.h:2290 msgid "Start revision distinct from the current one" -msgstr "" +msgstr "Emprimar una revisión distinta de la actual" # DLG_WordCount_Statistics #. DLG_WordCount_Statistics -#: po/tmp/ap_String_Id.h.h:2258 +#: po/tmp/ap_String_Id.h.h:2292 msgid "Statistics:" -msgstr "Estadistiques:" +msgstr "Estadístiques:" # DLG_Lists_Stop_Current_List #. DLG_Lists_Stop_Current_List -#: po/tmp/ap_String_Id.h.h:2260 +#: po/tmp/ap_String_Id.h.h:2294 msgid "Stop Current List" -msgstr "Parar la llista actual" +msgstr "Aparar la llista actual" # MENU_LABEL_FMT_STRIKE #. MENU_LABEL_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2262 +#: po/tmp/ap_String_Id.h.h:2296 msgid "Stri&ke" -msgstr "" +msgstr "&Escarabayar" # TOOLBAR_LABEL_FMT_STRIKE # TOOLBAR_STATUSLINE_FMT_STRIKE @@ -6844,22 +6868,22 @@ #. TOOLBAR_STATUSLINE_FMT_STRIKE #. TOOLBAR_TOOLTIP_FMT_STRIKE #. DLG_UFS_StrikeoutCheck -#: po/tmp/ap_String_Id.h.h:2266 po/tmp/xap_String_Id.h.h:668 +#: po/tmp/ap_String_Id.h.h:2300 +#: po/tmp/xap_String_Id.h.h:705 msgid "Strike" -msgstr "" +msgstr "Escarabayar" # MENU_STATUSLINE_FMT_STRIKE #. MENU_STATUSLINE_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2268 +#: po/tmp/ap_String_Id.h.h:2302 msgid "Strikeout the selection (toggle)" -msgstr "" +msgstr "Escarabayar la seleición (alternar)" # DLG_Styles_StylesTitle #. MENU_LABEL_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:2270 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2304 msgid "Sty&list" -msgstr "Estilos" +msgstr "Llista d'&estilos" # TOOLBAR_LABEL_FMT_STYLE # TOOLBAR_STATUSLINE_FMT_STYLE @@ -6867,66 +6891,66 @@ #. TOOLBAR_LABEL_FMT_STYLE #. TOOLBAR_STATUSLINE_FMT_STYLE #. TOOLBAR_TOOLTIP_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2274 +#: po/tmp/ap_String_Id.h.h:2308 msgid "Style" msgstr "Estilu" # DLG_Styles_ErrNotTitle1 #. DLG_Styles_ErrNotTitle1 -#: po/tmp/ap_String_Id.h.h:2276 +#: po/tmp/ap_String_Id.h.h:2310 msgid "Style Name - " msgstr "Nome del estilu - " # DLG_Styles_ModifyName #. DLG_Styles_ModifyName -#: po/tmp/ap_String_Id.h.h:2278 +#: po/tmp/ap_String_Id.h.h:2312 msgid "Style Name:" msgstr "Nome del estilu:" # DLG_Styles_ModifyType #. DLG_Styles_ModifyType -#: po/tmp/ap_String_Id.h.h:2280 +#: po/tmp/ap_String_Id.h.h:2314 msgid "Style Type" -msgstr "Tipu de estilu" +msgstr "Triba del estilu" # DLG_Styles_ModifyFollowing #. DLG_Styles_ModifyFollowing -#: po/tmp/ap_String_Id.h.h:2282 +#: po/tmp/ap_String_Id.h.h:2316 msgid "Style for following paragraph" -msgstr "Estilu pal siguiente párrafu" +msgstr "Estilu pal parágrafu siguiente" # DLG_Styles_ErrBlankName #. DLG_Styles_ErrBlankName -#: po/tmp/ap_String_Id.h.h:2284 +#: po/tmp/ap_String_Id.h.h:2318 msgid "Style name cannot be left blank" -msgstr "El nome del estilu nun pue tener blancos a dizquierda" +msgstr "El nome del estilu nun pue tener espacios blancos a la esquierda" # DLG_Lists_Style # DLG_UFS_StyleLabel #. DLG_Lists_Style #. DLG_UFS_StyleLabel -#: po/tmp/ap_String_Id.h.h:2286 po/tmp/xap_String_Id.h.h:670 +#: po/tmp/ap_String_Id.h.h:2320 +#: po/tmp/xap_String_Id.h.h:707 msgid "Style:" msgstr "Estilu:" # DLG_Styles_StylesTitle #. DLG_Styles_StylesTitle #. DLG_Stylist_Styles -#: po/tmp/ap_String_Id.h.h:2289 +#: po/tmp/ap_String_Id.h.h:2323 msgid "Styles" msgstr "Estilos" # DLG_Styles_StylesTitle #. DLG_Stylist_Title -#: po/tmp/ap_String_Id.h.h:2291 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2325 msgid "Stylist" -msgstr "Estilos" +msgstr "Llista d'estilos" # FIELD_Document_Subject # AUTOTEXT_SUBJECT_1 #. FIELD_Document_Subject -#: po/tmp/ap_String_Id.h.h:2293 +#: po/tmp/ap_String_Id.h.h:2327 msgid "Subject" msgstr "Asuntu" @@ -6934,7 +6958,7 @@ # AUTOTEXT_EMAIL_3 # MENU_LABEL_AUTOTEXT_SUBJECT #. DLG_MetaData_Subject_LBL -#: po/tmp/ap_String_Id.h.h:2295 +#: po/tmp/ap_String_Id.h.h:2329 msgid "Subject:" msgstr "Asuntu:" @@ -6946,59 +6970,58 @@ #. TOOLBAR_STATUSLINE_FMT_SUBSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUBSCRIPT #. DLG_UFS_SubScript -#: po/tmp/ap_String_Id.h.h:2299 po/tmp/xap_String_Id.h.h:674 +#: po/tmp/ap_String_Id.h.h:2333 +#: po/tmp/xap_String_Id.h.h:711 msgid "Subscript" -msgstr "Subindiz" +msgstr "Subíndiz" # DLG_Spell_Suggestions #. DLG_Spell_Suggestions -#: po/tmp/ap_String_Id.h.h:2301 +#: po/tmp/ap_String_Id.h.h:2335 msgid "Sugg&estions:" msgstr "Suxer&encies:" # DLG_Options_Label_SpellMainOnly #. DLG_Options_Label_SpellMainOnly -#: po/tmp/ap_String_Id.h.h:2303 +#: po/tmp/ap_String_Id.h.h:2337 msgid "Suggest from &main dictionary only" -msgstr "" +msgstr "Suxerir namái del diccionariu &principal" # TOOLBAR_LABEL_1COLUMN # TOOLBAR_STATUSLINE_1COLUMN # TOOLBAR_TOOLTIP_1COLUMN #. MENU_LABEL_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:2305 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2339 msgid "Sum a Column" -msgstr "1 Columna" +msgstr "Sumar una columna" #. MENU_LABEL_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:2307 +#: po/tmp/ap_String_Id.h.h:2341 msgid "Sum a Row" -msgstr "" +msgstr "Sumar una filera" # DLG_Column_Space_After #. FIELD_Numbers_TableSumRows -#: po/tmp/ap_String_Id.h.h:2309 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2343 msgid "Sum a Table Column" -msgstr "Espaciu dempues de la columna" +msgstr "Sumar una columna de la tabla" #. FIELD_Numbers_TableSumCols -#: po/tmp/ap_String_Id.h.h:2311 +#: po/tmp/ap_String_Id.h.h:2345 msgid "Sum a Table Row" -msgstr "" +msgstr "Sumar una filera de la tabla" # DLG_MetaData_TAB_Summary #. DLG_MetaData_TAB_Summary -#: po/tmp/ap_String_Id.h.h:2313 +#: po/tmp/ap_String_Id.h.h:2347 msgid "Summary" -msgstr "Sumariu" +msgstr "Resume" # MENU_LABEL_FMT_SUPERSCRIPT #. MENU_LABEL_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:2315 +#: po/tmp/ap_String_Id.h.h:2349 msgid "Supe&rscript" -msgstr "" +msgstr "Super&índiz" # TOOLBAR_LABEL_FMT_SUPERSCRIPT # TOOLBAR_STATUSLINE_FMT_SUPERSCRIPT @@ -7008,46 +7031,47 @@ #. TOOLBAR_STATUSLINE_FMT_SUPERSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUPERSCRIPT #. DLG_UFS_SuperScript -#: po/tmp/ap_String_Id.h.h:2319 po/tmp/xap_String_Id.h.h:676 +#: po/tmp/ap_String_Id.h.h:2353 +#: po/tmp/xap_String_Id.h.h:713 msgid "Superscript" -msgstr "Superindiz" +msgstr "Superíndiz" # MENU_LABEL_INSERT_SYMBOL #. MENU_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2321 +#: po/tmp/ap_String_Id.h.h:2355 msgid "Sy&mbol" -msgstr "Si&mbolu" +msgstr "Sí&mbolu" # TOOLBAR_LABEL_INSERT_SYMBOL #. TOOLBAR_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2323 +#: po/tmp/ap_String_Id.h.h:2357 msgid "Symbol" -msgstr "Simbolu" +msgstr "Símbolu" # MENU_LABEL_TABLE #. MENU_LABEL_TABLE -#: po/tmp/ap_String_Id.h.h:2325 +#: po/tmp/ap_String_Id.h.h:2359 msgid "T&able" -msgstr "" +msgstr "T&abla" # TabStopStatus #. TabStopStatus -#: po/tmp/ap_String_Id.h.h:2327 +#: po/tmp/ap_String_Id.h.h:2361 #, c-format msgid "Tab Stop [%s]" -msgstr "" +msgstr "Tabulador [%s]" # DLG_Tab_Label_TabPosition #. DLG_Tab_Label_TabPosition -#: po/tmp/ap_String_Id.h.h:2329 +#: po/tmp/ap_String_Id.h.h:2363 msgid "Tab stop position:" -msgstr "" +msgstr "Allugamientu del tabulador:" # DLG_Tab_Label_TabToClear #. DLG_Tab_Label_TabToClear -#: po/tmp/ap_String_Id.h.h:2331 +#: po/tmp/ap_String_Id.h.h:2365 msgid "Tab stops to be cleared:" -msgstr "" +msgstr "Tabuladores pa borrar:" # DLG_FormatTable_Apply_To_Table # MENU_STATUSLINE_TABLE @@ -7055,44 +7079,43 @@ #. DLG_FormatTable_Apply_To_Table #. MENU_STATUSLINE_TABLE #. TB_Table -#: po/tmp/ap_String_Id.h.h:2335 po/tmp/xap_String_Id.h.h:686 +#: po/tmp/ap_String_Id.h.h:2369 +#: po/tmp/xap_String_Id.h.h:723 msgid "Table" msgstr "Tabla" # DLG_InsertTable_TableSize_Capital #. DLG_InsertTable_TableSize_Capital -#: po/tmp/ap_String_Id.h.h:2337 +#: po/tmp/ap_String_Id.h.h:2371 msgid "Table Size" msgstr "Tamañu de la tabla" # DLG_Options_Label_ViewTableTB #. DLG_Options_Label_ViewTableTB -#: po/tmp/ap_String_Id.h.h:2339 +#: po/tmp/ap_String_Id.h.h:2373 msgid "Table Toolbar" -msgstr "Ferramientes de la tabla" +msgstr "Barra de ferramientes de la tabla" -#. TOC_TocHeading #. MENU_LABEL_INSERT_TABLEOFCONTENTS #. MENU_LABEL_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2343 +#: po/tmp/ap_String_Id.h.h:2376 msgid "Table of Contents" -msgstr "" +msgstr "Índiz" # DLG_Lists_Current_List_Label #. FIELD_Numbers_TOCListLabel -#: po/tmp/ap_String_Id.h.h:2345 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2378 msgid "Table of Contents List Label" -msgstr "Etiqueta actual de la llista" +msgstr "Lista d'etiquetes del índiz" #. FIELD_Numbers_TOCPageNumber -#: po/tmp/ap_String_Id.h.h:2347 +#: po/tmp/ap_String_Id.h.h:2380 msgid "Table of Contents Page" -msgstr "" +msgstr "Páxina d'índiz" # DLG_InsertTable_TableSize #. DLG_InsertTable_TableSize -#: po/tmp/ap_String_Id.h.h:2349 +#: po/tmp/ap_String_Id.h.h:2382 msgid "Table size" msgstr "Tamañu de la tabla" @@ -7100,164 +7123,136 @@ # DLG_Tab_TabTitle #. DLG_Styles_ModifyTabs #. DLG_Tab_TabTitle -#: po/tmp/ap_String_Id.h.h:2352 +#: po/tmp/ap_String_Id.h.h:2385 msgid "Tabs" -msgstr "" +msgstr "Tabuladores" # MENU_LABEL_FMT_BULLETS #. DLG_FormatTOC_DetailsTabPage -#: po/tmp/ap_String_Id.h.h:2354 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2387 msgid "Tabs and Page Numbering" -msgstr "Puntos y &Numberaición" +msgstr "Tabuladores y numberación de páxines" # MENU_LABEL_FMT #. MENU_LABEL_FMT -#: po/tmp/ap_String_Id.h.h:2356 +#: po/tmp/ap_String_Id.h.h:2389 msgid "Te&xt Formatting" -msgstr "Formatu de testu (&x)" +msgstr "For&matu del testu" # DLG_Options_Label_Text #. DLG_Options_Label_Text -#: po/tmp/ap_String_Id.h.h:2358 +#: po/tmp/ap_String_Id.h.h:2391 msgid "Text" msgstr "Testu" #. DLG_FormatTOC_TextAfter -#: po/tmp/ap_String_Id.h.h:2360 +#: po/tmp/ap_String_Id.h.h:2393 msgid "Text &after:" -msgstr "" +msgstr "Testu &depués:" # TOOLBAR_LABEL_PARA_0BEFORE #. DLG_FormatTOC_TextBefore -#: po/tmp/ap_String_Id.h.h:2362 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2395 msgid "Text &before:" -msgstr "Nengún enantes" +msgstr "Testu &enantes:" # DLG_Lists_Align #. DLG_Lists_Align -#: po/tmp/ap_String_Id.h.h:2364 +#: po/tmp/ap_String_Id.h.h:2397 msgid "Text Align:" -msgstr "Alliniamientu del testu:" +msgstr "Alliniamientu'l testu:" # DLG_UFS_ColorTab #. MENU_LABEL_INSERT_TEXTBOX #. MENU_LABEL_FMT_FRAME -#: po/tmp/ap_String_Id.h.h:2367 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2400 msgid "Text Box" -msgstr "Collor de textu" +msgstr "Caxa de testu" # MENU_LABEL_FMT #. DLG_Lists_PageFolding -#: po/tmp/ap_String_Id.h.h:2369 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2402 msgid "Text Folding" -msgstr "Formatu de testu (&x)" +msgstr "Plegáu del testu" # MENU_LABEL_FMT #. DLG_FormatFrame_TextWrapping -#: po/tmp/ap_String_Id.h.h:2371 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2404 msgid "Text Wrapping" -msgstr "Formatu de testu (&x)" +msgstr "Espardimientu del testu" # DLG_Options_Label_Both #. DLG_Options_Label_Both -#: po/tmp/ap_String_Id.h.h:2373 +#: po/tmp/ap_String_Id.h.h:2406 msgid "Text and Icon" -msgstr "Testu y Iconu" - -#. MSG_MergeDocsNotRelated -#: po/tmp/ap_String_Id.h.h:2375 -msgid "" -"The documents you are trying to merge are unrelated. AbiWord will attempt to " -"merge them, but the result might be meaningless." -msgstr "" +msgstr "Testu y iconu" # DLG_PageSetup_ErrBigMargins #. DLG_PageSetup_ErrBigMargins -#: po/tmp/ap_String_Id.h.h:2377 +#: po/tmp/ap_String_Id.h.h:2408 msgid "The margins selected are too large to fit on the page." -msgstr "Los marsenes seleicionaos son demasiao grante p'axustase a la páxina" +msgstr "Los márxenes seleicionaos son demasiao grandes pa encaxar na páxina." # DLG_Options_Prompt_YouMustRestart #. DLG_Options_Prompt_YouMustRestart -#: po/tmp/ap_String_Id.h.h:2379 -msgid "" -"The new user interface language will take effect the next time that you " -"start the application" -msgstr "" -"Los tos cambios nel llenguaxe de la interface d'usuariu van tener llugar nel " -"momentu que vuevas entamar AbiWord" +#: po/tmp/ap_String_Id.h.h:2410 +msgid "The new user interface language will take effect the next time that you start the application" +msgstr "La llingua d'interfaz d'usuariu nueva sedrá efeutiva la prósima vegada qu'entames l'aplicación" # MSG_SpellDone #. MSG_SpellDone -#: po/tmp/ap_String_Id.h.h:2381 +#: po/tmp/ap_String_Id.h.h:2412 msgid "The spelling check is complete." -msgstr "Finose la correición ortagráfica." +msgstr "Completóse la correición ortográfica." # MSG_HyperlinkCrossesBoundaries #. MSG_HyperlinkCrossesBoundaries -#: po/tmp/ap_String_Id.h.h:2383 -msgid "" -"The text to which the hyperlink is to be attached must be within a single " -"paragraph." -msgstr "El testu del hiperenllaz tien que tar amestáu y dientro d'un parrafu." +#: po/tmp/ap_String_Id.h.h:2414 +msgid "The text to which the hyperlink is to be attached must be within a single paragraph." +msgstr "El testu al que l'hiperenllaz va asociase ha tar dientro d'un solu parágrafu." # FIELD_DateTime_Wkday #. FIELD_DateTime_Wkday -#: po/tmp/ap_String_Id.h.h:2385 +#: po/tmp/ap_String_Id.h.h:2416 msgid "The weekday" msgstr "El día de la selmana" # DLG_WordCount_Lines #. DLG_FormatTable_Thickness -#: po/tmp/ap_String_Id.h.h:2387 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2418 msgid "Thickness:" -msgstr "Lllinies:" +msgstr "Grosor:" # MSG_AfterRestartNew #. MSG_AfterRestartNew -#: po/tmp/ap_String_Id.h.h:2389 -msgid "" -"This change will only take effect when you restart AbiWord or create a new " -"document." -msgstr "" -"Esti camudamientu nun va tener efeutu fasta que reentames AbiWord o faigas " -"un nueu documentu." +#: po/tmp/ap_String_Id.h.h:2420 +msgid "This change will only take effect when you restart AbiWord or create a new document." +msgstr "Esti cambéu namái va ser efeutivu cuando entames AbiWord otra vuelta o cuando crees un documentu nuevu." #. MSG_HiddenRevisions -#: po/tmp/ap_String_Id.h.h:2391 -msgid "" -"This document contains revisions which are currently hidden from view. " -"Please see AbiWord documentation for information on working with revisions." -msgstr "" +#: po/tmp/ap_String_Id.h.h:2422 +msgid "This document contains revisions which are currently hidden from view. Please see AbiWord documentation for information on working with revisions." +msgstr "Esti documentu contién revisiones ocultes a la vista nestos momentos. Por favor llei la documentación d'AbiWord pa informate sobre'l remanamientu de revisiones." # DLG_Para_PreviewSampleFallback #. DLG_Para_PreviewSampleFallback -#: po/tmp/ap_String_Id.h.h:2393 -msgid "" -"This paragraph represents words as they might appear in your document. To " -"see text from your document used in this preview, position your cursor in a " -"document paragraph with some text in it and open this dialog." -msgstr "" +#: po/tmp/ap_String_Id.h.h:2424 +msgid "This paragraph represents words as they might appear in your document. To see text from your document used in this preview, position your cursor in a document paragraph with some text in it and open this dialog." +msgstr "Esti parágrafu representa pallabres según podríen apaecer nel to documentu. Pa usar testu del to documentu nesta previsualización, alluga'l cursor nun parágrafu del documentu que tenga testu y abri esti diálogu." # DLG_Styles_ErrStyleNot #. DLG_Styles_ErrStyleNot -#: po/tmp/ap_String_Id.h.h:2395 +#: po/tmp/ap_String_Id.h.h:2426 msgid "" "This style does not exist \n" " so it cannot be modified" msgstr "" -"Esti estilu nun esiste \n" -"polo que nun pue camudase" +"Esti estilu nun esiste, \n" +" asina que nun pue ser camudáu" # DLG_Column_Three #. DLG_Column_Three -#: po/tmp/ap_String_Id.h.h:2397 +#: po/tmp/ap_String_Id.h.h:2428 msgid "Three" msgstr "Tres" @@ -7265,47 +7260,49 @@ # STYLE_TICKLIST #. DLG_Lists_Tick_List #. STYLE_TICKLIST -#: po/tmp/ap_String_Id.h.h:2399 po/tmp/xap_String_Id.h.h:718 +#: po/tmp/ap_String_Id.h.h:2430 +#: po/tmp/xap_String_Id.h.h:757 msgid "Tick List" -msgstr "" +msgstr "Llista de verificaciones" # FIELD_DateTime_TimeZone #. FIELD_DateTime_TimeZone -#: po/tmp/ap_String_Id.h.h:2401 +#: po/tmp/ap_String_Id.h.h:2432 msgid "Time Zone" msgstr "Zona horaria" # FIELD_Document_Title #. FIELD_Document_Title -#: po/tmp/ap_String_Id.h.h:2403 +#: po/tmp/ap_String_Id.h.h:2434 msgid "Title" msgstr "Títulu" # DLG_ToggleCase_TitleCase #. DLG_ToggleCase_TitleCase -#: po/tmp/ap_String_Id.h.h:2405 +#: po/tmp/ap_String_Id.h.h:2436 msgid "Title Case" -msgstr "" +msgstr "Capitalización del títulu" # DLG_MetaData_Title_LBL #. DLG_MetaData_Title_LBL #. DLG_Image_LblTitle -#: po/tmp/ap_String_Id.h.h:2407 po/tmp/xap_String_Id.h.h:722 +#: po/tmp/ap_String_Id.h.h:2438 +#: po/tmp/xap_String_Id.h.h:761 msgid "Title:" msgstr "Títulu:" # DLG_Options_Label_Toolbars #. DLG_Options_Label_Toolbars -#: po/tmp/ap_String_Id.h.h:2409 +#: po/tmp/ap_String_Id.h.h:2440 msgid "Toolbars" msgstr "Barres de ferramientes" # TopMarginStatus #. TopMarginStatus -#: po/tmp/ap_String_Id.h.h:2411 +#: po/tmp/ap_String_Id.h.h:2442 #, c-format msgid "Top Margin [%s]" -msgstr "" +msgstr "Marxe superior [%s]" # MENU_LABEL_FMT_TOPLINE # TOOLBAR_LABEL_FMT_TOPLINE @@ -7317,47 +7314,49 @@ #. TOOLBAR_STATUSLINE_FMT_TOPLINE #. TOOLBAR_TOOLTIP_FMT_TOPLINE #. DLG_UFS_ToplineCheck -#: po/tmp/ap_String_Id.h.h:2416 po/tmp/xap_String_Id.h.h:728 +#: po/tmp/ap_String_Id.h.h:2447 +#: po/tmp/xap_String_Id.h.h:767 msgid "Topline" -msgstr "" +msgstr "Llinia superior" # DLG_Lists_Triangle_List # STYLE_TRIANGLELIST #. DLG_Lists_Triangle_List #. STYLE_TRIANGLELIST -#: po/tmp/ap_String_Id.h.h:2418 po/tmp/xap_String_Id.h.h:730 +#: po/tmp/ap_String_Id.h.h:2449 +#: po/tmp/xap_String_Id.h.h:769 msgid "Triangle List" -msgstr "" +msgstr "Llista de triángulos" # DLG_Column_Two #. DLG_Column_Two -#: po/tmp/ap_String_Id.h.h:2420 +#: po/tmp/ap_String_Id.h.h:2451 msgid "Two" msgstr "Dos" # FIELD_Document_Type #. FIELD_Document_Type -#: po/tmp/ap_String_Id.h.h:2422 +#: po/tmp/ap_String_Id.h.h:2453 msgid "Type" -msgstr "Tipu" +msgstr "Triba" # DLG_InsertBookmark_Msg #. DLG_InsertBookmark_Msg -#: po/tmp/ap_String_Id.h.h:2424 +#: po/tmp/ap_String_Id.h.h:2455 msgid "Type a name for the bookmark, or select an existing from the list." -msgstr "Escribe un nome pal marcaor, o seleiciona unu de la llista." +msgstr "Escribi un nome pal marcador, o seleiciona ún esistente de la llista." # DLG_Lists_Type #. DLG_Lists_Type -#: po/tmp/ap_String_Id.h.h:2426 +#: po/tmp/ap_String_Id.h.h:2457 msgid "Type:" -msgstr "Tipu:" +msgstr "Triba:" # DLG_ToggleCase_UpperCase #. DLG_ToggleCase_UpperCase -#: po/tmp/ap_String_Id.h.h:2428 +#: po/tmp/ap_String_Id.h.h:2459 msgid "UPPERCASE" -msgstr "MAYUSCULES" +msgstr "MAYÚSCULES" # TOOLBAR_LABEL_FMT_UNDERLINE # TOOLBAR_STATUSLINE_FMT_UNDERLINE @@ -7367,21 +7366,22 @@ #. TOOLBAR_STATUSLINE_FMT_UNDERLINE #. TOOLBAR_TOOLTIP_FMT_UNDERLINE #. DLG_UFS_UnderlineCheck -#: po/tmp/ap_String_Id.h.h:2432 po/tmp/xap_String_Id.h.h:750 +#: po/tmp/ap_String_Id.h.h:2463 +#: po/tmp/xap_String_Id.h.h:789 msgid "Underline" -msgstr "" +msgstr "Sorrayar" # MENU_STATUSLINE_FMT_UNDERLINE #. MENU_STATUSLINE_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:2434 +#: po/tmp/ap_String_Id.h.h:2465 msgid "Underline the selection (toggle)" -msgstr "" +msgstr "Sorrayar la seleición (alternar)" # TOOLBAR_LABEL_EDIT_UNDO #. TOOLBAR_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2436 +#: po/tmp/ap_String_Id.h.h:2467 msgid "Undo" -msgstr "" +msgstr "Esfacer" # MENU_STATUSLINE_EDIT_UNDO # TOOLBAR_STATUSLINE_EDIT_UNDO @@ -7389,90 +7389,92 @@ #. MENU_STATUSLINE_EDIT_UNDO #. TOOLBAR_STATUSLINE_EDIT_UNDO #. TOOLBAR_TOOLTIP_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2440 +#: po/tmp/ap_String_Id.h.h:2471 msgid "Undo editing" -msgstr "" +msgstr "Esfacer la edición" # DLG_Lists_Upper_Case_List # STYLE_UPPERCASTELIST #. DLG_Lists_Upper_Case_List #. STYLE_UPPERCASTELIST -#: po/tmp/ap_String_Id.h.h:2442 po/tmp/xap_String_Id.h.h:784 +#: po/tmp/ap_String_Id.h.h:2473 +#: po/tmp/xap_String_Id.h.h:823 msgid "Upper Case List" -msgstr "Llista'n mayuscules" +msgstr "Llista en mayúscules" # DLG_Lists_Upper_Roman_List # STYLE_UPPERROMANLIST #. DLG_Lists_Upper_Roman_List #. STYLE_UPPERROMANLIST -#: po/tmp/ap_String_Id.h.h:2444 po/tmp/xap_String_Id.h.h:786 +#: po/tmp/ap_String_Id.h.h:2475 +#: po/tmp/xap_String_Id.h.h:825 msgid "Upper Roman List" -msgstr "Llista de romanos en mayuscules" +msgstr "Llista romana en mayúscules" # DLG_Column_RtlOrder #. DLG_Column_RtlOrder -#: po/tmp/ap_String_Id.h.h:2446 +#: po/tmp/ap_String_Id.h.h:2477 msgid "Use RTL Order" -msgstr "Usar orde RTL" +msgstr "Usar sentíu drecha-esquierda" # DLG_Options_Label_HebrewContextGlyphs #. DLG_Options_Label_HebrewContextGlyphs -#: po/tmp/ap_String_Id.h.h:2448 +#: po/tmp/ap_String_Id.h.h:2479 msgid "Use glyph shaping for Hebrew" -msgstr "" +msgstr "Usar perfiláu de glifu pal hebréu" #. DLG_Options_Label_UI -#: po/tmp/ap_String_Id.h.h:2450 +#: po/tmp/ap_String_Id.h.h:2481 msgid "User Interface" -msgstr "" +msgstr "Interfaz d'usuariu" # DLG_Options_Label_UILang #. DLG_Options_Label_UILang -#: po/tmp/ap_String_Id.h.h:2452 +#: po/tmp/ap_String_Id.h.h:2483 msgid "User Interface Language" -msgstr "" +msgstr "Llingua d'interfaz d'usuariu" #. DLG_Stylist_UserStyles -#: po/tmp/ap_String_Id.h.h:2454 +#: po/tmp/ap_String_Id.h.h:2485 msgid "User defined Styles" -msgstr "" +msgstr "Estilos definíos pol usuariu" #. DLG_Tab_Label_Existing -#: po/tmp/ap_String_Id.h.h:2456 +#: po/tmp/ap_String_Id.h.h:2487 msgid "User-defined Tabs" -msgstr "" +msgstr "Tabuladores definíes pol usuariu" # DLG_Styles_LBL_UserDefined #. DLG_Styles_LBL_UserDefined -#: po/tmp/ap_String_Id.h.h:2458 +#: po/tmp/ap_String_Id.h.h:2489 msgid "User-defined styles" -msgstr "" +msgstr "Estilos definíos pol usuariu" # FIELD_Application_Version #. FIELD_Application_Version #. DLG_History_Version_Version -#: po/tmp/ap_String_Id.h.h:2460 po/tmp/xap_String_Id.h.h:792 +#: po/tmp/ap_String_Id.h.h:2491 +#: po/tmp/xap_String_Id.h.h:833 msgid "Version" msgstr "Versión" # DLG_Options_TabLabel_View #. DLG_Options_TabLabel_View -#: po/tmp/ap_String_Id.h.h:2462 +#: po/tmp/ap_String_Id.h.h:2493 msgid "View" msgstr "Ver" # DLG_MW_MoreWindows #. MENU_STATUSLINE_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:2464 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2495 msgid "View document history" -msgstr "Agueyar Documentu" +msgstr "Ver historial del documentu" # MENU_STATUSLINE_VIEW_FULLSCREEN #. MENU_STATUSLINE_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:2466 +#: po/tmp/ap_String_Id.h.h:2497 msgid "View the document in full screen mode" -msgstr "Ver el documentu'n mou pantalla completa" +msgstr "Ver el documentu en mou de pantalla completa" # MENU_STATUSLINE_WINDOW_1 # MENU_STATUSLINE_WINDOW_2 @@ -7492,50 +7494,50 @@ #. MENU_STATUSLINE_WINDOW_7 #. MENU_STATUSLINE_WINDOW_8 #. MENU_STATUSLINE_WINDOW_9 -#: po/tmp/ap_String_Id.h.h:2476 +#: po/tmp/ap_String_Id.h.h:2507 msgid "View this document" msgstr "Ver esti documentu" # DLG_Options_Label_ViewTooltips #. DLG_Options_Label_ViewTooltips -#: po/tmp/ap_String_Id.h.h:2478 +#: po/tmp/ap_String_Id.h.h:2509 msgid "View tooltips" -msgstr "" +msgstr "Ver conseyos" # DLG_Options_Label_ViewViewFrame #. DLG_Options_Label_ViewViewFrame -#: po/tmp/ap_String_Id.h.h:2480 +#: po/tmp/ap_String_Id.h.h:2511 msgid "View..." -msgstr "Ver ..." +msgstr "Ver..." # DLG_Options_Label_Visible #. DLG_Options_Label_Visible -#: po/tmp/ap_String_Id.h.h:2482 +#: po/tmp/ap_String_Id.h.h:2513 msgid "Visible" msgstr "Visible" # MSG_HyperlinkNoBookmark #. MSG_HyperlinkNoBookmark -#: po/tmp/ap_String_Id.h.h:2484 +#: po/tmp/ap_String_Id.h.h:2515 #, c-format msgid "Warning: the bookmark you provided [%s] does not exist." -msgstr "" +msgstr "Avisu: el marcador qu'especificasti [%s] nun esiste." # MENU_STATUSLINE_VIEW_WEB #. MENU_STATUSLINE_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:2486 +#: po/tmp/ap_String_Id.h.h:2517 msgid "Web Layout" -msgstr "" +msgstr "Diseñu web" # DLG_Styles_LBL_TxtMsg #. DLG_Styles_LBL_TxtMsg -#: po/tmp/ap_String_Id.h.h:2488 +#: po/tmp/ap_String_Id.h.h:2519 msgid "What Hath God Wrought" -msgstr "" +msgstr "Fai Un Cutu Qu'Escarabaya'l Pelleyu" # DLG_Options_Label_WithExtension #. DLG_Options_Label_WithExtension -#: po/tmp/ap_String_Id.h.h:2490 +#: po/tmp/ap_String_Id.h.h:2521 msgid "With extension:" msgstr "Cola estensión:" @@ -7543,75 +7545,75 @@ # FIELD_Numbers_WordCount #. DLG_WordCount_WordCountTitle #. FIELD_Numbers_WordCount -#: po/tmp/ap_String_Id.h.h:2493 +#: po/tmp/ap_String_Id.h.h:2524 msgid "Word Count" -msgstr "Contar pallabres" +msgstr "Cuntar pallabres" # DLG_NEW_Tab1 #. DLG_NEW_Tab1 -#: po/tmp/ap_String_Id.h.h:2495 +#: po/tmp/ap_String_Id.h.h:2526 msgid "Wordprocessing" -msgstr "" +msgstr "Procesando'l testu" #. DLG_WordCount_Words_No_Notes -#: po/tmp/ap_String_Id.h.h:2497 +#: po/tmp/ap_String_Id.h.h:2528 msgid "Words (no footnotes/endnotes):" -msgstr "" +msgstr "Pallabres (ensin notes al pie nin a lo cabero):" # DLG_Options_Label_SpellUppercase #. DLG_Options_Label_SpellUppercase -#: po/tmp/ap_String_Id.h.h:2499 +#: po/tmp/ap_String_Id.h.h:2530 msgid "Words in &UPPERCASE" -msgstr "Pallabres en MAYUSCULES (&U)" +msgstr "Pallabres en &MAYÚSCULES" # DLG_Options_Label_SpellNumbers #. DLG_Options_Label_SpellNumbers -#: po/tmp/ap_String_Id.h.h:2501 +#: po/tmp/ap_String_Id.h.h:2532 msgid "Words with num&bers" msgstr "Pallabres con núm&beros" # DLG_WordCount_Words #. DLG_WordCount_Words -#: po/tmp/ap_String_Id.h.h:2503 +#: po/tmp/ap_String_Id.h.h:2534 msgid "Words:" msgstr "Pallabres:" # MSG_SaveFailedWrite #. MSG_SaveFailedWrite -#: po/tmp/ap_String_Id.h.h:2505 +#: po/tmp/ap_String_Id.h.h:2536 #, c-format msgid "Writing error when attempting to save %s" -msgstr "" +msgstr "Error d'escritura al tentar de guardar %s" # MSG_DefaultDirectionChg #. MSG_DefaultDirectionChg -#: po/tmp/ap_String_Id.h.h:2507 +#: po/tmp/ap_String_Id.h.h:2538 msgid "You have changed the default direction." -msgstr "" +msgstr "Camudasti la direición por defeutu" # MSG_DirectionModeChg #. MSG_DirectionModeChg -#: po/tmp/ap_String_Id.h.h:2509 +#: po/tmp/ap_String_Id.h.h:2540 msgid "You have changed the direction mode." -msgstr "" +msgstr "Camudasti'l mou de direición" # MSG_HyperlinkNoSelection #. MSG_HyperlinkNoSelection -#: po/tmp/ap_String_Id.h.h:2511 +#: po/tmp/ap_String_Id.h.h:2542 msgid "You must select a portion of the document before inserting a hyperlink." -msgstr "" +msgstr "Tienes que seleicionar una porción del documentu enantes d'enxertar un hiperenllaz." # DLG_Options_Label_InvalidRangeForAutoSave #. DLG_Options_Label_InvalidRangeForAutoSave -#: po/tmp/ap_String_Id.h.h:2513 +#: po/tmp/ap_String_Id.h.h:2544 msgid "You should choose a range from 1 to 120 for the auto save frequency" -msgstr "" +msgstr "Habríes escoyer un rangu dende 1 a 120 pa la frecuencia d'autoguardáu" # MSG_ConfirmSaveSecondary #. MSG_ConfirmSaveSecondary -#: po/tmp/ap_String_Id.h.h:2515 +#: po/tmp/ap_String_Id.h.h:2546 msgid "Your changes will be lost if you don't save them." -msgstr "Los tos cambios pues perdese si nun los salves." +msgstr "Los tos cambios perderánse si nun los guardes." # TOOLBAR_LABEL_ZOOM # TOOLBAR_STATUSLINE_ZOOM @@ -7621,105 +7623,106 @@ #. TOOLBAR_STATUSLINE_ZOOM #. TOOLBAR_TOOLTIP_ZOOM #. DLG_Zoom_ZoomTitle -#: po/tmp/ap_String_Id.h.h:2519 po/tmp/xap_String_Id.h.h:839 +#: po/tmp/ap_String_Id.h.h:2550 +#: po/tmp/xap_String_Id.h.h:882 msgid "Zoom" msgstr "Zoom" # MENU_LABEL_VIEW_ZOOM_100 #. MENU_LABEL_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2521 +#: po/tmp/ap_String_Id.h.h:2552 msgid "Zoom to &100%" msgstr "Zoom al &100%" # MENU_LABEL_VIEW_ZOOM_200 #. MENU_LABEL_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2523 +#: po/tmp/ap_String_Id.h.h:2554 msgid "Zoom to &200%" msgstr "Zoom al &200%" # MENU_LABEL_VIEW_ZOOM_50 #. MENU_LABEL_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2525 +#: po/tmp/ap_String_Id.h.h:2556 msgid "Zoom to &50%" msgstr "Zoom al &50%" # MENU_LABEL_VIEW_ZOOM_75 #. MENU_LABEL_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2527 +#: po/tmp/ap_String_Id.h.h:2558 msgid "Zoom to &75%" msgstr "Zoom al &75%" # MENU_STATUSLINE_VIEW_ZOOM_100 #. MENU_STATUSLINE_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2529 +#: po/tmp/ap_String_Id.h.h:2560 msgid "Zoom to 100%" msgstr "Zoom al 100%" # MENU_STATUSLINE_VIEW_ZOOM_200 #. MENU_STATUSLINE_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2531 +#: po/tmp/ap_String_Id.h.h:2562 msgid "Zoom to 200%" msgstr "Zoom al 200%" # MENU_STATUSLINE_VIEW_ZOOM_50 #. MENU_STATUSLINE_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2533 +#: po/tmp/ap_String_Id.h.h:2564 msgid "Zoom to 50%" msgstr "Zoom al 50%" # MENU_STATUSLINE_VIEW_ZOOM_75 #. MENU_STATUSLINE_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2535 +#: po/tmp/ap_String_Id.h.h:2566 msgid "Zoom to 75%" msgstr "Zoom al 75%" # MENU_STATUSLINE_VIEW_ZOOM_WIDTH #. MENU_STATUSLINE_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:2537 +#: po/tmp/ap_String_Id.h.h:2568 msgid "Zoom to page width" -msgstr "Zoom al anchu de la páxina" +msgstr "Anchor de páxina" # MENU_STATUSLINE_VIEW_ZOOM_WHOLE #. MENU_STATUSLINE_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:2539 +#: po/tmp/ap_String_Id.h.h:2570 msgid "Zoom to whole page" -msgstr "Zoom a to la páxina" +msgstr "Páxina completa" # DLG_Options_Label_CustomDict #. DLG_Options_Label_CustomDict -#: po/tmp/ap_String_Id.h.h:2541 +#: po/tmp/ap_String_Id.h.h:2572 msgid "custom.dic" msgstr "custom.dic" # FIELD_DateTime_DDMMYY #. FIELD_DateTime_DDMMYY -#: po/tmp/ap_String_Id.h.h:2543 +#: po/tmp/ap_String_Id.h.h:2574 msgid "dd/mm/yy" msgstr "dd/mm/aa" # DLG_ToggleCase_LowerCase #. DLG_ToggleCase_LowerCase -#: po/tmp/ap_String_Id.h.h:2545 +#: po/tmp/ap_String_Id.h.h:2576 msgid "lowercase" -msgstr "minuscules" +msgstr "minúscules" # DLG_Options_Label_Minutes #. DLG_Options_Label_Minutes -#: po/tmp/ap_String_Id.h.h:2547 +#: po/tmp/ap_String_Id.h.h:2578 msgid "minutes" msgstr "minutos" # FIELD_DateTime_MMDDYY #. FIELD_DateTime_MMDDYY -#: po/tmp/ap_String_Id.h.h:2549 +#: po/tmp/ap_String_Id.h.h:2580 msgid "mm/dd/yy" msgstr "mm/dd/aa" # DLG_ToggleCase_ToggleCase #. DLG_ToggleCase_ToggleCase -#: po/tmp/ap_String_Id.h.h:2551 +#: po/tmp/ap_String_Id.h.h:2582 msgid "tOGGLE cASE" -msgstr "" +msgstr "cAMUDAR cAPITALIZACIÓN" # DLG_UP_To #. @@ -7753,42 +7756,42 @@ #. DLG_Zoom_PageWidth #: po/tmp/xap_String_Id.h.h:17 msgid "&Page width" -msgstr "Anchu de &páxina" +msgstr "Anchor de &páxina" # DLG_ULANG_SetLangButton #. DLG_ULANG_SetLangButton #: po/tmp/xap_String_Id.h.h:19 msgid "&Set Language" -msgstr "Poner llenguaxe (&s)" +msgstr "Establecer &llingua" # DLG_Zoom_WholePage #. DLG_Zoom_WholePage #: po/tmp/xap_String_Id.h.h:23 msgid "&Whole page" -msgstr "Toa la páxina" +msgstr "&Páxina completa" # LANG_0 #. LANG_0 #: po/tmp/xap_String_Id.h.h:25 msgid "(no proofing)" -msgstr "" +msgstr "(ensin probar)" #. DLG_DocComparison_TestSkipped #: po/tmp/xap_String_Id.h.h:27 msgid "(test skipped)" -msgstr "" +msgstr "(testu omitíu)" # DLG_NoSaveFile_DirNotExist #. DLG_NoSaveFile_DirNotExist #: po/tmp/xap_String_Id.h.h:29 msgid "A directory in the given pathname does not exist." -msgstr "" +msgstr "Un direutoriu del camín especificáu nun esiste." # DLG_PLUGIN_MANAGER_TITLE #. DLG_PLUGIN_MANAGER_TITLE #: po/tmp/xap_String_Id.h.h:31 msgid "AbiWord Plugin Manager" -msgstr "Manexaor de plugins d'AbiWord" +msgstr "Remanador de plugins d'AbiWord" # SPELL_CANTLOAD_DLL #. SPELL_CANTLOAD_DLL @@ -7798,41 +7801,39 @@ "AbiWord cannot find the spelling file %s.dll\n" "Please download and install Aspell from http://aspell.net/win32/" msgstr "" +"AbiWord nun ye p'atopar l'archivu d'ortografía %s.dll\n" +"Por favor descarga y instala Aspell denden http://aspell.net/win32/" #. MSG_HistoryPartRestore1 #: po/tmp/xap_String_Id.h.h:35 #, c-format -msgid "" -"AbiWord cannot fully restore version %d of the document because the version " -"information is incomplete." -msgstr "" +msgid "AbiWord cannot fully restore version %d of the document because the version information is incomplete." +msgstr "AbiWord nun ye pa restaurar completamente la versión %d del documentu porque la información de versión ta incompleta." #. MSG_HistoryNoRestore #: po/tmp/xap_String_Id.h.h:37 #, c-format -msgid "" -"AbiWord cannot restore version %d of the document because the version " -"information is missing." -msgstr "" +msgid "AbiWord cannot restore version %d of the document because the version information is missing." +msgstr "AbiWord nun ye pa restaurar la versión %d del documentu porque falta la información de versión." # DLG_UP_PrintPreviewTitle #. DLG_UP_PrintPreviewTitle #: po/tmp/xap_String_Id.h.h:39 msgid "AbiWord: Print Preview" -msgstr "AbiWord: previsualización de l'imprentación" +msgstr "AbiWord: Previsualización d'imprentación" # DLG_ABOUT_Title #. DLG_ABOUT_Title #: po/tmp/xap_String_Id.h.h:41 #, c-format msgid "About %s" -msgstr "Alrodiu de %s" +msgstr "Tocante a %s" # DLG_PLUGIN_MANAGER_ACTIVE #. DLG_PLUGIN_MANAGER_ACTIVE #: po/tmp/xap_String_Id.h.h:43 msgid "Active Plugins" -msgstr "Activar plugins" +msgstr "Plugins activos" # LANG_AF_ZA #. LANG_AF_ZA @@ -7843,9 +7844,8 @@ # LANG_AF_ZA #. LANG_AK_GH #: po/tmp/xap_String_Id.h.h:47 -#, fuzzy msgid "Akan" -msgstr "Afrikaans" +msgstr "Akan" # LANG_SQ_AL #. LANG_SQ_AL @@ -7863,996 +7863,1035 @@ #. DLG_FOSA_ALLDOCS #: po/tmp/xap_String_Id.h.h:55 msgid "All Documents" -msgstr "Toos los documentos" +msgstr "Tolos documentos" # DLG_FOSA_ALLIMAGES #. DLG_FOSA_ALLIMAGES #: po/tmp/xap_String_Id.h.h:57 msgid "All Image Files" -msgstr "Toos los archivos d'imaxe" +msgstr "Tolos archivos d'imaxe" # DLG_HTMLOPT_ExpAllowAWML #. DLG_HTMLOPT_ExpAllowAWML #: po/tmp/xap_String_Id.h.h:59 msgid "Allow extra markup in AWML namespace" -msgstr "" +msgstr "Permitir marcáu adicional nel especiu de nomes AWML" # LANG_AM_ET #. LANG_AM_ET #: po/tmp/xap_String_Id.h.h:61 msgid "Amharic (Ethiopia)" -msgstr "Amharicu (Etiopia)" +msgstr "Amháricu (Etiopía)" + +# DLG_Lists_Arabic_List +#. LANG_AR +#: po/tmp/xap_String_Id.h.h:65 +msgid "Arabic" +msgstr "Árabe" # LANG_AR_EG #. LANG_AR_EG -#: po/tmp/xap_String_Id.h.h:65 +#: po/tmp/xap_String_Id.h.h:67 msgid "Arabic (Egypt)" -msgstr "Arabe (Exiptu)" +msgstr "Árabe (Exiptu)" # LANG_AR_SA #. LANG_AR_SA -#: po/tmp/xap_String_Id.h.h:67 +#: po/tmp/xap_String_Id.h.h:69 msgid "Arabic (Saudi Arabia)" -msgstr "Arabe (Arabia Saudí)" +msgstr "Árabe (Arabia Saudina)" # ENC_ARAB_ISO #. ENC_ARAB_ISO -#: po/tmp/xap_String_Id.h.h:69 +#: po/tmp/xap_String_Id.h.h:71 msgid "Arabic, ISO-8859-6" -msgstr "Arabe, ISO-8859-6" +msgstr "Árabe, ISO-8859-6" # ENC_ARAB_MAC #. ENC_ARAB_MAC -#: po/tmp/xap_String_Id.h.h:71 +#: po/tmp/xap_String_Id.h.h:73 msgid "Arabic, Macintosh" -msgstr "Arabe, Macintosh" +msgstr "Árabe, Macintosh" # ENC_ARAB_WIN #. ENC_ARAB_WIN -#: po/tmp/xap_String_Id.h.h:73 +#: po/tmp/xap_String_Id.h.h:75 msgid "Arabic, Windows Code Page 1256" -msgstr "Arábicu, páxina 1256 del códigu de Windows" +msgstr "Árábe, Páxina de Códigu Windows 1256" # LANG_HY_AM #. LANG_HY_AM -#: po/tmp/xap_String_Id.h.h:75 +#: po/tmp/xap_String_Id.h.h:77 msgid "Armenian" msgstr "Armeniu" # ENC_ARME_ARMSCII #. ENC_ARME_ARMSCII -#: po/tmp/xap_String_Id.h.h:77 +#: po/tmp/xap_String_Id.h.h:79 msgid "Armenian, ARMSCII-8" msgstr "Armeniu, ARMSCII-8" # LANG_AS_IN #. LANG_AS_IN -#: po/tmp/xap_String_Id.h.h:79 +#: po/tmp/xap_String_Id.h.h:81 msgid "Assamese" msgstr "Asamés" # LANG_ES_ES #. LANG_AST_ES -#: po/tmp/xap_String_Id.h.h:81 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:83 msgid "Asturian (Spain)" -msgstr "Castellanu (España)" +msgstr "Asturianu (Bable)" # DLG_Options_Label_DirMarkerAfterClosingParenthesis #. DLG_Options_Label_DirMarkerAfterClosingParenthesis -#: po/tmp/xap_String_Id.h.h:85 +#: po/tmp/xap_String_Id.h.h:87 msgid "Auto-insert direction markers" -msgstr "" +msgstr "Autoenxertar marcadores de direición" # MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION #. DLG_History_Version_AutoRevisioned -#: po/tmp/xap_String_Id.h.h:87 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:89 msgid "Auto-revision" -msgstr "&Aceptar revisión" +msgstr "Autorrevisión" # DLG_FOSA_FileTypeAutoDetect #. DLG_FOSA_FileTypeAutoDetect -#: po/tmp/xap_String_Id.h.h:89 +#: po/tmp/xap_String_Id.h.h:91 msgid "Automatically Detected" -msgstr "Detectar automáticamente" +msgstr "Detectáu automáticamente" # MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION #. MSG_AutoRevision -#: po/tmp/xap_String_Id.h.h:91 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:93 msgid "Autorevision" -msgstr "&Aceptar revisión" +msgstr "Autorrevisión" # DLG_MW_AvailableDocuments #. DLG_MW_AvailableDocuments -#: po/tmp/xap_String_Id.h.h:93 +#: po/tmp/xap_String_Id.h.h:95 msgid "Available Documents" msgstr "Documentos disponibles" # DLG_ULANG_AvailableLanguages #. DLG_ULANG_AvailableLanguages -#: po/tmp/xap_String_Id.h.h:95 +#: po/tmp/xap_String_Id.h.h:97 msgid "Available Languages" -msgstr "llenguaxes disponibles" +msgstr "Llingües disponibles" + +#. LANG_AYM_BO +#: po/tmp/xap_String_Id.h.h:99 +msgid "Aymara (La Paz)" +msgstr "Aimara (La Paz)" + +#. LANG_AYC_BO +#: po/tmp/xap_String_Id.h.h:101 +msgid "Aymara (Oruro)" +msgstr "Aimara (Oruro)" # ENC_BALT_ISO #. ENC_BALT_ISO -#: po/tmp/xap_String_Id.h.h:97 +#: po/tmp/xap_String_Id.h.h:103 msgid "Baltic, ISO-8859-4" msgstr "Bálticu, ISO-8859-4" # ENC_BALT_WIN #. ENC_BALT_WIN -#: po/tmp/xap_String_Id.h.h:99 +#: po/tmp/xap_String_Id.h.h:105 msgid "Baltic, Windows Code Page 1257" -msgstr "Bálticu, Windows Code Page 1257" +msgstr "Bálticu, Páxina de Códigu Windows 1257" # LANG_EU_ES #. LANG_EU_ES -#: po/tmp/xap_String_Id.h.h:101 +#: po/tmp/xap_String_Id.h.h:107 msgid "Basque" -msgstr "Vascu" +msgstr "Vascu (Euskara)" # LANG_BE_BY #. LANG_BE_BY -#: po/tmp/xap_String_Id.h.h:103 +#: po/tmp/xap_String_Id.h.h:109 msgid "Belarusian" msgstr "Bielorrusu" +# LANG_BE_BY +#. LANG_BE_LATIN +#: po/tmp/xap_String_Id.h.h:111 +msgid "Belarusian, Latin" +msgstr "Bielorrusu, Llatín" + #. LANG_BN_IN -#: po/tmp/xap_String_Id.h.h:105 +#: po/tmp/xap_String_Id.h.h:113 msgid "Bengali" -msgstr "" +msgstr "Bengalí" # DLG_UP_BlackWhite #. DLG_UP_BlackWhite -#: po/tmp/xap_String_Id.h.h:107 +#: po/tmp/xap_String_Id.h.h:115 msgid "Black & White" -msgstr "Negru y Blancu" +msgstr "Blancu y Negru" # STYLE_BLOCKTEXT #. STYLE_BLOCKTEXT -#: po/tmp/xap_String_Id.h.h:109 +#: po/tmp/xap_String_Id.h.h:117 msgid "Block Text" -msgstr "Bloque de testu" +msgstr "Testu bloquiáu" # DLG_UFS_StyleBoldItalic #. DLG_UFS_StyleBoldItalic -#: po/tmp/xap_String_Id.h.h:113 +#: po/tmp/xap_String_Id.h.h:121 msgid "Bold Italic" -msgstr "Negrita y cursiva" +msgstr "Negrina cursiva" # LANG_BR_FR #. LANG_BR_FR -#: po/tmp/xap_String_Id.h.h:119 +#: po/tmp/xap_String_Id.h.h:127 msgid "Breton" msgstr "Bretón" # MSG_BuildingDoc #. MSG_BuildingDoc -#: po/tmp/xap_String_Id.h.h:121 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:129 msgid "Building Document:" -msgstr "Faciendo'l documentu ..." +msgstr "Conformando'l documentu:" # LANG_BG_BG #. LANG_BG_BG -#: po/tmp/xap_String_Id.h.h:123 +#: po/tmp/xap_String_Id.h.h:131 msgid "Bulgarian" msgstr "Búlgaru" # DLG_Cancel #. DLG_Cancel -#: po/tmp/xap_String_Id.h.h:127 +#: po/tmp/xap_String_Id.h.h:135 msgid "Cancel" msgstr "Cancelar" #. LANG_CA_ES -#: po/tmp/xap_String_Id.h.h:129 +#: po/tmp/xap_String_Id.h.h:137 msgid "Catalan" -msgstr "Catalán" +msgstr "Catalán (català)" + +#. LANG_AYR +#: po/tmp/xap_String_Id.h.h:139 +msgid "Central Aymara" +msgstr "Aimara Central" # ENC_CENT_ISO #. ENC_CENT_ISO -#: po/tmp/xap_String_Id.h.h:131 +#: po/tmp/xap_String_Id.h.h:141 msgid "Central European, ISO-8859-2" -msgstr "Europeu central, ISO-8859-2" +msgstr "Européu Central, ISO-8859-2" # ENC_CENT_MAC #. ENC_CENT_MAC -#: po/tmp/xap_String_Id.h.h:133 +#: po/tmp/xap_String_Id.h.h:143 msgid "Central European, Macintosh" -msgstr "Europeu central, Macintosh" +msgstr "Européu Central, Macintosh" # ENC_CENT_WIN #. ENC_CENT_WIN -#: po/tmp/xap_String_Id.h.h:135 +#: po/tmp/xap_String_Id.h.h:145 msgid "Central European, Windows Code Page 1250" -msgstr "Europeu central, páxina 1250 del códigu de Windows" +msgstr "Européu Central, Páxina de Códigu Windows 1250" # DLG_Options_Label_LangWithKeyboard #. DLG_Options_Label_LangWithKeyboard -#: po/tmp/xap_String_Id.h.h:137 +#: po/tmp/xap_String_Id.h.h:147 msgid "Change Language when changing keyboard" -msgstr "Camudar el llenguaxe cuando camudese'l tecláu" +msgstr "Camudar la llingua al camudar el tecláu" # STYLE_CHAPHEADING #. STYLE_CHAPHEADING -#: po/tmp/xap_String_Id.h.h:139 +#: po/tmp/xap_String_Id.h.h:149 msgid "Chapter Heading" -msgstr "Cabecera del Capítulu" +msgstr "Encabezáu de capítulu" # LANG_ZH_HK #. LANG_ZH_HK -#: po/tmp/xap_String_Id.h.h:141 +#: po/tmp/xap_String_Id.h.h:151 msgid "Chinese (Hong Kong)" msgstr "Chinu (Hong Kong)" # LANG_ZH_CN #. LANG_ZH_CN -#: po/tmp/xap_String_Id.h.h:143 +#: po/tmp/xap_String_Id.h.h:153 msgid "Chinese (PRC)" msgstr "Chinu (PRC)" # LANG_ZH_SG #. LANG_ZH_SG -#: po/tmp/xap_String_Id.h.h:145 +#: po/tmp/xap_String_Id.h.h:155 msgid "Chinese (Singapore)" msgstr "Chinu (Singapur)" # LANG_ZH_TW #. LANG_ZH_TW -#: po/tmp/xap_String_Id.h.h:147 +#: po/tmp/xap_String_Id.h.h:157 msgid "Chinese (Taiwan)" msgstr "Chinu (Taiwán)" # ENC_CHSI_EUC #. ENC_CHSI_EUC -#: po/tmp/xap_String_Id.h.h:149 +#: po/tmp/xap_String_Id.h.h:159 msgid "Chinese Simplified, EUC-CN (GB2312)" -msgstr "Chinu simplificáu, EUC-CN (GB2312)" +msgstr "Chinu Simplificáu, EUC-CN (GB2312)" # ENC_CHSI_GB #. ENC_CHSI_GB -#: po/tmp/xap_String_Id.h.h:151 +#: po/tmp/xap_String_Id.h.h:161 msgid "Chinese Simplified, GB_2312-80" -msgstr "Chinu simplificáu, GB_2312-80" +msgstr "Chinu Simplificáu, GB_2312-80" # ENC_CHSI_HZ #. ENC_CHSI_HZ -#: po/tmp/xap_String_Id.h.h:153 +#: po/tmp/xap_String_Id.h.h:163 msgid "Chinese Simplified, HZ" -msgstr "Chinu simplificáu, HZ" +msgstr "Chinu Simplificáu, HZ" # ENC_CHSI_WIN #. ENC_CHSI_WIN -#: po/tmp/xap_String_Id.h.h:155 +#: po/tmp/xap_String_Id.h.h:165 msgid "Chinese Simplified, Windows Code Page 936" -msgstr "Chinu simplificáu, páxina 936 del códigu de Windows" +msgstr "Chinu Simplificáu, Páxina de Códigu Windows 936" # ENC_CHTR_BIG5 #. ENC_CHTR_BIG5 -#: po/tmp/xap_String_Id.h.h:157 +#: po/tmp/xap_String_Id.h.h:167 msgid "Chinese Traditional, BIG5" msgstr "Chinu Tradicional, BIG5" # ENC_CHTR_BIG5HKSCS #. ENC_CHTR_BIG5HKSCS -#: po/tmp/xap_String_Id.h.h:159 +#: po/tmp/xap_String_Id.h.h:169 msgid "Chinese Traditional, BIG5-HKSCS" msgstr "Chinu Tradicional, BIG5-HKSCS" # ENC_CHTR_EUC #. ENC_CHTR_EUC -#: po/tmp/xap_String_Id.h.h:161 +#: po/tmp/xap_String_Id.h.h:171 msgid "Chinese Traditional, EUC-TW" msgstr "Chinu Tradicional, EUC-TW" # ENC_CHTR_WIN #. ENC_CHTR_WIN -#: po/tmp/xap_String_Id.h.h:163 +#: po/tmp/xap_String_Id.h.h:173 msgid "Chinese Traditional, Windows Code Page 950" -msgstr "Chinu tradicional, páxina 950 del códigu de Windows" +msgstr "Chinu tradicional, Páxina de Códigu Windows 950" # DLG_NEW_Create #. DLG_LISTDOCS_Heading1 -#: po/tmp/xap_String_Id.h.h:165 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:175 msgid "Choose document from the list:" -msgstr "Crear un documentu dende una plantilla" +msgstr "Escoyer documentu de la llista:" + +# DLG_Background_ClearClr +#. TB_ClearBackground +#: po/tmp/xap_String_Id.h.h:177 +msgid "Clear Background" +msgstr "Llimpiar fondu" # DLG_CLIPART_Title #. DLG_CLIPART_Title -#: po/tmp/xap_String_Id.h.h:167 +#: po/tmp/xap_String_Id.h.h:179 msgid "Clip Art" -msgstr "Clip-Art" +msgstr "Clip Art" + +#. DLG_CLIPART_Error +#: po/tmp/xap_String_Id.h.h:181 +msgid "Clip Art could not be loaded" +msgstr "Nun pudo cargase'l Clip Art" # DLG_Close #. DLG_Close -#: po/tmp/xap_String_Id.h.h:169 +#: po/tmp/xap_String_Id.h.h:183 msgid "Close" msgstr "Pesllar" # DLG_Exit_CloseWithoutSaving #. DLG_Exit_CloseWithoutSaving -#: po/tmp/xap_String_Id.h.h:171 +#: po/tmp/xap_String_Id.h.h:185 msgid "Close &Without Saving" msgstr "Pesllar &ensin guardar" # DLG_UP_Collate #. DLG_UP_Collate -#: po/tmp/xap_String_Id.h.h:173 +#: po/tmp/xap_String_Id.h.h:187 msgid "Collate" -msgstr "Conpaxinar" +msgstr "Compaxinar" # DLG_UP_Color #. DLG_UP_Color -#: po/tmp/xap_String_Id.h.h:175 +#: po/tmp/xap_String_Id.h.h:189 msgid "Color" -msgstr "Collor" +msgstr "Color" #. DLG_Compare -#: po/tmp/xap_String_Id.h.h:179 +#: po/tmp/xap_String_Id.h.h:193 msgid "Compare" -msgstr "" +msgstr "Comparar" # DLG_ListRevisions_Column2Label #. DLG_DocComparison_Content -#: po/tmp/xap_String_Id.h.h:181 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:195 msgid "Content:" -msgstr "Comentariu" +msgstr "Conteníu:" #. STYLE_TOCHEADING1 -#: po/tmp/xap_String_Id.h.h:183 +#: po/tmp/xap_String_Id.h.h:197 msgid "Contents 1" -msgstr "" +msgstr "Conteníu 1" #. STYLE_TOCHEADING2 -#: po/tmp/xap_String_Id.h.h:185 +#: po/tmp/xap_String_Id.h.h:199 msgid "Contents 2" -msgstr "" +msgstr "Conteníu 2" #. STYLE_TOCHEADING3 -#: po/tmp/xap_String_Id.h.h:187 +#: po/tmp/xap_String_Id.h.h:201 msgid "Contents 3" -msgstr "" +msgstr "Conteníu 3" #. STYLE_TOCHEADING4 -#: po/tmp/xap_String_Id.h.h:189 +#: po/tmp/xap_String_Id.h.h:203 msgid "Contents 4" -msgstr "" +msgstr "Conteníu 4" # MENU_LABEL_INSERT_INSERTHEADER #. STYLE_TOCHEADING -#: po/tmp/xap_String_Id.h.h:191 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:205 msgid "Contents Header" -msgstr "Amestar cabecera" +msgstr "Encabezáu d'índiz" # DLG_UP_Copies #. DLG_UP_Copies -#: po/tmp/xap_String_Id.h.h:193 +#: po/tmp/xap_String_Id.h.h:207 msgid "Copies: " msgstr "Copies: " +# TOOLBAR_LABEL_EDIT_COPY +# TOOLBAR_STATUSLINE_EDIT_COPY +# TOOLBAR_TOOLTIP_EDIT_COPY +#. LANG_COP_EG +#: po/tmp/xap_String_Id.h.h:209 +msgid "Coptic" +msgstr "Cópticu" + # LANG_KW_GB #. LANG_KW_GB -#: po/tmp/xap_String_Id.h.h:195 +#: po/tmp/xap_String_Id.h.h:211 msgid "Cornish" msgstr "Córnicu" # LANG_CO_FR #. LANG_CO_FR -#: po/tmp/xap_String_Id.h.h:197 +#: po/tmp/xap_String_Id.h.h:213 msgid "Corsican" msgstr "Corsu" # DLG_PLUGIN_MANAGER_COULDNT_LOAD #. DLG_PLUGIN_MANAGER_COULDNT_LOAD -#: po/tmp/xap_String_Id.h.h:199 +#: po/tmp/xap_String_Id.h.h:215 msgid "Could not activate/load plugin" -msgstr "Nun pue cargase'l plugin" +msgstr "Nun pudo activase/cargar el plugin" # DLG_PLUGIN_MANAGER_COULDNT_UNLOAD #. DLG_PLUGIN_MANAGER_COULDNT_UNLOAD -#: po/tmp/xap_String_Id.h.h:201 +#: po/tmp/xap_String_Id.h.h:217 msgid "Could not deactivate plugin" -msgstr "Nun pudose desactivar el plugin" +msgstr "Nun pudo desactivase'l plugin" # SPELL_CANTLOAD_DICT #. SPELL_CANTLOAD_DICT -#: po/tmp/xap_String_Id.h.h:203 +#: po/tmp/xap_String_Id.h.h:219 #, c-format msgid "Could not load the dictionary for the %s language" -msgstr "Nun pudose cargar el diccionariu pal llenguaxe %s" +msgstr "Nun pudo cargase'l diccionariu de %s" # FIELD_Document_Creator #. DLG_History_Version_Started -#: po/tmp/xap_String_Id.h.h:205 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:221 msgid "Created" -msgstr "Creador" +msgstr "Creáu" # FIELD_Document_Creator #. DLG_History_Created -#: po/tmp/xap_String_Id.h.h:207 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:223 msgid "Created:" -msgstr "Creador" +msgstr "Creáu:" -#. LANG_HR -#: po/tmp/xap_String_Id.h.h:209 +#. LANG_HR_HR +#: po/tmp/xap_String_Id.h.h:225 msgid "Croatian" msgstr "Croata" # ENC_CROA_MAC #. ENC_CROA_MAC -#: po/tmp/xap_String_Id.h.h:211 +#: po/tmp/xap_String_Id.h.h:227 msgid "Croatian, Macintosh" msgstr "Croata, Macintosh" # ENC_CYRL_ISO #. ENC_CYRL_ISO -#: po/tmp/xap_String_Id.h.h:213 +#: po/tmp/xap_String_Id.h.h:229 msgid "Cyrillic, ISO-8859-5" msgstr "Cirílicu, ISO-8859-5" # ENC_CYRL_KOI #. ENC_CYRL_KOI -#: po/tmp/xap_String_Id.h.h:215 +#: po/tmp/xap_String_Id.h.h:231 msgid "Cyrillic, KOI8-R" msgstr "Cirílicu, KOI8-R" # ENC_CYRL_MAC #. ENC_CYRL_MAC -#: po/tmp/xap_String_Id.h.h:217 +#: po/tmp/xap_String_Id.h.h:233 msgid "Cyrillic, Macintosh" msgstr "Cirílicu, Macintosh" # ENC_CYRL_WIN #. ENC_CYRL_WIN -#: po/tmp/xap_String_Id.h.h:219 +#: po/tmp/xap_String_Id.h.h:235 msgid "Cyrillic, Windows Code Page 1251" -msgstr "Cirílicu, páxina 1251 del códigu de Windows" +msgstr "Cirílicu, Páxina de Códigu Windows 1251" # LANG_CS_CZ #. LANG_CS_CZ -#: po/tmp/xap_String_Id.h.h:221 +#: po/tmp/xap_String_Id.h.h:237 msgid "Czech" msgstr "Checu" #. LANG_DA_DK -#: po/tmp/xap_String_Id.h.h:223 +#: po/tmp/xap_String_Id.h.h:239 msgid "Danish" msgstr "Danés" # DLG_PLUGIN_MANAGER_DEACTIVATE_ALL #. DLG_PLUGIN_MANAGER_DEACTIVATE_ALL -#: po/tmp/xap_String_Id.h.h:227 +#: po/tmp/xap_String_Id.h.h:243 msgid "Deactivate all plugins" -msgstr "Desactivar toos los plugins" +msgstr "Desactivar tolos plugins" # DLG_PLUGIN_MANAGER_DEACTIVATE #. DLG_PLUGIN_MANAGER_DEACTIVATE -#: po/tmp/xap_String_Id.h.h:229 +#: po/tmp/xap_String_Id.h.h:245 msgid "Deactivate plugin" msgstr "Desactivar plugin" # DLG_HTMLOPT_ExpDeclareXML #. DLG_HTMLOPT_ExpDeclareXML -#: po/tmp/xap_String_Id.h.h:231 +#: po/tmp/xap_String_Id.h.h:247 msgid "Declare as XML (version 1.0)" msgstr "Declarar como XML (versión 1.0)" # DLG_ULANG_LangLabel #. DLG_ULANG_DefaultLangLabel -#: po/tmp/xap_String_Id.h.h:233 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:249 msgid "Default language: " -msgstr "Escoyer Llenguaxe:" +msgstr "Llingua por defeutu:" #. DLG_Image_Placement -#: po/tmp/xap_String_Id.h.h:235 +#: po/tmp/xap_String_Id.h.h:251 msgid "Define Image Placement" -msgstr "" +msgstr "Definir l'allugamientu de la imaxe" #. DLG_Image_TextWrapping -#: po/tmp/xap_String_Id.h.h:237 +#: po/tmp/xap_String_Id.h.h:253 msgid "Define Text Wrapping" -msgstr "" +msgstr "Definir axuste de testu" # DLG_Remove_Icon #. DLG_Remove_Icon -#: po/tmp/xap_String_Id.h.h:246 +#: po/tmp/xap_String_Id.h.h:262 msgid "Do you want to remove this icon from the toolbar?" -msgstr "¿Tas xuru que quies quitar esti iconu de la barra de ferramientes?" +msgstr "¿Quies eliminar esti iconu de la barra de ferramientes?" # DLG_MetaData_Title #. DLG_DocComparison_WindowLabel -#: po/tmp/xap_String_Id.h.h:248 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:264 msgid "Document Comparison" -msgstr "Propiedaes del documentu" +msgstr "Comparación de documentos" # DLG_MetaData_Title #. DLG_History_DocumentDetails -#: po/tmp/xap_String_Id.h.h:250 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:266 msgid "Document Details" -msgstr "Propiedaes del documentu" +msgstr "Detalles del documentu" # MENU_LABEL_WINDOW #. DLG_History_WindowLabel -#: po/tmp/xap_String_Id.h.h:252 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:268 msgid "Document History" -msgstr "&Documentos" +msgstr "Historial del documentu" # FIELD_Type_Document #. DLG_History_Path -#: po/tmp/xap_String_Id.h.h:254 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:270 msgid "Document name:" -msgstr "Documentu" +msgstr "Nome del documentu:" # DLG_MetaData_Title #. DLG_DocComparison_DocsCompared -#: po/tmp/xap_String_Id.h.h:256 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:272 msgid "Documents compared" -msgstr "Propiedaes del documentu" +msgstr "Documentos comparaos" # LANG_NL_NL #. LANG_NL_NL -#: po/tmp/xap_String_Id.h.h:258 +#: po/tmp/xap_String_Id.h.h:274 msgid "Dutch (Netherlands)" msgstr "Holandés (Holanda)" #. DLG_History_EditTime -#: po/tmp/xap_String_Id.h.h:260 +#: po/tmp/xap_String_Id.h.h:276 msgid "Editing time:" -msgstr "" +msgstr "Tiempu d'edición:" # DLG_UFS_EffectsFrameLabel #. DLG_UFS_EffectsFrameLabel -#: po/tmp/xap_String_Id.h.h:262 +#: po/tmp/xap_String_Id.h.h:278 msgid "Effects" -msgstr "Efectos" +msgstr "Efeutos" # DLG_HTMLOPT_ExpEmbedCSS #. DLG_HTMLOPT_ExpEmbedCSS -#: po/tmp/xap_String_Id.h.h:264 +#: po/tmp/xap_String_Id.h.h:280 msgid "Embed (CSS) style sheet" -msgstr "Encaxar fueyes d'estilos (CSS)" +msgstr "Encrustar fueya d'estilu (CSS)" # DLG_UP_EmbedFonts #. DLG_UP_EmbedFonts -#: po/tmp/xap_String_Id.h.h:266 +#: po/tmp/xap_String_Id.h.h:282 msgid "Embed Fonts" -msgstr "Fontes encaxaes" +msgstr "Encrustar fontes" # DLG_HTMLOPT_ExpEmbedImages #. DLG_HTMLOPT_ExpEmbedImages -#: po/tmp/xap_String_Id.h.h:268 +#: po/tmp/xap_String_Id.h.h:284 msgid "Embed images in URLs (Base64-encoded)" -msgstr "Encaxar imaxenes nes URLs (Base64-encoded))" +msgstr "Encrustar imáxenes nes URLs (Base64-encoded)" # DLG_UENC_EncTitle #. DLG_UENC_EncTitle -#: po/tmp/xap_String_Id.h.h:270 +#: po/tmp/xap_String_Id.h.h:286 msgid "Encoding" -msgstr "Codificar" +msgstr "Codificando" # DLG_UFS_EncodingLabel #. DLG_UFS_EncodingLabel -#: po/tmp/xap_String_Id.h.h:272 +#: po/tmp/xap_String_Id.h.h:288 msgid "Encoding:" -msgstr "Codificar:" +msgstr "Codificando:" # STYLE_ENDREFERENCE #. STYLE_ENDREFERENCE -#: po/tmp/xap_String_Id.h.h:274 +#: po/tmp/xap_String_Id.h.h:290 msgid "Endnote Reference" -msgstr "Referencia de la nota cabera" +msgstr "Referencia de nota a lo cabero" # STYLE_ENDTEXT #. STYLE_ENDTEXT -#: po/tmp/xap_String_Id.h.h:276 +#: po/tmp/xap_String_Id.h.h:292 msgid "Endnote Text" -msgstr "testu de la nota cabera" +msgstr "Testu de nota a lo cabero" # LANG_EN_AU #. LANG_EN_AU -#: po/tmp/xap_String_Id.h.h:278 +#: po/tmp/xap_String_Id.h.h:294 msgid "English (Australia)" msgstr "Inglés (Australia)" # LANG_EN_CA #. LANG_EN_CA -#: po/tmp/xap_String_Id.h.h:280 +#: po/tmp/xap_String_Id.h.h:296 msgid "English (Canada)" msgstr "Inglés (Canadá)" # LANG_EN_IE #. LANG_EN_IE -#: po/tmp/xap_String_Id.h.h:282 +#: po/tmp/xap_String_Id.h.h:298 msgid "English (Ireland)" msgstr "Inglés (Irlanda)" # LANG_EN_NZ #. LANG_EN_NZ -#: po/tmp/xap_String_Id.h.h:284 +#: po/tmp/xap_String_Id.h.h:300 msgid "English (New Zealand)" msgstr "Inglés (Nueva Zelanda)" # LANG_EN_ZA #. LANG_EN_ZA -#: po/tmp/xap_String_Id.h.h:286 +#: po/tmp/xap_String_Id.h.h:302 msgid "English (South Africa)" msgstr "Inglés (Sudáfrica)" # LANG_EN_GB #. LANG_EN_GB -#: po/tmp/xap_String_Id.h.h:288 +#: po/tmp/xap_String_Id.h.h:304 msgid "English (UK)" -msgstr "Inglés (RU)" +msgstr "Inglés (Reinu Xuníu)" # LANG_EN_US #. LANG_EN_US -#: po/tmp/xap_String_Id.h.h:290 +#: po/tmp/xap_String_Id.h.h:306 msgid "English (US)" -msgstr "Inglés (Estaos Uníos)" +msgstr "Inglés (Estaos Xuníos)" # DLG_Password_Title #. DLG_Password_Title -#: po/tmp/xap_String_Id.h.h:292 +#: po/tmp/xap_String_Id.h.h:308 msgid "Enter Password" -msgstr "meter contraseña" +msgstr "Escribir clave" #. LANG_EO -#: po/tmp/xap_String_Id.h.h:294 +#: po/tmp/xap_String_Id.h.h:310 msgid "Esperanto" msgstr "Esperanto" # LANG_ET #. LANG_ET -#: po/tmp/xap_String_Id.h.h:296 +#: po/tmp/xap_String_Id.h.h:312 msgid "Estonian" msgstr "Estoniu" # DLG_FOSA_ExportTitle #. DLG_FOSA_ExportTitle -#: po/tmp/xap_String_Id.h.h:298 +#: po/tmp/xap_String_Id.h.h:314 msgid "Export File" msgstr "Esportar archivu" # DLG_HTMLOPT_ExpIs4 #. DLG_HTMLOPT_ExpIs4 -#: po/tmp/xap_String_Id.h.h:300 +#: po/tmp/xap_String_Id.h.h:316 msgid "Export as HTML 4.01" msgstr "Esportar como HTML 4.01" # DLG_HTMLOPT_ExpAbiWebDoc #. DLG_HTMLOPT_ExpAbiWebDoc -#: po/tmp/xap_String_Id.h.h:302 +#: po/tmp/xap_String_Id.h.h:318 msgid "Export with PHP instructions" -msgstr "Esportar coles instruciones PHP" +msgstr "Esportar con instruciones PHP" # LANG_FA_IR #. LANG_FA_IR -#: po/tmp/xap_String_Id.h.h:304 +#: po/tmp/xap_String_Id.h.h:320 msgid "Farsi" msgstr "Persa" # DLG_UP_File #. DLG_UP_File -#: po/tmp/xap_String_Id.h.h:306 +#: po/tmp/xap_String_Id.h.h:322 msgid "File" msgstr "Archivu" # DLG_OverwriteFile #. DLG_OverwriteFile -#: po/tmp/xap_String_Id.h.h:308 +#: po/tmp/xap_String_Id.h.h:324 #, c-format msgid "File already exists. Overwrite file '%s'?" -msgstr "L'archivu ya esiste. ¿Quies sobreescibir esti archivu '%s'?" +msgstr "L'archivu yá esiste. ¿Sobreescibir l'archivu '%s'?" + +#. DLG_FOSA_RecordToFileLabel +#: po/tmp/xap_String_Id.h.h:326 +msgid "File to record editing:" +msgstr "Archivu nel que grabar la edición:" + +#. DLG_FOSA_ReplayFromFileLabel +#: po/tmp/xap_String_Id.h.h:328 +msgid "File to replay editing:" +msgstr "Archivu del que reproducir la edición:" # LANG_FI_FI #. LANG_FI_FI -#: po/tmp/xap_String_Id.h.h:310 +#: po/tmp/xap_String_Id.h.h:330 msgid "Finnish" -msgstr "Finés" +msgstr "Finlandés" # LANG_NL_BE #. LANG_NL_BE -#: po/tmp/xap_String_Id.h.h:312 +#: po/tmp/xap_String_Id.h.h:332 msgid "Flemish (Belgium)" -msgstr "Flamencu (Belxica)" +msgstr "Flamencu (Bélxica)" # STYLE_FOOTREFERENCE #. STYLE_FOOTREFERENCE -#: po/tmp/xap_String_Id.h.h:319 +#: po/tmp/xap_String_Id.h.h:339 msgid "Footnote Reference" -msgstr "Referiencia de la nota de pie de páxina" +msgstr "Referencia de nota al pie" # STYLE_FOOTTEXT #. STYLE_FOOTTEXT -#: po/tmp/xap_String_Id.h.h:321 +#: po/tmp/xap_String_Id.h.h:341 msgid "Footnote Text" -msgstr "Testu de la nota de pie de páxina" +msgstr "Testu de nota al pie" # LANG_FR_BE #. LANG_FR_BE -#: po/tmp/xap_String_Id.h.h:325 +#: po/tmp/xap_String_Id.h.h:345 msgid "French (Belgium)" msgstr "Francés (Bélxica)" # LANG_FR_CA #. LANG_FR_CA -#: po/tmp/xap_String_Id.h.h:327 +#: po/tmp/xap_String_Id.h.h:347 msgid "French (Canada)" msgstr "Francés (Canadá)" # LANG_FR_FR #. LANG_FR_FR -#: po/tmp/xap_String_Id.h.h:329 +#: po/tmp/xap_String_Id.h.h:349 msgid "French (France)" msgstr "Francés (Francia)" # LANG_FR_CH #. LANG_FR_CH -#: po/tmp/xap_String_Id.h.h:331 +#: po/tmp/xap_String_Id.h.h:351 msgid "French (Switzerland)" msgstr "Francés (Suiza)" # LANG_FY_NL #. LANG_FY_NL -#: po/tmp/xap_String_Id.h.h:333 +#: po/tmp/xap_String_Id.h.h:353 msgid "Frisian" msgstr "Frisón" # DLG_UP_From #. DLG_UP_From -#: po/tmp/xap_String_Id.h.h:335 +#: po/tmp/xap_String_Id.h.h:355 msgid "From: " -msgstr "de:" +msgstr "De:" # LANG_GL_ES -#. LANG_GL_ES -#: po/tmp/xap_String_Id.h.h:337 -msgid "Galician" -msgstr "Gallegu" +#. LANG_GL +#: po/tmp/xap_String_Id.h.h:357 +msgid "Galician (Galego)" +msgstr "Gallegu (Galego)" # LANG_KA_GE #. LANG_KA_GE -#: po/tmp/xap_String_Id.h.h:339 +#: po/tmp/xap_String_Id.h.h:359 msgid "Georgian" -msgstr "Georgianu" +msgstr "Xeorxanu" # ENC_GEOR_ACADEMY #. ENC_GEOR_ACADEMY -#: po/tmp/xap_String_Id.h.h:341 +#: po/tmp/xap_String_Id.h.h:361 msgid "Georgian, Academy" -msgstr "Georgianu, Academicu" +msgstr "Xeorxanu, Académicu" # ENC_GEOR_PS #. ENC_GEOR_PS -#: po/tmp/xap_String_Id.h.h:343 +#: po/tmp/xap_String_Id.h.h:363 msgid "Georgian, PS" -msgstr "Georgianu, PS" +msgstr "Xeorxanu, PS" # LANG_DE_AT #. LANG_DE_AT -#: po/tmp/xap_String_Id.h.h:345 +#: po/tmp/xap_String_Id.h.h:365 msgid "German (Austria)" msgstr "Alemán (Austria)" # LANG_DE_DE #. LANG_DE_DE -#: po/tmp/xap_String_Id.h.h:347 +#: po/tmp/xap_String_Id.h.h:367 msgid "German (Germany)" msgstr "Alemán (Alemaña)" # LANG_DE_CH #. LANG_DE_CH -#: po/tmp/xap_String_Id.h.h:349 +#: po/tmp/xap_String_Id.h.h:369 msgid "German (Switzerland)" msgstr "Alemán (Suiza)" # DLG_UP_Grayscale #. DLG_UP_Grayscale -#: po/tmp/xap_String_Id.h.h:351 +#: po/tmp/xap_String_Id.h.h:371 msgid "Grayscale" msgstr "Escala de grises" # LANG_EL_GR #. LANG_EL_GR -#: po/tmp/xap_String_Id.h.h:353 +#: po/tmp/xap_String_Id.h.h:373 msgid "Greek" msgstr "Griegu" # ENC_GREE_ISO #. ENC_GREE_ISO -#: po/tmp/xap_String_Id.h.h:355 +#: po/tmp/xap_String_Id.h.h:375 msgid "Greek, ISO-8859-7" msgstr "Griegu, ISO-8859-7" # ENC_GREE_MAC #. ENC_GREE_MAC -#: po/tmp/xap_String_Id.h.h:357 +#: po/tmp/xap_String_Id.h.h:377 msgid "Greek, Macintosh" msgstr "Griegu, Macintosh" # ENC_GREE_WIN #. ENC_GREE_WIN -#: po/tmp/xap_String_Id.h.h:359 +#: po/tmp/xap_String_Id.h.h:379 msgid "Greek, Windows Code Page 1253" -msgstr "Griegu, Windows Code Page 1253" +msgstr "Griegu, Páxina de Códigu Windows 1253" # DLG_HTMLOPT_ExpTitle #. DLG_HTMLOPT_ExpTitle -#: po/tmp/xap_String_Id.h.h:361 +#: po/tmp/xap_String_Id.h.h:381 msgid "HTML Export Options" msgstr "Opciones d'esportación HTML" # LANG_HA_NE #. LANG_HA_NE -#: po/tmp/xap_String_Id.h.h:365 +#: po/tmp/xap_String_Id.h.h:385 msgid "Hausa (Niger)" msgstr "Hausa (Níxer)" # LANG_HA_NG #. LANG_HA_NG -#: po/tmp/xap_String_Id.h.h:367 +#: po/tmp/xap_String_Id.h.h:387 msgid "Hausa (Nigeria)" msgstr "Hausa (Nixeria)" # LANG_GL_ES #. LANG_HAW_US -#: po/tmp/xap_String_Id.h.h:369 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:389 msgid "Hawaiian" -msgstr "Gallegu" +msgstr "Hawaianu" # STYLE_HEADING1 #. STYLE_HEADING1 -#: po/tmp/xap_String_Id.h.h:371 +#: po/tmp/xap_String_Id.h.h:391 msgid "Heading 1" -msgstr "Cabecera 1" +msgstr "Encabezáu 1" # STYLE_HEADING2 #. STYLE_HEADING2 -#: po/tmp/xap_String_Id.h.h:373 +#: po/tmp/xap_String_Id.h.h:393 msgid "Heading 2" -msgstr "Cabecera 2" +msgstr "Encabezáu 2" # STYLE_HEADING3 #. STYLE_HEADING3 -#: po/tmp/xap_String_Id.h.h:375 +#: po/tmp/xap_String_Id.h.h:395 msgid "Heading 3" -msgstr "Cabecera 3" +msgstr "Encabezáu 3" # STYLE_HEADING3 #. STYLE_HEADING4 -#: po/tmp/xap_String_Id.h.h:377 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:397 msgid "Heading 4" -msgstr "Cabecera 3" +msgstr "Encabezáu 4" # LANG_HE_IL #. LANG_HE_IL -#: po/tmp/xap_String_Id.h.h:381 +#: po/tmp/xap_String_Id.h.h:401 msgid "Hebrew" -msgstr "Hebreu" +msgstr "Hebréu" # ENC_HEBR_ISO #. ENC_HEBR_ISO -#: po/tmp/xap_String_Id.h.h:383 +#: po/tmp/xap_String_Id.h.h:403 msgid "Hebrew, ISO-8859-8" -msgstr "Hebreu, ISO-8859-8" +msgstr "Hebréu, ISO-8859-8" # ENC_HEBR_MAC #. ENC_HEBR_MAC -#: po/tmp/xap_String_Id.h.h:385 +#: po/tmp/xap_String_Id.h.h:405 msgid "Hebrew, Macintosh" -msgstr "Hebreu, Macintosh" +msgstr "Hebréu, Macintosh" # ENC_HEBR_WIN #. ENC_HEBR_WIN -#: po/tmp/xap_String_Id.h.h:387 +#: po/tmp/xap_String_Id.h.h:407 msgid "Hebrew, Windows Code Page 1255" -msgstr "" +msgstr "Hebréu, Páxina de Códigu Windows 1255" # DLG_Image_Height #. DLG_Image_Height -#: po/tmp/xap_String_Id.h.h:389 +#: po/tmp/xap_String_Id.h.h:409 msgid "Height:" -msgstr "Altu:" +msgstr "Altor:" # DLG_IP_Height_Label #. DLG_IP_Height_Label -#: po/tmp/xap_String_Id.h.h:391 +#: po/tmp/xap_String_Id.h.h:411 msgid "Height: " -msgstr "Altu:" +msgstr "Altor:" # DLG_UFS_HiddenCheck #. DLG_UFS_HiddenCheck -#: po/tmp/xap_String_Id.h.h:393 +#: po/tmp/xap_String_Id.h.h:413 msgid "Hidden" -msgstr "Escondiu" +msgstr "Ocultu" # DLG_UFS_BGColorTab #. DLG_UFS_BGColorTab -#: po/tmp/xap_String_Id.h.h:395 +#: po/tmp/xap_String_Id.h.h:415 msgid "HighLight Color" -msgstr "" +msgstr "Resaltar color" #. LANG_HI_IN -#: po/tmp/xap_String_Id.h.h:397 +#: po/tmp/xap_String_Id.h.h:417 msgid "Hindi" msgstr "Hindi" # LANG_HU_HU #. LANG_HU_HU -#: po/tmp/xap_String_Id.h.h:399 +#: po/tmp/xap_String_Id.h.h:419 msgid "Hungarian" msgstr "Húngaru" # LANG_IS_IS #. LANG_IS_IS -#: po/tmp/xap_String_Id.h.h:401 +#: po/tmp/xap_String_Id.h.h:421 msgid "Icelandic" msgstr "Islandés" #. ENC_ICEL_MAC -#: po/tmp/xap_String_Id.h.h:403 +#: po/tmp/xap_String_Id.h.h:423 msgid "Icelandic, Macintosh" msgstr "Islandés, Macintosh" #. DLG_History_Id -#: po/tmp/xap_String_Id.h.h:405 +#: po/tmp/xap_String_Id.h.h:425 msgid "Identifier:" -msgstr "" +msgstr "Identificador:" # DLG_Image_Title #. DLG_Image_Title -#: po/tmp/xap_String_Id.h.h:407 +#: po/tmp/xap_String_Id.h.h:427 msgid "Image Properties" -msgstr "Propiedaes de l'imaxe" +msgstr "Propiedaes d'imaxe" #. DLG_Image_WrappedNone -#: po/tmp/xap_String_Id.h.h:409 +#: po/tmp/xap_String_Id.h.h:429 msgid "Image floats above text" -msgstr "" +msgstr "Imaxe flotante enriba'l testu" #. DLG_Image_InLine -#: po/tmp/xap_String_Id.h.h:411 +#: po/tmp/xap_String_Id.h.h:431 msgid "Image placed in-line (no text wrapping)" -msgstr "" +msgstr "Imaxe allugada en llinia (ensin axuste de testu)" # DLG_FOSA_ImportTitle #. DLG_FOSA_ImportTitle -#: po/tmp/xap_String_Id.h.h:415 +#: po/tmp/xap_String_Id.h.h:435 msgid "Import File" msgstr "Importar archivu" # MSG_ImportingDoc #. MSG_ImportingDoc -#: po/tmp/xap_String_Id.h.h:417 -msgid "Importing Document.." +#: po/tmp/xap_String_Id.h.h:437 +msgid "Importing Document..." msgstr "Importando documentu ..." # LANG_ID_ID #. LANG_ID_ID -#: po/tmp/xap_String_Id.h.h:419 +#: po/tmp/xap_String_Id.h.h:439 msgid "Indonesian" msgstr "Indonesiu" # XIM_Methods #. XIM_Methods -#: po/tmp/xap_String_Id.h.h:421 +#: po/tmp/xap_String_Id.h.h:441 msgid "Input Methods" msgstr "Metodos d'entrada" @@ -8860,1157 +8899,1203 @@ # MENU_STATUSLINE_TABLE_INSERT_TABLE # MENU_STATUSLINE_TABLE_INSERTTABLE #. DLG_FOSA_InsertObject -#: po/tmp/xap_String_Id.h.h:425 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:445 msgid "Insert Embeddable Object" -msgstr "Amestar tabla" +msgstr "Enxertar oxetu encrustable" #. DLG_FOSA_FileInsertObject -#: po/tmp/xap_String_Id.h.h:427 +#: po/tmp/xap_String_Id.h.h:447 msgid "Insert Embeddable Object file:" -msgstr "" +msgstr "Enxertar archivu d'oxetu encrustable:" # DLG_FOSA_InsertTitle #. DLG_FOSA_InsertTitle -#: po/tmp/xap_String_Id.h.h:429 +#: po/tmp/xap_String_Id.h.h:449 msgid "Insert File" -msgstr "Amestar archivu" +msgstr "Enxertar archivu" # DLG_FOSA_InsertTitle #. DLG_FOSA_InsertMath -#: po/tmp/xap_String_Id.h.h:431 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:451 msgid "Insert Math File" -msgstr "Amestar archivu" +msgstr "Enxertar archivu Math" # DLG_FOSA_InsertTitle #. DLG_FOSA_FileInsertMath -#: po/tmp/xap_String_Id.h.h:433 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:453 msgid "Insert MathML file:" -msgstr "Amestar archivu" +msgstr "Enxertar archivu MathML" # TB_InsertNewTable #. TB_InsertNewTable -#: po/tmp/xap_String_Id.h.h:435 +#: po/tmp/xap_String_Id.h.h:455 msgid "Insert New Table" -msgstr "Amestar nua tabla" +msgstr "Enxertar tabla nueva" # DLG_IP_Title #. DLG_IP_Title -#: po/tmp/xap_String_Id.h.h:437 +#: po/tmp/xap_String_Id.h.h:457 msgid "Insert Picture" -msgstr "Amestar semeya" +msgstr "Enxertar imaxe" # DLG_Insert_SymbolTitle #. DLG_Insert_SymbolTitle -#: po/tmp/xap_String_Id.h.h:439 +#: po/tmp/xap_String_Id.h.h:459 msgid "Insert Symbol" -msgstr "Amestar símbolu" +msgstr "Enxertar símbolu" # DLG_PLUGIN_MANAGER_INSTALL #. DLG_PLUGIN_MANAGER_INSTALL -#: po/tmp/xap_String_Id.h.h:441 +#: po/tmp/xap_String_Id.h.h:461 msgid "Install new plugin" -msgstr "Instalar nueu plugin" +msgstr "Instalar plugin nuevu" #. LANG_IA -#: po/tmp/xap_String_Id.h.h:443 +#: po/tmp/xap_String_Id.h.h:463 msgid "Interlingua" msgstr "Interlingua" #. LANG_IU_CA -#: po/tmp/xap_String_Id.h.h:445 +#: po/tmp/xap_String_Id.h.h:465 msgid "Inuktitut" -msgstr "" +msgstr "Inuktitut" # DLG_InvalidPathname #. DLG_InvalidPathname -#: po/tmp/xap_String_Id.h.h:447 +#: po/tmp/xap_String_Id.h.h:467 msgid "Invalid pathname." -msgstr "Ruta d'archivu nun válida." +msgstr "Camín non válidu." # LANG_GA_IE #. LANG_GA_IE -#: po/tmp/xap_String_Id.h.h:449 +#: po/tmp/xap_String_Id.h.h:469 msgid "Irish" msgstr "Irlandés" # LANG_IT_IT #. LANG_IT_IT -#: po/tmp/xap_String_Id.h.h:451 +#: po/tmp/xap_String_Id.h.h:471 msgid "Italian (Italy)" msgstr "Italianu (Italia)" #. LANG_JA_JP -#: po/tmp/xap_String_Id.h.h:455 +#: po/tmp/xap_String_Id.h.h:475 msgid "Japanese" -msgstr "Japonés" +msgstr "Xaponés" # ENC_JAPN_EUC #. ENC_JAPN_EUC -#: po/tmp/xap_String_Id.h.h:457 +#: po/tmp/xap_String_Id.h.h:477 msgid "Japanese, EUC-JP" msgstr "Xaponés, EUC-JP" # ENC_JAPN_ISO #. ENC_JAPN_ISO -#: po/tmp/xap_String_Id.h.h:459 +#: po/tmp/xap_String_Id.h.h:479 msgid "Japanese, ISO-2022-JP" msgstr "Xaponés, ISO-2022-JP" # ENC_JAPN_SJIS #. ENC_JAPN_SJIS -#: po/tmp/xap_String_Id.h.h:461 +#: po/tmp/xap_String_Id.h.h:481 msgid "Japanese, Shift-JIS" msgstr "Xaponés, Shift-JIS" # ENC_JAPN_WIN #. ENC_JAPN_WIN -#: po/tmp/xap_String_Id.h.h:463 +#: po/tmp/xap_String_Id.h.h:483 msgid "Japanese, Windows Code Page 932" -msgstr "Xaponés, páxina 932 del códigu de Windows" +msgstr "Xaponés, Páxina de Códigu Windows 932" #. LANG_KN_IN -#: po/tmp/xap_String_Id.h.h:465 +#: po/tmp/xap_String_Id.h.h:485 msgid "Kannada" -msgstr "" +msgstr "Kannada" # LANG_KO_KR #. LANG_KO_KR -#: po/tmp/xap_String_Id.h.h:467 +#. LANG_KO +#: po/tmp/xap_String_Id.h.h:488 msgid "Korean" msgstr "Coreanu" # ENC_KORE_EUC #. ENC_KORE_EUC -#: po/tmp/xap_String_Id.h.h:469 +#: po/tmp/xap_String_Id.h.h:490 msgid "Korean, EUC-KR" msgstr "Coreanu, EUC-KR" # ENC_KORE_JOHAB #. ENC_KORE_JOHAB -#: po/tmp/xap_String_Id.h.h:471 +#: po/tmp/xap_String_Id.h.h:492 msgid "Korean, Johab" msgstr "Coreanu, Johab" # ENC_KORE_KSC #. ENC_KORE_KSC -#: po/tmp/xap_String_Id.h.h:473 +#: po/tmp/xap_String_Id.h.h:494 msgid "Korean, KSC_5601" msgstr "Coreanu, KSC_5601" # ENC_KORE_WIN #. ENC_KORE_WIN -#: po/tmp/xap_String_Id.h.h:475 +#: po/tmp/xap_String_Id.h.h:496 msgid "Korean, Windows Code Page 949" -msgstr "Koreanu, páxina 949 del códigu de Windows" +msgstr "Koreanu, Páxina de Códigu Windows 949" # LANG_TR_TR #. LANG_KU -#: po/tmp/xap_String_Id.h.h:477 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:498 msgid "Kurdish" -msgstr "Turcu" +msgstr "Curdu" #. LANG_LO_LA -#: po/tmp/xap_String_Id.h.h:479 +#: po/tmp/xap_String_Id.h.h:500 msgid "Lao" -msgstr "" +msgstr "Lao" #. DLG_History_LastSaved -#: po/tmp/xap_String_Id.h.h:481 +#: po/tmp/xap_String_Id.h.h:502 msgid "Last saved:" -msgstr "" +msgstr "Postrer vegada que se guardó:" # LANG_LA_IT #. LANG_LA_IT -#: po/tmp/xap_String_Id.h.h:483 +#: po/tmp/xap_String_Id.h.h:504 msgid "Latin (Renaissance)" msgstr "Llatín (Renacimientu)" # LANG_LV_LV #. LANG_LV_LV -#: po/tmp/xap_String_Id.h.h:485 +#: po/tmp/xap_String_Id.h.h:506 msgid "Latvian" msgstr "Letón" # LANG_LT_LT #. LANG_LT_LT -#: po/tmp/xap_String_Id.h.h:487 +#: po/tmp/xap_String_Id.h.h:508 msgid "Lithuanian" msgstr "Lituanu" +# DLG_CLIPART_Title +#. DLG_CLIPART_Loading +#: po/tmp/xap_String_Id.h.h:510 +msgid "Loading Clip Art" +msgstr "Cargando Clip Art" + # LANG_MK #. LANG_MK -#: po/tmp/xap_String_Id.h.h:493 +#: po/tmp/xap_String_Id.h.h:516 msgid "Macedonian" msgstr "Macedoniu" # DLG_FormatFootnotes_EndPlaceEndDoc #. DLG_ULANG_DefaultLangChkbox -#: po/tmp/xap_String_Id.h.h:495 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:518 msgid "Make default for document" -msgstr "Colocar al final del documentu" +msgstr "Facer por defeutu pal documentu" + +#. LANG_MS_MY +#: po/tmp/xap_String_Id.h.h:520 +msgid "Malay" +msgstr "Malayu" # DLG_PageSetup_Margin #. LANG_MI_NZ -#: po/tmp/xap_String_Id.h.h:497 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:522 msgid "Maori" -msgstr "&Marxe" +msgstr "Maorí" #. LANG_MR_IN -#: po/tmp/xap_String_Id.h.h:499 +#: po/tmp/xap_String_Id.h.h:524 msgid "Marathi" -msgstr "" +msgstr "Maratí" # LANG_MH_MH #. LANG_MH_MH -#: po/tmp/xap_String_Id.h.h:501 +#: po/tmp/xap_String_Id.h.h:526 msgid "Marshallese (Marshall Islands)" msgstr "Marxalés (Islles Marshall)" # LANG_MH_NR #. LANG_MH_NR -#: po/tmp/xap_String_Id.h.h:503 +#: po/tmp/xap_String_Id.h.h:528 msgid "Marshallese (Nauru)" msgstr "Marxalés (Nauru)" # TOOLBAR_LABEL_MERGELEFT #. DLG_Merge -#: po/tmp/xap_String_Id.h.h:505 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:530 msgid "Merge" -msgstr "Axuntar a dizquierda" +msgstr "Amestar" # LANG_MK #. LANG_MN_MN -#: po/tmp/xap_String_Id.h.h:507 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:532 msgid "Mongolian" -msgstr "Macedoniu" +msgstr "Mongol" # DLG_PLUGIN_MANAGER_NAME #. DLG_PLUGIN_MANAGER_NAME -#: po/tmp/xap_String_Id.h.h:509 +#: po/tmp/xap_String_Id.h.h:534 msgid "Name:" msgstr "Nome:" +#. LANG_NE_NP +#: po/tmp/xap_String_Id.h.h:536 +msgid "Nepali (Nepal)" +msgstr "Nepalín (Nepal)" + # DLG_QNXMB_No #. DLG_QNXMB_No -#: po/tmp/xap_String_Id.h.h:511 +#: po/tmp/xap_String_Id.h.h:538 msgid "No" -msgstr "No" +msgstr "Non" # DLG_IP_No_Picture_Label #. DLG_IP_No_Picture_Label -#: po/tmp/xap_String_Id.h.h:513 +#: po/tmp/xap_String_Id.h.h:540 msgid "No Picture" -msgstr "Ensin semeya" +msgstr "Ensin imaxe" # DLG_PLUGIN_MANAGER_NONE_SELECTED #. DLG_PLUGIN_MANAGER_NONE_SELECTED -#: po/tmp/xap_String_Id.h.h:515 +#: po/tmp/xap_String_Id.h.h:542 msgid "No plugin selected" msgstr "Nengún plugin seleicionáu" # STYLE_NORMAL #. STYLE_NORMAL -#: po/tmp/xap_String_Id.h.h:517 +#: po/tmp/xap_String_Id.h.h:544 msgid "Normal" msgstr "Normal" # LANG_NB_NO #. LANG_NB_NO -#: po/tmp/xap_String_Id.h.h:519 +#: po/tmp/xap_String_Id.h.h:546 msgid "Norwegian Bokmal" -msgstr "Noruegu Bokmaal" +msgstr "Noruegu Bokmal" # LANG_NN_NO #. LANG_NN_NO -#: po/tmp/xap_String_Id.h.h:521 +#: po/tmp/xap_String_Id.h.h:548 msgid "Norwegian Nynorsk" msgstr "Noruegu Nynorsk" # DLG_PLUGIN_MANAGER_NOT_AVAILABLE #. DLG_PLUGIN_MANAGER_NOT_AVAILABLE -#: po/tmp/xap_String_Id.h.h:523 +#: po/tmp/xap_String_Id.h.h:550 msgid "Not available" -msgstr "Nun disponible" +msgstr "Non disponible" # STYLE_NUMHEAD1 #. STYLE_NUMHEAD1 -#: po/tmp/xap_String_Id.h.h:525 +#: po/tmp/xap_String_Id.h.h:552 msgid "Numbered Heading 1" -msgstr "Títulu númberu 1" +msgstr "Encabezáu numberáu 1" # STYLE_NUMHEAD2 #. STYLE_NUMHEAD2 -#: po/tmp/xap_String_Id.h.h:527 +#: po/tmp/xap_String_Id.h.h:554 msgid "Numbered Heading 2" -msgstr "Títulu númberu 2" +msgstr "Encabezáu numberáu 2" # STYLE_NUMHEAD3 #. STYLE_NUMHEAD3 -#: po/tmp/xap_String_Id.h.h:529 +#: po/tmp/xap_String_Id.h.h:556 msgid "Numbered Heading 3" -msgstr "Títulu númberu 3" +msgstr "Encabezáu numberáu 3" # DLG_OK #. DLG_OK -#: po/tmp/xap_String_Id.h.h:533 +#: po/tmp/xap_String_Id.h.h:560 msgid "OK" msgstr "Aceutar" # LANG_OC_FR #. LANG_OC_FR -#: po/tmp/xap_String_Id.h.h:535 +#: po/tmp/xap_String_Id.h.h:562 msgid "Occitan" -msgstr "Ocitanu" +msgstr "Occitanu" # DLG_FOSA_OpenTitle #. DLG_FOSA_OpenTitle -#: po/tmp/xap_String_Id.h.h:537 +#: po/tmp/xap_String_Id.h.h:564 msgid "Open File" -msgstr "Abrir Archivu" +msgstr "Abrir archivu" # DLG_FOSA_FileOpenTypeLabel #. DLG_FOSA_FileOpenTypeLabel -#: po/tmp/xap_String_Id.h.h:539 +#: po/tmp/xap_String_Id.h.h:566 msgid "Open file as type:" -msgstr "Abir archivu como tipu:" +msgstr "Abir archivu como triba:" # DLG_NEW_Title #. DLG_LISTDOCS_Title -#: po/tmp/xap_String_Id.h.h:541 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:568 msgid "Opened Documents" -msgstr "Documentu nueu" +msgstr "Documentos abiertos" # TB_Zoom_Percent #. TB_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:543 +#: po/tmp/xap_String_Id.h.h:570 msgid "Other..." -msgstr "Otru ..." +msgstr "Otru..." # DLG_Zoom_Percent #. DLG_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:547 +#: po/tmp/xap_String_Id.h.h:574 msgid "P&ercent:" msgstr "P&or cientu:" # TB_Zoom_PageWidth #. TB_Zoom_PageWidth -#: po/tmp/xap_String_Id.h.h:549 +#: po/tmp/xap_String_Id.h.h:576 msgid "Page Width" -msgstr "Anchu de páxina" +msgstr "Anchor de páxina" # DLG_UP_PageRanges #. DLG_UP_PageRanges -#: po/tmp/xap_String_Id.h.h:551 +#: po/tmp/xap_String_Id.h.h:578 msgid "Page ranges:" msgstr "Rangos de páxina:" +# TOOLBAR_LABEL_EDIT_PASTE +# TOOLBAR_STATUSLINE_EDIT_PASTE +# TOOLBAR_TOOLTIP_EDIT_PASTE +#. LANG_PS +#: po/tmp/xap_String_Id.h.h:580 +msgid "Pashto" +msgstr "Pashto" + # DLG_Password_Password #. DLG_Password_Password -#: po/tmp/xap_String_Id.h.h:553 +#: po/tmp/xap_String_Id.h.h:582 msgid "Password:" -msgstr "Contraseña:" +msgstr "Clave:" # STYLE_PLAIN_TEXT #. STYLE_PLAIN_TEXT -#: po/tmp/xap_String_Id.h.h:555 +#: po/tmp/xap_String_Id.h.h:584 msgid "Plain Text" msgstr "Testu planu" # DLG_PLUGIN_MANAGER_DETAILS #. DLG_PLUGIN_MANAGER_DETAILS -#: po/tmp/xap_String_Id.h.h:557 +#: po/tmp/xap_String_Id.h.h:586 msgid "Plugin Details:" -msgstr "Detalles de plugin" +msgstr "Detalles del plugin" # DLG_PLUGIN_MANAGER_LIST #. DLG_PLUGIN_MANAGER_LIST -#: po/tmp/xap_String_Id.h.h:559 +#: po/tmp/xap_String_Id.h.h:588 msgid "Plugin List" -msgstr "Llista de plugin " +msgstr "Llista de plugins" # LANG_PL_PL #. LANG_PL_PL -#: po/tmp/xap_String_Id.h.h:561 +#: po/tmp/xap_String_Id.h.h:590 msgid "Polish" msgstr "Polacu" # LANG_PT_BR #. LANG_PT_BR -#: po/tmp/xap_String_Id.h.h:563 +#: po/tmp/xap_String_Id.h.h:592 msgid "Portuguese (Brazil)" msgstr "Portugués (Brasil)" #. LANG_PT_PT -#: po/tmp/xap_String_Id.h.h:565 +#: po/tmp/xap_String_Id.h.h:594 msgid "Portuguese (Portugal)" msgstr "Portugués (Portugal)" #. DLG_Image_PlaceColumn -#: po/tmp/xap_String_Id.h.h:567 +#: po/tmp/xap_String_Id.h.h:596 msgid "Position relative to its Column" -msgstr "" +msgstr "Allugamientu relativu a la so columna" #. DLG_Image_PlacePage -#: po/tmp/xap_String_Id.h.h:569 +#: po/tmp/xap_String_Id.h.h:598 msgid "Position relative to its Page" -msgstr "" +msgstr "Allugamientu relativu a la so páxina" #. DLG_Image_PlaceParagraph -#: po/tmp/xap_String_Id.h.h:571 +#: po/tmp/xap_String_Id.h.h:600 msgid "Position relative to nearest paragraph" -msgstr "" +msgstr "Allugamientu relativu al parágrafu más averáu" # DLG_Image_Aspect #. DLG_Image_Aspect -#: po/tmp/xap_String_Id.h.h:573 +#: po/tmp/xap_String_Id.h.h:602 msgid "Preserve aspect ratio" -msgstr "" +msgstr "Caltener proporción" # DLG_IP_Activate_Label #. DLG_IP_Activate_Label -#: po/tmp/xap_String_Id.h.h:577 +#: po/tmp/xap_String_Id.h.h:606 msgid "Preview Picture" -msgstr "Previsualizar semeya" +msgstr "Previsualizar imaxe" # DLG_FOSA_PrintToFileTitle #. DLG_FOSA_PrintToFileTitle -#: po/tmp/xap_String_Id.h.h:582 +#: po/tmp/xap_String_Id.h.h:611 msgid "Print To File" msgstr "Imprentar a archivu" # DLG_FOSA_FilePrintTypeLabel #. DLG_FOSA_FilePrintTypeLabel -#: po/tmp/xap_String_Id.h.h:584 +#: po/tmp/xap_String_Id.h.h:613 msgid "Print file as type:" -msgstr "Imprentar archivu como tipu:" +msgstr "Imprentar archivu como triba:" # DLG_UP_PrintIn #. DLG_UP_PrintIn -#: po/tmp/xap_String_Id.h.h:586 +#: po/tmp/xap_String_Id.h.h:615 msgid "Print in: " msgstr "Imprentar en:" # DLG_UP_PrintTo #. DLG_UP_PrintTo -#: po/tmp/xap_String_Id.h.h:588 +#: po/tmp/xap_String_Id.h.h:617 msgid "Print to: " msgstr "Imprentar a:" # DLG_UP_Printer #. DLG_UP_Printer -#: po/tmp/xap_String_Id.h.h:590 +#: po/tmp/xap_String_Id.h.h:619 msgid "Printer" msgstr "Impresora:" # DLG_UP_PrinterCommand #. DLG_UP_PrinterCommand -#: po/tmp/xap_String_Id.h.h:592 +#: po/tmp/xap_String_Id.h.h:621 msgid "Printer command: " -msgstr "Comandu de l'impresora:" +msgstr "Comandu d'impresora:" #. LANG_PA_IN -#: po/tmp/xap_String_Id.h.h:594 +#: po/tmp/xap_String_Id.h.h:623 msgid "Punjabi (Gurmukhi)" -msgstr "" +msgstr "Punjabi (Gurmukhi)" #. LANG_PA_PK -#: po/tmp/xap_String_Id.h.h:596 +#: po/tmp/xap_String_Id.h.h:625 msgid "Punjabi (Shahmukhi)" -msgstr "" +msgstr "Punjabi (Shahmukhi)" #. LANG_QU_BO -#: po/tmp/xap_String_Id.h.h:598 +#: po/tmp/xap_String_Id.h.h:627 msgid "Quechua" msgstr "Quechua" +#. LANG_QUH_BO +#: po/tmp/xap_String_Id.h.h:629 +msgid "Quechua (3 vowels)" +msgstr "Quechua (3 vocales)" + +#. LANG_QUL_BO +#: po/tmp/xap_String_Id.h.h:631 +msgid "Quechua (5 vowels)" +msgstr "Quechua (5 vocales)" + +#. DLG_FOSA_RecordToFileTitle +#: po/tmp/xap_String_Id.h.h:633 +msgid "Record Editing to File" +msgstr "Grabar la edición al archivu" + # DLG_UFS_StyleRegular #. DLG_UFS_StyleRegular -#: po/tmp/xap_String_Id.h.h:600 +#: po/tmp/xap_String_Id.h.h:635 msgid "Regular" msgstr "Regular" # DLG_MetaData_Relation_LBL #. DLG_DocComparison_Relationship -#: po/tmp/xap_String_Id.h.h:602 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:637 msgid "Relationship:" -msgstr "Relación:" +msgstr "Rellación:" + +# MENU_STATUSLINE_FILE_SAVEIMAGE +#. DLG_FOSA_ReplayFromFileTitle +#: po/tmp/xap_String_Id.h.h:639 +msgid "Replay Editing from File" +msgstr "Reproducir la edición dende l'archivu" # DLG_Options_Btn_IgnoreReset #. DLG_Restore -#: po/tmp/xap_String_Id.h.h:604 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:641 msgid "Restore" -msgstr "Reaxustar" +msgstr "Restaurar" # DLG_HTMLOPT_ExpRestore #. DLG_HTMLOPT_ExpRestore -#: po/tmp/xap_String_Id.h.h:606 +#: po/tmp/xap_String_Id.h.h:643 msgid "Restore Settings" -msgstr "" +msgstr "Restaurar configuración" # DLG_Options_Btn_Default #. DLG_DocComparison_Results -#: po/tmp/xap_String_Id.h.h:608 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:645 msgid "Results" -msgstr "Por &defeutu" +msgstr "Resultaos" # LANG_RO_RO #. LANG_RO_RO -#: po/tmp/xap_String_Id.h.h:610 +#: po/tmp/xap_String_Id.h.h:647 msgid "Romanian" msgstr "Rumanu" # ENC_ROMA_MAC #. ENC_ROMA_MAC -#: po/tmp/xap_String_Id.h.h:612 +#: po/tmp/xap_String_Id.h.h:649 msgid "Romanian, Macintosh" msgstr "Rumanu, Macintosh" # LANG_RU_RU #. LANG_RU_RU -#: po/tmp/xap_String_Id.h.h:614 +#: po/tmp/xap_String_Id.h.h:651 msgid "Russian (Russia)" msgstr "Rusu (Rusia)" # DLG_UFS_SampleFrameLabel #. DLG_UFS_SampleFrameLabel -#: po/tmp/xap_String_Id.h.h:616 +#: po/tmp/xap_String_Id.h.h:653 msgid "Sample" msgstr "Exemplu" # LANG_SC_IT #. LANG_SC_IT -#: po/tmp/xap_String_Id.h.h:618 +#: po/tmp/xap_String_Id.h.h:655 msgid "Sardinian" msgstr "Sardu" # DLG_FOSA_SaveAsTitle #. DLG_FOSA_SaveAsTitle -#: po/tmp/xap_String_Id.h.h:620 +#: po/tmp/xap_String_Id.h.h:657 msgid "Save File As" -msgstr "Guardar Archivu Como" +msgstr "Guardar archivu como" # DLG_HTMLOPT_ExpSave #. DLG_HTMLOPT_ExpSave -#: po/tmp/xap_String_Id.h.h:622 +#: po/tmp/xap_String_Id.h.h:659 msgid "Save Settings" msgstr "Guardar preferencies" # DLG_FOSA_FileSaveTypeLabel #. DLG_FOSA_FileSaveTypeLabel -#: po/tmp/xap_String_Id.h.h:624 +#: po/tmp/xap_String_Id.h.h:661 msgid "Save file as type:" -msgstr "Guardar archivu como tipu" +msgstr "Guardar archivu como triba:" # DLG_UFS_ScriptLabel #. DLG_UFS_ScriptLabel -#: po/tmp/xap_String_Id.h.h:626 +#: po/tmp/xap_String_Id.h.h:663 msgid "Script:" -msgstr "" +msgstr "Script:" # STYLE_SECTHEADING #. STYLE_SECTHEADING -#: po/tmp/xap_String_Id.h.h:628 +#: po/tmp/xap_String_Id.h.h:665 msgid "Section Heading" -msgstr "Títulu de la seición" +msgstr "Encabezáu de seición" # DLG_UENC_EncLabel #. DLG_UENC_EncLabel -#: po/tmp/xap_String_Id.h.h:632 +#: po/tmp/xap_String_Id.h.h:669 msgid "Select Encoding:" -msgstr "Seleicionar codificación" +msgstr "Seleicionar codificación:" # DLG_HTMLOPT_ExpLabel #. DLG_HTMLOPT_ExpLabel -#: po/tmp/xap_String_Id.h.h:634 +#: po/tmp/xap_String_Id.h.h:671 msgid "Select HTML export options:" -msgstr "Escoyer opciones de exportación HTML:" +msgstr "Seleicionar opciones de esportación HTML:" # DLG_ULANG_LangLabel #. DLG_ULANG_LangLabel -#: po/tmp/xap_String_Id.h.h:636 +#: po/tmp/xap_String_Id.h.h:673 msgid "Select Language:" -msgstr "Escoyer Llenguaxe:" +msgstr "Seleicionar llingua:" # LANG_SR #. LANG_SR -#: po/tmp/xap_String_Id.h.h:640 +#: po/tmp/xap_String_Id.h.h:677 msgid "Serbian" msgstr "Serbiu" # MENU_LABEL_FILE_SAVEIMAGE #. DLG_Image_ImageDesc -#: po/tmp/xap_String_Id.h.h:642 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:679 msgid "Set Image Name" -msgstr "&Guardar semeya como" +msgstr "Establecer nome d'imaxe" # DLG_Options_Label_DefaultPageSize #. DLG_Image_ImageSize -#: po/tmp/xap_String_Id.h.h:644 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:681 msgid "Set Image Size" -msgstr "tamañu de páxina por defeutu" +msgstr "Establecer tamañu d'imaxe" # DLG_ULANG_LangTitle #. DLG_ULANG_LangTitle -#: po/tmp/xap_String_Id.h.h:646 +#: po/tmp/xap_String_Id.h.h:683 msgid "Set Language" -msgstr "Poner llenguaxe" +msgstr "Establecer llingua" # DLG_UFS_TransparencyCheck #. DLG_UFS_TransparencyCheck -#: po/tmp/xap_String_Id.h.h:648 +#: po/tmp/xap_String_Id.h.h:685 msgid "Set no Highlight Color" -msgstr "" +msgstr "Nun establecer nengún color de resaltáu" # DLG_UFS_SizeLabel #. DLG_UFS_SizeLabel -#: po/tmp/xap_String_Id.h.h:652 +#: po/tmp/xap_String_Id.h.h:689 msgid "Size:" msgstr "Tamañu:" # LANG_SK_SK #. LANG_SK_SK -#: po/tmp/xap_String_Id.h.h:654 +#: po/tmp/xap_String_Id.h.h:691 msgid "Slovak" msgstr "Eslovacu" # LANG_SL_SI #. LANG_SL_SI -#: po/tmp/xap_String_Id.h.h:656 +#: po/tmp/xap_String_Id.h.h:693 msgid "Slovenian" msgstr "Eslovenu" # LANG_ES_MX #. LANG_ES_MX -#: po/tmp/xap_String_Id.h.h:658 +#: po/tmp/xap_String_Id.h.h:695 msgid "Spanish (Mexico)" msgstr "Castellanu (México)" # LANG_ES_ES #. LANG_ES_ES -#: po/tmp/xap_String_Id.h.h:660 +#: po/tmp/xap_String_Id.h.h:697 msgid "Spanish (Spain)" msgstr "Castellanu (España)" # MENU_LABEL_FMT #. DLG_Image_SquareWrap -#: po/tmp/xap_String_Id.h.h:664 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:701 msgid "Square text wrapping" -msgstr "Formatu de testu (&x)" +msgstr "Axuste de testu cuadráu" # DLG_Lists_Style # DLG_UFS_StyleLabel #. DLG_DocComparison_Styles -#: po/tmp/xap_String_Id.h.h:672 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:709 msgid "Styles:" -msgstr "Estilu:" +msgstr "Estilos:" #. LANG_SW -#: po/tmp/xap_String_Id.h.h:678 +#: po/tmp/xap_String_Id.h.h:715 msgid "Swahili" -msgstr "" +msgstr "Suah.ili" # LANG_SV_SE #. LANG_SV_SE -#: po/tmp/xap_String_Id.h.h:680 +#: po/tmp/xap_String_Id.h.h:717 msgid "Swedish" msgstr "Suecu" # TOOLBAR_LABEL_INSERT_SYMBOL #. TB_Font_Symbol -#: po/tmp/xap_String_Id.h.h:682 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:719 msgid "Symbols" -msgstr "Simbolu" +msgstr "Símbolos" # LANG_SR #. LANG_SYR -#: po/tmp/xap_String_Id.h.h:684 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:721 msgid "Syriac" -msgstr "Serbiu" +msgstr "Siriu" #. LANG_TL_PH -#: po/tmp/xap_String_Id.h.h:688 +#: po/tmp/xap_String_Id.h.h:725 msgid "Tagalog" -msgstr "" +msgstr "Tagalés" # LANG_TH_TH #. LANG_TA_IN -#: po/tmp/xap_String_Id.h.h:690 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:727 msgid "Tamil" -msgstr "Tailandés" +msgstr "Tamil" #. LANG_TE_IN -#: po/tmp/xap_String_Id.h.h:692 +#: po/tmp/xap_String_Id.h.h:729 msgid "Telugu" -msgstr "" +msgstr "Telugu" # DLG_UFS_ColorTab #. DLG_UFS_ColorTab -#: po/tmp/xap_String_Id.h.h:694 +#: po/tmp/xap_String_Id.h.h:731 msgid "Text Color" -msgstr "Collor de textu" +msgstr "Color del testu" #. DLG_Image_WrappedBoth -#: po/tmp/xap_String_Id.h.h:696 +#: po/tmp/xap_String_Id.h.h:733 msgid "Text wrapped on both sides of the Image" -msgstr "" +msgstr "Testu axustáu a dambos llaos de la imaxe" #. DLG_Image_WrappedLeft -#: po/tmp/xap_String_Id.h.h:698 +#: po/tmp/xap_String_Id.h.h:735 msgid "Text wrapped to the Left of the Image" -msgstr "" +msgstr "Testu axustáu a la esquierda de la imaxe" #. DLG_Image_WrappedRight -#: po/tmp/xap_String_Id.h.h:700 +#: po/tmp/xap_String_Id.h.h:737 msgid "Text wrapped to the Right of the Image" -msgstr "" +msgstr "Testu axustáu a la drecha de la imaxe" # LANG_TH_TH #. LANG_TH_TH -#: po/tmp/xap_String_Id.h.h:702 +#: po/tmp/xap_String_Id.h.h:739 msgid "Thai" msgstr "Tailandés" #. ENC_THAI_MAC -#: po/tmp/xap_String_Id.h.h:704 +#: po/tmp/xap_String_Id.h.h:741 msgid "Thai, Macintosh" msgstr "Tailandés, Macintosh" #. ENC_THAI_TIS -#: po/tmp/xap_String_Id.h.h:706 +#: po/tmp/xap_String_Id.h.h:743 msgid "Thai, TIS-620" msgstr "Tailandés, TIS-620" # ENC_THAI_WIN #. ENC_THAI_WIN -#: po/tmp/xap_String_Id.h.h:708 +#: po/tmp/xap_String_Id.h.h:745 msgid "Thai, Windows Code Page 874" -msgstr "Tailandés, páxina 874 del códigu de Windows" +msgstr "Tailandés, Páxina de Códigu Windows 874" # DLG_NoSaveFile_DirNotWriteable #. DLG_NoSaveFile_DirNotWriteable -#: po/tmp/xap_String_Id.h.h:710 +#: po/tmp/xap_String_Id.h.h:747 #, c-format msgid "The directory '%s' is write-protected." -msgstr "El directoriu '%s' ta protexiu escontra escritura" +msgstr "El directoriu '%s' ta protexiu escontra escritura." + +#. DLG_FOSA_ExtensionDoesNotMatch +#: po/tmp/xap_String_Id.h.h:749 +msgid "The given file extension does not match the chosen file type. Do you want to use this name anyway?" +msgstr "La estensión d'archivu especificada nun concueya cola triba d'archivu escoyida. ¿Quies usar esti nome de toes maneres?" #. MSG_HistoryPartRestore2 -#: po/tmp/xap_String_Id.h.h:712 +#: po/tmp/xap_String_Id.h.h:751 #, c-format -msgid "" -"The nearest version that can be restored fully is %d. Would you like to " -"restore this version instead? To partially restore version %d press No." -msgstr "" +msgid "The nearest version that can be restored fully is %d. Would you like to restore this version instead? To partially restore version %d press No." +msgstr "La versión más averada que pue restaurase completamente ye %d. ¿Quies restaurar esta versión? Pa restaurar parcialmente la versión %d calca en Non." # DLG_UP_InvalidPrintString #. DLG_UP_InvalidPrintString -#: po/tmp/xap_String_Id.h.h:714 +#: po/tmp/xap_String_Id.h.h:753 msgid "The print command string is not valid." -msgstr "La secuencia del comandu d'imprentación ye invalida." +msgstr "La secuencia del comandu d'imprentación nun ye válida." #. MSG_NoUndo -#: po/tmp/xap_String_Id.h.h:716 +#: po/tmp/xap_String_Id.h.h:755 msgid "This operation cannot be undone. Are you sure you want to proceed?" -msgstr "" +msgstr "Esta operación nun se pue esfacer. ¿Tas seguru de que quies continuar?" # MENU_LABEL_FMT #. DLG_Image_TightWrap -#: po/tmp/xap_String_Id.h.h:720 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:759 msgid "Tight text wrapping" -msgstr "Formatu de testu (&x)" +msgstr "Axuste de testu estrenchu" #. MSG_HistoryPartRestore3 -#: po/tmp/xap_String_Id.h.h:724 +#: po/tmp/xap_String_Id.h.h:763 msgid "To continue anyway, press OK." -msgstr "" +msgstr "Pa continuar de toles formes, calca n'Aceutar" #. MSG_HistoryPartRestore4 -#: po/tmp/xap_String_Id.h.h:726 +#: po/tmp/xap_String_Id.h.h:765 msgid "To quit the restoration attempt, press Cancel." -msgstr "" +msgstr "Pa encaboxar la restauración, calca en Cancelar." # LANG_TR_TR #. LANG_TR_TR -#: po/tmp/xap_String_Id.h.h:732 +#: po/tmp/xap_String_Id.h.h:771 msgid "Turkish" msgstr "Turcu" # ENC_TURK_ISO #. ENC_TURK_ISO -#: po/tmp/xap_String_Id.h.h:734 +#: po/tmp/xap_String_Id.h.h:773 msgid "Turkish, ISO-8859-9" msgstr "Turcu, ISO-8859-9" # ENC_TURK_MAC #. ENC_TURK_MAC -#: po/tmp/xap_String_Id.h.h:736 +#: po/tmp/xap_String_Id.h.h:775 msgid "Turkish, Macintosh" msgstr "Turcu Macintosh" # ENC_TURK_WIN #. ENC_TURK_WIN -#: po/tmp/xap_String_Id.h.h:738 +#: po/tmp/xap_String_Id.h.h:777 msgid "Turkish, Windows Code Page 1254" -msgstr "Turcu, páxina 1254 del códigu de Windows" +msgstr "Turcu, Páxina de Códigu Windows 1254" # MENU_LABEL_FMT #. DLG_Image_WrapType -#: po/tmp/xap_String_Id.h.h:740 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:779 msgid "Type of text wrapping" -msgstr "Formatu de testu (&x)" +msgstr "Triba d'axuste de testu" # ENC_WEST_ASCII #. ENC_WEST_ASCII -#: po/tmp/xap_String_Id.h.h:742 +#: po/tmp/xap_String_Id.h.h:781 msgid "US-ASCII" msgstr "US-ASCII" # LANG_UK_UA #. LANG_UK_UA -#: po/tmp/xap_String_Id.h.h:744 +#: po/tmp/xap_String_Id.h.h:783 msgid "Ukrainian" msgstr "Ucranianu" # ENC_UKRA_KOI #. ENC_UKRA_KOI -#: po/tmp/xap_String_Id.h.h:746 +#: po/tmp/xap_String_Id.h.h:785 msgid "Ukrainian, KOI8-U" msgstr "Ucranianu, KOI8-U" # ENC_UKRA_MAC #. ENC_UKRA_MAC -#: po/tmp/xap_String_Id.h.h:748 +#: po/tmp/xap_String_Id.h.h:787 msgid "Ukrainian, Macintosh" msgstr "Ucranianu, Macintosh" # ENC_UNIC_UCS2 #. ENC_UNIC_UCS2 -#: po/tmp/xap_String_Id.h.h:752 +#: po/tmp/xap_String_Id.h.h:791 msgid "Unicode UCS-2" msgstr "Unicode UCS-2" # ENC_UNIC_UCS_2BE #. ENC_UNIC_UCS_2BE -#: po/tmp/xap_String_Id.h.h:754 +#: po/tmp/xap_String_Id.h.h:793 msgid "Unicode UCS-2 Big Endian" msgstr "Unicode UCS-2 Big Endian" # ENC_UNIC_UCS_2LE #. ENC_UNIC_UCS_2LE -#: po/tmp/xap_String_Id.h.h:756 +#: po/tmp/xap_String_Id.h.h:795 msgid "Unicode UCS-2 Little Endian" msgstr "Unicode UCS-2 Little Endian" #. ENC_UNIC_UCS4 -#: po/tmp/xap_String_Id.h.h:758 +#: po/tmp/xap_String_Id.h.h:797 msgid "Unicode UCS-4" msgstr "Unicode UCS-4" # ENC_UNIC_UCS_4BE #. ENC_UNIC_UCS_4BE -#: po/tmp/xap_String_Id.h.h:760 +#: po/tmp/xap_String_Id.h.h:799 msgid "Unicode UCS-4 Big Endian" msgstr "Unicode UCS-4 Big Endian" #. ENC_UNIC_UCS_4LE -#: po/tmp/xap_String_Id.h.h:762 +#: po/tmp/xap_String_Id.h.h:801 msgid "Unicode UCS-4 Little Endian" msgstr "Unicode UCS-4 Little Endian" #. ENC_UNIC_UTF_16 -#: po/tmp/xap_String_Id.h.h:764 +#: po/tmp/xap_String_Id.h.h:803 msgid "Unicode UTF-16" msgstr "Unicode UTF-16" #. ENC_UNIC_UTF_16BE -#: po/tmp/xap_String_Id.h.h:766 +#: po/tmp/xap_String_Id.h.h:805 msgid "Unicode UTF-16 Big Endian" msgstr "Unicode UTF-16 Big Endian" #. ENC_UNIC_UTF_16LE -#: po/tmp/xap_String_Id.h.h:768 +#: po/tmp/xap_String_Id.h.h:807 msgid "Unicode UTF-16 Little Endian" msgstr "Unicode UTF-16 Little Endian" #. ENC_UNIC_UTF_32 -#: po/tmp/xap_String_Id.h.h:770 +#: po/tmp/xap_String_Id.h.h:809 msgid "Unicode UTF-32" msgstr "Unicode UTF-32" #. ENC_UNIC_UTF_32BE -#: po/tmp/xap_String_Id.h.h:772 +#: po/tmp/xap_String_Id.h.h:811 msgid "Unicode UTF-32 Big Endian" msgstr "Unicode UTF-32 Big Endian" #. ENC_UNIC_UTF_32LE -#: po/tmp/xap_String_Id.h.h:774 +#: po/tmp/xap_String_Id.h.h:813 msgid "Unicode UTF-32 Little Endian" msgstr "Unicode UTF-32 Little Endian" #. ENC_UNIC_UTF_7 -#: po/tmp/xap_String_Id.h.h:776 +#: po/tmp/xap_String_Id.h.h:815 msgid "Unicode UTF-7" msgstr "Unicode UTF-7" #. ENC_UNIC_UTF_8 -#: po/tmp/xap_String_Id.h.h:778 +#: po/tmp/xap_String_Id.h.h:817 msgid "Unicode UTF-8" msgstr "Unicode UTF-8" # UntitledDocument #. UntitledDocument -#: po/tmp/xap_String_Id.h.h:780 +#: po/tmp/xap_String_Id.h.h:819 #, c-format msgid "Untitled%d" msgstr "Ensin títulu%d" # DLG_Update #. DLG_Update -#: po/tmp/xap_String_Id.h.h:782 +#: po/tmp/xap_String_Id.h.h:821 msgid "Update" msgstr "Actualizar" # LANG_UR_PK -#. LANG_UR_PK -#: po/tmp/xap_String_Id.h.h:788 +#. LANG_UR +#: po/tmp/xap_String_Id.h.h:827 msgid "Urdu" msgstr "Urdu" +#. LANG_UR_PK +#: po/tmp/xap_String_Id.h.h:829 +msgid "Urdu (Pakistan)" +msgstr "Urdu (Paquistán)" + #. LANG_UZ_UZ -#: po/tmp/xap_String_Id.h.h:790 +#: po/tmp/xap_String_Id.h.h:831 msgid "Uzbek" -msgstr "" +msgstr "Uzbecu" # FIELD_Application_Version #. DLG_History_List_Title -#: po/tmp/xap_String_Id.h.h:794 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:835 msgid "Version history" -msgstr "Versión" +msgstr "Historial de versión" # DLG_PLUGIN_MANAGER_VERSION #. DLG_PLUGIN_MANAGER_VERSION #. DLG_History_Version -#: po/tmp/xap_String_Id.h.h:797 +#: po/tmp/xap_String_Id.h.h:838 msgid "Version:" msgstr "Versión:" # LANG_VI_VN #. LANG_VI_VN -#: po/tmp/xap_String_Id.h.h:799 +#: po/tmp/xap_String_Id.h.h:840 msgid "Vietnamese" -msgstr "Vietnamita" +msgstr "Vietnamés" #. ENC_VIET_TCVN -#: po/tmp/xap_String_Id.h.h:801 +#: po/tmp/xap_String_Id.h.h:842 msgid "Vietnamese, TCVN" -msgstr "Vietnamita, TCVN" +msgstr "Vietnamés, TCVN" # ENC_VIET_VISCII #. ENC_VIET_VISCII -#: po/tmp/xap_String_Id.h.h:803 +#: po/tmp/xap_String_Id.h.h:844 msgid "Vietnamese, VISCII" msgstr "Vietnamita, VISCII" # ENC_VIET_WIN #. ENC_VIET_WIN -#: po/tmp/xap_String_Id.h.h:805 +#: po/tmp/xap_String_Id.h.h:846 msgid "Vietnamese, Windows Code Page 1258" -msgstr "Vietnamita, páxina 1258 del códigu de Windows" +msgstr "Vietnamés, Páxina de Códigu Windows 1258" # DLG_MW_MoreWindows #. DLG_MW_MoreWindows -#: po/tmp/xap_String_Id.h.h:807 +#: po/tmp/xap_String_Id.h.h:848 msgid "View Document" -msgstr "Agueyar Documentu" +msgstr "Ver documentu" # DLG_MW_Activate #. DLG_MW_Activate -#: po/tmp/xap_String_Id.h.h:809 +#: po/tmp/xap_String_Id.h.h:850 msgid "View:" msgstr "Ver:" #. LANG_CY_GB -#: po/tmp/xap_String_Id.h.h:811 +#: po/tmp/xap_String_Id.h.h:852 msgid "Welsh" msgstr "Galés" # ENC_WEST_WIN #. ENC_US_DOS -#: po/tmp/xap_String_Id.h.h:813 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:854 msgid "Western European, DOS/Windows Code Page 437" -msgstr "Europeu Occidental, páxina 1252 del códigu de Windows" +msgstr "Européu Occidental, Páxina de Códigu DOS/Windows 437" # ENC_WEST_WIN #. ENC_MLNG_DOS -#: po/tmp/xap_String_Id.h.h:815 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:856 msgid "Western European, DOS/Windows Code Page 850" -msgstr "Europeu Occidental, páxina 1252 del códigu de Windows" +msgstr "Européu Occidental, Páxina de Códigu DOS/Windows 850" # ENC_WEST_HP #. ENC_WEST_HP -#: po/tmp/xap_String_Id.h.h:817 +#: po/tmp/xap_String_Id.h.h:858 msgid "Western European, HP" -msgstr "Europeu Occidental, HP" +msgstr "Européu Occidental, HP" # ENC_WEST_ISO #. ENC_WEST_ISO -#: po/tmp/xap_String_Id.h.h:819 +#: po/tmp/xap_String_Id.h.h:860 msgid "Western European, ISO-8859-1" -msgstr "Europeu Occidental, ISO-8859-1" +msgstr "Européu Occidental, ISO-8859-1" # ENC_WEST_MAC #. ENC_WEST_MAC -#: po/tmp/xap_String_Id.h.h:821 +#: po/tmp/xap_String_Id.h.h:862 msgid "Western European, Macintosh" -msgstr "Europeu Occidental, Macintosh" +msgstr "Européu Occidental, Macintosh" # ENC_WEST_NXT #. ENC_WEST_NXT -#: po/tmp/xap_String_Id.h.h:823 +#: po/tmp/xap_String_Id.h.h:864 msgid "Western European, NeXT" -msgstr "Europeu Occidental, NeXT" +msgstr "Européu Occidental, NeXT" # ENC_WEST_WIN #. ENC_WEST_WIN -#: po/tmp/xap_String_Id.h.h:825 +#: po/tmp/xap_String_Id.h.h:866 msgid "Western European, Windows Code Page 1252" -msgstr "Europeu Occidental, páxina 1252 del códigu de Windows" +msgstr "Européu Occidental, Páxina de Códigu Windows 1252" # TB_Zoom_WholePage #. TB_Zoom_WholePage -#: po/tmp/xap_String_Id.h.h:827 +#: po/tmp/xap_String_Id.h.h:868 msgid "Whole Page" -msgstr "La páxina entera" +msgstr "Páxina completa" # DLG_Image_Width #. DLG_Image_Width -#: po/tmp/xap_String_Id.h.h:829 +#: po/tmp/xap_String_Id.h.h:870 msgid "Width:" -msgstr "Anchu:" +msgstr "Anchor:" # DLG_IP_Width_Label #. DLG_IP_Width_Label -#: po/tmp/xap_String_Id.h.h:831 +#: po/tmp/xap_String_Id.h.h:872 msgid "Width: " -msgstr "Anchu:" +msgstr "Anchor:" + +#. LANG_WO_SN +#: po/tmp/xap_String_Id.h.h:874 +msgid "Wolof (Senegal)" +msgstr "Wolof (Senegal)" # DLG_QNXMB_Yes #. DLG_QNXMB_Yes -#: po/tmp/xap_String_Id.h.h:833 +#: po/tmp/xap_String_Id.h.h:876 msgid "Yes" msgstr "Sí" # LANG_YI #. LANG_YI -#: po/tmp/xap_String_Id.h.h:835 +#: po/tmp/xap_String_Id.h.h:878 msgid "Yiddish" -msgstr "Yiddish" +msgstr "Yídish" #. MSG_HistoryConfirmSave -#: po/tmp/xap_String_Id.h.h:837 +#: po/tmp/xap_String_Id.h.h:880 #, c-format msgid "You have to save changes to document %s before proceeding. Save now?" -msgstr "" +msgstr "Tienes que guardar los cambeos del documentu %s enantes de siguir. ¿Guardar agora?" # DLG_Zoom_RadioFrameCaption #. DLG_Zoom_RadioFrameCaption -#: po/tmp/xap_String_Id.h.h:841 +#: po/tmp/xap_String_Id.h.h:884 msgid "Zoom to" -msgstr "Apurrir / alexar" +msgstr "Zoom al" # DLG_UnixMB_No #. DLG_UnixMB_No -#: po/tmp/xap_String_Id.h.h:843 +#: po/tmp/xap_String_Id.h.h:886 msgid "_No" msgstr "_Non" # DLG_UnixMB_Yes #. DLG_UnixMB_Yes -#: po/tmp/xap_String_Id.h.h:845 +#: po/tmp/xap_String_Id.h.h:888 msgid "_Yes" msgstr "_Sí" #. DLG_Unit_cm -#: po/tmp/xap_String_Id.h.h:847 +#: po/tmp/xap_String_Id.h.h:890 msgid "cm" -msgstr "centímetros" +msgstr "cm" #. DLG_DocComparison_Different -#: po/tmp/xap_String_Id.h.h:849 +#: po/tmp/xap_String_Id.h.h:892 msgid "different" -msgstr "" +msgstr "diferente" #. DLG_DocComparison_DivergingPos -#: po/tmp/xap_String_Id.h.h:851 +#: po/tmp/xap_String_Id.h.h:894 #, c-format msgid "diverging after document position %d" -msgstr "" +msgstr "diverxe depués del allugamientu del documentu %d" #. DLG_DocComparison_Diverging -#: po/tmp/xap_String_Id.h.h:853 +#: po/tmp/xap_String_Id.h.h:896 #, c-format msgid "diverging after version %d of %s" -msgstr "" +msgstr "diverxe depués de la versión %d de %s" #. DLG_DocComparison_Identical -#: po/tmp/xap_String_Id.h.h:855 +#: po/tmp/xap_String_Id.h.h:898 msgid "identical" -msgstr "" +msgstr "idénticu" # DLG_Unit_inch #. DLG_Unit_inch -#: po/tmp/xap_String_Id.h.h:857 +#: po/tmp/xap_String_Id.h.h:900 msgid "inch" msgstr "pulgaes" # DLG_Unit_mm #. DLG_Unit_mm -#: po/tmp/xap_String_Id.h.h:859 +#: po/tmp/xap_String_Id.h.h:902 msgid "mm" -msgstr "milímetros" +msgstr "mm" # DLG_Unit_pica #. DLG_Unit_pica -#: po/tmp/xap_String_Id.h.h:861 +#: po/tmp/xap_String_Id.h.h:904 msgid "pica" msgstr "piques" # DLG_Unit_points #. DLG_Unit_points -#: po/tmp/xap_String_Id.h.h:863 +#: po/tmp/xap_String_Id.h.h:906 msgid "points" msgstr "puntos" #. DLG_DocComparison_Siblings -#: po/tmp/xap_String_Id.h.h:865 +#: po/tmp/xap_String_Id.h.h:908 msgid "siblings" -msgstr "" +msgstr "asemeyaos" #. DLG_DocComparison_Unrelated -#: po/tmp/xap_String_Id.h.h:867 +#: po/tmp/xap_String_Id.h.h:910 msgid "unrelated" -msgstr "" +msgstr "non rellacionaos" + +# MENU_LABEL_INSERT_GRAPHIC +#~ msgid "&From File" +#~ msgstr "&Dende archivu" +# MENU_STATUSLINE_INSERT_PICTURE +#~ msgid "Insert a picture" +#~ msgstr "Amestar semeya" +# MENU_LABEL_WINDOW +#, fuzzy +#~ msgid "M&erge documents" +#~ msgstr "&Documentos" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/po/da-DK.po /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/po/da-DK.po --- abiword-2.6.2/abiword/po/da-DK.po 2008-04-06 17:00:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword/po/da-DK.po 2009-07-15 16:56:23.000000000 +0100 @@ -6,13 +6,15 @@ msgstr "" "Project-Id-Version: AbiWord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-11 02:26+0200\n" -"PO-Revision-Date: 2002-02-24 00:04+0100\n" -"Last-Translator: Birger Langkjer \n" -"Language-Team: Danish \n" +"POT-Creation-Date: 2008-10-14 05:26+0200\n" +"PO-Revision-Date: 2008-11-23 14:53+0100\n" +"Last-Translator: Morten Juhl-Johansen Zlde-Fejr \n" +"Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Danish\n" +"X-Poedit-Country: DENMARK\n" #. #. * Translatable strings file generated by extract-ui. @@ -55,7 +57,6 @@ #. DLG_PageSetup_Percent #: po/tmp/ap_String_Id.h.h:29 -#, c-format msgid "% of normal size" msgstr "% af normal strrelse" @@ -86,9 +87,9 @@ "\n" "Otherwise, please be patient." msgstr "" -"%s er ikke blevet implementeret endnu.\n" +"%s er ikke implementeret endnu.\n" "\n" -"Hvis du er programmr, tilfj venligst den pgldende kode til %s, linje %d\n" +"Hvis du er programmr, s tilfj venligst den pgldende kode til %s, linje %d\n" "og send patches til:\n" "\n" "\tabiword-dev@abisource.com\n" @@ -132,7 +133,7 @@ #. DLG_Tab_Radio_Dash #: po/tmp/ap_String_Id.h.h:59 msgid "&3 ----------" -msgstr "&3 -------" +msgstr "&3 ----------" #. MENU_LABEL_FILE_RECENT_4 #. MENU_LABEL_VIEW_TB_4 @@ -191,7 +192,7 @@ #. MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION #: po/tmp/ap_String_Id.h.h:84 msgid "&Accept revision" -msgstr "" +msgstr "&Acceptr revision" #. DLG_Spell_AddToDict #. MENU_LABEL_SPELL_ADD @@ -212,18 +213,18 @@ #. DLG_Options_Label_ViewAll #: po/tmp/ap_String_Id.h.h:93 msgid "&All" -msgstr "&Alle tegn" +msgstr "&Alle" #. DLG_ApplyButton #: po/tmp/ap_String_Id.h.h:95 -#, fuzzy msgid "&Apply" -msgstr "Anvend" +msgstr "&Anvend" +# Vedr. strrelsen p linjeafstand. #. DLG_Para_LabelAt #: po/tmp/ap_String_Id.h.h:97 msgid "&At:" -msgstr "&Ved:" +msgstr "&P:" #. MENU_LABEL_TOOLS_AUTOSPELL #: po/tmp/ap_String_Id.h.h:99 @@ -232,9 +233,8 @@ #. MENU_LABEL_TABLE_AUTOFIT #: po/tmp/ap_String_Id.h.h:101 -#, fuzzy msgid "&Autofit Table" -msgstr "&Autotekst" +msgstr "&Autotilpas tabel" #. DLG_Options_Label_PrefsAutoSave #: po/tmp/ap_String_Id.h.h:103 @@ -268,31 +268,30 @@ #. MENU_LABEL_TABLE_SELECT_CELL #: po/tmp/ap_String_Id.h.h:115 -#, fuzzy msgid "&Cell" -msgstr "&Alle tegn" +msgstr "&Celle" #. MENU_LABEL_TABLE_INSERT_CELLS #. MENU_LABEL_TABLE_DELETE_CELLS #: po/tmp/ap_String_Id.h.h:118 -#, fuzzy msgid "&Cells" -msgstr "&Luk" +msgstr "&Celler" #. MENU_LABEL_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:120 msgid "&Center" msgstr "&Centreret" +# I forbindelse med ordforslag i stavekontrol. #. DLG_Spell_Change #: po/tmp/ap_String_Id.h.h:122 msgid "&Change" -msgstr "&ndr" +msgstr "&Udskift" #. MENU_LABEL_INSERT_CLIPART #: po/tmp/ap_String_Id.h.h:124 msgid "&Clip Art" -msgstr "&Udklipsbillede" +msgstr "&Clip Art" #. DLG_CloseButton #. MENU_LABEL_FILE_CLOSE @@ -302,9 +301,8 @@ #. MENU_LABEL_TABLE_DELETE_COLUMNS #: po/tmp/ap_String_Id.h.h:129 -#, fuzzy msgid "&Column" -msgstr "Spalt&er" +msgstr "&Kolonne" #. DLG_Break_ColumnBreak #: po/tmp/ap_String_Id.h.h:131 @@ -318,47 +316,43 @@ #. MENU_LABEL_TOOLS_REVISIONS_COMPARE_DOCUMENTS #: po/tmp/ap_String_Id.h.h:135 -#, fuzzy msgid "&Compare documents" -msgstr "Luk dokumentet" +msgstr "&Sammenlign dokumenter" #. MENU_LABEL_EDIT_COPY #: po/tmp/ap_String_Id.h.h:137 msgid "&Copy" -msgstr "K&opir" +msgstr "&Kopir" #. MENU_LABEL_FMT_STYLE_DEFINE #: po/tmp/ap_String_Id.h.h:139 -#, fuzzy msgid "&Create and Modify Styles" -msgstr "ndr typografier" +msgstr "&Opret og redigr typografier" #. DLG_Options_Label_PrefsCurrentScheme #: po/tmp/ap_String_Id.h.h:141 msgid "&Current Preferences Scheme" -msgstr "Nuvrende opstningsskema" +msgstr "&Nuvrende opstningsskema" #. MENU_LABEL_TABLE_DELETE #: po/tmp/ap_String_Id.h.h:143 -#, fuzzy msgid "&Delete" -msgstr "Slet" +msgstr "&Slet" #. MENU_LABEL_INSERT_DELETE_HYPERLINK #: po/tmp/ap_String_Id.h.h:145 msgid "&Delete hyperlink" -msgstr "&Slet bogmrkelnke" +msgstr "&Slet link" #. DLG_Options_Btn_CustomDict #: po/tmp/ap_String_Id.h.h:147 msgid "&Dictionary..." -msgstr "&Ordliste..." +msgstr "&Ordbog..." #. MENU_LABEL_INSERT_DIRECTIONMARKER #: po/tmp/ap_String_Id.h.h:149 -#, fuzzy msgid "&Direction Marker" -msgstr "&Ordliste..." +msgstr "&Retningsmarkr" #. MENU_LABEL_FMT_DOCUMENT #: po/tmp/ap_String_Id.h.h:151 @@ -367,15 +361,13 @@ #. MENU_LABEL_TOOLS_HISTORY #: po/tmp/ap_String_Id.h.h:153 -#, fuzzy msgid "&Document History" -msgstr "&Dokument" +msgstr "&Dokumenthistorik" #. MENU_LABEL_WINDOW #: po/tmp/ap_String_Id.h.h:155 -#, fuzzy msgid "&Documents" -msgstr "&Dokument" +msgstr "&Dokumenter" #. DLG_Para_PushNoHyphenate #: po/tmp/ap_String_Id.h.h:157 @@ -390,9 +382,8 @@ #. MENU_LABEL_INSERT_EDIT_HYPERLINK #: po/tmp/ap_String_Id.h.h:162 -#, fuzzy msgid "&Edit hyperlink" -msgstr "&Slet bogmrkelnke" +msgstr "&Redigr link" #. DLG_Options_Label_SmartQuotesEnable #: po/tmp/ap_String_Id.h.h:164 @@ -416,9 +407,8 @@ #. DLG_Field_Fields_No_Colon #: po/tmp/ap_String_Id.h.h:172 -#, fuzzy msgid "&Fields" -msgstr "&Felter:" +msgstr "&Felter" #. DLG_Field_Fields #: po/tmp/ap_String_Id.h.h:174 @@ -428,18 +418,17 @@ #. MENU_LABEL_FILE #: po/tmp/ap_String_Id.h.h:176 msgid "&File" -msgstr "&Filer" +msgstr "&Fil" #. DLG_Options_Label_FileExtension #: po/tmp/ap_String_Id.h.h:178 -#, fuzzy msgid "&File extension:" -msgstr "Med endelsen:" +msgstr "&Filendelse:" #. MENU_LABEL_EDIT_FIND #: po/tmp/ap_String_Id.h.h:180 msgid "&Find" -msgstr "&Sg" +msgstr "&Find" #. DLG_FR_FindNextButton #: po/tmp/ap_String_Id.h.h:182 @@ -458,811 +447,795 @@ #. MENU_LABEL_TABLE_FORMAT #: po/tmp/ap_String_Id.h.h:188 -#, fuzzy msgid "&Format Table" -msgstr "Formatr &billede" - -#. MENU_LABEL_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:190 -msgid "&From File" -msgstr "&Fra fil" +msgstr "&Formatr tabel" #. MENU_LABEL_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:192 +#: po/tmp/ap_String_Id.h.h:190 msgid "&Go To" -msgstr "G &til" +msgstr "&G til" +# Formatteringsfunktion, hvor overskriften for indholdsfortegnelsen kan sls fra. #. DLG_FormatTOC_HasHeading -#: po/tmp/ap_String_Id.h.h:194 +#: po/tmp/ap_String_Id.h.h:192 msgid "&Has Heading" -msgstr "" +msgstr "&Har overskrift" #. MENU_LABEL_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:196 +#: po/tmp/ap_String_Id.h.h:194 msgid "&Header and Footer" msgstr "Side&hoved og sidefod" #. DLG_PageSetup_Header -#: po/tmp/ap_String_Id.h.h:198 +#: po/tmp/ap_String_Id.h.h:196 msgid "&Header:" msgstr "Side&hoved:" +# Sidelngde? #. DLG_PageSetup_Height -#: po/tmp/ap_String_Id.h.h:200 +#: po/tmp/ap_String_Id.h.h:198 msgid "&Height:" msgstr "&Hjde:" #. DLG_HelpButton #. MENU_LABEL_HELP -#: po/tmp/ap_String_Id.h.h:203 +#: po/tmp/ap_String_Id.h.h:201 msgid "&Help" msgstr "&Hjlp" #. DLG_Options_Label_ViewHiddenText -#: po/tmp/ap_String_Id.h.h:205 +#: po/tmp/ap_String_Id.h.h:203 msgid "&Hidden Text" msgstr "&Skjult tekst" #. DLG_Options_Label_SpellHighlightMisspelledWords -#: po/tmp/ap_String_Id.h.h:207 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:205 msgid "&Highlight misspelled words" -msgstr "Ret automatisk stavefejl" +msgstr "Frem&hv stavefejl" #. MENU_LABEL_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:209 +#: po/tmp/ap_String_Id.h.h:207 msgid "&Hyperlink" -msgstr "Bogmrke&lnke" +msgstr "&Link" #. DLG_Spell_Ignore -#: po/tmp/ap_String_Id.h.h:211 +#: po/tmp/ap_String_Id.h.h:209 msgid "&Ignore" msgstr "&Ignorr" #. MENU_LABEL_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:213 +#: po/tmp/ap_String_Id.h.h:211 msgid "&Ignore All" msgstr "Ign&orr alle" #. MENU_LABEL_FMT_IMAGE #. MENU_LABEL_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:216 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:214 msgid "&Image" -msgstr "Formatr &billede" +msgstr "&Billede" #. MENU_LABEL_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:218 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:216 msgid "&Import Styles" -msgstr "Importr fil" +msgstr "&Importr typografier" #. MENU_LABEL_WEB_WEBPREVIEW -#: po/tmp/ap_String_Id.h.h:220 +#: po/tmp/ap_String_Id.h.h:218 msgid "&In web browser" -msgstr "" +msgstr "&I webbrowser" +# Mrkater til kapitler i indholdsfortegnelse #. DLG_FormatTOC_InheritLabel -#: po/tmp/ap_String_Id.h.h:222 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:220 msgid "&Inherit label" -msgstr "&Indst fil" +msgstr "&Overtag mrkat fra ovenstende niveau" #. DLG_InsertButton #. MENU_LABEL_INSERT #. MENU_LABEL_TABLE_INSERT #. DLG_Insert -#: po/tmp/ap_String_Id.h.h:226 po/tmp/xap_String_Id.h.h:15 +#: po/tmp/ap_String_Id.h.h:224 +#: po/tmp/xap_String_Id.h.h:15 msgid "&Insert" msgstr "&Indst" #. DLG_Options_Label_AutoSaveInterval -#: po/tmp/ap_String_Id.h.h:228 +#: po/tmp/ap_String_Id.h.h:226 msgid "&Interval:" -msgstr "" +msgstr "&Interval:" #. MENU_LABEL_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:230 +#: po/tmp/ap_String_Id.h.h:228 msgid "&Italic" msgstr "&Kursiv" #. MENU_LABEL_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:232 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:230 msgid "&Jump to hyperlink" -msgstr "&Slet bogmrkelnke" +msgstr "&G til link" #. MENU_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:234 +#: po/tmp/ap_String_Id.h.h:232 msgid "&Justify" msgstr "&Lige margener" #. DLG_Para_PushKeepLinesTogether -#: po/tmp/ap_String_Id.h.h:236 +#: po/tmp/ap_String_Id.h.h:234 msgid "&Keep lines together" msgstr "Hold &linjer samlet" #. MENU_LABEL_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:238 +#: po/tmp/ap_String_Id.h.h:236 msgid "&LRM" -msgstr "" +msgstr "&Venstre-mod-hjre-markr" #. DLG_PageSetup_Landscape -#: po/tmp/ap_String_Id.h.h:240 +#: po/tmp/ap_String_Id.h.h:238 msgid "&Landscape" -msgstr "&Landskab" +msgstr "&Bredformat" #. MENU_LABEL_TOOLS_LANGUAGE -#: po/tmp/ap_String_Id.h.h:242 +#: po/tmp/ap_String_Id.h.h:240 msgid "&Language" msgstr "&Sprog" #. MENU_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:244 +#: po/tmp/ap_String_Id.h.h:242 msgid "&Left" msgstr "&Venstre" #. MENU_LABEL_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:246 +#: po/tmp/ap_String_Id.h.h:244 msgid "&Left-to-right text" -msgstr "" +msgstr "&Venstre mod hjre" #. DLG_Para_LabelLeft #. DLG_PageSetup_Left -#: po/tmp/ap_String_Id.h.h:249 +#: po/tmp/ap_String_Id.h.h:247 msgid "&Left:" msgstr "&Venstre:" #. MENU_LABEL_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:251 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:249 msgid "&Lock layout" -msgstr "Udseende" +msgstr "&Ls layout" #. MENU_LABEL_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:253 +#: po/tmp/ap_String_Id.h.h:251 msgid "&Mail Merge" -msgstr "" +msgstr "&Brevfletning" #. MENU_LABEL_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:255 +#: po/tmp/ap_String_Id.h.h:253 msgid "&Mail Merge Field" -msgstr "" +msgstr "&Brevfletningsfelt" #. MENU_LABEL_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:257 +#: po/tmp/ap_String_Id.h.h:255 msgid "&Maintain Full History" -msgstr "" +msgstr "&Behold fuld historik" #. MENU_LABEL_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:259 +#: po/tmp/ap_String_Id.h.h:257 msgid "&Mark revisions while typing" -msgstr "" +msgstr "&Markr revisioner under skrivning" +# Hvorvidt store og sm bogstaver skal matches i sg/erstat. #. DLG_FR_MatchCase -#: po/tmp/ap_String_Id.h.h:261 +#: po/tmp/ap_String_Id.h.h:259 msgid "&Match case" -msgstr "Forskel p &store og sm bogstaver" +msgstr "&Match store og sm bogstaver" #. MENU_LABEL_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:263 +#: po/tmp/ap_String_Id.h.h:261 msgid "&Merge Cells" -msgstr "" +msgstr "&Flet celler" #. MENU_LABEL_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:265 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:263 msgid "&More Documents" -msgstr "&Dokument" +msgstr "&Flere dokumenter" #. DLG_Goto_Label_Name -#: po/tmp/ap_String_Id.h.h:267 +#: po/tmp/ap_String_Id.h.h:265 msgid "&Name:" msgstr "&Navn:" #. MENU_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:269 +#: po/tmp/ap_String_Id.h.h:267 msgid "&New" msgstr "&Ny" #. MENU_LABEL_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:271 +#: po/tmp/ap_String_Id.h.h:269 msgid "&New Window" msgstr "&Nyt vindue" #. MENU_LABEL_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:273 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:271 msgid "&New using Template" -msgstr "bn skabelon" +msgstr "&Ny udfra skabelon" #. DLG_Break_NextPage -#: po/tmp/ap_String_Id.h.h:275 +#: po/tmp/ap_String_Id.h.h:273 msgid "&Next page" msgstr "&Nste side" #. MENU_LABEL_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:277 +#: po/tmp/ap_String_Id.h.h:275 msgid "&Normal Layout" msgstr "&Normalt layout" #. DLG_Goto_Label_Number -#: po/tmp/ap_String_Id.h.h:279 +#: po/tmp/ap_String_Id.h.h:277 msgid "&Number:" msgstr "&Nummer:" #. DLG_FormatTOC_NumberingType -#: po/tmp/ap_String_Id.h.h:281 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:279 msgid "&Numbering type:" -msgstr "Nummerering" +msgstr "&Nummereringstype:" #. DLG_Break_OddPage -#: po/tmp/ap_String_Id.h.h:283 +#: po/tmp/ap_String_Id.h.h:281 msgid "&Odd page" msgstr "&Ulige side" #. MENU_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:285 +#: po/tmp/ap_String_Id.h.h:283 msgid "&Open" msgstr "&bn" #. DLG_MailMerge_OpenFile -#: po/tmp/ap_String_Id.h.h:287 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:285 msgid "&Open File" -msgstr "bn fil" +msgstr "&bn fil" +# Overlinje? Toplinje? #. MENU_LABEL_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:289 +#: po/tmp/ap_String_Id.h.h:287 msgid "&Overline" -msgstr "&Overstreg" +msgstr "&Topstreg" #. MENU_LABEL_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:291 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:289 msgid "&Page Width" msgstr "&Sidebredde" #. DLG_Break_PageBreak -#: po/tmp/ap_String_Id.h.h:293 +#: po/tmp/ap_String_Id.h.h:291 msgid "&Page break" msgstr "&Sideskift" #. DLG_FormatTOC_PageNumbering -#: po/tmp/ap_String_Id.h.h:295 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:293 msgid "&Page numbering:" -msgstr "Sidenummer" +msgstr "Side&nummerering:" #. MENU_LABEL_FMT_PARAGRAPH -#: po/tmp/ap_String_Id.h.h:297 +#: po/tmp/ap_String_Id.h.h:295 msgid "&Paragraph" msgstr "&Afsnit" #. MENU_LABEL_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:299 +#: po/tmp/ap_String_Id.h.h:297 msgid "&Paste" msgstr "&Indst" -#. MENU_LABEL_INSERT_PICTURE -#: po/tmp/ap_String_Id.h.h:301 +#. MENU_LABEL_INSERT_GRAPHIC +#: po/tmp/ap_String_Id.h.h:299 msgid "&Picture" msgstr "&Billede" #. MENU_LABEL_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:303 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:301 msgid "&Plugins" msgstr "&Udvidelsesmoduler" #. DLG_PageSetup_Portrait -#: po/tmp/ap_String_Id.h.h:305 +#: po/tmp/ap_String_Id.h.h:303 msgid "&Portrait" -msgstr "&Portrt" +msgstr "&Hjformat" #. MENU_LABEL_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:307 +#: po/tmp/ap_String_Id.h.h:305 msgid "&Print" msgstr "&Udskriv" #. MENU_LABEL_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:309 +#: po/tmp/ap_String_Id.h.h:307 msgid "&Print Layout" msgstr "&Udskriftslayout" #. MENU_LABEL_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:311 +#: po/tmp/ap_String_Id.h.h:309 msgid "&Purge History" -msgstr "" +msgstr "&Ryd historik" #. MENU_LABEL_FILE_EXIT -#: po/tmp/ap_String_Id.h.h:313 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:311 msgid "&Quit" msgstr "&Afslut" #. MENU_LABEL_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:315 +#: po/tmp/ap_String_Id.h.h:313 msgid "&RLM" -msgstr "" +msgstr "&Hjre-mod-venstre-markr" #. MENU_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:317 +#: po/tmp/ap_String_Id.h.h:315 msgid "&Redo" -msgstr "&Gentag" +msgstr "&Gr om" #. MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:319 +#: po/tmp/ap_String_Id.h.h:317 msgid "&Reject revision" -msgstr "" +msgstr "&Afvis revision" #. DLG_FR_ReplaceButton -#: po/tmp/ap_String_Id.h.h:321 +#: po/tmp/ap_String_Id.h.h:319 msgid "&Replace" msgstr "&Erstat" #. DLG_Options_Btn_IgnoreReset -#: po/tmp/ap_String_Id.h.h:323 +#: po/tmp/ap_String_Id.h.h:321 msgid "&Reset" msgstr "&Nulstil" #. MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:325 +#: po/tmp/ap_String_Id.h.h:323 msgid "&Reset to default layout" -msgstr "" +msgstr "&Nulstil til standardlayout" #. MENU_LABEL_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:327 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:325 msgid "&Revisions" -msgstr "&Foreslag:" +msgstr "&Revisioner" #. MENU_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:329 +#: po/tmp/ap_String_Id.h.h:327 msgid "&Right" msgstr "&Hjrestillet" #. MENU_LABEL_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:331 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:329 msgid "&Right-to-left text" -msgstr "Hjre mod venstre" +msgstr "&Hjre mod venstre" #. DLG_Para_LabelRight #. DLG_PageSetup_Right -#: po/tmp/ap_String_Id.h.h:334 +#: po/tmp/ap_String_Id.h.h:332 msgid "&Right:" msgstr "&Hjre:" #. MENU_LABEL_TABLE_DELETE_ROWS #. MENU_LABEL_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:337 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:335 msgid "&Row" -msgstr "&Gentag" +msgstr "&Rkke" #. DLG_Options_Label_ViewRuler -#: po/tmp/ap_String_Id.h.h:339 +#: po/tmp/ap_String_Id.h.h:337 msgid "&Ruler" -msgstr "&Linial" +msgstr "&Lineal" #. MENU_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:341 +#: po/tmp/ap_String_Id.h.h:339 msgid "&Save" msgstr "&Gem" #. MENU_LABEL_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:343 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:341 msgid "&Save Image As" -msgstr "Gem fil som" +msgstr "Gem billede &som" #. MENU_LABEL_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:345 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:343 msgid "&Save web page" -msgstr "&Se siden som netside" +msgstr "Gem &netside" #. MENU_LABEL_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:347 +#: po/tmp/ap_String_Id.h.h:345 msgid "&Search for Help" msgstr "&Sg i hjlp" +# En dialog om at markere hele tabellen, kolonnen, rkken eller cellen. #. MENU_LABEL_TABLE_SELECT -#: po/tmp/ap_String_Id.h.h:349 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:347 msgid "&Select" -msgstr "Markering" +msgstr "&Markr" #. MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL -#: po/tmp/ap_String_Id.h.h:351 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:349 msgid "&Select revision" -msgstr "Markering" +msgstr "Vlg &revision" #. MENU_LABEL_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:353 +#: po/tmp/ap_String_Id.h.h:351 msgid "&Show History" -msgstr "" +msgstr "&Vis historik" #. MENU_LABEL_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:355 +#: po/tmp/ap_String_Id.h.h:353 msgid "&Show Status Bar" msgstr "Vis &statuslinje" #. DLG_Para_LabelSpecial -#: po/tmp/ap_String_Id.h.h:357 +#: po/tmp/ap_String_Id.h.h:355 msgid "&Special:" msgstr "&Speciel:" #. MENU_LABEL_TOOLS_SPELLING -#: po/tmp/ap_String_Id.h.h:359 +#: po/tmp/ap_String_Id.h.h:357 msgid "&Spelling" msgstr "&Stavning" +# Hvilket kapitelnummer, der skal vre startvrdi i indholdsfortegnelse. #. DLG_FormatTOC_StartAt -#: po/tmp/ap_String_Id.h.h:361 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:359 msgid "&Start at:" -msgstr "Start ved:" +msgstr "&Start med:" #. DLG_Options_Label_ViewStatusBar -#: po/tmp/ap_String_Id.h.h:363 +#: po/tmp/ap_String_Id.h.h:361 msgid "&Status bar" msgstr "&Statuslinje" #. MENU_LABEL_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:365 +#: po/tmp/ap_String_Id.h.h:363 msgid "&Subscript" msgstr "&Snket" #. DLG_Para_PushSuppressLineNumbers -#: po/tmp/ap_String_Id.h.h:367 +#: po/tmp/ap_String_Id.h.h:365 msgid "&Suppress line numbers" msgstr "&Udelad linjenumre" +# Tabuleringstegn ssom udpunktering. #. DLG_FormatTOC_TabLeader -#: po/tmp/ap_String_Id.h.h:369 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:367 msgid "&Tab leader:" -msgstr "Side&hoved:" +msgstr "&Tabuleringstegn:" #. MENU_LABEL_TABLE_INSERT_TABLE #. MENU_LABEL_TABLE_DELETE_TABLE #. MENU_LABEL_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:373 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:371 msgid "&Table" -msgstr "&Tabulatorer" +msgstr "&Tabel" #. MENU_LABEL_FMT_TABS -#: po/tmp/ap_String_Id.h.h:375 +#: po/tmp/ap_String_Id.h.h:373 msgid "&Tabs" -msgstr "&Tabulatorer" +msgstr "&Tabulering" #. DLG_Para_ButtonTabs -#: po/tmp/ap_String_Id.h.h:377 +#: po/tmp/ap_String_Id.h.h:375 msgid "&Tabs..." -msgstr "&Tabulatorer..." +msgstr "&Tabulering..." #. MENU_LABEL_VIEW_TOOLBARS -#: po/tmp/ap_String_Id.h.h:379 +#: po/tmp/ap_String_Id.h.h:377 msgid "&Toolbars" msgstr "&Vrktjslinjer" #. MENU_LABEL_TOOLS -#: po/tmp/ap_String_Id.h.h:381 +#: po/tmp/ap_String_Id.h.h:379 msgid "&Tools" msgstr "Vr&ktjer" #. DLG_PageSetup_Top -#: po/tmp/ap_String_Id.h.h:383 +#: po/tmp/ap_String_Id.h.h:381 msgid "&Top:" msgstr "&Top:" #. DLG_Field_Types_No_Colon -#: po/tmp/ap_String_Id.h.h:385 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:383 msgid "&Types" -msgstr "&Typer:" +msgstr "&Typer" #. DLG_Field_Types -#: po/tmp/ap_String_Id.h.h:387 +#: po/tmp/ap_String_Id.h.h:385 msgid "&Types:" msgstr "&Typer:" #. MENU_LABEL_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:389 +#: po/tmp/ap_String_Id.h.h:387 msgid "&Underline" msgstr "&Understreg" #. MENU_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:391 +#: po/tmp/ap_String_Id.h.h:389 msgid "&Undo" msgstr "&Fortryd" #. DLG_Options_Label_ViewUnits #. DLG_PageSetup_Units -#: po/tmp/ap_String_Id.h.h:394 +#: po/tmp/ap_String_Id.h.h:392 msgid "&Units:" msgstr "&Mleenhed:" #. MENU_LABEL_VIEW #. DLG_MW_ViewButton -#: po/tmp/ap_String_Id.h.h:396 po/tmp/xap_String_Id.h.h:21 +#: po/tmp/ap_String_Id.h.h:394 +#: po/tmp/xap_String_Id.h.h:21 msgid "&View" msgstr "&Vis" +# Bedre forslag modtages. #. MENU_LABEL_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:398 +#: po/tmp/ap_String_Id.h.h:396 msgid "&Web Layout" msgstr "&Netudseende" #. MENU_LABEL_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:400 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:398 msgid "&Whole Page" msgstr "&Hele siden" #. DLG_FR_WholeWord -#: po/tmp/ap_String_Id.h.h:402 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:400 msgid "&Whole word" -msgstr "&Hele siden" +msgstr "&Hele ordet" #. DLG_Para_PushWidowOrphanControl -#: po/tmp/ap_String_Id.h.h:404 +#: po/tmp/ap_String_Id.h.h:402 msgid "&Widow/Orphan control" -msgstr "Enke/horunge&kontrol" +msgstr "Enke/horeunge&kontrol" #. DLG_PageSetup_Width -#: po/tmp/ap_String_Id.h.h:406 +#: po/tmp/ap_String_Id.h.h:404 msgid "&Width:" msgstr "&Bredde:" #. MENU_LABEL_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:408 +#: po/tmp/ap_String_Id.h.h:406 msgid "&Word Count" msgstr "&Ordoptlling" #. MENU_LABEL_VIEW_ZOOM_MENU #. MENU_LABEL_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:411 +#: po/tmp/ap_String_Id.h.h:409 msgid "&Zoom" -msgstr "&Forstrrelse" +msgstr "&Zoom" #. DLG_ListRevisions_LevelZero -#: po/tmp/ap_String_Id.h.h:413 +#: po/tmp/ap_String_Id.h.h:411 msgid "(All revisions visible)" -msgstr "" +msgstr "(Alle revisioner synlige)" #. DLG_Spell_NoSuggestions -#: po/tmp/ap_String_Id.h.h:415 +#: po/tmp/ap_String_Id.h.h:413 msgid "(no spelling suggestions)" msgstr "(Ingen staveforeslag)" #. DLG_Para_SpecialNone -#: po/tmp/ap_String_Id.h.h:417 +#: po/tmp/ap_String_Id.h.h:415 msgid "(none)" msgstr "(ingen)" #. TOOLBAR_LABEL_1COLUMN #. TOOLBAR_STATUSLINE_1COLUMN #. TOOLBAR_TOOLTIP_1COLUMN -#: po/tmp/ap_String_Id.h.h:421 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:419 msgid "1 Column" -msgstr "Spalter" +msgstr "1 spalte" #. TOOLBAR_LABEL_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:423 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:421 msgid "1.5 Spacing" -msgstr "Mellemrum" +msgstr "Halvanden linjeafstand" #. DLG_Para_SpacingHalf -#: po/tmp/ap_String_Id.h.h:425 +#: po/tmp/ap_String_Id.h.h:423 msgid "1.5 lines" -msgstr "1,5 linje" +msgstr "1,5 linjer" #. TOOLBAR_STATUSLINE_MIDDLE_SPACE #. TOOLBAR_TOOLTIP_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:428 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:426 msgid "1.5 spacing" -msgstr "Mellemrum" +msgstr "halvanden linjeafstand" #. TOOLBAR_LABEL_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:430 +#: po/tmp/ap_String_Id.h.h:428 msgid "12 pt before" -msgstr "" +msgstr "12 pkt. fr" #. TOOLBAR_LABEL_2COLUMN #. TOOLBAR_STATUSLINE_2COLUMN #. TOOLBAR_TOOLTIP_2COLUMN -#: po/tmp/ap_String_Id.h.h:434 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:432 msgid "2 Columns" -msgstr "Spalter" +msgstr "2 spalter" #. TOOLBAR_LABEL_3COLUMN #. TOOLBAR_STATUSLINE_3COLUMN #. TOOLBAR_TOOLTIP_3COLUMN -#: po/tmp/ap_String_Id.h.h:438 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:436 msgid "3 Columns" -msgstr "Spalter" +msgstr "3 spalter" #. DLG_Goto_Btn_Prev -#: po/tmp/ap_String_Id.h.h:440 +#: po/tmp/ap_String_Id.h.h:438 msgid "<< Prev" -msgstr "<< Forrige" +msgstr "<< Foregende" #. MSG_Exception -#: po/tmp/ap_String_Id.h.h:442 +#: po/tmp/ap_String_Id.h.h:440 msgid "" -"A fatal error has just occurred. Abiword is going to shutdown.\n" +"A fatal error has just occurred. AbiWord is going to shutdown.\n" "The current document has been saved to disc with a \".saved\" extension." msgstr "" +"Der er opstet en fatal fejl. Abiword vil lukke ned.\n" +"Det nuvrende dokument er blevet gemt med endelsen \".saved\"." #. DLG_Options_Label_SpellSuggest -#: po/tmp/ap_String_Id.h.h:444 +#: po/tmp/ap_String_Id.h.h:442 msgid "A&lways suggest corrections" msgstr "&Foresl altid ndringer" #. FIELD_DateTime_AMPM -#: po/tmp/ap_String_Id.h.h:446 +#: po/tmp/ap_String_Id.h.h:444 msgid "AM/PM" msgstr "AM/PM" #. MSG_IE_BogusDocument -#: po/tmp/ap_String_Id.h.h:448 -#, fuzzy, c-format +#: po/tmp/ap_String_Id.h.h:446 +#, c-format msgid "AbiWord cannot open %s. It appears to be an invalid document" -msgstr "Abiword kan ikke bne %s. Det er formentligt et ugyldigt dokument." +msgstr "Abiword kan ikke bne %s. Det synes at vre et ugyldigt dokument" #. MSG_SpellSelectionDone -#: po/tmp/ap_String_Id.h.h:450 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:448 msgid "AbiWord finished checking the selection." -msgstr "AbiWord er frdig med at sge i dokumentet." +msgstr "AbiWord er frdig med at sge i den markerede tekst.." #. DLG_FR_FinishedReplace -#: po/tmp/ap_String_Id.h.h:452 +#: po/tmp/ap_String_Id.h.h:450 #, c-format -msgid "" -"AbiWord has finished its search of the document and has made %d replacements." -msgstr "AbiWord er frdig med at sge i dokumentet og lavede %d erstatninger." +msgid "AbiWord has finished its search of the document and has made %d replacements." +msgstr "AbiWord er frdig med at sge i dokumentet og foretog %d erstatninger." #. DLG_FR_FinishedFind -#: po/tmp/ap_String_Id.h.h:454 +#: po/tmp/ap_String_Id.h.h:452 msgid "AbiWord has finished searching the document." msgstr "AbiWord er frdig med at sge i dokumentet." #. WINDOWS_COMCTL_WARNING -#: po/tmp/ap_String_Id.h.h:456 +#: po/tmp/ap_String_Id.h.h:454 msgid "" "AbiWord is designed for a newer version of the system file COMCTL32.DLL\n" "than the one currently on your system. (COMCTL32.DLL version 4.72 or newer)\n" -"A solution to this problem is explained in the FAQ on the AbiSource web " -"site\n" +"A solution to this problem is explained in the FAQ on the AbiSource web site\n" "\n" "\thttp://www.abisource.com\n" "\n" "You can use the program, but the toolbar may be missing." msgstr "" +"Abiword er bygget til en nyere version af systemfilen COMCTL32.DLL\n" +"end den, der er i dit system. (COMCTL32.DLL version 4.72 eller nyere)\n" +"En lsning p dette problem er forklaret blandt de Ofte Stillede Sprgsml (OSS/FAQ) p Abisource-hjemmesiden\n" +"\n" +"\thttp://www.abisource.com\n" +"\n" +"Du kan bruge programmet, men vrktjslinjen kan mangle." #. WINDOWS_NEED_UNICOWS -#: po/tmp/ap_String_Id.h.h:458 +#: po/tmp/ap_String_Id.h.h:456 #, c-format msgid "" "AbiWord needs the file %s.dll\n" -"Please download and install it from http://www.microsoft.com/msdownload/" -"platformsdk/sdkupdate/psdkredist.htm" +"Please download and install it from http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdkredist.htm" msgstr "" +"Abiword mangler filen %s.dll\n" +"Den kan hentes og installeres fra http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdkredist.htm" #. MENU_LABEL_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:460 +#: po/tmp/ap_String_Id.h.h:458 msgid "About G&NOME Office" msgstr "Om G&NOME Office" #. MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:462 +#: po/tmp/ap_String_Id.h.h:460 msgid "About the GNOME Office project" -msgstr "Om GNOME Office projektet" +msgstr "Om GNOME Office-projektet" #. MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION -#: po/tmp/ap_String_Id.h.h:464 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:462 msgid "Accept the suggested change" -msgstr "Brug det foreslede ord" +msgstr "Acceptr den foreslede ndring" #. TOOLBAR_STATUSLINE_ADD_COLUMN #. TOOLBAR_TOOLTIP_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:467 +#: po/tmp/ap_String_Id.h.h:465 msgid "Add a column to this table after the current column" -msgstr "" +msgstr "Tilfj kolonne til tabellen efter den nuvrende kolonne" #. TOOLBAR_STATUSLINE_ADD_ROW #. TOOLBAR_TOOLTIP_ADD_ROW -#: po/tmp/ap_String_Id.h.h:470 +#: po/tmp/ap_String_Id.h.h:468 msgid "Add a row to this table after the current row" -msgstr "" +msgstr "Tilfj en rkke til tabellen efter den nuvrende rkke" #. MENU_STATUSLINE_FMT_BORDERS -#: po/tmp/ap_String_Id.h.h:472 +#: po/tmp/ap_String_Id.h.h:470 msgid "Add borders and shading to the selection" msgstr "Tilfj rammer og skygge til den markerede tekst" #. TOOLBAR_LABEL_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:474 +#: po/tmp/ap_String_Id.h.h:472 msgid "Add column after" -msgstr "" +msgstr "Tilfj kolonne efter" #. MENU_STATUSLINE_FMT_BULLETS -#: po/tmp/ap_String_Id.h.h:476 +#: po/tmp/ap_String_Id.h.h:474 msgid "Add or modify bullets and numbering for selected paragraphs" -msgstr "Tilfj eller ndr en liste i de markerede afsnit" +msgstr "Tilfj eller skift punkttegn og nummerering i markerede afsnit" #. TOOLBAR_LABEL_ADD_ROW -#: po/tmp/ap_String_Id.h.h:478 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:476 msgid "Add row after" -msgstr "Fj til skabelon" +msgstr "Tilfj rkke efter" #. MENU_STATUSLINE_SPELL_ADD -#: po/tmp/ap_String_Id.h.h:480 +#: po/tmp/ap_String_Id.h.h:478 msgid "Add this word to the custom dictionary" msgstr "Tilfj dette ord til din personlige ordliste" #. DLG_Styles_ModifyTemplate -#: po/tmp/ap_String_Id.h.h:482 +#: po/tmp/ap_String_Id.h.h:480 msgid "Add to template" -msgstr "Fj til skabelon" +msgstr "Tilfj til skabelon" #. DLG_Para_LabelAfter -#: po/tmp/ap_String_Id.h.h:484 +#: po/tmp/ap_String_Id.h.h:482 msgid "Aft&er:" msgstr "&Efter:" #. DLG_Para_LabelAlignment -#: po/tmp/ap_String_Id.h.h:486 +#: po/tmp/ap_String_Id.h.h:484 msgid "Ali&gnment:" msgstr "&Justering:" #. DLG_Tab_Label_Alignment #. DLG_PageNumbers_Alignment_No_Colon -#: po/tmp/ap_String_Id.h.h:489 +#: po/tmp/ap_String_Id.h.h:487 msgid "Alignment" msgstr "Justering" #. DLG_PageNumbers_Alignment -#: po/tmp/ap_String_Id.h.h:491 +#: po/tmp/ap_String_Id.h.h:489 msgid "Alignment:" msgstr "Justering:" #. DLG_Styles_LBL_All #. DLG_UP_All -#: po/tmp/ap_String_Id.h.h:493 po/tmp/xap_String_Id.h.h:51 +#: po/tmp/ap_String_Id.h.h:491 +#: po/tmp/xap_String_Id.h.h:51 msgid "All" msgstr "Alle" #. DLG_Options_Label_CheckAllowCustomToolbars -#: po/tmp/ap_String_Id.h.h:495 +#: po/tmp/ap_String_Id.h.h:493 msgid "Allow Custom Toolbars" msgstr "Tillad egne vrktjslinjer" #. MENU_STATUSLINE_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:497 +#: po/tmp/ap_String_Id.h.h:495 msgid "Allow formatting using styles only" -msgstr "" +msgstr "Tillad udelukkende formattering med typografier" #. DLG_Options_Label_CheckWhiteForTransparent -#: po/tmp/ap_String_Id.h.h:499 +#: po/tmp/ap_String_Id.h.h:497 msgid "Allow screen colors other than white" msgstr "Tillad andre skrmfarver end hvid" +#. MENU_LABEL_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:499 +msgid "Annotation" +msgstr "Notat" + #. FIELD_Application #: po/tmp/ap_String_Id.h.h:501 msgid "Application" @@ -1270,13 +1243,13 @@ #. DLG_Options_Label_AppStartup #: po/tmp/ap_String_Id.h.h:503 -#, fuzzy msgid "Application Startup" -msgstr "Program" +msgstr "Programopstart" #. DLG_Options_Btn_Apply #. DLG_Apply -#: po/tmp/ap_String_Id.h.h:505 po/tmp/xap_String_Id.h.h:63 +#: po/tmp/ap_String_Id.h.h:505 +#: po/tmp/xap_String_Id.h.h:63 msgid "Apply" msgstr "Anvend" @@ -1284,7 +1257,7 @@ #. TOOLBAR_TOOLTIP_FMTPAINTER #: po/tmp/ap_String_Id.h.h:508 msgid "Apply the previously copied paragraph formatting onto the selected text" -msgstr "" +msgstr "Anvend formattering fra det tidligere kopierede afsnit p den markede tekst" #. DLG_Lists_Apply_Current #: po/tmp/ap_String_Id.h.h:510 @@ -1293,10 +1266,10 @@ #. DLG_FormatTable_Apply_To #: po/tmp/ap_String_Id.h.h:512 -#, fuzzy msgid "Apply to:" -msgstr "Anvend" +msgstr "Anvend p:" +# Ikke, som man ville vente, en liste med arabiske tal, men faktisk en arabisk liste. #. DLG_Lists_Arabic_List #: po/tmp/ap_String_Id.h.h:514 msgid "Arabic List" @@ -1304,10 +1277,8 @@ #. MSG_AutoRevisionOffWarning #: po/tmp/ap_String_Id.h.h:516 -msgid "" -"Are you sure you do not want to maintain full history record? If you " -"proceed, you will not be able to restore earlier versions of this document." -msgstr "" +msgid "Are you sure you do not want to maintain full history record? If you proceed, you will not be able to restore earlier versions of this document." +msgstr "Er du sikker p, at du ikke nsker at beholde den fulde historik? Hvis du fortstter, vil du ikke vre i stand til at reetablere tidligere versioner af dette dokument." #. DLG_Para_SpacingAtLeast #: po/tmp/ap_String_Id.h.h:518 @@ -1317,26 +1288,25 @@ #. DLG_Lists_Resume #: po/tmp/ap_String_Id.h.h:520 msgid "Attach to Previous List" -msgstr "Fortst forrige liste" +msgstr "Fortst foregende liste" +# Kun forfatter til plugins? Og hvad hedder det s? #. DLG_MetaData_Author_LBL #. DLG_PLUGIN_MANAGER_AUTHOR -#: po/tmp/ap_String_Id.h.h:522 po/tmp/xap_String_Id.h.h:83 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:522 +#: po/tmp/xap_String_Id.h.h:85 msgid "Author:" -msgstr "Forfatter" +msgstr "Forfatter:" #. DLG_Options_Label_AutoSaveUnderline #: po/tmp/ap_String_Id.h.h:524 -#, fuzzy msgid "Auto &Save" -msgstr "Autogem" +msgstr "Gem &automatisk" #. DLG_Options_Label_AutoSaveCurrent #: po/tmp/ap_String_Id.h.h:526 -#, fuzzy msgid "Auto &save current file every" -msgstr "&Gem automatisk dokument hvert" +msgstr "&Gem automatisk dokument hver" #. DLG_Options_Label_AutoSave #: po/tmp/ap_String_Id.h.h:528 @@ -1351,29 +1321,27 @@ #. DLG_InsertTable_AutoFit_Capital #: po/tmp/ap_String_Id.h.h:532 msgid "AutoFit Behavior" -msgstr "" +msgstr "Adfrd for autotilpasning" #. DLG_InsertTable_AutoFit #: po/tmp/ap_String_Id.h.h:534 msgid "AutoFit behavior" -msgstr "" +msgstr "Adfrd for autotilpasning" #. MENU_STATUSLINE_TABLE_AUTOFIT #: po/tmp/ap_String_Id.h.h:536 -#, fuzzy msgid "Autofit Table" -msgstr "Autogem" +msgstr "Autotilpas tabel" #. DLG_Options_Label_Grammar #: po/tmp/ap_String_Id.h.h:538 msgid "Automatic Grammar Checking" -msgstr "" +msgstr "Automatisk grammatikkontrol" #. DLG_InsertTable_AutoColSize #: po/tmp/ap_String_Id.h.h:540 -#, fuzzy msgid "Automatic column size" -msgstr "Maksimal spaltestrrelse " +msgstr "Automatisk kolonnestrrelse" #. DLG_Options_Label_CheckAutoLoadPlugins #: po/tmp/ap_String_Id.h.h:542 @@ -1392,21 +1360,18 @@ #. MSG_AutoMerge #: po/tmp/ap_String_Id.h.h:548 -#, fuzzy msgid "Automerge" -msgstr "Forfatter" +msgstr "Autoflet" #. DLG_MailMerge_AvailableFields #: po/tmp/ap_String_Id.h.h:550 -#, fuzzy msgid "Available Fields" -msgstr "Mulige typografier" +msgstr "Mulige felter" #. DLG_DateTime_AvailableFormats_Capital #: po/tmp/ap_String_Id.h.h:552 -#, fuzzy msgid "Available Formats" -msgstr "&Mulige formater:" +msgstr "Mulige formater" #. DLG_Styles_Available #: po/tmp/ap_String_Id.h.h:554 @@ -1416,21 +1381,19 @@ #. DLG_Para_LabelBy #: po/tmp/ap_String_Id.h.h:556 msgid "B&y:" -msgstr "&Efter:" +msgstr "&Med:" #. DLG_FormatFrame_Background #. DLG_FormatTable_Background #: po/tmp/ap_String_Id.h.h:559 -#, fuzzy msgid "Background" -msgstr "&Baggrund" +msgstr "Baggrund" #. DLG_FormatFrame_Background_Color #. DLG_FormatTable_Background_Color #: po/tmp/ap_String_Id.h.h:562 -#, fuzzy msgid "Background color:" -msgstr "Fjern baggrundsfarve" +msgstr "Baggrundsfarve:" #. DLG_Tab_Radio_Bar #: po/tmp/ap_String_Id.h.h:564 @@ -1440,7 +1403,7 @@ #. TabToggleBarTab #: po/tmp/ap_String_Id.h.h:566 msgid "Bar Tab" -msgstr "Linjetabulator" +msgstr "Linjetabulering" #. DLG_Styles_ModifyBasedOn #: po/tmp/ap_String_Id.h.h:568 @@ -1456,7 +1419,8 @@ #. TOOLBAR_STATUSLINE_FMT_BOLD #. TOOLBAR_TOOLTIP_FMT_BOLD #. DLG_UFS_StyleBold -#: po/tmp/ap_String_Id.h.h:574 po/tmp/xap_String_Id.h.h:111 +#: po/tmp/ap_String_Id.h.h:574 +#: po/tmp/xap_String_Id.h.h:119 msgid "Bold" msgstr "Fed" @@ -1474,20 +1438,19 @@ #: po/tmp/ap_String_Id.h.h:580 #, c-format msgid "Bookmark \"%s\" was not found in this document." -msgstr "Bogmrket \"%s\" fandtes ikke i dette dokument." +msgstr "Bogmrket \"%s\" blev ikke fundet i dette dokument." #. DLG_FormatFrame_Border_Color #. DLG_FormatTable_Border_Color #: po/tmp/ap_String_Id.h.h:583 msgid "Border color:" -msgstr "" +msgstr "Rammefarve:" #. DLG_FormatFrame_Borders #. DLG_FormatTable_Borders #: po/tmp/ap_String_Id.h.h:586 -#, fuzzy msgid "Borders" -msgstr "Ord" +msgstr "Rammer" #. MENU_LABEL_FMT_BORDERS #: po/tmp/ap_String_Id.h.h:588 @@ -1505,15 +1468,17 @@ #. TOOLBAR_STATUSLINE_FMT_BOTTOMLINE #. TOOLBAR_TOOLTIP_FMT_BOTTOMLINE #. DLG_UFS_BottomlineCheck -#: po/tmp/ap_String_Id.h.h:595 po/tmp/xap_String_Id.h.h:115 +#: po/tmp/ap_String_Id.h.h:595 +#: po/tmp/xap_String_Id.h.h:123 msgid "Bottomline" -msgstr "&Bundlinje" +msgstr "Bundlinje" #. DLG_Lists_Box_List #. STYLE_BOXLIST -#: po/tmp/ap_String_Id.h.h:597 po/tmp/xap_String_Id.h.h:117 +#: po/tmp/ap_String_Id.h.h:597 +#: po/tmp/xap_String_Id.h.h:125 msgid "Box List" -msgstr "Boksliste" +msgstr "Liste med boks-tegn" #. FIELD_Application_BuildId #: po/tmp/ap_String_Id.h.h:599 @@ -1533,11 +1498,12 @@ #. DLG_Lists_Type_bullet #: po/tmp/ap_String_Id.h.h:605 msgid "Bullet" -msgstr "Punkter" +msgstr "Bullet" #. DLG_Lists_Bullet_List #. STYLE_BULLETLIST -#: po/tmp/ap_String_Id.h.h:607 po/tmp/xap_String_Id.h.h:125 +#: po/tmp/ap_String_Id.h.h:607 +#: po/tmp/xap_String_Id.h.h:133 msgid "Bullet List" msgstr "Punktliste" @@ -1545,7 +1511,6 @@ #. TOOLBAR_STATUSLINE_LISTS_BULLETS #. TOOLBAR_TOOLTIP_LISTS_BULLETS #: po/tmp/ap_String_Id.h.h:611 -#, fuzzy msgid "Bullets" msgstr "Punkter" @@ -1567,7 +1532,7 @@ #. MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION #: po/tmp/ap_String_Id.h.h:619 msgid "C&opy hyperlink location" -msgstr "" +msgstr "K&opir link" #. MENU_LABEL_HELP_CREDITS #: po/tmp/ap_String_Id.h.h:621 @@ -1577,12 +1542,12 @@ #. MSG_NoBreakInsideTable #: po/tmp/ap_String_Id.h.h:623 msgid "Can not insert a Break inside a table" -msgstr "" +msgstr "Kan ikke indstte et skift indeni en tabel" #. MSG_NoBreakInsideFrame #: po/tmp/ap_String_Id.h.h:625 msgid "Can not insert a Break inside a text box" -msgstr "" +msgstr "Kan ikke indstte et skift indeni en tekstboks" #. DLG_Styles_ErrStyleCantDelete #: po/tmp/ap_String_Id.h.h:627 @@ -1597,12 +1562,12 @@ #. PRINT_CANNOTSTARTPRINTJOB #: po/tmp/ap_String_Id.h.h:631 msgid "Cannot start print job" -msgstr "" +msgstr "Kan ikke starte udskriftsopgave" #. DLG_MetaData_Category_LBL #: po/tmp/ap_String_Id.h.h:633 msgid "Category:" -msgstr "" +msgstr "Kategori:" #. DLG_Tab_Radio_Center #. DLG_PageNumbers_Center @@ -1619,9 +1584,8 @@ #. TOOLBAR_STATUSLINE_ALIGN_CENTER #. TOOLBAR_TOOLTIP_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:642 -#, fuzzy msgid "Center alignment" -msgstr "Justering" +msgstr "Centreret" #. MENU_STATUSLINE_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:644 @@ -1669,9 +1633,8 @@ #. DLG_FormatTOC_ChangeStyle #: po/tmp/ap_String_Id.h.h:660 -#, fuzzy msgid "Change Style" -msgstr "Store/sm bogstaver" +msgstr "Skift typografi" #. DLG_Background_TitleFore #: po/tmp/ap_String_Id.h.h:662 @@ -1681,14 +1644,13 @@ #. MENU_STATUSLINE_FMT_DIRECTION #: po/tmp/ap_String_Id.h.h:664 msgid "Change directional properties of text" -msgstr "" +msgstr "Skift tekstretning" #. TOOLBAR_STATUSLINE_FMT_DOM_DIRECTION #. TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION #: po/tmp/ap_String_Id.h.h:667 -#, fuzzy msgid "Change dominant direction of paragraph" -msgstr "ndr formatet for det markerede afsnit" +msgstr "Skift afsnittets primre retning" #. MENU_STATUSLINE_FMT_TOGGLECASE #: po/tmp/ap_String_Id.h.h:669 @@ -1723,9 +1685,8 @@ #. MENU_STATUSLINE_FMT_FRAME #: po/tmp/ap_String_Id.h.h:682 -#, fuzzy msgid "Change the properties of the Text Box" -msgstr "ndr skrifttype for den markerede tekst" +msgstr "Skift egenskaber for tekstboks" #. MENU_STATUSLINE_SPELL_SUGGEST_1 #. MENU_STATUSLINE_SPELL_SUGGEST_2 @@ -1742,15 +1703,13 @@ #. MENU_STATUSLINE_FMT_BACKGROUND #: po/tmp/ap_String_Id.h.h:694 -#, fuzzy msgid "Change your document's page background" -msgstr "ndr dokumentets baggrundsfarve" +msgstr "Skift dokumentets baggrund" #. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_COLOR #: po/tmp/ap_String_Id.h.h:696 -#, fuzzy msgid "Change your document's page color" -msgstr "ndr dokumentets baggrundsfarve" +msgstr "Skift dokumentets baggrundsfarve" #. DLG_Styles_ModifyCharacter #: po/tmp/ap_String_Id.h.h:698 @@ -1774,15 +1733,13 @@ #. DLG_WordCount_Characters_No #: po/tmp/ap_String_Id.h.h:706 -#, fuzzy msgid "Characters (no spaces):" -msgstr "Tegn (uden mellemrum)" +msgstr "Tegn (uden mellemrum):" #. DLG_WordCount_Characters_Sp #: po/tmp/ap_String_Id.h.h:708 -#, fuzzy msgid "Characters (with spaces):" -msgstr "Tegn (med mellemrum)" +msgstr "Tegn (med mellemrum):" #. MENU_LABEL_TOOLS_SPELL #: po/tmp/ap_String_Id.h.h:710 @@ -1791,20 +1748,18 @@ #. DLG_Options_Label_GrammarCheck #: po/tmp/ap_String_Id.h.h:712 -#, fuzzy msgid "Check &grammar as you type" msgstr "Stave&kontrol mens du skriver" #. MENU_LABEL_HELP_CHECKVER #: po/tmp/ap_String_Id.h.h:714 -#, fuzzy msgid "Check for &Updates" -msgstr " Autoopdatr" +msgstr "Check efter opdatering" #. MENU_STATUSLINE_HELP_CHECKVER #: po/tmp/ap_String_Id.h.h:716 msgid "Check online for newer versions of AbiWord" -msgstr "" +msgstr "Kontrollr online efter nyere versioner af Abiword" #. DLG_Options_Label_SpellCheckAsType #: po/tmp/ap_String_Id.h.h:718 @@ -1834,22 +1789,16 @@ #. MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL #: po/tmp/ap_String_Id.h.h:728 msgid "Choose which revision you wish to view" -msgstr "" +msgstr "Vlg, hvilken revision du nsker at se" #. DLG_Goto_Label_Help #: po/tmp/ap_String_Id.h.h:730 msgid "" "Choose your target in the left side.\n" -"If you want to use the \"Go To\" button, just fill the Number Entry with the " -"desired number. You can use + and - to perform relative movement.\tI.e., if " -"you write \"+2\" and you select \"Line\", the \"Go To\" will go 2 lines " -"below your current position." +"If you want to use the \"Go To\" button, just fill the Number Entry with the desired number. You can use + and - to perform relative movement.\tI.e., if you write \"+2\" and you select \"Line\", the \"Go To\" will go 2 lines below your current position." msgstr "" "Vlg nsket indstilling p venste side.\n" -"Dersom du vil bruge \"G til\" knappen skal du indtaste nsket nummer i " -"\"Nummer\"-feltet. Du kan bruge + og - til at udfre relativ forflytning. " -"Hvis du eksempelvis skriver +2 og vlger \"Linje\", vil \"G til\" flytte " -"markren to linjer nedenfor nuvrende position." +"Dersom du vil bruge \"G til\" knappen skal du indtaste nsket nummer i \"Nummer\"-feltet. Du kan bruge + og - til at udfre relativ forflytning. Hvis du eksempelvis skriver +2 og vlger \"Linje\", vil \"G til\" flytte markren to linjer nedenfor nuvrende position." #. MENU_LABEL_EDIT_CLEAR #: po/tmp/ap_String_Id.h.h:732 @@ -1893,34 +1842,33 @@ #. MENU_LABEL_TABLE_SELECT_COLUMN #: po/tmp/ap_String_Id.h.h:748 -#, fuzzy msgid "Co&lumn" -msgstr "Spalter" +msgstr "Ko&lonne" #. DLG_FormatFrame_Color #. DLG_FormatTable_Color #. DLG_UFS_ColorLabel -#: po/tmp/ap_String_Id.h.h:751 po/tmp/xap_String_Id.h.h:177 +#: po/tmp/ap_String_Id.h.h:751 +#: po/tmp/xap_String_Id.h.h:191 msgid "Color:" msgstr "Farve:" #. DLG_FormatTable_Apply_To_Column #: po/tmp/ap_String_Id.h.h:753 -#, fuzzy msgid "Column" -msgstr "Spalter" +msgstr "Kolonne" #. ColumnGapStatus #: po/tmp/ap_String_Id.h.h:755 #, c-format msgid "Column Gap [%s]" -msgstr "Spalteafstand [%s]" +msgstr "Kolonneafstand [%s]" #. ColumnStatus #: po/tmp/ap_String_Id.h.h:757 -#, fuzzy, c-format +#, c-format msgid "Column [%d]" -msgstr "Spalteafstand [%s]" +msgstr "Kolonne [%d]" #. DLG_Column_ColumnTitle #: po/tmp/ap_String_Id.h.h:759 @@ -1929,32 +1877,29 @@ #. MENU_LABEL_TABLE_INSERT_COLUMNS_BEFORE #: po/tmp/ap_String_Id.h.h:761 -#, fuzzy msgid "Columns &Left" -msgstr "Spalter" +msgstr "Kolonner til &venstre" #. MENU_LABEL_TABLE_INSERT_COLUMNS_AFTER #: po/tmp/ap_String_Id.h.h:763 -#, fuzzy msgid "Columns &Right" -msgstr "Spalter" +msgstr "Kolonner til hjre" +# Kommentr? #. DLG_ListRevisions_Column3Label #: po/tmp/ap_String_Id.h.h:765 -#, fuzzy msgid "Comment" -msgstr "&Dokument" +msgstr "Kommentar" #. DLG_MarkRevisions_Comment2Label #: po/tmp/ap_String_Id.h.h:767 msgid "Comment to be associated with the revision:" -msgstr "" +msgstr "Kommentarer knyttet til denne revision:" #. MENU_STATUSLINE_TOOLS_REVISIONS_COMPARE_DOCUMENTS #: po/tmp/ap_String_Id.h.h:769 -#, fuzzy msgid "Compare active document to another document" -msgstr "Gem dokumentet uden at ndre dets navn" +msgstr "Sammenlign aktive dokument med andet dokument" #. FIELD_Application_CompileDate #: po/tmp/ap_String_Id.h.h:771 @@ -1971,626 +1916,599 @@ msgid "Con&tinuous" msgstr "&Kontinurlig" -#. DLG_MarkRevisions_Check1Label +#. TOC_TocHeading #: po/tmp/ap_String_Id.h.h:777 +msgid "Contents" +msgstr "Indhold" + +#. DLG_MarkRevisions_Check1Label +#: po/tmp/ap_String_Id.h.h:779 #, c-format msgid "Continue previous revision (number %d)" -msgstr "" +msgstr "Fortst tidligere revision (nummer %d)" #. FIELD_Document_Contributor -#: po/tmp/ap_String_Id.h.h:779 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:781 msgid "Contributor" -msgstr "&Kontinurlig" +msgstr "Bidragsyder" #. DLG_MetaData_CoAuthor_LBL -#: po/tmp/ap_String_Id.h.h:781 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:783 msgid "Contributor(s):" -msgstr "&Kontinurlig" +msgstr "Bidragsyder(e):" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:783 +#: po/tmp/ap_String_Id.h.h:785 msgid "Convert Selected Text to a Table" -msgstr "" +msgstr "Konvertr den valgte tekst til en tabel" #. MENU_LABEL_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:785 +#: po/tmp/ap_String_Id.h.h:787 msgid "Convert Table to Text" -msgstr "" +msgstr "Konvertr tabel til tekst" #. MENU_LABEL_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:787 +#: po/tmp/ap_String_Id.h.h:789 msgid "Convert Text to Table" -msgstr "" +msgstr "Konvertr tekst til tabel" #. MENU_STATUSLINE_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:789 +#: po/tmp/ap_String_Id.h.h:791 msgid "Convert from a Table to Text" -msgstr "" +msgstr "Konvertr fra tabel til tekst" #. TOOLBAR_LABEL_EDIT_COPY #. TOOLBAR_STATUSLINE_EDIT_COPY #. TOOLBAR_TOOLTIP_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:793 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:795 msgid "Copy" -msgstr "K&opir" +msgstr "Kopir" #. MENU_STATUSLINE_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:795 +#: po/tmp/ap_String_Id.h.h:797 msgid "Copy Embedded Object" -msgstr "" +msgstr "Kopir indlejret objekt" #. MENU_LABEL_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:797 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:799 msgid "Copy Image" -msgstr "Formatr &billede" +msgstr "Kopir &billede" #. MENU_LABEL_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:799 +#: po/tmp/ap_String_Id.h.h:801 msgid "Copy Object" -msgstr "" +msgstr "Kopir objekt" #. MENU_LABEL_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:801 +#: po/tmp/ap_String_Id.h.h:803 msgid "Copy Text Box" -msgstr "" +msgstr "Kopir tekstboks" #. MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION -#: po/tmp/ap_String_Id.h.h:803 +#: po/tmp/ap_String_Id.h.h:805 msgid "Copy hyperlink location" -msgstr "" +msgstr "Kopir link" #. MENU_STATUSLINE_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:805 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:807 msgid "Copy the Text Box to the clipboard" -msgstr "Kopir det markerede og put det i udklipsholderen" +msgstr "Kopir tekstboksen til udklipsholder" #. MENU_STATUSLINE_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:807 +#: po/tmp/ap_String_Id.h.h:809 msgid "Copy the Text Box to the clipboard then remove it" -msgstr "" +msgstr "Kopir tekstboksen til udklipsholder og fjern den" #. MENU_STATUSLINE_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:809 +#: po/tmp/ap_String_Id.h.h:811 msgid "Copy the selection and put it on the Clipboard" msgstr "Kopir det markerede og put det i udklipsholderen" #. MSG_IE_CouldNotOpen -#: po/tmp/ap_String_Id.h.h:811 +#: po/tmp/ap_String_Id.h.h:813 #, c-format msgid "Could not open file %s for writing" -msgstr "Kunne ikke bne filen %s for skrivning." +msgstr "Kunne ikke bne filen %s for skrivning" #. MSG_OpenFailed -#: po/tmp/ap_String_Id.h.h:813 +#: po/tmp/ap_String_Id.h.h:815 #, c-format msgid "Could not open file %s." msgstr "Kunne ikke bne filen %s." #. MSG_IE_CouldNotWrite -#: po/tmp/ap_String_Id.h.h:815 +#: po/tmp/ap_String_Id.h.h:817 #, c-format msgid "Could not write to file %s" -msgstr "Kunne ikke skrive til filen %s." +msgstr "Kunne ikke skrive til filen %s" #. MSG_SaveFailed -#: po/tmp/ap_String_Id.h.h:817 +#: po/tmp/ap_String_Id.h.h:819 #, c-format msgid "Could not write to the file %s." msgstr "Kunne ikke skrive til filen %s." #. MENU_STATUSLINE_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:819 +#: po/tmp/ap_String_Id.h.h:821 msgid "Count the number of words in the document" msgstr "Optl antallet af ord i dokumentet" #. FIELD_Document_Coverage -#: po/tmp/ap_String_Id.h.h:821 +#: po/tmp/ap_String_Id.h.h:823 msgid "Coverage" -msgstr "" +msgstr "Dkning" #. DLG_MetaData_Coverage_LBL -#: po/tmp/ap_String_Id.h.h:823 +#: po/tmp/ap_String_Id.h.h:825 msgid "Coverage:" -msgstr "" +msgstr "Dkning:" #. DLG_NEW_Tab1_FAX1 -#: po/tmp/ap_String_Id.h.h:825 +#: po/tmp/ap_String_Id.h.h:827 msgid "Create a fax" msgstr "Lav en fax" #. DLG_NEW_Tab1_WP1 -#: po/tmp/ap_String_Id.h.h:827 +#: po/tmp/ap_String_Id.h.h:829 msgid "Create a new blank document" msgstr "Lav et nyt tomt dokument" #. MENU_STATUSLINE_FILE_NEW #. TOOLBAR_STATUSLINE_FILE_NEW #. TOOLBAR_TOOLTIP_FILE_NEW -#: po/tmp/ap_String_Id.h.h:831 +#: po/tmp/ap_String_Id.h.h:833 msgid "Create a new document" msgstr "Nyt dokument" #. DLG_NEW_Create -#: po/tmp/ap_String_Id.h.h:833 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:835 msgid "Create a new document from a template" -msgstr "Lav et nyt dokument fra en skabelon" +msgstr "Opret et nyt dokument fra en skabelon" #. MENU_STATUSLINE_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:835 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:837 msgid "Create a new document using a template" -msgstr "Lav et nyt dokument fra en skabelon" +msgstr "Opret et nyt dokument baseret p en skabelon" #. DLG_NEW_StartEmpty -#: po/tmp/ap_String_Id.h.h:837 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:839 msgid "Create an empty document" -msgstr "Nyt dokument" +msgstr "Opret et tomt dokument" #. FIELD_Document_Creator -#: po/tmp/ap_String_Id.h.h:839 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:841 msgid "Creator" -msgstr "Ryd" +msgstr "Dokumentforfatter" #. MENU_LABEL_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:841 +#: po/tmp/ap_String_Id.h.h:843 msgid "Cu&t" msgstr "&Klip" #. FIELD_Datetime_CurrentDate -#: po/tmp/ap_String_Id.h.h:843 +#: po/tmp/ap_String_Id.h.h:845 msgid "Current Date" msgstr "Nuvrende dato" #. DLG_Lists_Current_Font -#: po/tmp/ap_String_Id.h.h:845 +#: po/tmp/ap_String_Id.h.h:847 msgid "Current Font" msgstr "Nuvrende skrifttype" #. DLG_Lists_Current_List_Label -#: po/tmp/ap_String_Id.h.h:847 +#: po/tmp/ap_String_Id.h.h:849 msgid "Current List Label" msgstr "Nuvrende listenavn" #. DLG_Lists_Current_List_Type -#: po/tmp/ap_String_Id.h.h:849 +#: po/tmp/ap_String_Id.h.h:851 msgid "Current List Type" msgstr "Nuvrende listetype" #. MSG_EmptySelection -#: po/tmp/ap_String_Id.h.h:851 +#: po/tmp/ap_String_Id.h.h:853 msgid "Current Selection is Empty" msgstr "Denne markering er tom" #. DLG_Styles_DefCurrent -#: po/tmp/ap_String_Id.h.h:853 +#: po/tmp/ap_String_Id.h.h:855 msgid "Current Settings" msgstr "Nuvrende indstillinger" #. FIELD_Datetime_CurrentTime -#: po/tmp/ap_String_Id.h.h:855 +#: po/tmp/ap_String_Id.h.h:857 msgid "Current Time" msgstr "Nuvrende tidspunkt" #. DLG_Options_Label_ViewCursorBlink -#: po/tmp/ap_String_Id.h.h:857 +#: po/tmp/ap_String_Id.h.h:859 msgid "Cursor &blink" msgstr "Markrblink" #. DLG_Options_Label_SpellCustomDict -#: po/tmp/ap_String_Id.h.h:859 +#: po/tmp/ap_String_Id.h.h:861 msgid "Custom Dictionary:" msgstr "Egen ordliste:" #. FIELD_DateTime_Custom -#: po/tmp/ap_String_Id.h.h:861 +#: po/tmp/ap_String_Id.h.h:863 msgid "Customizable date/time" -msgstr "" +msgstr "Redigrbar dato/tid" #. DLG_Lists_Customize -#: po/tmp/ap_String_Id.h.h:863 +#: po/tmp/ap_String_Id.h.h:865 msgid "Customized List" msgstr "Personlig liste" #. TOOLBAR_LABEL_EDIT_CUT #. TOOLBAR_STATUSLINE_EDIT_CUT #. TOOLBAR_TOOLTIP_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:867 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:869 msgid "Cut" -msgstr "&Klip" +msgstr "Klip" #. MENU_STATUSLINE_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:869 +#: po/tmp/ap_String_Id.h.h:871 msgid "Cut Embedded Object" -msgstr "" +msgstr "Klip indlejret objekt" #. MENU_LABEL_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:871 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:873 msgid "Cut Image" -msgstr "Formatr &billede" +msgstr "Klip billede" #. MENU_LABEL_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:873 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:875 msgid "Cut Object" -msgstr "Emne" +msgstr "Klip" #. MENU_LABEL_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:875 +#: po/tmp/ap_String_Id.h.h:877 msgid "Cut Text Box" -msgstr "" +msgstr "Klip tekstboks" #. MENU_STATUSLINE_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:877 +#: po/tmp/ap_String_Id.h.h:879 msgid "Cut the selection and put it on the Clipboard" msgstr "Udklip det markerede og put det i udklipsholderen" #. MENU_LABEL_FMT_DIRECTION -#: po/tmp/ap_String_Id.h.h:879 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:881 msgid "D&irectional" msgstr "Bi-direktionale indstillinger" #. DLG_Lists_Dashed_List #. STYLE_DASHEDLIST -#: po/tmp/ap_String_Id.h.h:881 po/tmp/xap_String_Id.h.h:225 +#: po/tmp/ap_String_Id.h.h:883 +#: po/tmp/xap_String_Id.h.h:241 msgid "Dashed List" msgstr "Stregliste" #. FIELD_Document_Date #. DLG_ListRevisions_Column2Label -#: po/tmp/ap_String_Id.h.h:884 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:886 msgid "Date" -msgstr "Opdatr" +msgstr "Dato" #. MENU_LABEL_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:886 +#: po/tmp/ap_String_Id.h.h:888 msgid "Date and &Time" msgstr "&Dato og tid" #. FIELD_Type_Datetime -#: po/tmp/ap_String_Id.h.h:888 +#: po/tmp/ap_String_Id.h.h:890 msgid "Date and Time" msgstr "Dato og tid" #. FIELD_DateTime_DOY -#: po/tmp/ap_String_Id.h.h:890 +#: po/tmp/ap_String_Id.h.h:892 msgid "Day # in the year" msgstr "Nummer dag i ret" #. DLG_Options_Btn_Default -#: po/tmp/ap_String_Id.h.h:892 +#: po/tmp/ap_String_Id.h.h:894 msgid "De&faults" msgstr "&Standard" #. DLG_Tab_Radio_Decimal -#: po/tmp/ap_String_Id.h.h:894 +#: po/tmp/ap_String_Id.h.h:896 msgid "Decimal" msgstr "Decimal" #. TabToggleDecimalTab -#: po/tmp/ap_String_Id.h.h:896 +#: po/tmp/ap_String_Id.h.h:898 msgid "Decimal Tab" msgstr "Decimaltabulator" #. TOOLBAR_LABEL_UNINDENT #. TOOLBAR_STATUSLINE_UNINDENT #. TOOLBAR_TOOLTIP_UNINDENT -#: po/tmp/ap_String_Id.h.h:900 +#: po/tmp/ap_String_Id.h.h:902 msgid "Decrease indent" -msgstr "" +msgstr "Reducr indrykning" #. FIELD_DateTime_DefaultDateNoTime -#: po/tmp/ap_String_Id.h.h:902 +#: po/tmp/ap_String_Id.h.h:904 msgid "Default date (w/o time)" msgstr "Standard dato (uden tid)" #. FIELD_DateTime_DefaultDate -#: po/tmp/ap_String_Id.h.h:904 +#: po/tmp/ap_String_Id.h.h:906 msgid "Default date representation" msgstr "Standard datovisning" #. DLG_Options_Label_DefaultPageSize -#: po/tmp/ap_String_Id.h.h:906 +#: po/tmp/ap_String_Id.h.h:908 msgid "Default page size" msgstr "Standard sidestrrelse" #. DLG_Tab_Label_DefaultTS -#: po/tmp/ap_String_Id.h.h:908 +#: po/tmp/ap_String_Id.h.h:910 msgid "Default tab stops:" msgstr "Standard tabulatorstop:" #. DLG_Options_Label_DirectionRtl -#: po/tmp/ap_String_Id.h.h:910 +#: po/tmp/ap_String_Id.h.h:912 msgid "Default to right-to-left direction of text" msgstr "Standardtekstretning skal vre hjre mod venstre" #. DLG_FormatTOC_LevelDefs -#: po/tmp/ap_String_Id.h.h:912 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:914 msgid "Define Main Properties" -msgstr "Sidehovedegenskaber" +msgstr "Definr hovedopstning" #. MENU_STATUSLINE_FMT_STYLE #. MENU_STATUSLINE_FMT_STYLE_DEFINE -#: po/tmp/ap_String_Id.h.h:915 +#: po/tmp/ap_String_Id.h.h:917 msgid "Define or apply style for the selection" msgstr "Angiv eller tilfj typografi for den markerede tekst" #. DLG_Styles_Delete #. MENU_STATUSLINE_TABLE_DELETE #. DLG_Delete -#: po/tmp/ap_String_Id.h.h:918 po/tmp/xap_String_Id.h.h:239 +#: po/tmp/ap_String_Id.h.h:920 +#: po/tmp/xap_String_Id.h.h:255 msgid "Delete" msgstr "Slet" #. MENU_STATUSLINE_TABLE_DELETE_CELLS -#: po/tmp/ap_String_Id.h.h:920 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:922 msgid "Delete Cells" -msgstr "Slet" +msgstr "Slet celler" #. MENU_LABEL_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:922 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:924 msgid "Delete Co&lumn" -msgstr "Mellemrum efter spalte " +msgstr "Slet ko&lonne" #. MENU_STATUSLINE_TABLE_DELETE_COLUMNS #. MENU_STATUSLINE_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:925 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:927 msgid "Delete Column" -msgstr "Mellemrum efter spalte " +msgstr "Slet kolonne" #. MENU_STATUSLINE_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:927 +#: po/tmp/ap_String_Id.h.h:929 msgid "Delete Embedded Object" -msgstr "" +msgstr "Slet indlejret objekt" #. MENU_LABEL_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:929 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:931 msgid "Delete Image" -msgstr "Slet" +msgstr "Slet billede" #. MENU_LABEL_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:931 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:933 msgid "Delete Object" -msgstr "Slet" +msgstr "Slet objekt" #. MENU_LABEL_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:933 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:935 msgid "Delete Ro&w" -msgstr "Slet" +msgstr "Slet &rkke" #. MENU_STATUSLINE_TABLE_DELETE_ROWS #. MENU_STATUSLINE_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:936 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:938 msgid "Delete Row" -msgstr "Slet" +msgstr "Slet rkke" #. MENU_LABEL_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:938 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:940 msgid "Delete Tabl&e" -msgstr "Styktabel" +msgstr "Slet tabe&l" #. MENU_STATUSLINE_TABLE_DELETE_TABLE #. MENU_STATUSLINE_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:941 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:943 msgid "Delete Table" -msgstr "Styktabel" +msgstr "Slet tabel" #. MENU_LABEL_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:943 +#: po/tmp/ap_String_Id.h.h:945 msgid "Delete Text Box" -msgstr "" +msgstr "Slet tekstboks" #. TOOLBAR_LABEL_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:945 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:947 msgid "Delete column" -msgstr "Slet" +msgstr "Slet kolonne" #. MENU_STATUSLINE_INSERT_DELETE_HYPERLINK -#: po/tmp/ap_String_Id.h.h:947 +#: po/tmp/ap_String_Id.h.h:949 msgid "Delete hyperlink" -msgstr "Slet bogmrkelnke" +msgstr "Slet link" #. TOOLBAR_LABEL_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:949 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:951 msgid "Delete row" -msgstr "Slet" +msgstr "Slet rkke" #. MENU_STATUSLINE_EDIT_CLEAR -#: po/tmp/ap_String_Id.h.h:951 +#: po/tmp/ap_String_Id.h.h:953 msgid "Delete the selection" msgstr "Fjern det markerede" #. TOOLBAR_STATUSLINE_DELETE_COLUMN #. TOOLBAR_TOOLTIP_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:954 +#: po/tmp/ap_String_Id.h.h:956 msgid "Delete this column from its table" -msgstr "" +msgstr "Slet denne kolonne fra dens tabel" #. TOOLBAR_STATUSLINE_DELETE_ROW #. TOOLBAR_TOOLTIP_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:957 +#: po/tmp/ap_String_Id.h.h:959 msgid "Delete this row from its table" -msgstr "" +msgstr "Slet denne rkke fra dens tabel" #. DLG_Styles_Description #. DLG_Styles_ModifyDescription #. FIELD_Document_Description -#: po/tmp/ap_String_Id.h.h:961 +#: po/tmp/ap_String_Id.h.h:963 msgid "Description" msgstr "Beskrivelse" #. DLG_MetaData_Description_LBL #. DLG_PLUGIN_MANAGER_DESC #. DLG_Image_LblDescription -#: po/tmp/ap_String_Id.h.h:963 po/tmp/xap_String_Id.h.h:242 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:965 +#: po/tmp/xap_String_Id.h.h:258 msgid "Description:" -msgstr "Beskrivelse" +msgstr "Beskrivelse:" #. DLG_Lists_Diamond_List #. STYLE_DIAMONLIST -#: po/tmp/ap_String_Id.h.h:965 po/tmp/xap_String_Id.h.h:244 +#: po/tmp/ap_String_Id.h.h:967 +#: po/tmp/xap_String_Id.h.h:260 msgid "Diamond List" msgstr "Diamantliste" #. DLG_Options_Label_SpellDictionaries -#: po/tmp/ap_String_Id.h.h:967 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:969 msgid "Dictionaries" -msgstr "&Ordliste..." +msgstr "Ordbger" #. DLG_HdrFtr_FooterEven -#: po/tmp/ap_String_Id.h.h:969 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:971 msgid "Different footer on facing pages" -msgstr "Forskellig sidefod p modsatte sider" +msgstr "Different footer on facing pages" #. DLG_HdrFtr_FooterFirst -#: po/tmp/ap_String_Id.h.h:971 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:973 msgid "Different footer on first page" -msgstr "Forskellig sidefod p 1. side" +msgstr "Anderledes sidefod p 1. side" #. DLG_HdrFtr_FooterLast -#: po/tmp/ap_String_Id.h.h:973 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:975 msgid "Different footer on last page" -msgstr "Forskellig sidefod p sidste side" +msgstr "Anderledes sidefod p sidste side" #. DLG_HdrFtr_HeaderEven -#: po/tmp/ap_String_Id.h.h:975 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:977 msgid "Different header on facing pages" -msgstr "Forskellig sidehoved p modsatte sider" +msgstr "Forskellige sidehoveder p modsatte sider" #. DLG_HdrFtr_HeaderFirst -#: po/tmp/ap_String_Id.h.h:977 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:979 msgid "Different header on first page" -msgstr "Forskellig sidehoved p 1. side" +msgstr "Anderledes sidehoved p frste side" #. DLG_HdrFtr_HeaderLast -#: po/tmp/ap_String_Id.h.h:979 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:981 msgid "Different header on last page" -msgstr "Forskellig sidehoved p sidste side" +msgstr "Anderledes sidehoved p sidste side" #. DLG_Styles_StylesLocked -#: po/tmp/ap_String_Id.h.h:981 +#: po/tmp/ap_String_Id.h.h:983 msgid "Disable all formatting commands, except styles" -msgstr "" +msgstr "Deaktivr alle formatteringskommandoer pnr tyopgrafier" #. MENU_STATUSLINE_HELP_CREDITS -#: po/tmp/ap_String_Id.h.h:983 +#: po/tmp/ap_String_Id.h.h:985 msgid "Display Credits" msgstr "Vis takkeliste" #. MENU_STATUSLINE_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:985 +#: po/tmp/ap_String_Id.h.h:987 msgid "Display Help Contents" msgstr "Vis indhold af hjlp" #. MENU_STATUSLINE_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:987 +#: po/tmp/ap_String_Id.h.h:989 msgid "Display Help Index" msgstr "Vis hjlpeindeks" #. MENU_STATUSLINE_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:989 +#: po/tmp/ap_String_Id.h.h:991 msgid "Display non-printing characters" msgstr "Vis tegn der ikke skal udskrives" #. MENU_STATUSLINE_HELP_ABOUT -#: po/tmp/ap_String_Id.h.h:991 +#: po/tmp/ap_String_Id.h.h:993 msgid "Display program information, version number, and copyright" msgstr "Vis programinformation, versionsnummer og ophavsret" #. DLG_FormatTOC_DispStyle -#: po/tmp/ap_String_Id.h.h:993 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:995 msgid "Display style:" -msgstr "Vis hjlpeindeks" +msgstr "Vis typografi:" #. DLG_Options_Prompt_IgnoreResetAll -#: po/tmp/ap_String_Id.h.h:995 +#: po/tmp/ap_String_Id.h.h:997 msgid "Do you want to reset ignored words in all the documents?" msgstr "Vil du gendanne ignorerede ord i alle dokumenterne?" #. DLG_Options_Prompt_IgnoreResetCurrent -#: po/tmp/ap_String_Id.h.h:997 +#: po/tmp/ap_String_Id.h.h:999 msgid "Do you want to reset ignored words in the current document?" msgstr "Vil du gendanne ignorerede ord i dette dokument?" #. FIELD_Type_Document -#: po/tmp/ap_String_Id.h.h:999 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1001 msgid "Document" -msgstr "&Dokument" +msgstr "Dokument" #. DLG_MetaData_Title -#: po/tmp/ap_String_Id.h.h:1001 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1003 msgid "Document Properties" -msgstr "Billedegenskaber" +msgstr "Dokumentegenskaber" #. DLG_Options_Label_Documents -#: po/tmp/ap_String_Id.h.h:1003 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1005 msgid "Documents" -msgstr "&Dokument" +msgstr "Dokumenter" #. DLG_FormatFootnotes_FootRestartNone -#: po/tmp/ap_String_Id.h.h:1005 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1007 msgid "Don't restart" -msgstr "&Ingen bindestreg" +msgstr "Genstart ikke" #. DLG_Para_SpacingDouble -#: po/tmp/ap_String_Id.h.h:1007 +#: po/tmp/ap_String_Id.h.h:1009 msgid "Double" msgstr "Dobbelt" #. TOOLBAR_LABEL_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1009 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1011 msgid "Double Spacing" -msgstr "Mellemrum" +msgstr "Dobbel linjeafstand" #. TOOLBAR_STATUSLINE_DOUBLE_SPACE #. TOOLBAR_TOOLTIP_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1012 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1014 msgid "Double spacing" -msgstr "&Linjeafstand:" +msgstr "Dobbel linjeafstand" + +#. MENU_LABEL_EDIT_LATEXEQUATION +#: po/tmp/ap_String_Id.h.h:1016 +msgid "Edit Equation" +msgstr "Redigr formel" #. MENU_LABEL_EDIT_EDITFOOTER #. TOOLBAR_LABEL_EDIT_FOOTER #. TOOLBAR_STATUSLINE_EDIT_FOOTER #. TOOLBAR_TOOLTIP_EDIT_FOOTER -#: po/tmp/ap_String_Id.h.h:1017 +#: po/tmp/ap_String_Id.h.h:1021 msgid "Edit Footer" msgstr "ndr sidefod" @@ -2598,293 +2516,285 @@ #. TOOLBAR_LABEL_EDIT_HEADER #. TOOLBAR_STATUSLINE_EDIT_HEADER #. TOOLBAR_TOOLTIP_EDIT_HEADER -#: po/tmp/ap_String_Id.h.h:1022 +#: po/tmp/ap_String_Id.h.h:1026 msgid "Edit Header" msgstr "ndr sidehoved" +#. MENU_STATUSLINE_EDIT_LATEXEQUATION +#: po/tmp/ap_String_Id.h.h:1028 +msgid "Edit Latex Equation" +msgstr "Redigr Latex-formel" + #. MENU_STATUSLINE_INSERT_EDIT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1024 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1030 msgid "Edit hyperlink" -msgstr "Indst bogmrkelnke" +msgstr "Redigr link" #. MENU_STATUSLINE_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:1026 +#: po/tmp/ap_String_Id.h.h:1032 msgid "Edit text at the top or bottom of every page" msgstr "Redigr tekst i toppen eller i bunden af hver side" #. MENU_STATUSLINE_EDIT_EDITFOOTER -#: po/tmp/ap_String_Id.h.h:1028 +#: po/tmp/ap_String_Id.h.h:1034 msgid "Edit the Footer on the current page" msgstr "Redigr sidefod p denne side" #. MENU_STATUSLINE_EDIT_EDITHEADER -#: po/tmp/ap_String_Id.h.h:1030 +#: po/tmp/ap_String_Id.h.h:1036 msgid "Edit the Header on the current page" msgstr "Redigr sidehoved p denne side" +#. TB_Embedded +#: po/tmp/ap_String_Id.h.h:1038 +msgid "Embedded" +msgstr "Indlejret" + #. MENU_LABEL_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:1032 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1040 msgid "Enable F&ormatting Tools" -msgstr "T&ekstformat" +msgstr "Tillad F&ormatteringsvrktjer" #. DLG_Options_Label_CheckEnableSmoothScrolling -#: po/tmp/ap_String_Id.h.h:1034 +#: po/tmp/ap_String_Id.h.h:1042 msgid "Enable Smooth Scrolling" -msgstr "" +msgstr "Aktivr bld rulning" #. FIELD_Numbers_EndnoteAnchor -#: po/tmp/ap_String_Id.h.h:1036 +#: po/tmp/ap_String_Id.h.h:1044 msgid "Endnote anchor" msgstr "Slutnoteanker" #. FIELD_Numbers_EndnoteReference -#: po/tmp/ap_String_Id.h.h:1038 +#: po/tmp/ap_String_Id.h.h:1046 msgid "Endnote reference" msgstr "Slutnotereference" #. DLG_FormatFootnotes_EndStyle -#: po/tmp/ap_String_Id.h.h:1040 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1048 msgid "Endnote style" -msgstr "&Slutnote" +msgstr "Slutnotetypografi" #. MENU_LABEL_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1042 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1050 msgid "Equation" -msgstr "Hilsen:" +msgstr "Ligning" #. FIELD_Error -#: po/tmp/ap_String_Id.h.h:1044 +#: po/tmp/ap_String_Id.h.h:1052 msgid "Error calculating value!" msgstr "Fejl ved udregning af vrdi!" #. SCRIPT_CANTRUN -#: po/tmp/ap_String_Id.h.h:1046 +#: po/tmp/ap_String_Id.h.h:1054 #, c-format msgid "Error executing script %s" msgstr "Fejl ved kring af skript %s." #. MSG_ImportError -#: po/tmp/ap_String_Id.h.h:1048 +#: po/tmp/ap_String_Id.h.h:1056 #, c-format msgid "Error importing file %s." msgstr "Fejl ved importering af filen %s." #. MSG_SaveFailedExport -#: po/tmp/ap_String_Id.h.h:1050 +#: po/tmp/ap_String_Id.h.h:1058 #, c-format msgid "Error while attempting to save %s: could not construct exporter" msgstr "Kunne ikke skrive til filen %s: kunne ikke konstruere eksporter" #. MSG_SaveFailedName -#: po/tmp/ap_String_Id.h.h:1052 +#: po/tmp/ap_String_Id.h.h:1060 #, c-format msgid "Error while attempting to save %s: invalid name" msgstr "Kunne ikke skrive til filen %s: ulovligt filnavn" #. TOOLBAR_LABEL_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1054 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1062 msgid "Ex. script" -msgstr "&Snket" +msgstr "Kr script" #. DLG_Para_SpacingExactly -#: po/tmp/ap_String_Id.h.h:1056 +#: po/tmp/ap_String_Id.h.h:1064 msgid "Exactly" msgstr "Prcis" #. DLG_Latex_Example -#: po/tmp/ap_String_Id.h.h:1058 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1066 msgid "Example:" -msgstr "Eksempel" +msgstr "Eksempel:" #. MENU_STATUSLINE_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1060 +#: po/tmp/ap_String_Id.h.h:1068 msgid "Execute helper scripts" msgstr "Udfr hjlpeskripter" #. TOOLBAR_STATUSLINE_SCRIPT_PLAY #. TOOLBAR_TOOLTIP_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1063 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1071 msgid "Execute script" -msgstr "Udfr hjlpeskripter" +msgstr "Kr script" #. DLG_ListRevisions_Label1 -#: po/tmp/ap_String_Id.h.h:1065 +#: po/tmp/ap_String_Id.h.h:1073 msgid "Existing revisions:" -msgstr "" +msgstr "Eksisterende revisioner:" #. TB_Extra -#: po/tmp/ap_String_Id.h.h:1067 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1075 msgid "Extra" -msgstr "&Ekstra" +msgstr "Ekstra" #. DLG_Field_Parameters_Capital -#: po/tmp/ap_String_Id.h.h:1069 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1077 msgid "Extra Parameters" -msgstr "Ekstra parametre:" +msgstr "Ekstra parametre" #. DLG_Options_Label_ViewExtraTB -#: po/tmp/ap_String_Id.h.h:1071 +#: po/tmp/ap_String_Id.h.h:1079 msgid "Extra Toolbar" msgstr "Ekstra vrktjslinje" #. DLG_Field_Parameters -#: po/tmp/ap_String_Id.h.h:1073 +#: po/tmp/ap_String_Id.h.h:1081 msgid "Extra parameters:" msgstr "Ekstra parametre:" #. MENU_LABEL_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1075 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1083 msgid "F&ile" -msgstr "Fil" +msgstr "F&il" #. MENU_LABEL_FORMAT -#: po/tmp/ap_String_Id.h.h:1077 +#: po/tmp/ap_String_Id.h.h:1085 msgid "F&ormat" msgstr "F&ormatr" #. MENU_LABEL_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:1079 +#: po/tmp/ap_String_Id.h.h:1087 msgid "F&ull Screen" msgstr "&Fuldskrm" #. DLG_FR_FindLabel -#: po/tmp/ap_String_Id.h.h:1081 +#: po/tmp/ap_String_Id.h.h:1089 msgid "Fi&nd what:" msgstr "&Find hvad: " #. DLG_MailMerge_Insert_No_Colon -#: po/tmp/ap_String_Id.h.h:1083 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1091 msgid "Field Name" -msgstr "Filnavn" +msgstr "Feltnavn" #. DLG_MailMerge_Insert -#: po/tmp/ap_String_Id.h.h:1085 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1093 msgid "Field Name:" -msgstr "Filnavn" +msgstr "Feltnavn:" #. MSG_IE_UnsupportedType -#: po/tmp/ap_String_Id.h.h:1087 +#: po/tmp/ap_String_Id.h.h:1095 #, c-format msgid "File %s is not of a currently supported file type" msgstr "Filen %s er ikke en understttet filtype i jeblikket" #. MSG_IE_FakeType -#: po/tmp/ap_String_Id.h.h:1089 +#: po/tmp/ap_String_Id.h.h:1097 #, c-format msgid "File %s is not of the type it claims to be" msgstr "Filen %s er en anden type end den siger" #. MSG_IE_UnknownType -#: po/tmp/ap_String_Id.h.h:1091 +#: po/tmp/ap_String_Id.h.h:1099 #, c-format msgid "File %s is of unknown type" msgstr "Filen %s er en ukendt type" #. MSG_IE_FileNotFound -#: po/tmp/ap_String_Id.h.h:1093 +#: po/tmp/ap_String_Id.h.h:1101 #, c-format msgid "File %s not found" msgstr "Kunne desvrre ikke finde filen %s" #. FIELD_Application_Filename -#: po/tmp/ap_String_Id.h.h:1095 +#: po/tmp/ap_String_Id.h.h:1103 msgid "File Name" msgstr "Filnavn" +# Kontekst? #. DLG_FormatTOC_FillStyle -#: po/tmp/ap_String_Id.h.h:1097 +#: po/tmp/ap_String_Id.h.h:1105 msgid "Fill style:" -msgstr "" +msgstr "Fyldtyopgrafi" #. DLG_FR_FindTitle -#: po/tmp/ap_String_Id.h.h:1099 +#: po/tmp/ap_String_Id.h.h:1107 msgid "Find" msgstr "Find" #. MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1101 +#: po/tmp/ap_String_Id.h.h:1109 msgid "Find &next revision" -msgstr "" +msgstr "Find &nste revision" #. MENU_LABEL_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1103 +#: po/tmp/ap_String_Id.h.h:1111 msgid "Find &previous revision" -msgstr "" +msgstr "Find &tidligere revision" #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1105 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1113 msgid "Find next visible revision in the document" -msgstr "&Vis ikke stavefejl i dokumentet" +msgstr "Find dokumentets nste synlige revision" #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1107 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1115 msgid "Find previous visible revision in the document" -msgstr "&Vis ikke stavefejl i dokumentet" +msgstr "Find dokumentets foregende synlige revision" #. MENU_STATUSLINE_EDIT_FIND -#: po/tmp/ap_String_Id.h.h:1109 +#: po/tmp/ap_String_Id.h.h:1117 msgid "Find the specified text" msgstr "Sg efter en angivet tekst" #. FirstLineIndentStatus -#: po/tmp/ap_String_Id.h.h:1111 +#: po/tmp/ap_String_Id.h.h:1119 #, c-format msgid "First Line Indent [%s]" msgstr "Frste linjeindryk [%s]" #. DLG_Para_SpecialFirstLine -#: po/tmp/ap_String_Id.h.h:1113 +#: po/tmp/ap_String_Id.h.h:1121 msgid "First line" msgstr "Frste linje" #. DLG_InsertTable_FixedColSize -#: po/tmp/ap_String_Id.h.h:1115 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1123 msgid "Fixed column size:" -msgstr "Maksimal spaltestrrelse " +msgstr "Fast spaltestrrelse " #. DLG_Lists_FoldingLevel1 -#: po/tmp/ap_String_Id.h.h:1117 +#: po/tmp/ap_String_Id.h.h:1125 msgid "Fold below level 1" -msgstr "" +msgstr "Fold under niveau 1" #. DLG_Lists_FoldingLevel2 -#: po/tmp/ap_String_Id.h.h:1119 +#: po/tmp/ap_String_Id.h.h:1127 msgid "Fold below level 2" -msgstr "" +msgstr "Fold under niveau 2" #. DLG_Lists_FoldingLevel3 -#: po/tmp/ap_String_Id.h.h:1121 +#: po/tmp/ap_String_Id.h.h:1129 msgid "Fold below level 3" -msgstr "" +msgstr "Fold under niveau 3" #. DLG_Lists_FoldingLevel4 -#: po/tmp/ap_String_Id.h.h:1123 +#: po/tmp/ap_String_Id.h.h:1131 msgid "Fold below level 4" -msgstr "" +msgstr "Fold under niveau 4" #. DLG_Para_PreviewFollowParagraph -#: po/tmp/ap_String_Id.h.h:1125 -msgid "" -"Following Paragraph Following Paragraph Following Paragraph Following " -"Paragraph Following Paragraph Following Paragraph Following Paragraph" -msgstr "" -"Nste afsnit nste afsnit nste afsnit nste afsnit nste afsnit nste " -"afsnit nste afsnit nste afsnit nste afsnit nste afsnit" +#: po/tmp/ap_String_Id.h.h:1133 +msgid "Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph" +msgstr "Nste afsnit nste afsnit nste afsnit nste afsnit nste afsnit nste afsnit nste afsnit nste afsnit nste afsnit nste afsnit" #. DLG_Styles_ModifyFont #. TOOLBAR_LABEL_FMT_FONT @@ -2892,778 +2802,737 @@ #. TOOLBAR_TOOLTIP_FMT_FONT #. DLG_UFS_FontTitle #. DLG_UFS_FontTab -#: po/tmp/ap_String_Id.h.h:1130 po/tmp/xap_String_Id.h.h:315 +#: po/tmp/ap_String_Id.h.h:1138 +#: po/tmp/xap_String_Id.h.h:335 msgid "Font" msgstr "Skrifttype" +#. TOOLBAR_STATUSLINE_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:1140 +msgid "Font Choose" +msgstr "Vlg skrifttype" + #. TOOLBAR_LABEL_FMT_SIZE #. TOOLBAR_STATUSLINE_FMT_SIZE #. TOOLBAR_TOOLTIP_FMT_SIZE -#: po/tmp/ap_String_Id.h.h:1134 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1144 msgid "Font Size" -msgstr "Skrifttype" +msgstr "Skriftstrrelse" + +#. TOOLBAR_LABEL_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:1146 +msgid "Font choose" +msgstr "Valg af skrifttype" #. TOOLBAR_LABEL_COLOR_FORE #. TOOLBAR_STATUSLINE_COLOR_FORE #. TOOLBAR_TOOLTIP_COLOR_FORE -#: po/tmp/ap_String_Id.h.h:1138 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1150 msgid "Font color" -msgstr " Tekstfarve " +msgstr "Skriftfarve" #. DLG_Lists_ButtonFont -#: po/tmp/ap_String_Id.h.h:1140 +#: po/tmp/ap_String_Id.h.h:1152 msgid "Font..." msgstr "Skrifttype..." #. DLG_Lists_Font #. DLG_UFS_FontLabel -#: po/tmp/ap_String_Id.h.h:1142 po/tmp/xap_String_Id.h.h:317 +#: po/tmp/ap_String_Id.h.h:1154 +#: po/tmp/xap_String_Id.h.h:337 msgid "Font:" msgstr "Skrifttype:" #. MENU_LABEL_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1144 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1156 msgid "Foot¬e" -msgstr "Sidefod" +msgstr "Fod¬e" #. DLG_PageNumbers_Footer #. MENU_LABEL_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1147 +#: po/tmp/ap_String_Id.h.h:1159 msgid "Footer" msgstr "Sidefod" #. DLG_HdrFtr_FooterFrame -#: po/tmp/ap_String_Id.h.h:1149 +#: po/tmp/ap_String_Id.h.h:1161 msgid "Footer Properties" msgstr "Sidefodsegenskaber" #. FooterStatus -#: po/tmp/ap_String_Id.h.h:1151 +#: po/tmp/ap_String_Id.h.h:1163 #, c-format msgid "Footer [%s]" msgstr "Sidefod [%s]" #. FIELD_Numbers_FootnoteAnchor -#: po/tmp/ap_String_Id.h.h:1153 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1165 msgid "Footnote anchor" -msgstr "Slutnoteanker" +msgstr "Fodnoteanker" #. FIELD_Numbers_FootnoteReference -#: po/tmp/ap_String_Id.h.h:1155 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1167 msgid "Footnote reference" -msgstr "Slutnotereference" +msgstr "Fodnotereference" #. DLG_FormatFootnotes_FootStyle -#: po/tmp/ap_String_Id.h.h:1157 +#: po/tmp/ap_String_Id.h.h:1169 msgid "Footnote style" -msgstr "" +msgstr "Fodnotetypografi" #. MENU_LABEL_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:1159 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1171 msgid "Footnotes and Endnotes" -msgstr "Indst slutnote" +msgstr "Fodnoter og slutnoter" #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1162 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1174 msgid "Force LTR direction of text" -msgstr "Standardtekstretning skal vre hjre mod venstre" +msgstr "Gennemtving venstre-mod-hjre-retning af tekst" #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_RTL #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1165 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1177 msgid "Force RTL direction of text" -msgstr "Standardtekstretning skal vre hjre mod venstre" +msgstr "Gennemtving hre-mod-venstre-retning af tekst" #. MENU_STATUSLINE_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:1167 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1179 msgid "Force left-to-right direction of text" -msgstr "Standardtekstretning skal vre hjre mod venstre" +msgstr "Gennemtving retningen venstre mod hjre" #. MENU_STATUSLINE_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:1169 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1181 msgid "Force right-to-left direction of text" -msgstr "Standardtekstretning skal vre hjre mod venstre" +msgstr "Gennemtving hre-mod-venstre-retning af tekst" #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1171 +#: po/tmp/ap_String_Id.h.h:1183 msgid "Force text LTR" -msgstr "" +msgstr "Tving tekst venstre-mod-hjre" #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1173 +#: po/tmp/ap_String_Id.h.h:1185 msgid "Force text RTL" -msgstr "" +msgstr "Tving tekst hjre-mod-venstre" #. DLG_Styles_ModifyFormat #. TB_Format -#: po/tmp/ap_String_Id.h.h:1176 +#: po/tmp/ap_String_Id.h.h:1188 msgid "Format" msgstr "Formatr" #. MENU_STATUSLINE_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1178 +#: po/tmp/ap_String_Id.h.h:1190 msgid "Format Embedded Object" -msgstr "" +msgstr "Formatr indlejret objekt" #. DLG_FormatFootnotes_Endnotes -#: po/tmp/ap_String_Id.h.h:1180 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1192 msgid "Format Endnotes" -msgstr "Side&hoved/fod" +msgstr "Formatr slutnoter" #. DLG_FormatFootnotes_Footnotes -#: po/tmp/ap_String_Id.h.h:1182 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1194 msgid "Format Footnotes" -msgstr "Side&hoved/fod" +msgstr "Formatr fodnoter" #. DLG_FormatFootnotes_Title -#: po/tmp/ap_String_Id.h.h:1184 +#: po/tmp/ap_String_Id.h.h:1196 msgid "Format Footnotes and Endnotes" -msgstr "" +msgstr "Formatr fodnoter og slutnoter" #. DLG_HdrFtr_Title -#: po/tmp/ap_String_Id.h.h:1186 +#: po/tmp/ap_String_Id.h.h:1198 msgid "Format Header/Footers" -msgstr "Side&hoved/fod" +msgstr "Formatr sidehoveder/sidefdder " #. MENU_LABEL_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1188 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1200 msgid "Format Object" -msgstr "Formatr" +msgstr "Formatr objekt" #. TOOLBAR_LABEL_FMTPAINTER -#: po/tmp/ap_String_Id.h.h:1190 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1202 msgid "Format Painter" -msgstr "Formatr &billede" +msgstr "Formateringsbrste" #. DLG_FormatTableTitle #. MENU_STATUSLINE_TABLE_FORMAT -#: po/tmp/ap_String_Id.h.h:1193 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1205 msgid "Format Table" -msgstr "Formatr &billede" +msgstr "formatr tabel" #. DLG_FormatTOC_Title -#: po/tmp/ap_String_Id.h.h:1195 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1207 msgid "Format Table of Contents" -msgstr "Side&hoved/fod" +msgstr "Formatr indholdsfortegnelse" #. DLG_FormatFrameTitle -#: po/tmp/ap_String_Id.h.h:1197 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1209 msgid "Format Text Box" msgstr "Formateringslinje" #. DLG_Options_Label_ViewFormatTB -#: po/tmp/ap_String_Id.h.h:1199 +#: po/tmp/ap_String_Id.h.h:1211 msgid "Format Toolbar" msgstr "Formateringslinje" #. MENU_STATUSLINE_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:1201 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1213 msgid "Format this image" -msgstr "Formatr &billede" +msgstr "Formatr billede" #. MENU_STATUSLINE_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:1203 +#: po/tmp/ap_String_Id.h.h:1215 msgid "Format your document using styles" -msgstr "" +msgstr "formatr dit dokument ved hjlp af typografier" #. DLG_Lists_Format #. DLG_DocComparison_Fmt -#: po/tmp/ap_String_Id.h.h:1205 po/tmp/xap_String_Id.h.h:323 +#: po/tmp/ap_String_Id.h.h:1217 +#: po/tmp/xap_String_Id.h.h:343 msgid "Format:" msgstr "Format:" #. MENU_LABEL_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1207 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1219 msgid "From File" -msgstr "&Fra fil" +msgstr "Fra fil" #. MENU_LABEL_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1209 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1221 msgid "From LaTeX" -msgstr "Fra: " +msgstr "Fra LaTeX " + +#. TOOLBAR_LABEL_VIEW_FULL_SCREEN +#. TOOLBAR_STATUSLINE_VIEW_FULL_SCREEN +#. TOOLBAR_TOOLTIP_VIEW_FULL_SCREEN +#: po/tmp/ap_String_Id.h.h:1225 +msgid "Full Screen" +msgstr "Fuldskrm" #. DLG_FormatTOC_General #. DLG_Options_Label_General #. DLG_MetaData_TAB_General -#: po/tmp/ap_String_Id.h.h:1213 +#: po/tmp/ap_String_Id.h.h:1229 msgid "General" msgstr "Generelt" #. DLG_Goto_Btn_Goto -#: po/tmp/ap_String_Id.h.h:1215 +#: po/tmp/ap_String_Id.h.h:1231 msgid "Go To" msgstr "G til" #. DLG_Goto_Label_What -#: po/tmp/ap_String_Id.h.h:1217 +#: po/tmp/ap_String_Id.h.h:1233 msgid "Go To &What:" msgstr "G til &hvad:" #. DLG_Goto_Title -#: po/tmp/ap_String_Id.h.h:1219 +#: po/tmp/ap_String_Id.h.h:1235 msgid "Go to..." msgstr "G til..." +# Om indholdsfortegnelse og kapitler i denne. #. DLG_FormatTOC_HasLabel -#: po/tmp/ap_String_Id.h.h:1221 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1237 msgid "H&as label" -msgstr "Listenavn" +msgstr "H&ar overskrift" #. DLG_FormatTOC_HeadingText -#: po/tmp/ap_String_Id.h.h:1223 +#: po/tmp/ap_String_Id.h.h:1239 msgid "H&eading text:" -msgstr "" +msgstr "Overskrift for indholdsfortegnelse:" #. DLG_Lists_Hand_List #. STYLE_HANDLIST -#: po/tmp/ap_String_Id.h.h:1225 po/tmp/xap_String_Id.h.h:363 +#: po/tmp/ap_String_Id.h.h:1241 +#: po/tmp/xap_String_Id.h.h:383 msgid "Hand List" msgstr "Hndliste" #. DLG_Para_SpecialHanging -#: po/tmp/ap_String_Id.h.h:1227 +#: po/tmp/ap_String_Id.h.h:1243 msgid "Hanging" msgstr "Hngende" #. DLG_PageNumbers_Header #. MENU_LABEL_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1230 +#: po/tmp/ap_String_Id.h.h:1246 msgid "Header" msgstr "Sidehoved" #. DLG_HdrFtr_HeaderFrame -#: po/tmp/ap_String_Id.h.h:1232 +#: po/tmp/ap_String_Id.h.h:1248 msgid "Header Properties" msgstr "Sidehovedegenskaber" #. HeaderStatus -#: po/tmp/ap_String_Id.h.h:1234 +#: po/tmp/ap_String_Id.h.h:1250 #, c-format msgid "Header [%s]" msgstr "Sidehoved [%s]" #. MENU_LABEL_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:1236 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1252 msgid "Header/Footers" -msgstr "Side&hoved/fod" +msgstr "Sidehoved/sidefod" #. MSG_CHECK_PRINT_MODE -#: po/tmp/ap_String_Id.h.h:1238 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1254 msgid "" -"Headers and Footers can only be created and edited while in Print View " -"Mode. \n" +"Headers and Footers can only be created and edited while in Print View Mode. \n" " To enter this mode choose View then Print Layout from the Menus. \n" " Would you like to enter Print Layout mode right now?" msgstr "" -"Sidehoveder og -fdder kan kun oprettes og redigeres, hvis du har valgt " -"\"Vis udskriftslayout\" i menuen \"Vis\".\n" +"Sidehoveder og -fdder kan kun oprettes og redigeres, hvis du har valgt \"Vis udskriftslayout\" i menuen \"Vis\".\n" "Vil du vlge udskriftslayout nu?" #. DLG_Stylist_HeadingStyles -#: po/tmp/ap_String_Id.h.h:1240 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1256 msgid "Heading Styles" -msgstr "ndr typografier" +msgstr "Overskriftstypografier" #. DLG_FormatTOC_HeadingStyle -#: po/tmp/ap_String_Id.h.h:1242 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1258 msgid "Heading style:" -msgstr "Brugertypografier" +msgstr "Overskriftstypografi:" #. DLG_Lists_Heart_List #. STYLE_HEARTLIST -#: po/tmp/ap_String_Id.h.h:1244 po/tmp/xap_String_Id.h.h:379 +#: po/tmp/ap_String_Id.h.h:1260 +#: po/tmp/xap_String_Id.h.h:399 msgid "Heart List" msgstr "Hjerteliste" #. DLG_Lists_Hebrew_List -#: po/tmp/ap_String_Id.h.h:1246 +#: po/tmp/ap_String_Id.h.h:1262 msgid "Hebrew List" msgstr "Hebraisk liste" #. TOOLBAR_LABEL_HELP #. TOOLBAR_STATUSLINE_HELP #. TOOLBAR_TOOLTIP_HELP -#: po/tmp/ap_String_Id.h.h:1250 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1266 msgid "Help" -msgstr "&Hjlp" +msgstr "Hjlp" #. MENU_LABEL_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:1252 +#: po/tmp/ap_String_Id.h.h:1268 msgid "Help &Contents" msgstr "&Indhold af hjlp" #. MENU_LABEL_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:1254 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1270 msgid "Help &Introduction" -msgstr "Brevinstruktioner:" +msgstr "Hjlp &introduktion" #. DLG_Options_Label_Hide -#: po/tmp/ap_String_Id.h.h:1256 +#: po/tmp/ap_String_Id.h.h:1272 msgid "Hide" msgstr "Skjul" #. DLG_Options_Label_SpellHideErrors -#: po/tmp/ap_String_Id.h.h:1258 +#: po/tmp/ap_String_Id.h.h:1274 msgid "Hide &spelling errors in the document" msgstr "&Vis ikke stavefejl i dokumentet" #. DLG_Lists_FoldingLevelexp -#: po/tmp/ap_String_Id.h.h:1260 +#: po/tmp/ap_String_Id.h.h:1276 msgid "Hide text below List Levels" -msgstr "" +msgstr "Skjul tekst under listeniveau" #. TOOLBAR_LABEL_COLOR_BACK #. TOOLBAR_STATUSLINE_COLOR_BACK #. TOOLBAR_TOOLTIP_COLOR_BACK -#: po/tmp/ap_String_Id.h.h:1264 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1280 msgid "Highlight" -msgstr " Markeringsfarve " +msgstr "Markr" #. DLG_Spell_IgnoreAll -#: po/tmp/ap_String_Id.h.h:1266 +#: po/tmp/ap_String_Id.h.h:1282 msgid "I&gnore All" msgstr "I&gnorr alle" #. DLG_FormatTOC_Indent -#: po/tmp/ap_String_Id.h.h:1268 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1284 msgid "I&ndent:" -msgstr "Indrykning" +msgstr "I&ndrykning:" #. InsertModeFieldINS -#: po/tmp/ap_String_Id.h.h:1270 +#: po/tmp/ap_String_Id.h.h:1286 msgid "INS" msgstr "INS" #. DLG_Options_Label_Icons -#: po/tmp/ap_String_Id.h.h:1272 +#: po/tmp/ap_String_Id.h.h:1288 msgid "Icons" msgstr "Ikoner" #. DLG_Options_Label_Ignore -#: po/tmp/ap_String_Id.h.h:1274 +#: po/tmp/ap_String_Id.h.h:1290 msgid "Ignore" msgstr "Ignorr" #. DLG_Options_Label_SpellIgnoreWords -#: po/tmp/ap_String_Id.h.h:1276 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1292 msgid "Ignore Words" -msgstr "Ignorerede ord:" +msgstr "Ignorr ord" #. MENU_STATUSLINE_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:1278 +#: po/tmp/ap_String_Id.h.h:1294 msgid "Ignore all occurrences of this word in the document" msgstr "Ignorr alle forekomster af dette ord i dokumentet" #. DLG_Options_Label_SpellIgnoredWord -#: po/tmp/ap_String_Id.h.h:1280 +#: po/tmp/ap_String_Id.h.h:1296 msgid "Ignored words:" msgstr "Ignorerede ord:" #. DLG_FormatFrame_SetImageBackground #. DLG_FormatTable_SetImageBackground -#: po/tmp/ap_String_Id.h.h:1283 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1299 msgid "Image For Background" -msgstr "ndr baggrundsfarve" +msgstr "Baggrundsbillede" #. DLG_Lists_Implies_List #. STYLE_IMPLIES_LIST -#: po/tmp/ap_String_Id.h.h:1285 po/tmp/xap_String_Id.h.h:413 +#: po/tmp/ap_String_Id.h.h:1301 +#: po/tmp/xap_String_Id.h.h:433 msgid "Implies List" msgstr "Implikationsliste" #. MENU_STATUSLINE_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:1287 +#: po/tmp/ap_String_Id.h.h:1303 msgid "Import style definitions from a document" -msgstr "" +msgstr "Importr typografidefinitioner fra dokument" #. DLG_Styles_LBL_InUse -#: po/tmp/ap_String_Id.h.h:1289 +#: po/tmp/ap_String_Id.h.h:1305 msgid "In Use" msgstr "I brug" #. WORD_PassInvalid -#: po/tmp/ap_String_Id.h.h:1291 +#: po/tmp/ap_String_Id.h.h:1307 msgid "Incorrect Password" msgstr "Forkert adgangskode" #. TOOLBAR_LABEL_INDENT #. TOOLBAR_STATUSLINE_INDENT #. TOOLBAR_TOOLTIP_INDENT -#: po/tmp/ap_String_Id.h.h:1295 +#: po/tmp/ap_String_Id.h.h:1311 msgid "Increase indent" -msgstr "" +msgstr "Forg indrykning" #. DLG_Para_LabelIndentation -#: po/tmp/ap_String_Id.h.h:1297 +#: po/tmp/ap_String_Id.h.h:1313 msgid "Indentation" msgstr "Indrykning" #. DLG_Para_TabLabelIndentsAndSpacing -#: po/tmp/ap_String_Id.h.h:1299 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1315 msgid "Indents and Spacing" -msgstr "&Indryk og mellemrum" +msgstr "Indrykning og mellemrum" #. DLG_ToggleCase_FirstUpperCase -#: po/tmp/ap_String_Id.h.h:1301 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1317 msgid "Initial Caps" -msgstr "Kapitler" +msgstr "Store Forbogstaver" #. DLG_FormatFootnotes_EndInitialVal -#: po/tmp/ap_String_Id.h.h:1303 +#: po/tmp/ap_String_Id.h.h:1319 msgid "Initial Endnote value" -msgstr "" +msgstr "Startvrdi for slutnote" #. DLG_FormatFootnotes_FootInitialVal -#: po/tmp/ap_String_Id.h.h:1305 +#: po/tmp/ap_String_Id.h.h:1321 msgid "Initial Footnote value" -msgstr "" +msgstr "Startvrdi for fodnote" #. DLG_Break_Insert #. MENU_STATUSLINE_TABLE_INSERT #. DLG_IP_Button_Label -#: po/tmp/ap_String_Id.h.h:1308 po/tmp/xap_String_Id.h.h:423 +#: po/tmp/ap_String_Id.h.h:1324 +#: po/tmp/xap_String_Id.h.h:443 msgid "Insert" msgstr "Indst" #. MENU_LABEL_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1310 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1326 msgid "Insert &Columns" -msgstr "Spalt&er" +msgstr "Indst &kolonner" #. MENU_LABEL_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1312 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1328 msgid "Insert &Rows" -msgstr "Indst" +msgstr "Indst &rkker" #. MENU_LABEL_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1314 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1330 msgid "Insert &Table" -msgstr "Indst fil" +msgstr "Indst &tabel" #. DLG_InsertBookmark_Title #. TOOLBAR_LABEL_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1317 +#: po/tmp/ap_String_Id.h.h:1333 msgid "Insert Bookmark" msgstr "Indst bogmrke" #. DLG_Break_BreakTitle_Capital -#: po/tmp/ap_String_Id.h.h:1319 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1335 msgid "Insert Break" -msgstr "Indst bogmrke" +msgstr "Indst skift" #. MENU_STATUSLINE_TABLE_INSERT_CELLS -#: po/tmp/ap_String_Id.h.h:1321 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1337 msgid "Insert Cells" -msgstr "Indst fil" +msgstr "Indst celler" #. MENU_STATUSLINE_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1323 +#: po/tmp/ap_String_Id.h.h:1339 msgid "Insert Clipboard contents" msgstr "Indst indhold af udklipsholderen" #. DLG_DateTime_DateTimeTitle -#: po/tmp/ap_String_Id.h.h:1325 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1341 msgid "Insert Date and Time" -msgstr "Dato og tid" +msgstr "Indst dato og tid" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1327 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1343 msgid "Insert Equation" -msgstr "Indrykning" +msgstr "Indst ligning" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1329 +#: po/tmp/ap_String_Id.h.h:1345 msgid "Insert Equation from a LaTeX expression" -msgstr "" +msgstr "Indst formel fra LaTeX-udtryk" #. DLG_Field_FieldTitle_Capital -#: po/tmp/ap_String_Id.h.h:1331 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1347 msgid "Insert Field" -msgstr "Indst fil" +msgstr "Indst felt" #. DLG_InsertHyperlink_Title #. TOOLBAR_LABEL_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1334 +#: po/tmp/ap_String_Id.h.h:1350 msgid "Insert Hyperlink" -msgstr "Indst bogmrkelnke" +msgstr "Indst link" #. TOOLBAR_LABEL_IMG -#: po/tmp/ap_String_Id.h.h:1336 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1352 msgid "Insert Image" -msgstr "Indst fil" +msgstr "Indst billede" #. DLG_MailMerge_MailMergeTitle -#: po/tmp/ap_String_Id.h.h:1338 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1354 msgid "Insert Mail Merge Field" -msgstr "Indst et kalkuleret felt" +msgstr "Indst brevfletningsfelt" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1340 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1356 msgid "Insert MathML from a file" -msgstr "Indst et billede fra en fil" +msgstr "Indst MATHML fra fil" #. DLG_InsertTable_TableTitle #. MENU_STATUSLINE_TABLE_INSERT_TABLE #. MENU_STATUSLINE_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1344 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1360 msgid "Insert Table" -msgstr "Indst fil" +msgstr "Indst tabel" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER -#: po/tmp/ap_String_Id.h.h:1346 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1362 msgid "Insert Unicode direction marker into the document" -msgstr "&Vis ikke stavefejl i dokumentet" +msgstr "Indst Unicode-retningsmarkr i dokumentet" #. MENU_STATUSLINE_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1348 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1364 msgid "Insert a Footer" -msgstr "Indst slutnote" +msgstr "Indst sidefod" #. MENU_STATUSLINE_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1350 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1366 msgid "Insert a Header" -msgstr "Indst slutnote" +msgstr "Indst sidehoved" #. MENU_STATUSLINE_INSERT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:1352 +#: po/tmp/ap_String_Id.h.h:1368 msgid "Insert a Table of Contents based on Headings" -msgstr "" +msgstr "Indst Indholdsfortegnelse baseret p overskrifter" #. MENU_STATUSLINE_INSERT_TEXTBOX -#: po/tmp/ap_String_Id.h.h:1354 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1370 msgid "Insert a Text Box" -msgstr "Indst slutnote" +msgstr "Indst tekstboks" #. TOOLBAR_STATUSLINE_FMT_BOOKMARK #. TOOLBAR_TOOLTIP_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1357 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1373 msgid "Insert a bookmark into the document" -msgstr "Udskriv hele dokumentet eller en del af det" +msgstr "Indst bogmrke i dokumentet" #. MENU_STATUSLINE_INSERT_FIELD -#: po/tmp/ap_String_Id.h.h:1359 +#: po/tmp/ap_String_Id.h.h:1375 msgid "Insert a calculated field" msgstr "Indst et kalkuleret felt" #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_BEFORE -#: po/tmp/ap_String_Id.h.h:1361 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1377 msgid "Insert a column to the left" -msgstr "Indst indholdet af en anden fil" +msgstr "Indst kolonne til venstre" #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_AFTER #. MENU_STATUSLINE_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1364 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1380 msgid "Insert a column to the right" -msgstr "Indst en ny side, spalte eller sektion" +msgstr "Indst kolonne til hjre" #. MENU_STATUSLINE_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1366 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1382 msgid "Insert a footnote" -msgstr "Indst slutnote" +msgstr "Indst fodnote" #. TOOLBAR_STATUSLINE_FMT_HYPERLINK #. TOOLBAR_TOOLTIP_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1369 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1385 msgid "Insert a hyperlink into the document" -msgstr "bn et nyt vindue for dokumentet" +msgstr "Indst link i dokumentet" #. MENU_STATUSLINE_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1371 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1387 msgid "Insert a mail merge field" -msgstr "Indst et kalkuleret felt" +msgstr "Indst et brevfletningsfelt" #. TOOLBAR_STATUSLINE_INSERT_TABLE #. TOOLBAR_TOOLTIP_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1374 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1390 msgid "Insert a new table into your document" -msgstr "Lav et nyt tomt dokument" +msgstr "Indst ny tabel i dokument" #. MENU_STATUSLINE_INSERT_BREAK -#: po/tmp/ap_String_Id.h.h:1376 +#: po/tmp/ap_String_Id.h.h:1392 msgid "Insert a page, column, or section break" msgstr "Indst en ny side, spalte eller sektion" -#. MENU_STATUSLINE_INSERT_PICTURE -#: po/tmp/ap_String_Id.h.h:1378 -msgid "Insert a picture" -msgstr "Indst et billede" - #. MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1380 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1394 msgid "Insert a row above" -msgstr "Indst et billede" +msgstr "Indst rkke ovenover" #. MENU_STATUSLINE_TABLE_INSERT_ROWS_AFTER #. MENU_STATUSLINE_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1383 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1397 msgid "Insert a row below" -msgstr "Indst et billede" +msgstr "Indst rkke nedenunder" #. MENU_STATUSLINE_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1385 +#: po/tmp/ap_String_Id.h.h:1399 msgid "Insert a symbol or other special character" msgstr "Indst et symbol eller andre specielle tegn" +# Noter i teksten? +#. MENU_STATUSLINE_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:1401 +msgid "Insert an Annotation" +msgstr "Indst note" + #. MENU_STATUSLINE_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1387 +#: po/tmp/ap_String_Id.h.h:1403 msgid "Insert an automatically-updated page number" msgstr "Indst et automatisk opdateret sidetal" #. MENU_STATUSLINE_INSERT_ENDNOTE -#: po/tmp/ap_String_Id.h.h:1389 +#: po/tmp/ap_String_Id.h.h:1405 msgid "Insert an endnote" msgstr "Indst slutnote" #. MENU_STATUSLINE_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:1391 +#: po/tmp/ap_String_Id.h.h:1407 msgid "Insert an existing picture from another file" msgstr "Indst et billede fra en fil" #. TOOLBAR_STATUSLINE_IMG #. TOOLBAR_TOOLTIP_IMG -#: po/tmp/ap_String_Id.h.h:1394 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1410 msgid "Insert an image into the document" -msgstr "bn et nyt vindue for dokumentet" +msgstr "Indst billede i dokumentet" #. MENU_STATUSLINE_INSERT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1396 +#: po/tmp/ap_String_Id.h.h:1412 msgid "Insert bookmark" msgstr "Indst bogmrke" #. DLG_Break_BreakTitle -#: po/tmp/ap_String_Id.h.h:1398 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1414 msgid "Insert break" -msgstr "Indst bogmrke" +msgstr "Indst skift" #. MENU_STATUSLINE_INSERT_CLIPART -#: po/tmp/ap_String_Id.h.h:1400 +#: po/tmp/ap_String_Id.h.h:1416 msgid "Insert clipart" msgstr "Indst udklipsbillede" #. DLG_Field_FieldTitle -#: po/tmp/ap_String_Id.h.h:1402 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1418 msgid "Insert field" -msgstr "Indst fil" +msgstr "Indst felt" #. MENU_STATUSLINE_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1404 +#: po/tmp/ap_String_Id.h.h:1420 msgid "Insert hyperlink" -msgstr "Indst bogmrkelnke" +msgstr "Indst link" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:1406 +#: po/tmp/ap_String_Id.h.h:1422 msgid "Insert left-to-right direction marker (LRM)" -msgstr "" +msgstr "Indst venstre-til-hjre-markr" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:1408 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1424 msgid "Insert right-to-left direction marker (RLM)" -msgstr "Standardtekstretning skal vre hjre mod venstre" +msgstr "Indst hjre-til-venstre-markr" #. TOOLBAR_STATUSLINE_INSERT_SYMBOL #. TOOLBAR_TOOLTIP_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1411 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1427 msgid "Insert symbol" msgstr "Indst symbol" #. TOOLBAR_LABEL_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1413 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1429 msgid "Insert table" -msgstr "Indst fil" +msgstr "Indst tabel" #. MENU_STATUSLINE_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:1415 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1431 msgid "Insert the Sum of a Table Column" -msgstr "ndr antallet af spalter" +msgstr "Indst summen af en tabelkolonne" #. MENU_STATUSLINE_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:1417 +#: po/tmp/ap_String_Id.h.h:1433 msgid "Insert the Sum of a Table Row" -msgstr "" +msgstr "Indst summen af en tabelrkke" #. MENU_STATUSLINE_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1419 +#: po/tmp/ap_String_Id.h.h:1435 msgid "Insert the contents of another file" msgstr "Indst indholdet af en anden fil" #. MENU_STATUSLINE_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:1421 +#: po/tmp/ap_String_Id.h.h:1437 msgid "Insert the date and/or time" msgstr "Indst dato og/eller klokkeslt" #. MENU_STATUSLINE_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1423 +#: po/tmp/ap_String_Id.h.h:1439 msgid "Insert unformatted clipboard contents" msgstr "Indst r indhold af udklipsholder" #. DLG_Options_Label_ViewUnprintable -#: po/tmp/ap_String_Id.h.h:1425 +#: po/tmp/ap_String_Id.h.h:1441 msgid "Invisible &Layout Marks" msgstr "&Ikkeudskrivbare tegn" @@ -3671,109 +3540,102 @@ #. TOOLBAR_STATUSLINE_FMT_ITALIC #. TOOLBAR_TOOLTIP_FMT_ITALIC #. DLG_UFS_StyleItalic -#: po/tmp/ap_String_Id.h.h:1429 po/tmp/xap_String_Id.h.h:453 +#: po/tmp/ap_String_Id.h.h:1445 +#: po/tmp/xap_String_Id.h.h:473 msgid "Italic" msgstr "Kursiv" #. MENU_STATUSLINE_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1431 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1447 msgid "Jump to hyperlink" -msgstr "Indst bogmrkelnke" +msgstr "G til link" #. DLG_Para_AlignJustified -#: po/tmp/ap_String_Id.h.h:1433 +#: po/tmp/ap_String_Id.h.h:1449 msgid "Justified" msgstr "Lige margener" #. TOOLBAR_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1435 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1451 msgid "Justify" -msgstr "&Lige margener" +msgstr "Juster margener" #. TOOLBAR_STATUSLINE_ALIGN_JUSTIFY #. TOOLBAR_TOOLTIP_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1438 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1454 msgid "Justify paragraph" -msgstr "Lige margener i afsnit" +msgstr "Juster afsnit" #. MENU_STATUSLINE_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1440 +#: po/tmp/ap_String_Id.h.h:1456 msgid "Justify the paragraph" msgstr "Lige margener i afsnit" #. DLG_Para_PushKeepWithNext -#: po/tmp/ap_String_Id.h.h:1442 +#: po/tmp/ap_String_Id.h.h:1458 msgid "Keep with ne&xt" msgstr "H&old sammen med nste" #. FIELD_PieceTable_Test -#: po/tmp/ap_String_Id.h.h:1444 +#: po/tmp/ap_String_Id.h.h:1460 msgid "Kevins Test" msgstr "Kevins test" #. FIELD_Document_Keywords -#: po/tmp/ap_String_Id.h.h:1446 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1462 msgid "Keywords" -msgstr "Ord" +msgstr "Ngleord" #. DLG_MetaData_Keywords_LBL -#: po/tmp/ap_String_Id.h.h:1448 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1464 msgid "Keywords:" -msgstr "Ignorerede ord:" +msgstr "Ngleord:" #. DLG_Latex_LatexTitle #. DLG_Latex_LatexEquation -#: po/tmp/ap_String_Id.h.h:1451 +#: po/tmp/ap_String_Id.h.h:1467 msgid "LaTeX Equation" -msgstr "" +msgstr "LaTeX-formel" #. DLG_Lists_Indent -#: po/tmp/ap_String_Id.h.h:1453 +#: po/tmp/ap_String_Id.h.h:1469 msgid "Label Align:" msgstr "Etiketjustering:" #. DLG_FormatTOC_DetailsTop -#: po/tmp/ap_String_Id.h.h:1455 +#: po/tmp/ap_String_Id.h.h:1471 msgid "Label Definitions" -msgstr "" +msgstr "Etiketdefinitioner" #. DLG_Styles_ModifyLanguage #. DLG_Options_Label_Language #. FIELD_Document_Language -#: po/tmp/ap_String_Id.h.h:1459 +#: po/tmp/ap_String_Id.h.h:1475 msgid "Language" msgstr "Sprog" #. DLG_Options_Label_LangSettings -#: po/tmp/ap_String_Id.h.h:1461 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1477 msgid "Language settings" -msgstr "Sprog" +msgstr "Sprogindstillinger" #. DLG_MetaData_Languages_LBL -#: po/tmp/ap_String_Id.h.h:1463 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1479 msgid "Language(s):" -msgstr "Sprog" +msgstr "Sprog:" #. DLG_Options_Label_Layout -#: po/tmp/ap_String_Id.h.h:1465 +#: po/tmp/ap_String_Id.h.h:1481 msgid "Layout" msgstr "Udseende" #. DLG_FormatTOC_LayoutDetails -#: po/tmp/ap_String_Id.h.h:1467 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1483 msgid "Layout Details" -msgstr "Moduldetaljer" +msgstr "Layoutdetaljer" #. DLG_Tab_Label_Leader -#: po/tmp/ap_String_Id.h.h:1469 +#: po/tmp/ap_String_Id.h.h:1485 msgid "Leader" msgstr "Tabulatortegn" @@ -3781,425 +3643,410 @@ #. DLG_Tab_Radio_Left #. DLG_PageNumbers_Left #. TOOLBAR_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1474 +#: po/tmp/ap_String_Id.h.h:1490 msgid "Left" msgstr "Venstre" #. LeftIndentStatus -#: po/tmp/ap_String_Id.h.h:1476 +#: po/tmp/ap_String_Id.h.h:1492 #, c-format msgid "Left Indent [%s]" msgstr "Venstreindryk [%s]" #. LeftIndentTextIndentStatus -#: po/tmp/ap_String_Id.h.h:1478 +#: po/tmp/ap_String_Id.h.h:1494 #, c-format msgid "Left Indent [%s] First Line Indent [%s]" msgstr "Venstreindryk [%s] Frste linjeindryk [%s]" #. LeftMarginStatus -#: po/tmp/ap_String_Id.h.h:1480 +#: po/tmp/ap_String_Id.h.h:1496 #, c-format msgid "Left Margin [%s]" msgstr "Venstre margen [%s]" #. TabToggleLeftTab -#: po/tmp/ap_String_Id.h.h:1482 +#: po/tmp/ap_String_Id.h.h:1498 msgid "Left Tab" msgstr "Venstretabulator" #. TOOLBAR_STATUSLINE_ALIGN_LEFT #. TOOLBAR_TOOLTIP_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1485 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1501 msgid "Left alignment" -msgstr "Justering" +msgstr "Venstrestilling" #. MENU_STATUSLINE_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1487 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1503 msgid "Left-align the paragraph" -msgstr "Centrr afsnittet" +msgstr "Venstrestil afsnit" #. DLG_FormatTOC_Level1 -#: po/tmp/ap_String_Id.h.h:1489 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1505 msgid "Level 1" -msgstr "Niveau:" +msgstr "Niveau 1" #. DLG_FormatTOC_Level2 -#: po/tmp/ap_String_Id.h.h:1491 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1507 msgid "Level 2" -msgstr "Niveau:" +msgstr "Niveau 2" #. DLG_FormatTOC_Level3 -#: po/tmp/ap_String_Id.h.h:1493 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1509 msgid "Level 3" -msgstr "Niveau:" +msgstr "Niveau 3" #. DLG_FormatTOC_Level4 -#: po/tmp/ap_String_Id.h.h:1495 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1511 msgid "Level 4" -msgstr "Niveau:" +msgstr "Niveau 4" #. DLG_Lists_DelimiterString -#: po/tmp/ap_String_Id.h.h:1497 +#: po/tmp/ap_String_Id.h.h:1513 msgid "Level Delimiter:" msgstr "Niveauadskiller:" #. DLG_Lists_Level -#: po/tmp/ap_String_Id.h.h:1499 +#: po/tmp/ap_String_Id.h.h:1515 msgid "Level:" msgstr "Niveau:" #. DLG_Para_LabelLineSpacing -#: po/tmp/ap_String_Id.h.h:1501 +#: po/tmp/ap_String_Id.h.h:1517 msgid "Li&ne spacing:" msgstr "&Linjeafstand:" #. DLG_Goto_Target_Line -#: po/tmp/ap_String_Id.h.h:1503 +#: po/tmp/ap_String_Id.h.h:1519 msgid "Line" msgstr "Linje" #. FIELD_Numbers_LineCount -#: po/tmp/ap_String_Id.h.h:1505 +#: po/tmp/ap_String_Id.h.h:1521 msgid "Line Count" msgstr "Linjetal" #. MENU_STATUSLINE_FMT_TOPLINE -#: po/tmp/ap_String_Id.h.h:1507 +#: po/tmp/ap_String_Id.h.h:1523 msgid "Line above the selection (toggle)" msgstr "Linje over markering (til/fra)" #. DLG_Para_TabLabelLineAndPageBreaks -#: po/tmp/ap_String_Id.h.h:1509 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1525 msgid "Line and Page Breaks" -msgstr "Linje- og &sideskift" +msgstr "Linje- og sideskift" #. MENU_STATUSLINE_FMT_BOTTOMLINE -#: po/tmp/ap_String_Id.h.h:1511 +#: po/tmp/ap_String_Id.h.h:1527 msgid "Line below the selection (toggle)" msgstr "Linje under markering (til/fra)" #. DLG_Column_Line_Between -#: po/tmp/ap_String_Id.h.h:1513 +#: po/tmp/ap_String_Id.h.h:1529 msgid "Line between" msgstr "Linje imellem" #. DLG_WordCount_Lines -#: po/tmp/ap_String_Id.h.h:1515 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1531 msgid "Lines:" -msgstr "Linjer" +msgstr "Linjer:" #. DLG_Styles_List -#: po/tmp/ap_String_Id.h.h:1517 +#: po/tmp/ap_String_Id.h.h:1533 msgid "List" msgstr "Liste" #. FIELD_Numbers_ListLabel -#: po/tmp/ap_String_Id.h.h:1519 +#: po/tmp/ap_String_Id.h.h:1535 msgid "List Label" msgstr "Listenavn" #. DLG_Lists_PageProperties -#: po/tmp/ap_String_Id.h.h:1521 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1537 msgid "List Properties" -msgstr "Sidefodsegenskaber" +msgstr "Listeegenskaber" #. DLG_Stylist_ListStyles -#: po/tmp/ap_String_Id.h.h:1523 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1539 msgid "List Styles" -msgstr "Typografier" +msgstr "Listetypografier" #. DLG_Lists_Title -#: po/tmp/ap_String_Id.h.h:1525 +#: po/tmp/ap_String_Id.h.h:1541 msgid "Lists for " msgstr "Lister for" #. MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1527 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1543 msgid "Lock the layout of the current toolbars" -msgstr "Redigr sidefod p denne side" +msgstr "Fastls nuvrende vrktjslinjers layout" #. DLG_Lists_Lower_Case_List #. STYLE_LOWERCASELIST -#: po/tmp/ap_String_Id.h.h:1529 po/tmp/xap_String_Id.h.h:489 +#: po/tmp/ap_String_Id.h.h:1545 +#: po/tmp/xap_String_Id.h.h:512 msgid "Lower Case List" msgstr "Liste med sm bogstaver" #. DLG_Lists_Lower_Roman_List #. STYLE_LOWERROMANLIST -#: po/tmp/ap_String_Id.h.h:1531 po/tmp/xap_String_Id.h.h:491 +#: po/tmp/ap_String_Id.h.h:1547 +#: po/tmp/xap_String_Id.h.h:514 msgid "Lower Roman List" msgstr "Liste med sm romertal" -#. MENU_LABEL_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1533 -#, fuzzy -msgid "M&erge documents" -msgstr "Gem dokumentet" - #. FIELD_Application_MailMerge #. MENU_STATUSLINE_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1536 +#: po/tmp/ap_String_Id.h.h:1550 msgid "Mail Merge" -msgstr "" +msgstr "Brevfletning" #. MENU_STATUSLINE_FMT_BOLD -#: po/tmp/ap_String_Id.h.h:1538 +#: po/tmp/ap_String_Id.h.h:1552 msgid "Make the selection bold (toggle)" msgstr "Gr den markerede tekst fed (til/fra)" #. MENU_STATUSLINE_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:1540 +#: po/tmp/ap_String_Id.h.h:1554 msgid "Make the selection italic (toggle)" msgstr "Gr den markerede tekst kursiv (til/fra)" #. MENU_STATUSLINE_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:1542 +#: po/tmp/ap_String_Id.h.h:1556 msgid "Make the selection subscript (toggle)" msgstr "Gr den markerede tekst lavere end omgivelserne (til/fra)" #. MENU_STATUSLINE_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:1544 +#: po/tmp/ap_String_Id.h.h:1558 msgid "Make the selection superscript (toggle)" msgstr "Gr den markerede tekst hjere end omgivelserne (til/fra)" #. MENU_STATUSLINE_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:1546 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1560 msgid "Manage changes in document" -msgstr "bn et eksisterende dokument" +msgstr "Administrer ndringer i dokument" #. MENU_STATUSLINE_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:1548 +#: po/tmp/ap_String_Id.h.h:1562 msgid "Manage plugins" msgstr "Unvidelsesmoduler" #. DLG_PageSetup_Margin -#: po/tmp/ap_String_Id.h.h:1550 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1564 msgid "Margin" -msgstr "&Margen" +msgstr "Margen" #. DLG_MarkRevisions_Title -#: po/tmp/ap_String_Id.h.h:1552 +#: po/tmp/ap_String_Id.h.h:1566 msgid "Mark Revisions" -msgstr "" +msgstr "Marker revisioner" #. MENU_STATUSLINE_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:1554 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1568 msgid "Mark changes as you type" -msgstr "Stave&kontrol mens du skriver" +msgstr "Markr ndringer, mens du skriver" #. FIELD_PieceTable_MartinTest -#: po/tmp/ap_String_Id.h.h:1556 +#: po/tmp/ap_String_Id.h.h:1570 msgid "Martins Test" msgstr "Martins test" #. DLG_Column_Size -#: po/tmp/ap_String_Id.h.h:1558 +#: po/tmp/ap_String_Id.h.h:1572 msgid "Max Column size" msgstr "Maksimal spaltestrrelse " +#. TOOLBAR_LABEL_MENU +#. TOOLBAR_STATUSLINE_MENU +#. TOOLBAR_TOOLTIP_MENU +#: po/tmp/ap_String_Id.h.h:1576 +msgid "Menu" +msgstr "Menu" + #. DLG_MergeCells_Above -#: po/tmp/ap_String_Id.h.h:1560 +#: po/tmp/ap_String_Id.h.h:1578 msgid "Merge Above" -msgstr "" +msgstr "Flet over" #. DLG_MergeCells_Below -#: po/tmp/ap_String_Id.h.h:1562 +#: po/tmp/ap_String_Id.h.h:1580 msgid "Merge Below" -msgstr "" +msgstr "Flet under" #. DLG_MergeCellsTitle #. DLG_MergeCells_Frame #. MENU_STATUSLINE_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1566 +#: po/tmp/ap_String_Id.h.h:1584 msgid "Merge Cells" -msgstr "" +msgstr "Flet celler" #. DLG_MergeCells_Left -#: po/tmp/ap_String_Id.h.h:1568 +#: po/tmp/ap_String_Id.h.h:1586 msgid "Merge Left" -msgstr "" +msgstr "Flet venstre" #. DLG_MergeCells_Right -#: po/tmp/ap_String_Id.h.h:1570 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1588 msgid "Merge Right" -msgstr "Hjre" +msgstr "Flet hjre" #. TOOLBAR_LABEL_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1572 +#: po/tmp/ap_String_Id.h.h:1590 msgid "Merge above" -msgstr "" +msgstr "Flet over" #. MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1574 +#: po/tmp/ap_String_Id.h.h:1592 msgid "Merge another document into the active document using revision marks" -msgstr "" +msgstr "Indfj andet dokument i det aktive dokument med revisionsmrker" #. TOOLBAR_LABEL_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1576 +#: po/tmp/ap_String_Id.h.h:1594 msgid "Merge below" -msgstr "" +msgstr "Flet under" #. TOOLBAR_LABEL_MERGE_CELLS #. TOOLBAR_STATUSLINE_MERGE_CELLS #. TOOLBAR_TOOLTIP_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1580 +#: po/tmp/ap_String_Id.h.h:1598 msgid "Merge cells" -msgstr "" +msgstr "Flet celler" #. TOOLBAR_LABEL_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1582 +#: po/tmp/ap_String_Id.h.h:1600 msgid "Merge left" -msgstr "" +msgstr "Flet venstre" #. TOOLBAR_LABEL_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1584 +#: po/tmp/ap_String_Id.h.h:1602 msgid "Merge right" -msgstr "" +msgstr "Flet hjre" #. TOOLBAR_STATUSLINE_MERGEABOVE #. TOOLBAR_TOOLTIP_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1587 +#: po/tmp/ap_String_Id.h.h:1605 msgid "Merge with cell above" -msgstr "" +msgstr "Flet med ovenstende celle" #. TOOLBAR_STATUSLINE_MERGEBELOW #. TOOLBAR_TOOLTIP_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1590 +#: po/tmp/ap_String_Id.h.h:1608 msgid "Merge with cell below" -msgstr "" +msgstr "Flet med nedenstende celle" #. TOOLBAR_STATUSLINE_MERGELEFT #. TOOLBAR_TOOLTIP_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1593 +#: po/tmp/ap_String_Id.h.h:1611 msgid "Merge with left cell" -msgstr "" +msgstr "Flet med ovenstende celle" #. TOOLBAR_STATUSLINE_MERGERIGHT #. TOOLBAR_TOOLTIP_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1596 +#: po/tmp/ap_String_Id.h.h:1614 msgid "Merge with right cell" -msgstr "" +msgstr "Flet med celle til hjre" #. FIELD_DateTime_MilTime -#: po/tmp/ap_String_Id.h.h:1598 +#: po/tmp/ap_String_Id.h.h:1616 msgid "Military Time" msgstr "Militr tid" #. DLG_Options_TabLabel_Misc -#: po/tmp/ap_String_Id.h.h:1600 +#: po/tmp/ap_String_Id.h.h:1618 msgid "Misc." msgstr "Divs." #. DLG_Stylist_MiscStyles -#: po/tmp/ap_String_Id.h.h:1602 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1620 msgid "Miscellaneous Styles" -msgstr "Mulige typografier" +msgstr "Forskellige typografier" #. DLG_Styles_ModifyTitle -#: po/tmp/ap_String_Id.h.h:1604 +#: po/tmp/ap_String_Id.h.h:1622 msgid "Modify Styles" msgstr "ndr typografier" #. DLG_Styles_Modify -#: po/tmp/ap_String_Id.h.h:1606 +#: po/tmp/ap_String_Id.h.h:1624 msgid "Modify..." msgstr "ndr..." #. FIELD_DateTime_MonthDayYear -#: po/tmp/ap_String_Id.h.h:1608 +#: po/tmp/ap_String_Id.h.h:1626 msgid "Month Day, Year" msgstr "Mned dag, r" #. MENU_STATUSLINE_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:1610 +#: po/tmp/ap_String_Id.h.h:1628 msgid "Move the insertion point to a specific location" msgstr "Flyt markren til en angivet placering" #. FIELD_DateTime_MthDayYear -#: po/tmp/ap_String_Id.h.h:1612 +#: po/tmp/ap_String_Id.h.h:1630 msgid "Mth. Day, Year" msgstr "Mnd. dag, r" #. DLG_Para_SpacingMultiple -#: po/tmp/ap_String_Id.h.h:1614 +#: po/tmp/ap_String_Id.h.h:1632 msgid "Multiple" msgstr "Flere" #. TOOLBAR_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:1616 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1634 msgid "New" -msgstr "&Ny" +msgstr "Ny" #. DLG_NEW_Title -#: po/tmp/ap_String_Id.h.h:1618 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1636 msgid "New Document" -msgstr "&Dokument" +msgstr "Nyt dokument" #. DLG_Lists_New_List_Label -#: po/tmp/ap_String_Id.h.h:1620 +#: po/tmp/ap_String_Id.h.h:1638 msgid "New List Label" msgstr "Nyt listenavn" #. DLG_Lists_New_List_Type -#: po/tmp/ap_String_Id.h.h:1622 +#: po/tmp/ap_String_Id.h.h:1640 msgid "" "New List \n" "Type" msgstr "Ny listetype" #. DLG_Lists_Starting_Value -#: po/tmp/ap_String_Id.h.h:1624 +#: po/tmp/ap_String_Id.h.h:1642 msgid "" "New Starting \n" "Value" msgstr "Ny startvrdi" #. DLG_Styles_NewTitle -#: po/tmp/ap_String_Id.h.h:1626 +#: po/tmp/ap_String_Id.h.h:1644 msgid "New Style" msgstr "Ny typografi" #. DLG_Styles_New -#: po/tmp/ap_String_Id.h.h:1628 +#: po/tmp/ap_String_Id.h.h:1646 msgid "New..." msgstr "Ny..." #. DLG_Goto_Btn_Next -#: po/tmp/ap_String_Id.h.h:1630 +#: po/tmp/ap_String_Id.h.h:1648 msgid "Next >>" msgstr "Nste >>" #. DLG_NEW_NoFile -#: po/tmp/ap_String_Id.h.h:1632 +#: po/tmp/ap_String_Id.h.h:1650 msgid "No File" msgstr "Ingen fil" #. DLG_Lists_FoldingLevel0 -#: po/tmp/ap_String_Id.h.h:1634 +#: po/tmp/ap_String_Id.h.h:1652 msgid "No Folding" -msgstr "" +msgstr "Ingen foldning" #. DLG_Styles_ErrNoStyle -#: po/tmp/ap_String_Id.h.h:1636 +#: po/tmp/ap_String_Id.h.h:1654 msgid "" "No Style selected \n" " so it cannot be modified" @@ -4208,7 +4055,7 @@ " s den kan ikke ndres" #. SCRIPT_NOSCRIPTS -#: po/tmp/ap_String_Id.h.h:1638 +#: po/tmp/ap_String_Id.h.h:1656 msgid "No scripts found" msgstr "Ingen skripter fundet" @@ -4216,66 +4063,64 @@ #. DLG_Styles_DefNone #. DLG_Tab_Radio_NoAlign #. DLG_Lists_Type_none -#: po/tmp/ap_String_Id.h.h:1643 +#: po/tmp/ap_String_Id.h.h:1661 msgid "None" msgstr "Ingen" #. TOOLBAR_LABEL_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:1645 +#: po/tmp/ap_String_Id.h.h:1663 msgid "None before" -msgstr "" +msgstr "Ingen fr" #. MENU_STATUSLINE_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:1647 +#: po/tmp/ap_String_Id.h.h:1665 msgid "Normal View" msgstr "Normal visning" #. DLG_Spell_UnknownWord -#: po/tmp/ap_String_Id.h.h:1649 +#: po/tmp/ap_String_Id.h.h:1667 msgid "Not in dictionary&:" msgstr "Ikk&e i ordlisten:" #. DLG_Stylist_FootnoteStyles -#: po/tmp/ap_String_Id.h.h:1651 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1669 msgid "Note Styles" -msgstr "Ny typografi" +msgstr "Notetypografier" #. DLG_Column_Number_Cols -#: po/tmp/ap_String_Id.h.h:1653 +#: po/tmp/ap_String_Id.h.h:1671 msgid "Number of Columns" msgstr "Antal spalter " #. FIELD_Numbers_PagesCount -#: po/tmp/ap_String_Id.h.h:1655 +#: po/tmp/ap_String_Id.h.h:1673 msgid "Number of Pages" msgstr "Antal sider" #. DLG_Column_Number -#: po/tmp/ap_String_Id.h.h:1657 +#: po/tmp/ap_String_Id.h.h:1675 msgid "Number of columns" msgstr "Antal spalter" #. DLG_InsertTable_NumCols -#: po/tmp/ap_String_Id.h.h:1659 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1677 msgid "Number of columns:" -msgstr "Antal spalter" +msgstr "Antal kolonner:" #. DLG_InsertTable_NumRows -#: po/tmp/ap_String_Id.h.h:1661 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1679 msgid "Number of rows:" -msgstr "Antal spalter " +msgstr "Antal rkker: " #. DLG_Lists_Type_numbered -#: po/tmp/ap_String_Id.h.h:1663 +#: po/tmp/ap_String_Id.h.h:1681 msgid "Numbered" msgstr "Numre" #. DLG_Lists_Numbered_List #. STYLE_NUMBER_LIST -#: po/tmp/ap_String_Id.h.h:1665 po/tmp/xap_String_Id.h.h:531 +#: po/tmp/ap_String_Id.h.h:1683 +#: po/tmp/xap_String_Id.h.h:558 msgid "Numbered List" msgstr "Nummeret liste" @@ -4284,62 +4129,60 @@ #. TOOLBAR_LABEL_LISTS_NUMBERS #. TOOLBAR_STATUSLINE_LISTS_NUMBERS #. TOOLBAR_TOOLTIP_LISTS_NUMBERS -#: po/tmp/ap_String_Id.h.h:1671 +#: po/tmp/ap_String_Id.h.h:1689 msgid "Numbering" msgstr "Nummerering" #. FIELD_Type_Numbers -#: po/tmp/ap_String_Id.h.h:1673 +#: po/tmp/ap_String_Id.h.h:1691 msgid "Numbers" msgstr "Numre" #. InsertModeFieldOVR -#: po/tmp/ap_String_Id.h.h:1675 +#: po/tmp/ap_String_Id.h.h:1693 msgid "OVR" msgstr "OVR" #. DLG_Column_One -#: po/tmp/ap_String_Id.h.h:1677 +#: po/tmp/ap_String_Id.h.h:1695 msgid "One" msgstr "En" #. MENU_LABEL_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1679 +#: po/tmp/ap_String_Id.h.h:1697 msgid "Op&en Copy" msgstr "bn &kopi" #. TOOLBAR_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1681 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1699 msgid "Open" -msgstr "&bn" +msgstr "bn" #. MENU_LABEL_OPEN_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1683 +#: po/tmp/ap_String_Id.h.h:1701 msgid "Open Template" msgstr "bn skabelon" #. MENU_STATUSLINE_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1685 +#: po/tmp/ap_String_Id.h.h:1703 msgid "Open a document by making a copy" msgstr "bn dokumentet ved at lave en kopi" #. MENU_STATUSLINE_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1687 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1705 msgid "Open a recently used document" -msgstr "bn dette dokument" +msgstr "bn nyligt anvendt dokument" #. DLG_NEW_Open #. MENU_STATUSLINE_FILE_OPEN #. TOOLBAR_STATUSLINE_FILE_OPEN #. TOOLBAR_TOOLTIP_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1692 +#: po/tmp/ap_String_Id.h.h:1710 msgid "Open an existing document" msgstr "bn et eksisterende dokument" #. MENU_STATUSLINE_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:1694 +#: po/tmp/ap_String_Id.h.h:1712 msgid "Open another window for the document" msgstr "bn et nyt vindue for dokumentet" @@ -4352,22 +4195,22 @@ #. MENU_STATUSLINE_FILE_RECENT_7 #. MENU_STATUSLINE_FILE_RECENT_8 #. MENU_STATUSLINE_FILE_RECENT_9 -#: po/tmp/ap_String_Id.h.h:1704 +#: po/tmp/ap_String_Id.h.h:1722 msgid "Open this document" msgstr "bn dette dokument" #. DLG_PageSetup_Orient -#: po/tmp/ap_String_Id.h.h:1706 +#: po/tmp/ap_String_Id.h.h:1724 msgid "Orientation..." msgstr "Papirretning..." #. DLG_Options_TabLabel_Other -#: po/tmp/ap_String_Id.h.h:1708 +#: po/tmp/ap_String_Id.h.h:1726 msgid "Other" msgstr "Andre" #. MSG_IE_NoMemory -#: po/tmp/ap_String_Id.h.h:1710 +#: po/tmp/ap_String_Id.h.h:1728 #, c-format msgid "Out of memory attempting to open %s" msgstr "Ikke nok hukommelse til at bne %s" @@ -4376,247 +4219,230 @@ #. TOOLBAR_STATUSLINE_FMT_OVERLINE #. TOOLBAR_TOOLTIP_FMT_OVERLINE #. DLG_UFS_OverlineCheck -#: po/tmp/ap_String_Id.h.h:1714 po/tmp/xap_String_Id.h.h:545 +#: po/tmp/ap_String_Id.h.h:1732 +#: po/tmp/xap_String_Id.h.h:572 msgid "Overline" msgstr "Overstreg" #. MENU_STATUSLINE_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:1716 +#: po/tmp/ap_String_Id.h.h:1734 msgid "Overline the selection (toggle)" msgstr "Overstreg den markerede tekst (til/fra)" #. MENU_LABEL_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:1718 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1736 msgid "P&roperties" -msgstr "Billedegenskaber" +msgstr "&Egenskaber" #. MENU_LABEL_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1720 +#: po/tmp/ap_String_Id.h.h:1738 msgid "P&urge revisions" -msgstr "" +msgstr "R&yd revisioner" #. MENU_LABEL_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1722 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1740 msgid "Pa&ste Unformatted" msgstr "I&ndst r tekst" #. DLG_Goto_Target_Page #. DLG_PageSetup_Page -#: po/tmp/ap_String_Id.h.h:1725 +#: po/tmp/ap_String_Id.h.h:1743 msgid "Page" msgstr "Side" #. DLG_Para_PushPageBreakBefore -#: po/tmp/ap_String_Id.h.h:1727 +#: po/tmp/ap_String_Id.h.h:1745 msgid "Page &break before" msgstr "Sid&eskift fr" #. MENU_LABEL_FMT_BACKGROUND -#: po/tmp/ap_String_Id.h.h:1729 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1747 msgid "Page Background" -msgstr "&Baggrund" +msgstr "Sidebaggrund" #. MENU_LABEL_FMT_BACKGROUND_PAGE_COLOR -#: po/tmp/ap_String_Id.h.h:1731 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1749 msgid "Page C&olor" -msgstr " Tekstfarve " +msgstr "Sidef&arve" #. MENU_LABEL_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:1733 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1751 msgid "Page Image" -msgstr "Sidestrrelser:" +msgstr "Sidebillede" #. MENU_LABEL_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1735 +#: po/tmp/ap_String_Id.h.h:1753 msgid "Page N&umbers" msgstr "Side&tal" #. FIELD_Numbers_PageNumber -#: po/tmp/ap_String_Id.h.h:1737 +#: po/tmp/ap_String_Id.h.h:1755 msgid "Page Number" msgstr "Sidenummer" #. DLG_HdrFtr_PageNumberProperties -#: po/tmp/ap_String_Id.h.h:1739 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1757 msgid "Page Number Properties" -msgstr "Billedegenskaber" +msgstr "Egenskaber for sidenummerering" #. DLG_PageNumbers_Title -#: po/tmp/ap_String_Id.h.h:1741 +#: po/tmp/ap_String_Id.h.h:1759 msgid "Page Numbers" msgstr "Sidenumre" #. FIELD_Numbers_PageReference -#: po/tmp/ap_String_Id.h.h:1743 +#: po/tmp/ap_String_Id.h.h:1761 msgid "Page Reference" msgstr "Sidereference" #. MENU_LABEL_FILE_PAGESETUP -#: po/tmp/ap_String_Id.h.h:1745 +#: po/tmp/ap_String_Id.h.h:1763 msgid "Page Set&up" msgstr "S&ideopstning" #. DLG_PageSetup_Title -#: po/tmp/ap_String_Id.h.h:1747 +#: po/tmp/ap_String_Id.h.h:1765 msgid "Page Setup" msgstr "Sideopstning" #. PageInfoField -#: po/tmp/ap_String_Id.h.h:1749 +#: po/tmp/ap_String_Id.h.h:1767 #, c-format msgid "Page: %d/%d" msgstr "Side: %d/%d" #. DLG_WordCount_Pages -#: po/tmp/ap_String_Id.h.h:1751 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1769 msgid "Pages:" -msgstr "Sider" +msgstr "Sider:" #. DLG_Para_LabelPagination -#: po/tmp/ap_String_Id.h.h:1753 +#: po/tmp/ap_String_Id.h.h:1771 msgid "Pagination" msgstr "Sideskift" #. DLG_PageSetup_Paper_Size -#: po/tmp/ap_String_Id.h.h:1755 +#: po/tmp/ap_String_Id.h.h:1773 msgid "Paper Si&ze:" msgstr "Papir&strrelse:" #. DLG_PageSetup_Paper -#: po/tmp/ap_String_Id.h.h:1757 +#: po/tmp/ap_String_Id.h.h:1775 msgid "Paper..." msgstr "Papir..." #. DLG_Styles_ModifyParagraph #. DLG_Para_ParaTitle -#: po/tmp/ap_String_Id.h.h:1760 +#: po/tmp/ap_String_Id.h.h:1778 msgid "Paragraph" msgstr "Afsnit" #. FIELD_Numbers_ParaCount -#: po/tmp/ap_String_Id.h.h:1762 +#: po/tmp/ap_String_Id.h.h:1780 msgid "Paragraph Count" msgstr "Antal afsnit" #. TOOLBAR_LABEL_FMT_DOM_DIRECTION -#: po/tmp/ap_String_Id.h.h:1764 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1782 msgid "Paragraph Direction" -msgstr "Afsnitseksempel" +msgstr "Afsnitsretning" #. DLG_Styles_ParaPrev -#: po/tmp/ap_String_Id.h.h:1766 +#: po/tmp/ap_String_Id.h.h:1784 msgid "Paragraph Preview" msgstr "Afsnitseksempel" #. DLG_WordCount_Paragraphs -#: po/tmp/ap_String_Id.h.h:1768 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1786 msgid "Paragraphs:" -msgstr "Afsnit" +msgstr "Afsnit:" #. WORD_PassRequired -#: po/tmp/ap_String_Id.h.h:1770 +#: po/tmp/ap_String_Id.h.h:1788 msgid "Password required, this is an encrypted document" msgstr "Dette er et krypteret dokument, adgangskode pkrvet" #. TOOLBAR_LABEL_EDIT_PASTE #. TOOLBAR_STATUSLINE_EDIT_PASTE #. TOOLBAR_TOOLTIP_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1774 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1792 msgid "Paste" -msgstr "&Indst" +msgstr "Indst" #. DLG_MetaData_TAB_Permission -#: po/tmp/ap_String_Id.h.h:1776 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1794 msgid "Permissions" -msgstr "Version" +msgstr "Rettigheder" #. DLG_Goto_Target_Picture -#: po/tmp/ap_String_Id.h.h:1778 +#: po/tmp/ap_String_Id.h.h:1796 msgid "Picture" msgstr "Billede" #. FIELD_Type_PieceTable -#: po/tmp/ap_String_Id.h.h:1780 +#: po/tmp/ap_String_Id.h.h:1798 msgid "Piece Table" msgstr "Styktabel" #. DLG_FormatFootnotes_EndPlaceEndDoc -#: po/tmp/ap_String_Id.h.h:1782 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1800 msgid "Place at end of document" -msgstr "Gem dokumentet" +msgstr "Placr til sidst i dokumentet" #. DLG_FormatFootnotes_EndPlaceEndSec -#: po/tmp/ap_String_Id.h.h:1784 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1802 msgid "Place at end of section" -msgstr "Fjern det markerede" +msgstr "Placr til sidst i sektionen" #. DLG_FormatFootnotes_EndPlacement -#: po/tmp/ap_String_Id.h.h:1786 +#: po/tmp/ap_String_Id.h.h:1804 msgid "Placement" -msgstr "" +msgstr "Placering" #. DLG_Tab_Label_Position #. DLG_PageNumbers_Position_No_Colon -#: po/tmp/ap_String_Id.h.h:1789 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1807 msgid "Position" -msgstr "Placering:" +msgstr "Placering" #. DLG_FormatFrame_PositionTo -#: po/tmp/ap_String_Id.h.h:1791 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1809 msgid "Position Text Box" -msgstr "Placering:" +msgstr "Placr tekstboks" #. DLG_FormatFrame_SetToColumn -#: po/tmp/ap_String_Id.h.h:1793 +#: po/tmp/ap_String_Id.h.h:1811 msgid "Position to Column" -msgstr "" +msgstr "Placr efter kolonne" #. DLG_FormatFrame_SetToPage -#: po/tmp/ap_String_Id.h.h:1795 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1813 msgid "Position to Page" -msgstr "Placering:" +msgstr "Placr efter side" #. DLG_FormatFrame_SetToParagraph -#: po/tmp/ap_String_Id.h.h:1797 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1815 msgid "Position to Paragraph" -msgstr "Lige margener i afsnit" +msgstr "Placr efter afsnit" #. DLG_PageNumbers_Position -#: po/tmp/ap_String_Id.h.h:1799 +#: po/tmp/ap_String_Id.h.h:1817 msgid "Position:" msgstr "Placering:" #. MENU_LABEL_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:1801 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1819 msgid "Pr&eferences" -msgstr "Indstillinger" +msgstr "&Indstillinger" #. DLG_Options_TabLabel_Preferences #. DLG_Options_Label_Schemes -#: po/tmp/ap_String_Id.h.h:1804 +#: po/tmp/ap_String_Id.h.h:1822 msgid "Preference Schemes" msgstr "Indstillingsskema" #. DLG_Options_OptionsTitle -#: po/tmp/ap_String_Id.h.h:1806 +#: po/tmp/ap_String_Id.h.h:1824 msgid "Preferences" msgstr "Indstillinger" @@ -4628,165 +4454,164 @@ #. DLG_Lists_Preview #. DLG_PageNumbers_Preview #. DLG_Zoom_PreviewFrame -#: po/tmp/ap_String_Id.h.h:1814 po/tmp/xap_String_Id.h.h:575 +#: po/tmp/ap_String_Id.h.h:1832 +#: po/tmp/xap_String_Id.h.h:604 msgid "Preview" msgstr "Eksempel" #. MENU_STATUSLINE_WEB_WEBPREVIEW #. MENU_STATUSLINE_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:1817 +#: po/tmp/ap_String_Id.h.h:1835 msgid "Preview the document as a web page" msgstr "Se hvordan dokumentet ser ud som en netside (.html)" #. MENU_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1821 +#: po/tmp/ap_String_Id.h.h:1839 msgid "Preview the document before printing" msgstr "Vis dokumentet fr det udskrives" #. DLG_Para_PreviewPrevParagraph -#: po/tmp/ap_String_Id.h.h:1823 -msgid "" -"Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph " -"Previous Paragraph Previous Paragraph Previous Paragraph" -msgstr "" -"Forrige afsnit forrige afsnit forrige afsnit forrige afsnit forrige afsnit " -"forrige afsnit forrige afsnit" +#: po/tmp/ap_String_Id.h.h:1841 +msgid "Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph" +msgstr "Forrige afsnit forrige afsnit forrige afsnit forrige afsnit forrige afsnit forrige afsnit forrige afsnit" #. TOOLBAR_LABEL_FILE_PRINT #. DLG_UP_PrintTitle #. DLG_UP_PrintButton -#: po/tmp/ap_String_Id.h.h:1825 po/tmp/xap_String_Id.h.h:580 +#: po/tmp/ap_String_Id.h.h:1843 +#: po/tmp/xap_String_Id.h.h:609 msgid "Print" msgstr "Udskriv" #. MENU_LABEL_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1827 +#: po/tmp/ap_String_Id.h.h:1845 msgid "Print &directly" msgstr "Udskriv &direkte" #. MENU_STATUSLINE_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:1829 +#: po/tmp/ap_String_Id.h.h:1847 msgid "Print Layout" msgstr "Udskriftslayout" #. MENU_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1831 +#: po/tmp/ap_String_Id.h.h:1849 msgid "Print P&review" msgstr "Vis udskrift" #. TOOLBAR_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1833 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1851 msgid "Print Preview" -msgstr "Vis udskrift" +msgstr "Forhndsvisning af udskrift" #. MENU_STATUSLINE_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1835 +#: po/tmp/ap_String_Id.h.h:1853 msgid "Print all or part of the document" msgstr "Udskriv hele dokumentet eller en del af det" #. TOOLBAR_STATUSLINE_FILE_PRINT #. TOOLBAR_TOOLTIP_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1838 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1856 msgid "Print the document" -msgstr "Gem dokumentet" +msgstr "Udskriv dokumentet" #. MENU_STATUSLINE_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1840 +#: po/tmp/ap_String_Id.h.h:1858 msgid "Print using the internal PS driver" msgstr "Udskriv via den interne PostScript-driver" #. MSG_PrintingDoc -#: po/tmp/ap_String_Id.h.h:1842 +#: po/tmp/ap_String_Id.h.h:1860 msgid "Printing Document.." msgstr "Udskriver dokument..." #. MSG_PrintStatus -#: po/tmp/ap_String_Id.h.h:1844 +#: po/tmp/ap_String_Id.h.h:1862 #, c-format msgid "Printing page %d of %d" msgstr "Udskriver side %d af %d" #. FIELD_Document_Publisher -#: po/tmp/ap_String_Id.h.h:1846 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1864 msgid "Publisher" -msgstr "Polsk" +msgstr "Udgiver af dokumentet" #. DLG_MetaData_Publisher_LBL -#: po/tmp/ap_String_Id.h.h:1848 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1866 msgid "Publisher:" -msgstr "Polsk" +msgstr "Udgiver af dokumentet:" #. MENU_LABEL_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1850 +#: po/tmp/ap_String_Id.h.h:1868 msgid "R&eplace" msgstr "&Erstat" +#. MENU_LABEL_FMT_DIRECTION_DOCD_RTL +#: po/tmp/ap_String_Id.h.h:1870 +msgid "RTL &Document" +msgstr "Hele &dokumentet hjre-mod-venstre" + #. MENU_LABEL_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:1852 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1872 msgid "RTL &Paragraph" -msgstr "&Afsnit" +msgstr "Hele &afsnittet hjre-mod-venstre" + +#. MENU_LABEL_FMT_DIRECTION_SD_RTL +#: po/tmp/ap_String_Id.h.h:1874 +msgid "RTL &Section" +msgstr "Hele &sektionen hjre-mod-venstre" #. DLG_FR_ReplaceWithLabel -#: po/tmp/ap_String_Id.h.h:1854 +#: po/tmp/ap_String_Id.h.h:1876 msgid "Re&place with:" msgstr "&Erstat med: " #. DLG_FR_ReverseFind -#: po/tmp/ap_String_Id.h.h:1856 +#: po/tmp/ap_String_Id.h.h:1878 msgid "Re&verse find" -msgstr "" +msgstr "Find bagud" +# Nulstilling af indstillinger #. MENU_LABEL_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1858 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1880 msgid "Re&vert" -msgstr "&Forkast" +msgstr "N&ulstil" #. MENU_LABEL_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1860 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1882 msgid "Recent &Files" -msgstr "bn fil" +msgstr "Nylige &filer" #. TOOLBAR_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1862 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1884 msgid "Redo" -msgstr "&Gentag" +msgstr "Gendan" #. TOOLBAR_STATUSLINE_EDIT_REDO #. TOOLBAR_TOOLTIP_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1865 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1887 msgid "Redo editing" -msgstr "Fortryd ndring" +msgstr "Gendan ndring" #. MENU_STATUSLINE_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1867 +#: po/tmp/ap_String_Id.h.h:1889 msgid "Redo previously undone editing" msgstr "Gentag sidste fortrydte ndring" #. MENU_STATUSLINE_VIEW_ZOOM_MENU #. MENU_STATUSLINE_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:1870 +#: po/tmp/ap_String_Id.h.h:1892 msgid "Reduce or enlarge the document display" msgstr "Formindsk eller forstr dokumentet p skrmen" #. DLG_MetaData_Relation_LBL -#: po/tmp/ap_String_Id.h.h:1872 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1894 msgid "Relation:" -msgstr "Hilsen:" +msgstr "Relation:" #. DLG_Styles_RemoveButton -#: po/tmp/ap_String_Id.h.h:1874 +#: po/tmp/ap_String_Id.h.h:1896 msgid "Remove" msgstr "Fjern" @@ -4794,7 +4619,7 @@ #. TOOLBAR_LABEL_EDIT_REMOVEFOOTER #. TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER #. TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1879 +#: po/tmp/ap_String_Id.h.h:1901 msgid "Remove Footer" msgstr "Fjern sidefod" @@ -4802,1562 +4627,1467 @@ #. TOOLBAR_LABEL_EDIT_REMOVEHEADER #. TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER #. TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1884 +#: po/tmp/ap_String_Id.h.h:1906 msgid "Remove Header" msgstr "Fjern sidehoved" #. DLG_Styles_RemoveLab -#: po/tmp/ap_String_Id.h.h:1886 +#: po/tmp/ap_String_Id.h.h:1908 msgid "Remove Property from Style" msgstr "Fjern egenskab fra typografi" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1888 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1910 msgid "Remove Row as Heading" -msgstr "Fjern sidehoved" +msgstr "Fjern rkke som overskrift" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1890 +#: po/tmp/ap_String_Id.h.h:1912 msgid "Remove Row as the page Heading" -msgstr "" +msgstr "Fjern rkke som sideoverskrift" #. MENU_STATUSLINE_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1892 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1914 msgid "Remove all revision information from the document" -msgstr "Fjern sidehovedet p denne side fra dokumentet" +msgstr "Fjern alle revisionsoplysninger fra dokumentet" #. MENU_STATUSLINE_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:1894 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1916 msgid "Remove full document history from the document" -msgstr "Fjern sidehovedet p denne side fra dokumentet" +msgstr "Fjern fuld dokumenthistorik fra dokumentet" #. MENU_STATUSLINE_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1896 +#: po/tmp/ap_String_Id.h.h:1918 msgid "Remove the Footer on this page from the Document" msgstr "Fjern sidefoden p denne side fra dokumentet" #. MENU_STATUSLINE_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1898 +#: po/tmp/ap_String_Id.h.h:1920 msgid "Remove the Header on this page from the Document" msgstr "Fjern sidehovedet p denne side fra dokumentet" #. MENU_STATUSLINE_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:1900 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1922 msgid "Remove the Image and save a copy on the clipboard" -msgstr "Kopir det markerede og put det i udklipsholderen" +msgstr "Fjern billede og gem en kopi i udklipsholder" #. MENU_STATUSLINE_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:1902 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1924 msgid "Remove the Image from the Document" -msgstr "Fjern sidefoden p denne side fra dokumentet" +msgstr "Fjern billede fra dokument" #. MENU_STATUSLINE_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:1904 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1926 msgid "Remove the Text Box from the Document" -msgstr "Fjern sidehovedet p denne side fra dokumentet" +msgstr "Fjern tekstboks fra dokument" #. MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:1906 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1928 msgid "Remove the suggested change" -msgstr "Brug det foreslede ord" +msgstr "Fjern den foreslede ndring" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1908 +#: po/tmp/ap_String_Id.h.h:1930 msgid "Repeat Row as Heading" -msgstr "" +msgstr "Gentag rkke som overskrift" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1910 +#: po/tmp/ap_String_Id.h.h:1932 msgid "Repeat Row as Heading on each new page" -msgstr "" +msgstr "Gentag rkke som overskrift p alle nye sider" #. DLG_FR_ReplaceTitle -#: po/tmp/ap_String_Id.h.h:1912 +#: po/tmp/ap_String_Id.h.h:1934 msgid "Replace" msgstr "Erstat" #. DLG_FR_ReplaceAllButton -#: po/tmp/ap_String_Id.h.h:1914 +#: po/tmp/ap_String_Id.h.h:1936 msgid "Replace &All" msgstr "Erstat &alle" #. MENU_STATUSLINE_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1916 +#: po/tmp/ap_String_Id.h.h:1938 msgid "Replace the specified text with different text" msgstr "Erstat en angivet tekst med en anden tekst" #. MENU_LABEL_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1918 +#: po/tmp/ap_String_Id.h.h:1940 msgid "Report a &Bug" msgstr "&Fejlrapportering" #. MENU_STATUSLINE_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1920 +#: po/tmp/ap_String_Id.h.h:1942 msgid "Report a bug and help AbiWord become a better product" msgstr "Rapportr fejl og hjlp AbiWord til at blive endnu bedre!" #. MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1922 +#: po/tmp/ap_String_Id.h.h:1944 msgid "Reset the current toolbar layout to its defaults" -msgstr "" +msgstr "Nulstil opstning af vrktjslinjen til standard" #. MENU_STATUSLINE_FMT_IMAGE -#: po/tmp/ap_String_Id.h.h:1924 +#: po/tmp/ap_String_Id.h.h:1946 msgid "Resize this image" msgstr "Vlg ny strrelse" #. DLG_HdrFtr_RestartNumbers -#: po/tmp/ap_String_Id.h.h:1926 +#: po/tmp/ap_String_Id.h.h:1948 msgid "Restart numbering at:" msgstr "Genstart nummerering ved:" +# Vedr. fodnotenummerering #. DLG_FormatFootnotes_FootRestartPage -#: po/tmp/ap_String_Id.h.h:1928 +#: po/tmp/ap_String_Id.h.h:1950 msgid "Restart on each page" -msgstr "" +msgstr "Start forfra p hver side" #. DLG_FormatFootnotes_FootRestartSec #. DLG_FormatFootnotes_EndRestartSec -#: po/tmp/ap_String_Id.h.h:1931 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1953 msgid "Restart on each section" -msgstr "Genstart sidenumre p nye sektioner" +msgstr "Start sidenumre forfra p hver sektion" #. DLG_HdrFtr_RestartCheck -#: po/tmp/ap_String_Id.h.h:1933 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1955 msgid "Restart page numbers on new sections" -msgstr "Genstart sidenumre p nye sektioner" +msgstr "Start sidenumre forfra p nye sektioner" #. DLG_Lists_Resume_Previous_List -#: po/tmp/ap_String_Id.h.h:1935 +#: po/tmp/ap_String_Id.h.h:1957 msgid "Resume Previous List" msgstr "Fortst forrige liste" #. MENU_STATUSLINE_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:1937 +#: po/tmp/ap_String_Id.h.h:1959 msgid "Retain all document changes" -msgstr "" +msgstr "Behold alle dokumentndringer" #. MSG_RevertFile -#: po/tmp/ap_String_Id.h.h:1939 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1961 msgid "Revert file to last saved state?" -msgstr "G tilbage til sidste ugemte status?" +msgstr "Gendan fil til sidst gemte tilstand?" #. MENU_STATUSLINE_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1941 +#: po/tmp/ap_String_Id.h.h:1963 msgid "Revert the document to the last saved state" msgstr "Forkast alle ndringer siden du sidst gemte" #. MSG_RevertBuffer -#: po/tmp/ap_String_Id.h.h:1943 +#: po/tmp/ap_String_Id.h.h:1965 #, c-format msgid "Revert to saved copy of %s?" msgstr "G tilbage til gemt kopi af %s?" #. DLG_ListRevisions_Column1Label -#: po/tmp/ap_String_Id.h.h:1945 +#: po/tmp/ap_String_Id.h.h:1967 msgid "Revision ID" -msgstr "" +msgstr "Revisions-ID" #. DLG_Para_AlignRight #. DLG_Tab_Radio_Right #. DLG_PageNumbers_Right #. TOOLBAR_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1950 +#: po/tmp/ap_String_Id.h.h:1972 msgid "Right" msgstr "Hjre" #. RightIndentStatus -#: po/tmp/ap_String_Id.h.h:1952 +#: po/tmp/ap_String_Id.h.h:1974 #, c-format msgid "Right Indent [%s]" msgstr "Hjreindryk [%s]" #. RightMarginStatus -#: po/tmp/ap_String_Id.h.h:1954 +#: po/tmp/ap_String_Id.h.h:1976 #, c-format msgid "Right Margin [%s]" msgstr "Hjre margen [%s]" #. TabToggleRightTab -#: po/tmp/ap_String_Id.h.h:1956 +#: po/tmp/ap_String_Id.h.h:1978 msgid "Right Tab" msgstr "Hjretabulator" #. TOOLBAR_STATUSLINE_ALIGN_RIGHT #. TOOLBAR_TOOLTIP_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1959 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1981 msgid "Right alignment" -msgstr "Justering" +msgstr "Hjrejustering" #. MENU_STATUSLINE_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1961 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1983 msgid "Right-align the paragraph" -msgstr "Centrr afsnittet" +msgstr "Hjrestil afsnittet" #. DLG_Para_DomDirection -#: po/tmp/ap_String_Id.h.h:1963 +#: po/tmp/ap_String_Id.h.h:1985 msgid "Right-to-left &dominant" msgstr "Hjre mod venstre &dominerende" +# Felt med dokumentoplysninger: Rettigheder til dokumentet. #. FIELD_Document_Rights -#: po/tmp/ap_String_Id.h.h:1965 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1987 msgid "Rights" -msgstr "Hjre" +msgstr "Rettigheder" #. DLG_MetaData_Rights_LBL -#: po/tmp/ap_String_Id.h.h:1967 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1989 msgid "Rights:" -msgstr "&Hjre:" +msgstr "Rettigheder:" #. DLG_FormatTable_Apply_To_Row -#: po/tmp/ap_String_Id.h.h:1969 +#: po/tmp/ap_String_Id.h.h:1991 msgid "Row" -msgstr "" +msgstr "Rkke" #. MENU_LABEL_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1971 +#: po/tmp/ap_String_Id.h.h:1993 msgid "Rows &Above" -msgstr "" +msgstr "Rkker &over" #. MENU_LABEL_TABLE_INSERT_ROWS_AFTER -#: po/tmp/ap_String_Id.h.h:1973 +#: po/tmp/ap_String_Id.h.h:1995 msgid "Rows &Below" -msgstr "" +msgstr "Rkker &under" #. MENU_LABEL_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1975 +#: po/tmp/ap_String_Id.h.h:1997 msgid "S&cripts" msgstr "S&kripter" #. MENU_LABEL_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:1977 +#: po/tmp/ap_String_Id.h.h:1999 msgid "S&how revisions" -msgstr "" +msgstr "V&is revisioner" #. MENU_LABEL_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:1979 +#: po/tmp/ap_String_Id.h.h:2001 msgid "S&plit Cells" -msgstr "" +msgstr "O&psplit celler" #. DLG_Options_Btn_Save -#: po/tmp/ap_String_Id.h.h:1981 +#: po/tmp/ap_String_Id.h.h:2003 msgid "Sa&ve" msgstr "&Gem" #. MENU_LABEL_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:1983 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2005 msgid "Sav&e Copy" msgstr "Gem k&opi" #. TOOLBAR_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:1985 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2007 msgid "Save" -msgstr "&Gem" +msgstr "Gem" #. MENU_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:1987 +#: po/tmp/ap_String_Id.h.h:2009 msgid "Save &As" msgstr "Gem &som" #. MENU_LABEL_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1989 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2011 msgid "Save &Template" -msgstr "bn skabelon" +msgstr "Gem &skabelon" #. TOOLBAR_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:1991 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2013 msgid "Save As" msgstr "Gem &som" #. MENU_STATUSLINE_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:1993 +#: po/tmp/ap_String_Id.h.h:2015 msgid "Save a copy of the image on the clipboard" -msgstr "" +msgstr "Gem en kopi af billedet i udklipsholder" #. MSG_ConfirmSave -#: po/tmp/ap_String_Id.h.h:1995 -#, fuzzy, c-format +#: po/tmp/ap_String_Id.h.h:2017 +#, c-format msgid "Save changes to document %s before closing?" -msgstr "Vis dokumentet fr det udskrives" +msgstr "Gem ndringerne i dokumentet %s, fr det lukkes?" #. MENU_STATUSLINE_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:1997 +#: po/tmp/ap_String_Id.h.h:2019 msgid "Save the Embedded Object" -msgstr "" +msgstr "Gem det indlejrede objekt" #. MENU_STATUSLINE_FILE_SAVE #. TOOLBAR_STATUSLINE_FILE_SAVE #. TOOLBAR_TOOLTIP_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:2001 +#: po/tmp/ap_String_Id.h.h:2023 msgid "Save the document" msgstr "Gem dokumentet" #. MENU_STATUSLINE_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:2003 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2025 msgid "Save the document as a template" -msgstr "Gem dokumentet som en netside (.html)" +msgstr "Gem dokumentet som skabelon" #. MENU_STATUSLINE_FILE_SAVEAS #. TOOLBAR_STATUSLINE_FILE_SAVEAS #. TOOLBAR_TOOLTIP_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:2007 +#: po/tmp/ap_String_Id.h.h:2029 msgid "Save the document under a different name" msgstr "Gem dokumentet under et andet navn" #. MENU_STATUSLINE_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:2009 +#: po/tmp/ap_String_Id.h.h:2031 msgid "Save the document without changing the current name" msgstr "Gem dokumentet uden at ndre dets navn" #. MENU_STATUSLINE_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:2011 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2033 msgid "Save the selected image to a file" -msgstr "Gr den markerede tekst kursiv (til/fra)" +msgstr "Gem det valgte billede som fil" #. MENU_LABEL_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:2013 +#: po/tmp/ap_String_Id.h.h:2035 msgid "Save to file" -msgstr "" +msgstr "Gem til fil" #. DLG_PageSetup_Scale -#: po/tmp/ap_String_Id.h.h:2015 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2037 msgid "Scale..." -msgstr "Papir..." +msgstr "Skala..." #. MENU_STATUSLINE_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:2017 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2039 msgid "Search for help about..." -msgstr "&Sg i hjlp" +msgstr "Sg hjlp om..." #. DLG_WordCount_Update_Rate -#: po/tmp/ap_String_Id.h.h:2019 +#: po/tmp/ap_String_Id.h.h:2041 msgid "Seconds between updates" -msgstr "" +msgstr "Sekunder mellem opdateringer" #. FIELD_DateTime_Epoch -#: po/tmp/ap_String_Id.h.h:2021 +#: po/tmp/ap_String_Id.h.h:2043 msgid "Seconds since the epoch" -msgstr "" +msgstr "Sekunder siden start p tidsregning" #. DLG_Break_SectionBreaks_Capital -#: po/tmp/ap_String_Id.h.h:2023 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2045 msgid "Section Breaks" -msgstr "&Ordliste..." +msgstr "Sektionsskift" #. DLG_Break_SectionBreaks -#: po/tmp/ap_String_Id.h.h:2025 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2047 msgid "Section breaks" -msgstr "&Ordliste..." +msgstr "Sektionsskift" #. MENU_STATUSLINE_TOOLS_HISTORY -#: po/tmp/ap_String_Id.h.h:2027 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2049 msgid "See history of the current document" -msgstr "Fjern sidehovedet p denne side fra dokumentet" +msgstr "Se nuvrende dokuments historik" #. MENU_STATUSLINE_TABLE_SELECT #. DLG_Select -#: po/tmp/ap_String_Id.h.h:2029 po/tmp/xap_String_Id.h.h:630 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2051 +#: po/tmp/xap_String_Id.h.h:667 msgid "Select" -msgstr "Markering" +msgstr "Vlg" #. MENU_LABEL_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2031 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2053 msgid "Select A&ll" -msgstr "Markering" +msgstr "Vlg &Alle" #. MENU_STATUSLINE_TABLE_SELECT_CELL -#: po/tmp/ap_String_Id.h.h:2033 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2055 msgid "Select Cell" -msgstr "Slet" +msgstr "Vlg celle" #. MENU_STATUSLINE_TABLE_SELECT_COLUMN -#: po/tmp/ap_String_Id.h.h:2035 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2057 msgid "Select Column" -msgstr "Mellemrum efter spalte " +msgstr "Vlg kolonne" + +#. TOOLBAR_TOOLTIP_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:2059 +msgid "Select Font" +msgstr "Vlg skrifttype" #. DLG_ListRevisions_Title -#: po/tmp/ap_String_Id.h.h:2037 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2061 msgid "Select Revision" -msgstr "Markering" +msgstr "Vlg revision" #. MENU_STATUSLINE_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:2039 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2063 msgid "Select Row" -msgstr "Slet" +msgstr "Vlg rkke" #. MENU_STATUSLINE_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:2041 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2065 msgid "Select Table" -msgstr "Styktabel" +msgstr "Vlg tabel" #. MENU_LABEL_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2043 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2067 msgid "Select Text Box" -msgstr "Indst slutnote" +msgstr "Vlg tekstboks" #. DLG_InsertHyperlink_Msg -#: po/tmp/ap_String_Id.h.h:2045 +#: po/tmp/ap_String_Id.h.h:2069 msgid "Select a target bookmark from the list." -msgstr "" +msgstr "Vlg bogmrke fra liste." #. DLG_FormatFrame_SelectImage #. DLG_FormatTable_SelectImage -#: po/tmp/ap_String_Id.h.h:2048 +#: po/tmp/ap_String_Id.h.h:2072 msgid "Select image from File" -msgstr "" +msgstr "Vlg billede fra fil" #. MENU_STATUSLINE_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2050 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2074 msgid "Select the Text Box" -msgstr "Indst slutnote" +msgstr "Vlg tekstboksen" #. MENU_STATUSLINE_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2052 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2076 msgid "Select the entire document" -msgstr "Gem dokumentet" +msgstr "Vlg hele dokumentet" #. DLG_FormatTable_Apply_To_Selection #. DLG_UP_Selection -#: po/tmp/ap_String_Id.h.h:2054 po/tmp/xap_String_Id.h.h:638 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2078 +#: po/tmp/xap_String_Id.h.h:675 msgid "Selection" msgstr "Markering" #. DLG_ToggleCase_SentenceCase -#: po/tmp/ap_String_Id.h.h:2056 +#: po/tmp/ap_String_Id.h.h:2080 msgid "Sentence case" -msgstr "" +msgstr "Store og sm bogstaver i stningen" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2058 +#: po/tmp/ap_String_Id.h.h:2082 msgid "Separate table items with commas" -msgstr "" +msgstr "Adskil tabelelementer med kommaer" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2060 +#: po/tmp/ap_String_Id.h.h:2084 msgid "Separate table items with commas and tabs" -msgstr "" +msgstr "Adskil tabelelementer med kommaer og tabulering" #. MENU_STATUSLINE_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2062 +#: po/tmp/ap_String_Id.h.h:2086 msgid "Separate table items with tabs" -msgstr "" +msgstr "Adskil tabelelementer med tabulering" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2064 +#: po/tmp/ap_String_Id.h.h:2088 msgid "Separate with commas" -msgstr "" +msgstr "Adskil med kommaer" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2066 +#: po/tmp/ap_String_Id.h.h:2090 msgid "Separate with commas and tabs" -msgstr "" +msgstr "Adskil med kommaer og tabulering" #. MENU_LABEL_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2068 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2092 msgid "Separate with tabs" -msgstr "Tegn (med mellemrum)" +msgstr "Adskil med tabulering" +# Ifb.m. tabulering #. DLG_Tab_Button_Set -#: po/tmp/ap_String_Id.h.h:2070 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2094 msgid "Set" -msgstr "Markering" +msgstr "St" #. MENU_LABEL_FMT_LANGUAGE -#: po/tmp/ap_String_Id.h.h:2072 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2096 msgid "Set &Language" msgstr "&Sprog" #. DLG_Lists_SetDefault -#: po/tmp/ap_String_Id.h.h:2074 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2098 msgid "Set Default Values" -msgstr "Standard sidestrrelse" +msgstr "Vlg standardvrdier" +# Uklar. #. DLG_FormatFrame_SetImage #. DLG_FormatTable_SetImage -#: po/tmp/ap_String_Id.h.h:2077 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2101 msgid "Set Image" -msgstr "Formatr &billede" +msgstr "Placr billede" +#. MENU_LABEL_FMT_SETPOSIMAGE +#: po/tmp/ap_String_Id.h.h:2103 +msgid "Set Positioned Image" +msgstr "Placr billede" + +# Betyder 'Set' Aktivr tekstfoldning #. DLG_FormatFrame_SetTextWrapping -#: po/tmp/ap_String_Id.h.h:2079 +#: po/tmp/ap_String_Id.h.h:2105 msgid "Set Text Wrapping" -msgstr "" +msgstr "St tekstfoldning" #. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:2081 +#: po/tmp/ap_String_Id.h.h:2107 msgid "Set an image as a background for your page" -msgstr "" +msgstr "Vlg billede som baggrund for din side" + +#. MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL +#: po/tmp/ap_String_Id.h.h:2109 +msgid "Set dominant direction of document to RTL" +msgstr "St dokumentets primre retning til hjre mod venstre" #. MENU_STATUSLINE_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:2083 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2111 msgid "Set dominant direction of paragraph to RTL" -msgstr "ndr formatet for det markerede afsnit" +msgstr "St afsnittets primre retning til hjre mod venstre" + +#. MENU_STATUSLINE_FMT_DIRECTION_SD_RTL +#: po/tmp/ap_String_Id.h.h:2113 +msgid "Set dominant direction of section to RTL" +msgstr "St sektionens primre retning til hjre mod venstre" #. MENU_STATUSLINE_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:2085 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2115 msgid "Set meta-data properties" -msgstr "Sidehovedegenskaber" +msgstr "Definr egenskaber for metadata" #. DLG_Tab_Label_New -#: po/tmp/ap_String_Id.h.h:2087 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2117 msgid "Set new Tab" -msgstr "Centertabulator" +msgstr "Definr ny tabulator" #. DLG_FormatFrame_NoImageBackground #. DLG_FormatTable_NoImageBackground -#: po/tmp/ap_String_Id.h.h:2090 +#: po/tmp/ap_String_Id.h.h:2120 msgid "Set no image" -msgstr "" +msgstr "Uden billede" #. MENU_STATUSLINE_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:2092 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2122 msgid "Set preferences" msgstr "Indstillinger" #. MENU_STATUSLINE_FMT_TABS -#: po/tmp/ap_String_Id.h.h:2094 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2124 msgid "Set tab stops" -msgstr "Standard tabulatorstop:" +msgstr "St tabulatorstop:" #. MENU_STATUSLINE_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2096 +#: po/tmp/ap_String_Id.h.h:2126 msgid "Set the type and styles of the Table of Contents" -msgstr "" +msgstr "Vlg type og typografi for Indholdsfortegnelse" #. MENU_STATUSLINE_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:2098 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2128 msgid "Set the types of Footnotes and Endnotes" -msgstr "Indst slutnote" +msgstr "Vlg fodnote- og slutnotetypografier" #. MENU_STATUSLINE_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:2100 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2130 msgid "Set the types of Headers and Footers" -msgstr "Side&hoved og sidefod" +msgstr "St sidehoved- og sidefodstypografier" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2102 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2132 msgid "Set this Row as Heading" -msgstr "Fjern sidehoved" +msgstr "St denne rkke som overskrift" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2104 +#: po/tmp/ap_String_Id.h.h:2134 msgid "Set this Row as the Heading on each page" -msgstr "" +msgstr "St denne rkke som overskrift p hver side" + +#. MENU_STATUSLINE_FMT_SETPOSIMAGE +#: po/tmp/ap_String_Id.h.h:2136 +msgid "Set this image to be positioned" +msgstr "Placr dette billede" #. MENU_STATUSLINE_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2106 +#: po/tmp/ap_String_Id.h.h:2138 msgid "Set your spelling preferences" -msgstr "" +msgstr "Vlg dine staveprferencer" #. MENU_STATUSLINE_FMT_DOCUMENT -#: po/tmp/ap_String_Id.h.h:2108 +#: po/tmp/ap_String_Id.h.h:2140 msgid "Setup your document's page properties such as page size and margins" -msgstr "" +msgstr "Definr sideegenskaber ssom sidestrrelse og margener" #. DLG_Styles_ModifyShortCut -#: po/tmp/ap_String_Id.h.h:2110 +#: po/tmp/ap_String_Id.h.h:2142 msgid "Shortcut Key" -msgstr "" +msgstr "Genvejstast" #. DLG_Options_Label_Show #. DLG_Show -#: po/tmp/ap_String_Id.h.h:2112 po/tmp/xap_String_Id.h.h:650 +#: po/tmp/ap_String_Id.h.h:2144 +#: po/tmp/xap_String_Id.h.h:687 msgid "Show" -msgstr "" +msgstr "Vis" #. MENU_LABEL_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2114 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2146 msgid "Show &Ruler" -msgstr "&Linial" +msgstr "Vis &lineal" #. TOOLBAR_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2116 +#: po/tmp/ap_String_Id.h.h:2148 msgid "Show All" -msgstr "" +msgstr "Vis alle" #. MENU_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2118 +#: po/tmp/ap_String_Id.h.h:2150 msgid "Show For&matting Marks" -msgstr "" +msgstr "Vis for&matteringsmrker" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2120 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2152 msgid "Show document &before revisions" -msgstr "Vis dokumentet fr det udskrives" +msgstr "Vis dokumentet &fr revisioner" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2122 +#: po/tmp/ap_String_Id.h.h:2154 msgid "Show document a&fter revisions" -msgstr "" +msgstr "Vis dokument e&fter revisioner" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2124 +#: po/tmp/ap_String_Id.h.h:2156 msgid "Show document after &previous revisions" -msgstr "" +msgstr "Vis dokument efter &tidligere revisioner" #. MENU_STATUSLINE_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:2126 +#: po/tmp/ap_String_Id.h.h:2158 msgid "Show full list of documents" -msgstr "" +msgstr "Vis fuld dokumentliste" #. MENU_STATUSLINE_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2128 +#: po/tmp/ap_String_Id.h.h:2160 msgid "Show or hide the rulers" -msgstr "" +msgstr "Vis/skjul linealer" #. MENU_STATUSLINE_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:2130 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2162 msgid "Show or hide the status bar" -msgstr "Vis &statuslinje" +msgstr "Vis/skjul statuslinje" #. MENU_STATUSLINE_VIEW_TB_1 #. MENU_STATUSLINE_VIEW_TB_2 #. MENU_STATUSLINE_VIEW_TB_3 #. MENU_STATUSLINE_VIEW_TB_4 -#: po/tmp/ap_String_Id.h.h:2135 +#: po/tmp/ap_String_Id.h.h:2167 msgid "Show or hide the toolbar" -msgstr "" +msgstr "Vis/skjul vrktjslinjen" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:2137 +#: po/tmp/ap_String_Id.h.h:2169 msgid "Show revisions that are present in document" -msgstr "" - -#. DLG_Options_Label_ShowSplash -#: po/tmp/ap_String_Id.h.h:2139 -msgid "Show the AbiWord splash screen on application startup" -msgstr "" +msgstr "Vis revisioner, der findes i dokumentet" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2141 +#: po/tmp/ap_String_Id.h.h:2171 msgid "Show what the document looks like after previous revisions" -msgstr "" +msgstr "Vis, hvordan dokumentet ser ud efter tidligere revisioner" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2143 +#: po/tmp/ap_String_Id.h.h:2173 msgid "Show what the document looks like after revisions" -msgstr "" +msgstr "Vis, hvordan dokumentet ser ud efter revisioner" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2145 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2175 msgid "Show what the document looks like before revisions" -msgstr "Vis dokumentet fr det udskrives" +msgstr "Vis dokumentet fra fr revisioner" #. DLG_Options_Label_ViewShowHide -#: po/tmp/ap_String_Id.h.h:2147 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2177 msgid "Show..." -msgstr "Ny..." +msgstr "Vis..." #. TOOLBAR_STATUSLINE_VIEW_SHOWPARA #. TOOLBAR_TOOLTIP_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2150 +#: po/tmp/ap_String_Id.h.h:2180 msgid "Show/hide formatting marks" -msgstr "" +msgstr "Vis/skjul formatteringsmrker" + +#. TB_Simple +#: po/tmp/ap_String_Id.h.h:2182 +msgid "Simple" +msgstr "Enkel" + +#. DLG_Options_Label_ViewSimpleTB +#: po/tmp/ap_String_Id.h.h:2184 +msgid "Simple Toolbar" +msgstr "Enkel vrktjslinje" #. DLG_Para_SpacingSingle -#: po/tmp/ap_String_Id.h.h:2152 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2186 msgid "Single" -msgstr "Linje" +msgstr "Enkelt" #. TOOLBAR_LABEL_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2154 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2188 msgid "Single Spacing" -msgstr "Mellemrum" +msgstr "Enkelt linjeafstand" #. TOOLBAR_STATUSLINE_SINGLE_SPACE #. TOOLBAR_TOOLTIP_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2157 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2191 msgid "Single spacing" -msgstr "&Linjeafstand:" +msgstr "Enkelt linjeafstand" #. MENU_LABEL_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2159 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2193 msgid "So&rt Table" -msgstr "Formatr &billede" +msgstr "So&rtr tabel" #. MENU_LABEL_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2161 +#: po/tmp/ap_String_Id.h.h:2195 msgid "Sort Columns in Ascending Order" -msgstr "" +msgstr "Sortr kolonner efter stigende vrdi" #. MENU_STATUSLINE_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2163 +#: po/tmp/ap_String_Id.h.h:2197 msgid "Sort Columns in Ascending Order based on Selected Row" -msgstr "" +msgstr "Sortr kolonner efter stigende vrdi baseret p den valgte rkke" #. MENU_LABEL_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2165 +#: po/tmp/ap_String_Id.h.h:2199 msgid "Sort Columns in Descending Order" -msgstr "" +msgstr "Sortr kolonner efter faldende vrdi" #. MENU_STATUSLINE_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2167 +#: po/tmp/ap_String_Id.h.h:2201 msgid "Sort Columns in Descending Order based on Selected Row" -msgstr "" +msgstr "Sortr kolonner efter faldende vrdi baseret p den valgte rkke" #. MENU_LABEL_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2169 +#: po/tmp/ap_String_Id.h.h:2203 msgid "Sort Rows in Ascending Order" -msgstr "" +msgstr "Sortr rkker efter stigende vrdi" #. MENU_STATUSLINE_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2171 +#: po/tmp/ap_String_Id.h.h:2205 msgid "Sort Rows in Ascending Order based on selected Column" -msgstr "" +msgstr "Sortr rkker efter stigende vrdi baseret p den valgte kolonne" #. MENU_LABEL_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2173 +#: po/tmp/ap_String_Id.h.h:2207 msgid "Sort Rows in Descending Order" -msgstr "" +msgstr "Sortr rkker efter faldende vrdi" #. MENU_STATUSLINE_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2175 +#: po/tmp/ap_String_Id.h.h:2209 msgid "Sort Rows in Descending Order based on Selected Column" -msgstr "" +msgstr "Sortr rkker efter faldende vrdi baseret p den valgte kolonne" #. MENU_STATUSLINE_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2177 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2211 msgid "Sort Table" -msgstr "Formatr &billede" +msgstr "Sortr tabel" #. DLG_MetaData_Source_LBL -#: po/tmp/ap_String_Id.h.h:2179 +#: po/tmp/ap_String_Id.h.h:2213 msgid "Source:" -msgstr "" +msgstr "Kilde:" +# Spalte? #. DLG_Column_Space_After -#: po/tmp/ap_String_Id.h.h:2181 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2215 msgid "Space after Column" -msgstr "Mellemrum efter spalte " +msgstr "Mellemrum efter kolonne " #. TOOLBAR_STATUSLINE_PARA_12BEFORE #. TOOLBAR_TOOLTIP_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:2184 +#: po/tmp/ap_String_Id.h.h:2218 msgid "Space before: 12 pt" -msgstr "" +msgstr "Mellemrum fr: 12 pkt" #. TOOLBAR_STATUSLINE_PARA_0BEFORE #. TOOLBAR_TOOLTIP_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:2187 +#: po/tmp/ap_String_Id.h.h:2221 msgid "Space before: None" -msgstr "" +msgstr "Mellemrum fr: Intet" #. DLG_Para_LabelSpacing -#: po/tmp/ap_String_Id.h.h:2189 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2223 msgid "Spacing" msgstr "Mellemrum" #. DLG_Options_SpellCheckingTitle -#: po/tmp/ap_String_Id.h.h:2191 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2225 msgid "Spell Checking" -msgstr "&Stavning" +msgstr "Stavekontrol" #. TOOLBAR_LABEL_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2193 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2227 msgid "Spellcheck" -msgstr "&Lbende stavekontrol" +msgstr "Stavekontrol" #. TOOLBAR_STATUSLINE_SPELLCHECK #. TOOLBAR_TOOLTIP_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2196 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2230 msgid "Spellcheck the document" -msgstr "Gem dokumentet" +msgstr "Stavekontrol af dokumentet" #. DLG_Spell_SpellTitle #. DLG_Options_TabLabel_Spelling -#: po/tmp/ap_String_Id.h.h:2199 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2233 msgid "Spelling" -msgstr "&Stavning" +msgstr "Stavning" #. MENU_LABEL_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2201 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2235 msgid "Spelling &Options" -msgstr "(Ingen staveforeslag)" +msgstr "Stave&opstning" #. MENU_LABEL_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2203 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2237 msgid "Spli&t Table" -msgstr "Styktabel" +msgstr "Opspli&t tabel" #. DLG_SplitCellsTitle #. DLG_SplitCells_Frame #. MENU_STATUSLINE_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2207 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2241 msgid "Split Cells" -msgstr "Slet" +msgstr "Opsplit celler" #. MENU_STATUSLINE_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2209 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2243 msgid "Split Table" -msgstr "Styktabel" +msgstr "Opsplit tabel" #. TOOLBAR_LABEL_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2211 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2245 msgid "Split cells" -msgstr "Slet" +msgstr "Opsplit celler" #. DLG_SplitCells_HoriMid #. DLG_SplitCells_VertMid -#: po/tmp/ap_String_Id.h.h:2214 +#: po/tmp/ap_String_Id.h.h:2248 msgid "Split in Middle" -msgstr "" +msgstr "Opsplit p midten" #. DLG_SplitCells_Below -#: po/tmp/ap_String_Id.h.h:2216 +#: po/tmp/ap_String_Id.h.h:2250 msgid "Split on Bottom Side" -msgstr "" +msgstr "Opsplit i bunden" #. DLG_SplitCells_Left -#: po/tmp/ap_String_Id.h.h:2218 +#: po/tmp/ap_String_Id.h.h:2252 msgid "Split on Left Side" -msgstr "" +msgstr "Opsplit i venstre side" #. DLG_SplitCells_Right -#: po/tmp/ap_String_Id.h.h:2220 +#: po/tmp/ap_String_Id.h.h:2254 msgid "Split on Right Side" -msgstr "" +msgstr "Opslit i hjre side" #. DLG_SplitCells_Above -#: po/tmp/ap_String_Id.h.h:2222 +#: po/tmp/ap_String_Id.h.h:2256 msgid "Split on Top Side" -msgstr "" +msgstr "Opsplit i toppen" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2224 +#: po/tmp/ap_String_Id.h.h:2258 msgid "Split on all delimiters except spaces" -msgstr "" +msgstr "Opsplit ved alle adskillelsesmarkrer pnr mellemrum" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2226 +#: po/tmp/ap_String_Id.h.h:2260 msgid "Split on all word delimiters including spaces" -msgstr "" +msgstr "Opsplit ved alle adskillelsesmarkrer, inklusive mellemrum" #. MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2228 +#: po/tmp/ap_String_Id.h.h:2262 msgid "Split text at commas or tabs" -msgstr "" +msgstr "Opsplit tekst ved kommaer eller tabuleringer" #. MENU_LABEL_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2230 +#: po/tmp/ap_String_Id.h.h:2264 msgid "Split text at spaces, commas, or tabs" -msgstr "" +msgstr "Opsplit tekst ved mellemrum, kommaer eller tabuleringer" #. TOOLBAR_STATUSLINE_SPLIT_CELLS #. TOOLBAR_TOOLTIP_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2233 +#: po/tmp/ap_String_Id.h.h:2267 msgid "Split this cell" -msgstr "" +msgstr "Opsplit denne celle" #. DLG_Lists_Square_List #. STYLE_SQUARELIST -#: po/tmp/ap_String_Id.h.h:2235 po/tmp/xap_String_Id.h.h:662 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2269 +#: po/tmp/xap_String_Id.h.h:699 msgid "Square List" -msgstr "Nummeret liste" +msgstr "Liste med firkanter som tegn" #. MENU_LABEL_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2237 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2271 msgid "St&yle" -msgstr "Ny typografi" +msgstr "T&ypografi" #. TB_Standard -#: po/tmp/ap_String_Id.h.h:2239 +#: po/tmp/ap_String_Id.h.h:2273 msgid "Standard" -msgstr "" +msgstr "Standard" #. DLG_Options_Label_ViewStandardTB -#: po/tmp/ap_String_Id.h.h:2241 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2275 msgid "Standard Toolbar" -msgstr "Ekstra vrktjslinje" +msgstr "Standardvrktjslinje" #. DLG_Lists_Star_List #. STYLE_STARLIST -#: po/tmp/ap_String_Id.h.h:2243 po/tmp/xap_String_Id.h.h:666 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2277 +#: po/tmp/xap_String_Id.h.h:703 msgid "Star List" -msgstr "Hjerteliste" +msgstr "Liste med stjerner som tegn" #. DLG_Lists_Start -#: po/tmp/ap_String_Id.h.h:2245 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2279 msgid "Start At:" -msgstr "Start ved:" +msgstr "begynd ved:" #. DLG_Lists_Start_New_List #. DLG_Lists_Start_New -#: po/tmp/ap_String_Id.h.h:2248 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2282 msgid "Start New List" -msgstr "Hjerteliste" +msgstr "Pbegynd ny liste" #. DLG_Lists_Start_Sub -#: po/tmp/ap_String_Id.h.h:2250 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2284 msgid "Start Sublist" -msgstr "Start ved:" +msgstr "Pbegynd underliste" #. DLG_MarkRevisions_Check2Label -#: po/tmp/ap_String_Id.h.h:2252 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2286 msgid "Start a new revision" -msgstr "Markering" +msgstr "Pbegynd ny revision" #. MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2254 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2288 msgid "Start ne&w revision" -msgstr "Markering" +msgstr "Pbegynd &ny revision" #. MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2256 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2290 msgid "Start revision distinct from the current one" -msgstr "Fjern sidehovedet p denne side fra dokumentet" +msgstr "Pbegynd ny revision adskilt fra den nuvrende" #. DLG_WordCount_Statistics -#: po/tmp/ap_String_Id.h.h:2258 +#: po/tmp/ap_String_Id.h.h:2292 msgid "Statistics:" -msgstr "" +msgstr "Statistik:" #. DLG_Lists_Stop_Current_List -#: po/tmp/ap_String_Id.h.h:2260 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2294 msgid "Stop Current List" -msgstr "Anvend p denne liste" +msgstr "Afslut nuvrende liste" #. MENU_LABEL_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2262 +#: po/tmp/ap_String_Id.h.h:2296 msgid "Stri&ke" -msgstr "" +msgstr "Ov&erstreg" #. TOOLBAR_LABEL_FMT_STRIKE #. TOOLBAR_STATUSLINE_FMT_STRIKE #. TOOLBAR_TOOLTIP_FMT_STRIKE #. DLG_UFS_StrikeoutCheck -#: po/tmp/ap_String_Id.h.h:2266 po/tmp/xap_String_Id.h.h:668 +#: po/tmp/ap_String_Id.h.h:2300 +#: po/tmp/xap_String_Id.h.h:705 msgid "Strike" -msgstr "" +msgstr "Overstreg" #. MENU_STATUSLINE_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2268 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2302 msgid "Strikeout the selection (toggle)" msgstr "Overstreg den markerede tekst (til/fra)" #. MENU_LABEL_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:2270 +#: po/tmp/ap_String_Id.h.h:2304 msgid "Sty&list" -msgstr "" +msgstr "Typo&graf" #. TOOLBAR_LABEL_FMT_STYLE #. TOOLBAR_STATUSLINE_FMT_STYLE #. TOOLBAR_TOOLTIP_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2274 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2308 msgid "Style" -msgstr "Ny typografi" +msgstr "Typografi" #. DLG_Styles_ErrNotTitle1 -#: po/tmp/ap_String_Id.h.h:2276 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2310 msgid "Style Name - " -msgstr "Filnavn" +msgstr "Typografinavn - " #. DLG_Styles_ModifyName -#: po/tmp/ap_String_Id.h.h:2278 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2312 msgid "Style Name:" -msgstr "Filnavn" +msgstr "Typografinavn:" #. DLG_Styles_ModifyType -#: po/tmp/ap_String_Id.h.h:2280 +#: po/tmp/ap_String_Id.h.h:2314 msgid "Style Type" -msgstr "" +msgstr "Typografitype" #. DLG_Styles_ModifyFollowing -#: po/tmp/ap_String_Id.h.h:2282 +#: po/tmp/ap_String_Id.h.h:2316 msgid "Style for following paragraph" -msgstr "" +msgstr "Typografi for det flgende afsnit" #. DLG_Styles_ErrBlankName -#: po/tmp/ap_String_Id.h.h:2284 +#: po/tmp/ap_String_Id.h.h:2318 msgid "Style name cannot be left blank" -msgstr "" +msgstr "Typografinavnet skal vre udfyldt" #. DLG_Lists_Style #. DLG_UFS_StyleLabel -#: po/tmp/ap_String_Id.h.h:2286 po/tmp/xap_String_Id.h.h:670 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2320 +#: po/tmp/xap_String_Id.h.h:707 msgid "Style:" -msgstr "Ny typografi" +msgstr "Typografi:" #. DLG_Styles_StylesTitle #. DLG_Stylist_Styles -#: po/tmp/ap_String_Id.h.h:2289 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2323 msgid "Styles" msgstr "Typografier" #. DLG_Stylist_Title -#: po/tmp/ap_String_Id.h.h:2291 +#: po/tmp/ap_String_Id.h.h:2325 msgid "Stylist" -msgstr "" +msgstr "Typograf" #. FIELD_Document_Subject -#: po/tmp/ap_String_Id.h.h:2293 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2327 msgid "Subject" msgstr "Emne" #. DLG_MetaData_Subject_LBL -#: po/tmp/ap_String_Id.h.h:2295 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2329 msgid "Subject:" -msgstr "Emne" +msgstr "Emne:" #. TOOLBAR_LABEL_FMT_SUBSCRIPT #. TOOLBAR_STATUSLINE_FMT_SUBSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUBSCRIPT #. DLG_UFS_SubScript -#: po/tmp/ap_String_Id.h.h:2299 po/tmp/xap_String_Id.h.h:674 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2333 +#: po/tmp/xap_String_Id.h.h:711 msgid "Subscript" -msgstr "&Snket" +msgstr "Snket skrift" #. DLG_Spell_Suggestions -#: po/tmp/ap_String_Id.h.h:2301 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2335 msgid "Sugg&estions:" -msgstr "&Foreslag:" +msgstr "&Forslag:" #. DLG_Options_Label_SpellMainOnly -#: po/tmp/ap_String_Id.h.h:2303 +#: po/tmp/ap_String_Id.h.h:2337 msgid "Suggest from &main dictionary only" -msgstr "" +msgstr "Forslag kun fra &primr ordbog" #. MENU_LABEL_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:2305 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2339 msgid "Sum a Column" -msgstr "Spalter" +msgstr "Kolonnesum" #. MENU_LABEL_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:2307 +#: po/tmp/ap_String_Id.h.h:2341 msgid "Sum a Row" -msgstr "" +msgstr "Opsummr rkke" #. FIELD_Numbers_TableSumRows -#: po/tmp/ap_String_Id.h.h:2309 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2343 msgid "Sum a Table Column" -msgstr "ndr antallet af spalter" +msgstr "Tabelkolonnesum" #. FIELD_Numbers_TableSumCols -#: po/tmp/ap_String_Id.h.h:2311 +#: po/tmp/ap_String_Id.h.h:2345 msgid "Sum a Table Row" -msgstr "" +msgstr "Opsummr tabelrkke" #. DLG_MetaData_TAB_Summary -#: po/tmp/ap_String_Id.h.h:2313 +#: po/tmp/ap_String_Id.h.h:2347 msgid "Summary" -msgstr "" +msgstr "Resumm" #. MENU_LABEL_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:2315 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2349 msgid "Supe&rscript" -msgstr "&Snket" +msgstr "&Hvet skrift" #. TOOLBAR_LABEL_FMT_SUPERSCRIPT #. TOOLBAR_STATUSLINE_FMT_SUPERSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUPERSCRIPT #. DLG_UFS_SuperScript -#: po/tmp/ap_String_Id.h.h:2319 po/tmp/xap_String_Id.h.h:676 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2353 +#: po/tmp/xap_String_Id.h.h:713 msgid "Superscript" -msgstr "&Snket" +msgstr "Hvet skrift" #. MENU_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2321 +#: po/tmp/ap_String_Id.h.h:2355 msgid "Sy&mbol" -msgstr "" +msgstr "Sy&mbol" #. TOOLBAR_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2323 +#: po/tmp/ap_String_Id.h.h:2357 msgid "Symbol" -msgstr "" +msgstr "Symbol" #. MENU_LABEL_TABLE -#: po/tmp/ap_String_Id.h.h:2325 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2359 msgid "T&able" -msgstr "&Tabulatorer" +msgstr "T&abel" #. TabStopStatus -#: po/tmp/ap_String_Id.h.h:2327 +#: po/tmp/ap_String_Id.h.h:2361 #, c-format msgid "Tab Stop [%s]" -msgstr "" +msgstr "Tabulatorstop [%s]" #. DLG_Tab_Label_TabPosition -#: po/tmp/ap_String_Id.h.h:2329 +#: po/tmp/ap_String_Id.h.h:2363 msgid "Tab stop position:" -msgstr "" +msgstr "Placering af tabulatorstop" #. DLG_Tab_Label_TabToClear -#: po/tmp/ap_String_Id.h.h:2331 +#: po/tmp/ap_String_Id.h.h:2365 msgid "Tab stops to be cleared:" -msgstr "" +msgstr "Tabulatorstop, der skal ryddes:" #. DLG_FormatTable_Apply_To_Table #. MENU_STATUSLINE_TABLE #. TB_Table -#: po/tmp/ap_String_Id.h.h:2335 po/tmp/xap_String_Id.h.h:686 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2369 +#: po/tmp/xap_String_Id.h.h:723 msgid "Table" -msgstr "&Tabulatorer" +msgstr "Tabel" #. DLG_InsertTable_TableSize_Capital -#: po/tmp/ap_String_Id.h.h:2337 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2371 msgid "Table Size" -msgstr "Papir&strrelse:" +msgstr "Tabelstrrelse:" #. DLG_Options_Label_ViewTableTB -#: po/tmp/ap_String_Id.h.h:2339 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2373 msgid "Table Toolbar" -msgstr "Ekstra vrktjslinje" +msgstr "Tabelvrktjslinje" -#. TOC_TocHeading #. MENU_LABEL_INSERT_TABLEOFCONTENTS #. MENU_LABEL_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2343 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2376 msgid "Table of Contents" -msgstr "Side&hoved/fod" +msgstr "Indholdsfortegnelse" #. FIELD_Numbers_TOCListLabel -#: po/tmp/ap_String_Id.h.h:2345 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2378 msgid "Table of Contents List Label" -msgstr "Side&hoved/fod" +msgstr "Overskrift for indholdsfortegnelse" #. FIELD_Numbers_TOCPageNumber -#: po/tmp/ap_String_Id.h.h:2347 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2380 msgid "Table of Contents Page" -msgstr "Side&hoved/fod" +msgstr "Side med indholdsfortegnelse" #. DLG_InsertTable_TableSize -#: po/tmp/ap_String_Id.h.h:2349 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2382 msgid "Table size" -msgstr "&Tabulatorer" +msgstr "Tabelstrrelse" #. DLG_Styles_ModifyTabs #. DLG_Tab_TabTitle -#: po/tmp/ap_String_Id.h.h:2352 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2385 msgid "Tabs" -msgstr "&Tabulatorer" +msgstr "Tabulatorer" #. DLG_FormatTOC_DetailsTabPage -#: po/tmp/ap_String_Id.h.h:2354 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2387 msgid "Tabs and Page Numbering" -msgstr "&Liste" +msgstr "Tabulering og sidenummerering" #. MENU_LABEL_FMT -#: po/tmp/ap_String_Id.h.h:2356 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2389 msgid "Te&xt Formatting" -msgstr "T&ekstformat" +msgstr "T&ekstformatering" #. DLG_Options_Label_Text -#: po/tmp/ap_String_Id.h.h:2358 +#: po/tmp/ap_String_Id.h.h:2391 msgid "Text" -msgstr "" +msgstr "Tekst" #. DLG_FormatTOC_TextAfter -#: po/tmp/ap_String_Id.h.h:2360 +#: po/tmp/ap_String_Id.h.h:2393 msgid "Text &after:" -msgstr "" +msgstr "Tekst &efter:" #. DLG_FormatTOC_TextBefore -#: po/tmp/ap_String_Id.h.h:2362 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2395 msgid "Text &before:" -msgstr "&Fr:" +msgstr "Tekst &fr:" #. DLG_Lists_Align -#: po/tmp/ap_String_Id.h.h:2364 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2397 msgid "Text Align:" -msgstr "Etiketjustering:" +msgstr "Tekstjustering:" #. MENU_LABEL_INSERT_TEXTBOX #. MENU_LABEL_FMT_FRAME -#: po/tmp/ap_String_Id.h.h:2367 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2400 msgid "Text Box" -msgstr "Formateringslinje" +msgstr "Tekstboks" #. DLG_Lists_PageFolding -#: po/tmp/ap_String_Id.h.h:2369 +#: po/tmp/ap_String_Id.h.h:2402 msgid "Text Folding" -msgstr "" +msgstr "Tekstfoldning" #. DLG_FormatFrame_TextWrapping -#: po/tmp/ap_String_Id.h.h:2371 +#: po/tmp/ap_String_Id.h.h:2404 msgid "Text Wrapping" -msgstr "" +msgstr "Tekstfoldning" #. DLG_Options_Label_Both -#: po/tmp/ap_String_Id.h.h:2373 +#: po/tmp/ap_String_Id.h.h:2406 msgid "Text and Icon" -msgstr "" - -#. MSG_MergeDocsNotRelated -#: po/tmp/ap_String_Id.h.h:2375 -msgid "" -"The documents you are trying to merge are unrelated. AbiWord will attempt to " -"merge them, but the result might be meaningless." -msgstr "" +msgstr "Tekst og ikon" #. DLG_PageSetup_ErrBigMargins -#: po/tmp/ap_String_Id.h.h:2377 +#: po/tmp/ap_String_Id.h.h:2408 msgid "The margins selected are too large to fit on the page." -msgstr "" +msgstr "De valgte margener er for store til at passe p siden." #. DLG_Options_Prompt_YouMustRestart -#: po/tmp/ap_String_Id.h.h:2379 -msgid "" -"The new user interface language will take effect the next time that you " -"start the application" -msgstr "" +#: po/tmp/ap_String_Id.h.h:2410 +msgid "The new user interface language will take effect the next time that you start the application" +msgstr "Det nye sprogvalg i brugerfladen vil trde i kraft, nste gang du starter programmet" #. MSG_SpellDone -#: po/tmp/ap_String_Id.h.h:2381 +#: po/tmp/ap_String_Id.h.h:2412 msgid "The spelling check is complete." -msgstr "" +msgstr "Stavekontrol er fuldfrt." #. MSG_HyperlinkCrossesBoundaries -#: po/tmp/ap_String_Id.h.h:2383 -msgid "" -"The text to which the hyperlink is to be attached must be within a single " -"paragraph." -msgstr "" +#: po/tmp/ap_String_Id.h.h:2414 +msgid "The text to which the hyperlink is to be attached must be within a single paragraph." +msgstr "Teksten, som linket er forbundet med, skal vre indenfor et enkelt afsnit." #. FIELD_DateTime_Wkday -#: po/tmp/ap_String_Id.h.h:2385 +#: po/tmp/ap_String_Id.h.h:2416 msgid "The weekday" -msgstr "" +msgstr "Ugedagen" #. DLG_FormatTable_Thickness -#: po/tmp/ap_String_Id.h.h:2387 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2418 msgid "Thickness:" -msgstr "Linjer" +msgstr "Tykkelse:" #. MSG_AfterRestartNew -#: po/tmp/ap_String_Id.h.h:2389 -msgid "" -"This change will only take effect when you restart AbiWord or create a new " -"document." -msgstr "" +#: po/tmp/ap_String_Id.h.h:2420 +msgid "This change will only take effect when you restart AbiWord or create a new document." +msgstr "Denne ndring vil frst trde i kraft, nr du genstarter AbiWord eller opretter et nyt dokument." #. MSG_HiddenRevisions -#: po/tmp/ap_String_Id.h.h:2391 -msgid "" -"This document contains revisions which are currently hidden from view. " -"Please see AbiWord documentation for information on working with revisions." -msgstr "" +#: po/tmp/ap_String_Id.h.h:2422 +msgid "This document contains revisions which are currently hidden from view. Please see AbiWord documentation for information on working with revisions." +msgstr "Dette dokument indeholder revisioner, som er skjulte. Se AbiWords dokumentation efter nrmere information om at arbejde med revisioner." #. DLG_Para_PreviewSampleFallback -#: po/tmp/ap_String_Id.h.h:2393 -msgid "" -"This paragraph represents words as they might appear in your document. To " -"see text from your document used in this preview, position your cursor in a " -"document paragraph with some text in it and open this dialog." -msgstr "" +#: po/tmp/ap_String_Id.h.h:2424 +msgid "This paragraph represents words as they might appear in your document. To see text from your document used in this preview, position your cursor in a document paragraph with some text in it and open this dialog." +msgstr "Dette afsnit prsenterer ord, som de vil se ud i dit dokument. For at se tekst fra dit dokument i denne forsmag, kan du placere din markr i et dokumentafsnit med tekst i og bne denne dialog." #. DLG_Styles_ErrStyleNot -#: po/tmp/ap_String_Id.h.h:2395 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2426 msgid "" "This style does not exist \n" " so it cannot be modified" msgstr "" -"Ingen typografi er valgt, \n" +"Denne typografi eksisterer ikke, \n" " s den kan ikke ndres" #. DLG_Column_Three -#: po/tmp/ap_String_Id.h.h:2397 +#: po/tmp/ap_String_Id.h.h:2428 msgid "Three" -msgstr "" +msgstr "Tre" #. DLG_Lists_Tick_List #. STYLE_TICKLIST -#: po/tmp/ap_String_Id.h.h:2399 po/tmp/xap_String_Id.h.h:718 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2430 +#: po/tmp/xap_String_Id.h.h:757 msgid "Tick List" -msgstr "Arabisk liste" +msgstr "Afkrydsningsliste" #. FIELD_DateTime_TimeZone -#: po/tmp/ap_String_Id.h.h:2401 +#: po/tmp/ap_String_Id.h.h:2432 msgid "Time Zone" -msgstr "" +msgstr "Tidszone" #. FIELD_Document_Title -#: po/tmp/ap_String_Id.h.h:2403 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2434 msgid "Title" -msgstr "Fil" +msgstr "Titel" #. DLG_ToggleCase_TitleCase -#: po/tmp/ap_String_Id.h.h:2405 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2436 msgid "Title Case" -msgstr "Kapitler" +msgstr "Titel STORE/sm bogstaver" #. DLG_MetaData_Title_LBL #. DLG_Image_LblTitle -#: po/tmp/ap_String_Id.h.h:2407 po/tmp/xap_String_Id.h.h:722 +#: po/tmp/ap_String_Id.h.h:2438 +#: po/tmp/xap_String_Id.h.h:761 msgid "Title:" -msgstr "" +msgstr "Titel:" #. DLG_Options_Label_Toolbars -#: po/tmp/ap_String_Id.h.h:2409 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2440 msgid "Toolbars" -msgstr "&Vrktjslinjer" +msgstr "Vrktjslinjer" #. TopMarginStatus -#: po/tmp/ap_String_Id.h.h:2411 -#, fuzzy, c-format +#: po/tmp/ap_String_Id.h.h:2442 +#, c-format msgid "Top Margin [%s]" -msgstr "Bundmargen [%s]" +msgstr "Topmargen [%s]" #. MENU_LABEL_FMT_TOPLINE #. TOOLBAR_LABEL_FMT_TOPLINE #. TOOLBAR_STATUSLINE_FMT_TOPLINE #. TOOLBAR_TOOLTIP_FMT_TOPLINE #. DLG_UFS_ToplineCheck -#: po/tmp/ap_String_Id.h.h:2416 po/tmp/xap_String_Id.h.h:728 +#: po/tmp/ap_String_Id.h.h:2447 +#: po/tmp/xap_String_Id.h.h:767 msgid "Topline" -msgstr "" +msgstr "Toplinje" #. DLG_Lists_Triangle_List #. STYLE_TRIANGLELIST -#: po/tmp/ap_String_Id.h.h:2418 po/tmp/xap_String_Id.h.h:730 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2449 +#: po/tmp/xap_String_Id.h.h:769 msgid "Triangle List" -msgstr "Diamantliste" +msgstr "Liste med trekanter som tegn" #. DLG_Column_Two -#: po/tmp/ap_String_Id.h.h:2420 +#: po/tmp/ap_String_Id.h.h:2451 msgid "Two" -msgstr "" +msgstr "To" #. FIELD_Document_Type -#: po/tmp/ap_String_Id.h.h:2422 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2453 msgid "Type" -msgstr "&Typer:" +msgstr "Type" #. DLG_InsertBookmark_Msg -#: po/tmp/ap_String_Id.h.h:2424 +#: po/tmp/ap_String_Id.h.h:2455 msgid "Type a name for the bookmark, or select an existing from the list." -msgstr "" +msgstr "Indtast et navn til bogmrket, eller vlg et fra listen." #. DLG_Lists_Type -#: po/tmp/ap_String_Id.h.h:2426 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2457 msgid "Type:" -msgstr "&Typer:" +msgstr "Type:" #. DLG_ToggleCase_UpperCase -#: po/tmp/ap_String_Id.h.h:2428 +#: po/tmp/ap_String_Id.h.h:2459 msgid "UPPERCASE" -msgstr "" +msgstr "STORE BOGSTAVER" #. TOOLBAR_LABEL_FMT_UNDERLINE #. TOOLBAR_STATUSLINE_FMT_UNDERLINE #. TOOLBAR_TOOLTIP_FMT_UNDERLINE #. DLG_UFS_UnderlineCheck -#: po/tmp/ap_String_Id.h.h:2432 po/tmp/xap_String_Id.h.h:750 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2463 +#: po/tmp/xap_String_Id.h.h:789 msgid "Underline" -msgstr "&Understreg" +msgstr "Understreg" #. MENU_STATUSLINE_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:2434 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2465 msgid "Underline the selection (toggle)" -msgstr "Overstreg den markerede tekst (til/fra)" +msgstr "Understreg den markerede tekst (til/fra)" #. TOOLBAR_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2436 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2467 msgid "Undo" -msgstr "&Fortryd" +msgstr "Fortryd" #. MENU_STATUSLINE_EDIT_UNDO #. TOOLBAR_STATUSLINE_EDIT_UNDO #. TOOLBAR_TOOLTIP_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2440 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2471 msgid "Undo editing" msgstr "Fortryd ndring" #. DLG_Lists_Upper_Case_List #. STYLE_UPPERCASTELIST -#: po/tmp/ap_String_Id.h.h:2442 po/tmp/xap_String_Id.h.h:784 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2473 +#: po/tmp/xap_String_Id.h.h:823 msgid "Upper Case List" -msgstr "Liste med sm bogstaver" +msgstr "Liste med store bogstaver" #. DLG_Lists_Upper_Roman_List #. STYLE_UPPERROMANLIST -#: po/tmp/ap_String_Id.h.h:2444 po/tmp/xap_String_Id.h.h:786 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2475 +#: po/tmp/xap_String_Id.h.h:825 msgid "Upper Roman List" -msgstr "Liste med sm romertal" +msgstr "Liste med store romertal" #. DLG_Column_RtlOrder -#: po/tmp/ap_String_Id.h.h:2446 +#: po/tmp/ap_String_Id.h.h:2477 msgid "Use RTL Order" -msgstr "" +msgstr "Brug hjre-mod-venstre-rkkeflge" #. DLG_Options_Label_HebrewContextGlyphs -#: po/tmp/ap_String_Id.h.h:2448 +#: po/tmp/ap_String_Id.h.h:2479 msgid "Use glyph shaping for Hebrew" -msgstr "" +msgstr "Brug \"glyph shaping\" til hebrisk" #. DLG_Options_Label_UI -#: po/tmp/ap_String_Id.h.h:2450 +#: po/tmp/ap_String_Id.h.h:2481 msgid "User Interface" -msgstr "" +msgstr "Brugerflade" #. DLG_Options_Label_UILang -#: po/tmp/ap_String_Id.h.h:2452 +#: po/tmp/ap_String_Id.h.h:2483 msgid "User Interface Language" -msgstr "" +msgstr "Sprog for brugerflade" #. DLG_Stylist_UserStyles -#: po/tmp/ap_String_Id.h.h:2454 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2485 msgid "User defined Styles" -msgstr "ndr typografier" +msgstr "Brugerdefinerede typografier" #. DLG_Tab_Label_Existing -#: po/tmp/ap_String_Id.h.h:2456 +#: po/tmp/ap_String_Id.h.h:2487 msgid "User-defined Tabs" -msgstr "" +msgstr "Brugerdefineret tabulering" #. DLG_Styles_LBL_UserDefined -#: po/tmp/ap_String_Id.h.h:2458 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2489 msgid "User-defined styles" -msgstr "ndr typografier" +msgstr "Brugerdefinerede typografier" #. FIELD_Application_Version #. DLG_History_Version_Version -#: po/tmp/ap_String_Id.h.h:2460 po/tmp/xap_String_Id.h.h:792 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2491 +#: po/tmp/xap_String_Id.h.h:833 msgid "Version" msgstr "Version" #. DLG_Options_TabLabel_View -#: po/tmp/ap_String_Id.h.h:2462 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2493 msgid "View" -msgstr "&Vis" +msgstr "Vis" #. MENU_STATUSLINE_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:2464 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2495 msgid "View document history" -msgstr "&Dokument" +msgstr "Vis dokumenthistorik" #. MENU_STATUSLINE_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:2466 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2497 msgid "View the document in full screen mode" -msgstr "Gem dokumentet under et andet navn" +msgstr "Vis dokumentet i fuldskrmsvisning" #. MENU_STATUSLINE_WINDOW_1 #. MENU_STATUSLINE_WINDOW_2 @@ -6368,203 +6098,197 @@ #. MENU_STATUSLINE_WINDOW_7 #. MENU_STATUSLINE_WINDOW_8 #. MENU_STATUSLINE_WINDOW_9 -#: po/tmp/ap_String_Id.h.h:2476 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2507 msgid "View this document" -msgstr "bn dette dokument" +msgstr "Vis dette dokument" #. DLG_Options_Label_ViewTooltips -#: po/tmp/ap_String_Id.h.h:2478 +#: po/tmp/ap_String_Id.h.h:2509 msgid "View tooltips" -msgstr "" +msgstr "Vis vrktjstips" #. DLG_Options_Label_ViewViewFrame -#: po/tmp/ap_String_Id.h.h:2480 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2511 msgid "View..." -msgstr "Ny..." +msgstr "Vis..." #. DLG_Options_Label_Visible -#: po/tmp/ap_String_Id.h.h:2482 +#: po/tmp/ap_String_Id.h.h:2513 msgid "Visible" -msgstr "" +msgstr "Synlig" #. MSG_HyperlinkNoBookmark -#: po/tmp/ap_String_Id.h.h:2484 +#: po/tmp/ap_String_Id.h.h:2515 #, c-format msgid "Warning: the bookmark you provided [%s] does not exist." -msgstr "" +msgstr "Advarsel: Det bogmrke, som du opgav [%s], findes ikke." #. MENU_STATUSLINE_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:2486 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2517 msgid "Web Layout" -msgstr "&Netudseende" +msgstr "Web Layout" #. DLG_Styles_LBL_TxtMsg -#: po/tmp/ap_String_Id.h.h:2488 +#: po/tmp/ap_String_Id.h.h:2519 msgid "What Hath God Wrought" -msgstr "" +msgstr "Hvad gud har skabt" #. DLG_Options_Label_WithExtension -#: po/tmp/ap_String_Id.h.h:2490 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2521 msgid "With extension:" msgstr "Med endelsen:" #. DLG_WordCount_WordCountTitle #. FIELD_Numbers_WordCount -#: po/tmp/ap_String_Id.h.h:2493 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2524 msgid "Word Count" -msgstr "&Ordoptlling" +msgstr "Ordoptlling" #. DLG_NEW_Tab1 -#: po/tmp/ap_String_Id.h.h:2495 +#: po/tmp/ap_String_Id.h.h:2526 msgid "Wordprocessing" -msgstr "" +msgstr "Tekstbehandling" #. DLG_WordCount_Words_No_Notes -#: po/tmp/ap_String_Id.h.h:2497 +#: po/tmp/ap_String_Id.h.h:2528 msgid "Words (no footnotes/endnotes):" -msgstr "" +msgstr "Ord (uden fodnoter/slutnoter)" #. DLG_Options_Label_SpellUppercase -#: po/tmp/ap_String_Id.h.h:2499 +#: po/tmp/ap_String_Id.h.h:2530 msgid "Words in &UPPERCASE" -msgstr "" +msgstr "Ord &MED STORE BOGSTAVER" #. DLG_Options_Label_SpellNumbers -#: po/tmp/ap_String_Id.h.h:2501 +#: po/tmp/ap_String_Id.h.h:2532 msgid "Words with num&bers" -msgstr "" +msgstr "Ord med &tal" #. DLG_WordCount_Words -#: po/tmp/ap_String_Id.h.h:2503 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2534 msgid "Words:" -msgstr "Ignorerede ord:" +msgstr "Ord:" #. MSG_SaveFailedWrite -#: po/tmp/ap_String_Id.h.h:2505 -#, fuzzy, c-format +#: po/tmp/ap_String_Id.h.h:2536 +#, c-format msgid "Writing error when attempting to save %s" -msgstr "Kunne ikke skrive til filen %s: ulovligt filnavn" +msgstr "Skrivefejl under forsg p at gemme %s" #. MSG_DefaultDirectionChg -#: po/tmp/ap_String_Id.h.h:2507 +#: po/tmp/ap_String_Id.h.h:2538 msgid "You have changed the default direction." -msgstr "" +msgstr "Du har ndret standardretning." #. MSG_DirectionModeChg -#: po/tmp/ap_String_Id.h.h:2509 +#: po/tmp/ap_String_Id.h.h:2540 msgid "You have changed the direction mode." -msgstr "" +msgstr "Du har ndret retningsindstilling" #. MSG_HyperlinkNoSelection -#: po/tmp/ap_String_Id.h.h:2511 +#: po/tmp/ap_String_Id.h.h:2542 msgid "You must select a portion of the document before inserting a hyperlink." -msgstr "" +msgstr "Du skal markere et udsnit af dokumentet for at indstte et link." #. DLG_Options_Label_InvalidRangeForAutoSave -#: po/tmp/ap_String_Id.h.h:2513 +#: po/tmp/ap_String_Id.h.h:2544 msgid "You should choose a range from 1 to 120 for the auto save frequency" -msgstr "" +msgstr "Du br vlge en vrdi i intervallet 1-120 for, hvor ofte dokumentet automatisk skal gemmes" #. MSG_ConfirmSaveSecondary -#: po/tmp/ap_String_Id.h.h:2515 +#: po/tmp/ap_String_Id.h.h:2546 msgid "Your changes will be lost if you don't save them." -msgstr "" +msgstr "Dine ndringer vil g tabt, hvis du ikke gemmer dem." +# - eller "forstr". Kontekst? #. TOOLBAR_LABEL_ZOOM #. TOOLBAR_STATUSLINE_ZOOM #. TOOLBAR_TOOLTIP_ZOOM #. DLG_Zoom_ZoomTitle -#: po/tmp/ap_String_Id.h.h:2519 po/tmp/xap_String_Id.h.h:839 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2550 +#: po/tmp/xap_String_Id.h.h:882 msgid "Zoom" -msgstr "&Forstrrelse" +msgstr "Forstrrelse" #. MENU_LABEL_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2521 +#: po/tmp/ap_String_Id.h.h:2552 msgid "Zoom to &100%" -msgstr "" +msgstr "Zoom til &100%" #. MENU_LABEL_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2523 +#: po/tmp/ap_String_Id.h.h:2554 msgid "Zoom to &200%" -msgstr "" +msgstr "Zoom til &200%" #. MENU_LABEL_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2525 +#: po/tmp/ap_String_Id.h.h:2556 msgid "Zoom to &50%" -msgstr "" +msgstr "Zoom til &50%" #. MENU_LABEL_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2527 +#: po/tmp/ap_String_Id.h.h:2558 msgid "Zoom to &75%" -msgstr "" +msgstr "Zoom til &75%" #. MENU_STATUSLINE_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2529 +#: po/tmp/ap_String_Id.h.h:2560 msgid "Zoom to 100%" -msgstr "" +msgstr "Zoom til 100%" #. MENU_STATUSLINE_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2531 +#: po/tmp/ap_String_Id.h.h:2562 msgid "Zoom to 200%" -msgstr "" +msgstr "Zoom til 200%" #. MENU_STATUSLINE_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2533 +#: po/tmp/ap_String_Id.h.h:2564 msgid "Zoom to 50%" -msgstr "" +msgstr "Zoom til 50%" #. MENU_STATUSLINE_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2535 +#: po/tmp/ap_String_Id.h.h:2566 msgid "Zoom to 75%" -msgstr "" +msgstr "Zoom til 75%" #. MENU_STATUSLINE_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:2537 +#: po/tmp/ap_String_Id.h.h:2568 msgid "Zoom to page width" -msgstr "" +msgstr "Zoom til sidebredde" #. MENU_STATUSLINE_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:2539 +#: po/tmp/ap_String_Id.h.h:2570 msgid "Zoom to whole page" -msgstr "" +msgstr "Zoom til fuld side" #. DLG_Options_Label_CustomDict -#: po/tmp/ap_String_Id.h.h:2541 +#: po/tmp/ap_String_Id.h.h:2572 msgid "custom.dic" -msgstr "" +msgstr "custom.dic" #. FIELD_DateTime_DDMMYY -#: po/tmp/ap_String_Id.h.h:2543 +#: po/tmp/ap_String_Id.h.h:2574 msgid "dd/mm/yy" -msgstr "" +msgstr "dd/mm/" #. DLG_ToggleCase_LowerCase -#: po/tmp/ap_String_Id.h.h:2545 +#: po/tmp/ap_String_Id.h.h:2576 msgid "lowercase" -msgstr "" +msgstr "sm bogstaver" #. DLG_Options_Label_Minutes -#: po/tmp/ap_String_Id.h.h:2547 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2578 msgid "minutes" -msgstr "Linjer" +msgstr "minutter" #. FIELD_DateTime_MMDDYY -#: po/tmp/ap_String_Id.h.h:2549 +#: po/tmp/ap_String_Id.h.h:2580 msgid "mm/dd/yy" -msgstr "" +msgstr "mm/dd/" #. DLG_ToggleCase_ToggleCase -#: po/tmp/ap_String_Id.h.h:2551 +#: po/tmp/ap_String_Id.h.h:2582 msgid "tOGGLE cASE" -msgstr "" +msgstr "sKIFT mELLEM sTORE oG sM bOGSTAVER" #. #. * Translatable strings file generated by extract-ui. @@ -6573,63 +6297,57 @@ #. DLG_UP_To #: po/tmp/xap_String_Id.h.h:7 msgid " to " -msgstr "" +msgstr " til " #. DLG_Zoom_100 #: po/tmp/xap_String_Id.h.h:9 -#, fuzzy msgid "&100%" -msgstr "&1 %s" +msgstr "&100%" #. DLG_Zoom_200 #: po/tmp/xap_String_Id.h.h:11 -#, fuzzy msgid "&200%" -msgstr "&2 %s" +msgstr "&200%" #. DLG_Zoom_75 #: po/tmp/xap_String_Id.h.h:13 -#, fuzzy msgid "&75%" -msgstr "&7 %s" +msgstr "&75%" #. DLG_Zoom_PageWidth #: po/tmp/xap_String_Id.h.h:17 -#, fuzzy msgid "&Page width" msgstr "&Sidebredde" #. DLG_ULANG_SetLangButton #: po/tmp/xap_String_Id.h.h:19 -#, fuzzy msgid "&Set Language" -msgstr "&Sprog" +msgstr "&Vlg sprog" #. DLG_Zoom_WholePage #: po/tmp/xap_String_Id.h.h:23 -#, fuzzy msgid "&Whole page" msgstr "&Hele siden" #. LANG_0 #: po/tmp/xap_String_Id.h.h:25 msgid "(no proofing)" -msgstr "" +msgstr "(ingen korrektur)" #. DLG_DocComparison_TestSkipped #: po/tmp/xap_String_Id.h.h:27 msgid "(test skipped)" -msgstr "" +msgstr "(test skippet)" #. DLG_NoSaveFile_DirNotExist #: po/tmp/xap_String_Id.h.h:29 msgid "A directory in the given pathname does not exist." -msgstr "" +msgstr "Der findes ingen folder med det opgivne stinavn." #. DLG_PLUGIN_MANAGER_TITLE #: po/tmp/xap_String_Id.h.h:31 msgid "AbiWord Plugin Manager" -msgstr "" +msgstr "Administration af Abiword-udvidelser" #. SPELL_CANTLOAD_DLL #: po/tmp/xap_String_Id.h.h:33 @@ -6638,1996 +6356,1993 @@ "AbiWord cannot find the spelling file %s.dll\n" "Please download and install Aspell from http://aspell.net/win32/" msgstr "" +"AbiWord kan ikke finde stavekontrolfilen %s.dll\n" +"Aspell kan downloades og installeres p http://aspell.net/win32/" #. MSG_HistoryPartRestore1 #: po/tmp/xap_String_Id.h.h:35 #, c-format -msgid "" -"AbiWord cannot fully restore version %d of the document because the version " -"information is incomplete." -msgstr "" +msgid "AbiWord cannot fully restore version %d of the document because the version information is incomplete." +msgstr "AbiWord kan ikke fuldstndigt gendanne version %d af dokumentet, fordi versionsoplysningerne er ufuldstndige." #. MSG_HistoryNoRestore #: po/tmp/xap_String_Id.h.h:37 #, c-format -msgid "" -"AbiWord cannot restore version %d of the document because the version " -"information is missing." -msgstr "" +msgid "AbiWord cannot restore version %d of the document because the version information is missing." +msgstr "AbiWord kan ikke gendanne version %d af dokumentet, fordi der mangler versionsoplysninger." #. DLG_UP_PrintPreviewTitle #: po/tmp/xap_String_Id.h.h:39 -#, fuzzy msgid "AbiWord: Print Preview" -msgstr "Vis udskrift" +msgstr "Abiword: Forhndsvisning af udskrift" #. DLG_ABOUT_Title #: po/tmp/xap_String_Id.h.h:41 -#, fuzzy, c-format +#, c-format msgid "About %s" -msgstr "&Om %s" +msgstr "Om %s" #. DLG_PLUGIN_MANAGER_ACTIVE #: po/tmp/xap_String_Id.h.h:43 -#, fuzzy msgid "Active Plugins" -msgstr "&Udvidelsesmoduler" +msgstr "Aktive udvidelsesmoduler" #. LANG_AF_ZA #: po/tmp/xap_String_Id.h.h:45 msgid "Afrikaans" -msgstr "" +msgstr "Afrikaans" #. LANG_AK_GH #: po/tmp/xap_String_Id.h.h:47 msgid "Akan" -msgstr "" +msgstr "Akan" #. LANG_SQ_AL #: po/tmp/xap_String_Id.h.h:49 msgid "Albanian" -msgstr "" +msgstr "Albansk" #. DLG_FOSA_ALL #: po/tmp/xap_String_Id.h.h:53 msgid "All (*.*)" -msgstr "" +msgstr "Alle (*.*)" #. DLG_FOSA_ALLDOCS #: po/tmp/xap_String_Id.h.h:55 -#, fuzzy msgid "All Documents" -msgstr "&Dokument" +msgstr "Alle dokumenter" #. DLG_FOSA_ALLIMAGES #: po/tmp/xap_String_Id.h.h:57 msgid "All Image Files" -msgstr "" +msgstr "Alle billedfiler" #. DLG_HTMLOPT_ExpAllowAWML #: po/tmp/xap_String_Id.h.h:59 msgid "Allow extra markup in AWML namespace" -msgstr "" +msgstr "Tillad ekstra opmrkning i AWML-navnerum" #. LANG_AM_ET #: po/tmp/xap_String_Id.h.h:61 msgid "Amharic (Ethiopia)" -msgstr "" +msgstr "Amharisk (Ethiopien)" -#. LANG_AR_EG +#. LANG_AR #: po/tmp/xap_String_Id.h.h:65 -#, fuzzy +msgid "Arabic" +msgstr "Arabisk" + +#. LANG_AR_EG +#: po/tmp/xap_String_Id.h.h:67 msgid "Arabic (Egypt)" -msgstr "Arabisk liste" +msgstr "Arabisk (Egypten)" #. LANG_AR_SA -#: po/tmp/xap_String_Id.h.h:67 +#: po/tmp/xap_String_Id.h.h:69 msgid "Arabic (Saudi Arabia)" -msgstr "" +msgstr "Arabisk (Saudiarabien" #. ENC_ARAB_ISO -#: po/tmp/xap_String_Id.h.h:69 +#: po/tmp/xap_String_Id.h.h:71 msgid "Arabic, ISO-8859-6" -msgstr "" +msgstr "Arabisk, ISO-8859-6" #. ENC_ARAB_MAC -#: po/tmp/xap_String_Id.h.h:71 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:73 msgid "Arabic, Macintosh" -msgstr "Arabisk liste" +msgstr "Arabisk, Macintosh" #. ENC_ARAB_WIN -#: po/tmp/xap_String_Id.h.h:73 +#: po/tmp/xap_String_Id.h.h:75 msgid "Arabic, Windows Code Page 1256" -msgstr "" +msgstr "Arabisk, Windows CP-1256" #. LANG_HY_AM -#: po/tmp/xap_String_Id.h.h:75 +#: po/tmp/xap_String_Id.h.h:77 msgid "Armenian" -msgstr "" +msgstr "Armensk" #. ENC_ARME_ARMSCII -#: po/tmp/xap_String_Id.h.h:77 +#: po/tmp/xap_String_Id.h.h:79 msgid "Armenian, ARMSCII-8" -msgstr "" +msgstr "Armensk, ARMSCII-8" #. LANG_AS_IN -#: po/tmp/xap_String_Id.h.h:79 +#: po/tmp/xap_String_Id.h.h:81 msgid "Assamese" -msgstr "" +msgstr "Assamesisk" #. LANG_AST_ES -#: po/tmp/xap_String_Id.h.h:81 +#: po/tmp/xap_String_Id.h.h:83 msgid "Asturian (Spain)" -msgstr "" +msgstr "Asturisk (Spanien)" #. DLG_Options_Label_DirMarkerAfterClosingParenthesis -#: po/tmp/xap_String_Id.h.h:85 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:87 msgid "Auto-insert direction markers" -msgstr "Standardtekstretning skal vre hjre mod venstre" +msgstr "Autoindstning af retningsmarkrer" #. DLG_History_Version_AutoRevisioned -#: po/tmp/xap_String_Id.h.h:87 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:89 msgid "Auto-revision" -msgstr "Markering" +msgstr "Auto-revision" #. DLG_FOSA_FileTypeAutoDetect -#: po/tmp/xap_String_Id.h.h:89 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:91 msgid "Automatically Detected" -msgstr "Opdatr automatisk" +msgstr "Autoregistreret" #. MSG_AutoRevision -#: po/tmp/xap_String_Id.h.h:91 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:93 msgid "Autorevision" -msgstr "Markering" +msgstr "Autorevision" #. DLG_MW_AvailableDocuments -#: po/tmp/xap_String_Id.h.h:93 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:95 msgid "Available Documents" -msgstr "&Mulige formater:" +msgstr "Tilgngelige dokumenter" #. DLG_ULANG_AvailableLanguages -#: po/tmp/xap_String_Id.h.h:95 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:97 msgid "Available Languages" -msgstr "Mulige typografier" +msgstr "Tilgngelige sprog" + +#. LANG_AYM_BO +#: po/tmp/xap_String_Id.h.h:99 +msgid "Aymara (La Paz)" +msgstr "Aymara (La Paz)" + +#. LANG_AYC_BO +#: po/tmp/xap_String_Id.h.h:101 +msgid "Aymara (Oruro)" +msgstr "Aymara (Oruro)" #. ENC_BALT_ISO -#: po/tmp/xap_String_Id.h.h:97 +#: po/tmp/xap_String_Id.h.h:103 msgid "Baltic, ISO-8859-4" -msgstr "" +msgstr "Baltisk, ISO-8859-4" #. ENC_BALT_WIN -#: po/tmp/xap_String_Id.h.h:99 +#: po/tmp/xap_String_Id.h.h:105 msgid "Baltic, Windows Code Page 1257" -msgstr "" +msgstr "Baltisk, Windows CP-1257" #. LANG_EU_ES -#: po/tmp/xap_String_Id.h.h:101 +#: po/tmp/xap_String_Id.h.h:107 msgid "Basque" -msgstr "" +msgstr "Baskisk" #. LANG_BE_BY -#: po/tmp/xap_String_Id.h.h:103 +#: po/tmp/xap_String_Id.h.h:109 msgid "Belarusian" -msgstr "" +msgstr "Hviderussisk" + +#. LANG_BE_LATIN +#: po/tmp/xap_String_Id.h.h:111 +msgid "Belarusian, Latin" +msgstr "Hviderussisk, Latin" #. LANG_BN_IN -#: po/tmp/xap_String_Id.h.h:105 +#: po/tmp/xap_String_Id.h.h:113 msgid "Bengali" -msgstr "" +msgstr "Bengalsk" #. DLG_UP_BlackWhite -#: po/tmp/xap_String_Id.h.h:107 +#: po/tmp/xap_String_Id.h.h:115 msgid "Black & White" -msgstr "" +msgstr "Sort & hvidt" +# Typografi #. STYLE_BLOCKTEXT -#: po/tmp/xap_String_Id.h.h:109 +#: po/tmp/xap_String_Id.h.h:117 msgid "Block Text" -msgstr "" +msgstr "Tekstblok" #. DLG_UFS_StyleBoldItalic -#: po/tmp/xap_String_Id.h.h:113 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:121 msgid "Bold Italic" -msgstr "Kursiv" +msgstr "Fed Kursiv" #. LANG_BR_FR -#: po/tmp/xap_String_Id.h.h:119 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:127 msgid "Breton" -msgstr "Ryd" +msgstr "Bretonsk" #. MSG_BuildingDoc -#: po/tmp/xap_String_Id.h.h:121 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:129 msgid "Building Document:" -msgstr "Udskriver dokument..." +msgstr "Opbygger dokument:" #. LANG_BG_BG -#: po/tmp/xap_String_Id.h.h:123 +#: po/tmp/xap_String_Id.h.h:131 msgid "Bulgarian" -msgstr "" +msgstr "Bulgarisk" #. DLG_Cancel -#: po/tmp/xap_String_Id.h.h:127 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:135 msgid "Cancel" -msgstr "&ndr" +msgstr "Fortryd" #. LANG_CA_ES -#: po/tmp/xap_String_Id.h.h:129 +#: po/tmp/xap_String_Id.h.h:137 msgid "Catalan" -msgstr "" +msgstr "Katalansk" + +#. LANG_AYR +#: po/tmp/xap_String_Id.h.h:139 +msgid "Central Aymara" +msgstr "Central Aymara" #. ENC_CENT_ISO -#: po/tmp/xap_String_Id.h.h:131 +#: po/tmp/xap_String_Id.h.h:141 msgid "Central European, ISO-8859-2" -msgstr "" +msgstr "Centraleuropisk, ISO-8859-2" #. ENC_CENT_MAC -#: po/tmp/xap_String_Id.h.h:133 +#: po/tmp/xap_String_Id.h.h:143 msgid "Central European, Macintosh" -msgstr "" +msgstr "Centraleuropisk, Macintosh" #. ENC_CENT_WIN -#: po/tmp/xap_String_Id.h.h:135 +#: po/tmp/xap_String_Id.h.h:145 msgid "Central European, Windows Code Page 1250" -msgstr "" +msgstr "Centraleuopisk, Windows CP-1250" #. DLG_Options_Label_LangWithKeyboard -#: po/tmp/xap_String_Id.h.h:137 +#: po/tmp/xap_String_Id.h.h:147 msgid "Change Language when changing keyboard" -msgstr "" +msgstr "Skift sprog ved tastaturskift" #. STYLE_CHAPHEADING -#: po/tmp/xap_String_Id.h.h:139 +#: po/tmp/xap_String_Id.h.h:149 msgid "Chapter Heading" -msgstr "" +msgstr "Kapiteloverskrift" #. LANG_ZH_HK -#: po/tmp/xap_String_Id.h.h:141 +#: po/tmp/xap_String_Id.h.h:151 msgid "Chinese (Hong Kong)" -msgstr "" +msgstr "Kinesisk (Hong Kong)" #. LANG_ZH_CN -#: po/tmp/xap_String_Id.h.h:143 +#: po/tmp/xap_String_Id.h.h:153 msgid "Chinese (PRC)" -msgstr "" +msgstr "Kinesisk (Folkerepublikken Kina)" #. LANG_ZH_SG -#: po/tmp/xap_String_Id.h.h:145 +#: po/tmp/xap_String_Id.h.h:155 msgid "Chinese (Singapore)" -msgstr "" +msgstr "Kinesisk (Singapore)" #. LANG_ZH_TW -#: po/tmp/xap_String_Id.h.h:147 +#: po/tmp/xap_String_Id.h.h:157 msgid "Chinese (Taiwan)" -msgstr "" +msgstr "Kinesisk (Taiwan)" #. ENC_CHSI_EUC -#: po/tmp/xap_String_Id.h.h:149 +#: po/tmp/xap_String_Id.h.h:159 msgid "Chinese Simplified, EUC-CN (GB2312)" -msgstr "" +msgstr "Forenklet kinesisk, EUC-CN (GB2312)" #. ENC_CHSI_GB -#: po/tmp/xap_String_Id.h.h:151 +#: po/tmp/xap_String_Id.h.h:161 msgid "Chinese Simplified, GB_2312-80" -msgstr "" +msgstr "Forenklet kinesisk, GB_2312-80" #. ENC_CHSI_HZ -#: po/tmp/xap_String_Id.h.h:153 +#: po/tmp/xap_String_Id.h.h:163 msgid "Chinese Simplified, HZ" -msgstr "" +msgstr "Forenklet kinesisk, HZ" #. ENC_CHSI_WIN -#: po/tmp/xap_String_Id.h.h:155 +#: po/tmp/xap_String_Id.h.h:165 msgid "Chinese Simplified, Windows Code Page 936" -msgstr "" +msgstr "Forenklet kinesisk, Windows CP-936" #. ENC_CHTR_BIG5 -#: po/tmp/xap_String_Id.h.h:157 +#: po/tmp/xap_String_Id.h.h:167 msgid "Chinese Traditional, BIG5" -msgstr "" +msgstr "Traditionelt kinesisk, BIG5" #. ENC_CHTR_BIG5HKSCS -#: po/tmp/xap_String_Id.h.h:159 +#: po/tmp/xap_String_Id.h.h:169 msgid "Chinese Traditional, BIG5-HKSCS" -msgstr "" +msgstr "Traditionelt kinesisk, BIG5-HKSCS" #. ENC_CHTR_EUC -#: po/tmp/xap_String_Id.h.h:161 +#: po/tmp/xap_String_Id.h.h:171 msgid "Chinese Traditional, EUC-TW" -msgstr "" +msgstr "Traditionelt kinesisk, EUC-TW" #. ENC_CHTR_WIN -#: po/tmp/xap_String_Id.h.h:163 +#: po/tmp/xap_String_Id.h.h:173 msgid "Chinese Traditional, Windows Code Page 950" -msgstr "" +msgstr "Traditionelt kinesisk, Windows CP-950" #. DLG_LISTDOCS_Heading1 -#: po/tmp/xap_String_Id.h.h:165 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:175 msgid "Choose document from the list:" -msgstr "Lav et nyt dokument fra en skabelon" +msgstr "Vlg dokument fra liste:" + +#. TB_ClearBackground +#: po/tmp/xap_String_Id.h.h:177 +msgid "Clear Background" +msgstr "Ryd baggrund" #. DLG_CLIPART_Title -#: po/tmp/xap_String_Id.h.h:167 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:179 msgid "Clip Art" -msgstr "&Udklipsbillede" +msgstr "Clip Art" + +#. DLG_CLIPART_Error +#: po/tmp/xap_String_Id.h.h:181 +msgid "Clip Art could not be loaded" +msgstr "Clip Art kunne ikke indlses" #. DLG_Close -#: po/tmp/xap_String_Id.h.h:169 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:183 msgid "Close" -msgstr "&Luk" +msgstr "Luk" #. DLG_Exit_CloseWithoutSaving -#: po/tmp/xap_String_Id.h.h:171 +#: po/tmp/xap_String_Id.h.h:185 msgid "Close &Without Saving" -msgstr "" +msgstr "Luk &uden at gemme" #. DLG_UP_Collate -#: po/tmp/xap_String_Id.h.h:173 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:187 msgid "Collate" -msgstr "Kompileringsdato" +msgstr "Sortr" #. DLG_UP_Color -#: po/tmp/xap_String_Id.h.h:175 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:189 msgid "Color" -msgstr "Farve:" +msgstr "Farve" #. DLG_Compare -#: po/tmp/xap_String_Id.h.h:179 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:193 msgid "Compare" -msgstr "Kompileringsdato" +msgstr "Sammenlign" #. DLG_DocComparison_Content -#: po/tmp/xap_String_Id.h.h:181 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:195 msgid "Content:" -msgstr "&Dokument" +msgstr "Indhold:" #. STYLE_TOCHEADING1 -#: po/tmp/xap_String_Id.h.h:183 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:197 msgid "Contents 1" -msgstr "&Indhold af hjlp" +msgstr "Indhold 1" #. STYLE_TOCHEADING2 -#: po/tmp/xap_String_Id.h.h:185 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:199 msgid "Contents 2" -msgstr "&Indhold af hjlp" +msgstr "Indhold 2" #. STYLE_TOCHEADING3 -#: po/tmp/xap_String_Id.h.h:187 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:201 msgid "Contents 3" -msgstr "&Indhold af hjlp" +msgstr "Indhold 3" #. STYLE_TOCHEADING4 -#: po/tmp/xap_String_Id.h.h:189 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:203 msgid "Contents 4" -msgstr "&Indhold af hjlp" +msgstr "Indhold 4" #. STYLE_TOCHEADING -#: po/tmp/xap_String_Id.h.h:191 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:205 msgid "Contents Header" -msgstr "Indst slutnote" +msgstr "Overskrift til indholdsfortegnelse" #. DLG_UP_Copies -#: po/tmp/xap_String_Id.h.h:193 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:207 msgid "Copies: " -msgstr "Kompileringstidspunkt" +msgstr "Kopier: " + +#. LANG_COP_EG +#: po/tmp/xap_String_Id.h.h:209 +msgid "Coptic" +msgstr "Koptisk" #. LANG_KW_GB -#: po/tmp/xap_String_Id.h.h:195 +#: po/tmp/xap_String_Id.h.h:211 msgid "Cornish" -msgstr "" +msgstr "Kornisk" #. LANG_CO_FR -#: po/tmp/xap_String_Id.h.h:197 +#: po/tmp/xap_String_Id.h.h:213 msgid "Corsican" -msgstr "" +msgstr "Korsikansk" #. DLG_PLUGIN_MANAGER_COULDNT_LOAD -#: po/tmp/xap_String_Id.h.h:199 +#: po/tmp/xap_String_Id.h.h:215 msgid "Could not activate/load plugin" -msgstr "" +msgstr "Kunne ikke aktivere/indlse udvidelse" #. DLG_PLUGIN_MANAGER_COULDNT_UNLOAD -#: po/tmp/xap_String_Id.h.h:201 +#: po/tmp/xap_String_Id.h.h:217 msgid "Could not deactivate plugin" -msgstr "" +msgstr "Kunne ikke deaktivere udvidelse" #. SPELL_CANTLOAD_DICT -#: po/tmp/xap_String_Id.h.h:203 +#: po/tmp/xap_String_Id.h.h:219 #, c-format msgid "Could not load the dictionary for the %s language" -msgstr "" +msgstr "Kunne ikke indlse ordbogen for sproget %s" #. DLG_History_Version_Started -#: po/tmp/xap_String_Id.h.h:205 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:221 msgid "Created" -msgstr "Ryd" +msgstr "Oprettet" #. DLG_History_Created -#: po/tmp/xap_String_Id.h.h:207 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:223 msgid "Created:" -msgstr "Ryd" +msgstr "Oprettet:" -#. LANG_HR -#: po/tmp/xap_String_Id.h.h:209 +#. LANG_HR_HR +#: po/tmp/xap_String_Id.h.h:225 msgid "Croatian" -msgstr "" +msgstr "Kroatisk" #. ENC_CROA_MAC -#: po/tmp/xap_String_Id.h.h:211 +#: po/tmp/xap_String_Id.h.h:227 msgid "Croatian, Macintosh" -msgstr "" +msgstr "Kroatisk, Macintosh" #. ENC_CYRL_ISO -#: po/tmp/xap_String_Id.h.h:213 +#: po/tmp/xap_String_Id.h.h:229 msgid "Cyrillic, ISO-8859-5" -msgstr "" +msgstr "Kyrillisk, ISO-8859-5" #. ENC_CYRL_KOI -#: po/tmp/xap_String_Id.h.h:215 +#: po/tmp/xap_String_Id.h.h:231 msgid "Cyrillic, KOI8-R" -msgstr "" +msgstr "Kyrillisk, KOI8-R" #. ENC_CYRL_MAC -#: po/tmp/xap_String_Id.h.h:217 +#: po/tmp/xap_String_Id.h.h:233 msgid "Cyrillic, Macintosh" -msgstr "" +msgstr "Kyrillisk, Macintosh" #. ENC_CYRL_WIN -#: po/tmp/xap_String_Id.h.h:219 +#: po/tmp/xap_String_Id.h.h:235 msgid "Cyrillic, Windows Code Page 1251" -msgstr "" +msgstr "Kyrillisk, Windows CP-1251" #. LANG_CS_CZ -#: po/tmp/xap_String_Id.h.h:221 +#: po/tmp/xap_String_Id.h.h:237 msgid "Czech" -msgstr "" +msgstr "Tjekkisk" #. LANG_DA_DK -#: po/tmp/xap_String_Id.h.h:223 +#: po/tmp/xap_String_Id.h.h:239 msgid "Danish" -msgstr "" +msgstr "Dansk" #. DLG_PLUGIN_MANAGER_DEACTIVATE_ALL -#: po/tmp/xap_String_Id.h.h:227 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:243 msgid "Deactivate all plugins" -msgstr "Unvidelsesmoduler" +msgstr "Deaktivr alle udvidelsesmoduler" #. DLG_PLUGIN_MANAGER_DEACTIVATE -#: po/tmp/xap_String_Id.h.h:229 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:245 msgid "Deactivate plugin" -msgstr "Unvidelsesmoduler" +msgstr "Deaktivr udvidelsesmodul" #. DLG_HTMLOPT_ExpDeclareXML -#: po/tmp/xap_String_Id.h.h:231 +#: po/tmp/xap_String_Id.h.h:247 msgid "Declare as XML (version 1.0)" -msgstr "" +msgstr "Deklarr som XML (version 1.0)" #. DLG_ULANG_DefaultLangLabel -#: po/tmp/xap_String_Id.h.h:233 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:249 msgid "Default language: " -msgstr "Standard sidestrrelse" +msgstr "Standarsprog: " #. DLG_Image_Placement -#: po/tmp/xap_String_Id.h.h:235 +#: po/tmp/xap_String_Id.h.h:251 msgid "Define Image Placement" -msgstr "" +msgstr "Definr billedplacering" #. DLG_Image_TextWrapping -#: po/tmp/xap_String_Id.h.h:237 +#: po/tmp/xap_String_Id.h.h:253 msgid "Define Text Wrapping" -msgstr "" +msgstr "Definr tekstfoldning" #. DLG_Remove_Icon -#: po/tmp/xap_String_Id.h.h:246 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:262 msgid "Do you want to remove this icon from the toolbar?" -msgstr "Vil du gendanne ignorerede ord i alle dokumenterne?" +msgstr "nsker du at fjerne dette ikon fra vrktjslinjen?" #. DLG_DocComparison_WindowLabel -#: po/tmp/xap_String_Id.h.h:248 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:264 msgid "Document Comparison" -msgstr "Billedegenskaber" +msgstr "Dokumentsammenligning" #. DLG_History_DocumentDetails -#: po/tmp/xap_String_Id.h.h:250 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:266 msgid "Document Details" -msgstr "Billedegenskaber" +msgstr "Detaljer for dokument" #. DLG_History_WindowLabel -#: po/tmp/xap_String_Id.h.h:252 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:268 msgid "Document History" -msgstr "&Dokument" +msgstr "Dokumenthistorik" #. DLG_History_Path -#: po/tmp/xap_String_Id.h.h:254 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:270 msgid "Document name:" -msgstr "&Dokument" +msgstr "Navn p dokument:" +# Kontekst? #. DLG_DocComparison_DocsCompared -#: po/tmp/xap_String_Id.h.h:256 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:272 msgid "Documents compared" -msgstr "Billedegenskaber" +msgstr "Dokumenter sammenlignet" #. LANG_NL_NL -#: po/tmp/xap_String_Id.h.h:258 +#: po/tmp/xap_String_Id.h.h:274 msgid "Dutch (Netherlands)" -msgstr "" +msgstr "Hollandsk" #. DLG_History_EditTime -#: po/tmp/xap_String_Id.h.h:260 +#: po/tmp/xap_String_Id.h.h:276 msgid "Editing time:" -msgstr "" +msgstr "Redigeringstid:" #. DLG_UFS_EffectsFrameLabel -#: po/tmp/xap_String_Id.h.h:262 +#: po/tmp/xap_String_Id.h.h:278 msgid "Effects" -msgstr "" +msgstr "Effekter" #. DLG_HTMLOPT_ExpEmbedCSS -#: po/tmp/xap_String_Id.h.h:264 +#: po/tmp/xap_String_Id.h.h:280 msgid "Embed (CSS) style sheet" -msgstr "" +msgstr "Indlg (CSS) style sheet" #. DLG_UP_EmbedFonts -#: po/tmp/xap_String_Id.h.h:266 +#: po/tmp/xap_String_Id.h.h:282 msgid "Embed Fonts" -msgstr "" +msgstr "Indlg skrifttyper" #. DLG_HTMLOPT_ExpEmbedImages -#: po/tmp/xap_String_Id.h.h:268 +#: po/tmp/xap_String_Id.h.h:284 msgid "Embed images in URLs (Base64-encoded)" -msgstr "" +msgstr "Indlg billeder i URL'er (Base64-kodet)" #. DLG_UENC_EncTitle -#: po/tmp/xap_String_Id.h.h:270 +#: po/tmp/xap_String_Id.h.h:286 msgid "Encoding" -msgstr "" +msgstr "Indkodning" #. DLG_UFS_EncodingLabel -#: po/tmp/xap_String_Id.h.h:272 +#: po/tmp/xap_String_Id.h.h:288 msgid "Encoding:" -msgstr "" +msgstr "Indkodning:" #. STYLE_ENDREFERENCE -#: po/tmp/xap_String_Id.h.h:274 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:290 msgid "Endnote Reference" msgstr "Slutnotereference" #. STYLE_ENDTEXT -#: po/tmp/xap_String_Id.h.h:276 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:292 msgid "Endnote Text" -msgstr "&Slutnote" +msgstr "Slutnotetekst" #. LANG_EN_AU -#: po/tmp/xap_String_Id.h.h:278 +#: po/tmp/xap_String_Id.h.h:294 msgid "English (Australia)" -msgstr "" +msgstr "Engelsk (Australien)" #. LANG_EN_CA -#: po/tmp/xap_String_Id.h.h:280 +#: po/tmp/xap_String_Id.h.h:296 msgid "English (Canada)" -msgstr "" +msgstr "Engelsk (Canada)" #. LANG_EN_IE -#: po/tmp/xap_String_Id.h.h:282 +#: po/tmp/xap_String_Id.h.h:298 msgid "English (Ireland)" -msgstr "" +msgstr "Engelsk (Irland)" #. LANG_EN_NZ -#: po/tmp/xap_String_Id.h.h:284 +#: po/tmp/xap_String_Id.h.h:300 msgid "English (New Zealand)" -msgstr "" +msgstr "Engelsk (New Zealand)" #. LANG_EN_ZA -#: po/tmp/xap_String_Id.h.h:286 +#: po/tmp/xap_String_Id.h.h:302 msgid "English (South Africa)" -msgstr "" +msgstr "Engelsk (Sydafrika)" #. LANG_EN_GB -#: po/tmp/xap_String_Id.h.h:288 +#: po/tmp/xap_String_Id.h.h:304 msgid "English (UK)" -msgstr "" +msgstr "Engelsk (Storbritannien)" #. LANG_EN_US -#: po/tmp/xap_String_Id.h.h:290 +#: po/tmp/xap_String_Id.h.h:306 msgid "English (US)" -msgstr "" +msgstr "Engelsk (USA)" #. DLG_Password_Title -#: po/tmp/xap_String_Id.h.h:292 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:308 msgid "Enter Password" -msgstr "Forkert adgangskode" +msgstr "Indtast adgangskode" #. LANG_EO -#: po/tmp/xap_String_Id.h.h:294 +#: po/tmp/xap_String_Id.h.h:310 msgid "Esperanto" -msgstr "" +msgstr "Esperanto" #. LANG_ET -#: po/tmp/xap_String_Id.h.h:296 +#: po/tmp/xap_String_Id.h.h:312 msgid "Estonian" -msgstr "" +msgstr "Estonsk" #. DLG_FOSA_ExportTitle -#: po/tmp/xap_String_Id.h.h:298 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:314 msgid "Export File" -msgstr "Ingen fil" +msgstr "Eksportr fil" #. DLG_HTMLOPT_ExpIs4 -#: po/tmp/xap_String_Id.h.h:300 +#: po/tmp/xap_String_Id.h.h:316 msgid "Export as HTML 4.01" -msgstr "" +msgstr "Eksportr som HTML 4.01" #. DLG_HTMLOPT_ExpAbiWebDoc -#: po/tmp/xap_String_Id.h.h:302 +#: po/tmp/xap_String_Id.h.h:318 msgid "Export with PHP instructions" -msgstr "" +msgstr "Eksportr med PHP-instruktioner" #. LANG_FA_IR -#: po/tmp/xap_String_Id.h.h:304 +#: po/tmp/xap_String_Id.h.h:320 msgid "Farsi" -msgstr "" +msgstr "Farsi" #. DLG_UP_File -#: po/tmp/xap_String_Id.h.h:306 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:322 msgid "File" msgstr "Fil" #. DLG_OverwriteFile -#: po/tmp/xap_String_Id.h.h:308 +#: po/tmp/xap_String_Id.h.h:324 #, c-format msgid "File already exists. Overwrite file '%s'?" -msgstr "" +msgstr "Filen eksisterer allerede. Overskriv filen '%s'?" + +#. DLG_FOSA_RecordToFileLabel +#: po/tmp/xap_String_Id.h.h:326 +msgid "File to record editing:" +msgstr "Fil til registrering af redigering:" + +#. DLG_FOSA_ReplayFromFileLabel +#: po/tmp/xap_String_Id.h.h:328 +msgid "File to replay editing:" +msgstr "Fil til at gengive redigering:" #. LANG_FI_FI -#: po/tmp/xap_String_Id.h.h:310 +#: po/tmp/xap_String_Id.h.h:330 msgid "Finnish" -msgstr "" +msgstr "Finsk" #. LANG_NL_BE -#: po/tmp/xap_String_Id.h.h:312 +#: po/tmp/xap_String_Id.h.h:332 msgid "Flemish (Belgium)" -msgstr "" +msgstr "Flamsk (Belgien)" #. STYLE_FOOTREFERENCE -#: po/tmp/xap_String_Id.h.h:319 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:339 msgid "Footnote Reference" -msgstr "Slutnotereference" +msgstr "Fodnotereference" #. STYLE_FOOTTEXT -#: po/tmp/xap_String_Id.h.h:321 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:341 msgid "Footnote Text" -msgstr "Sidefod" +msgstr "Fodnotetekst" #. LANG_FR_BE -#: po/tmp/xap_String_Id.h.h:325 +#: po/tmp/xap_String_Id.h.h:345 msgid "French (Belgium)" -msgstr "" +msgstr "Fransk (Belgien)" #. LANG_FR_CA -#: po/tmp/xap_String_Id.h.h:327 +#: po/tmp/xap_String_Id.h.h:347 msgid "French (Canada)" -msgstr "" +msgstr "Fransk (Canada)" #. LANG_FR_FR -#: po/tmp/xap_String_Id.h.h:329 +#: po/tmp/xap_String_Id.h.h:349 msgid "French (France)" -msgstr "" +msgstr "Fransk (Frankrig)" #. LANG_FR_CH -#: po/tmp/xap_String_Id.h.h:331 +#: po/tmp/xap_String_Id.h.h:351 msgid "French (Switzerland)" -msgstr "" +msgstr "Fransk (Schweitz)" #. LANG_FY_NL -#: po/tmp/xap_String_Id.h.h:333 +#: po/tmp/xap_String_Id.h.h:353 msgid "Frisian" -msgstr "" +msgstr "Frisisk" #. DLG_UP_From -#: po/tmp/xap_String_Id.h.h:335 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:355 msgid "From: " -msgstr "&Fra fil" +msgstr "Fra: " -#. LANG_GL_ES -#: po/tmp/xap_String_Id.h.h:337 -msgid "Galician" -msgstr "" +#. LANG_GL +#: po/tmp/xap_String_Id.h.h:357 +msgid "Galician (Galego)" +msgstr "Galicisk (Galego)" #. LANG_KA_GE -#: po/tmp/xap_String_Id.h.h:339 +#: po/tmp/xap_String_Id.h.h:359 msgid "Georgian" -msgstr "" +msgstr "Georgisk" #. ENC_GEOR_ACADEMY -#: po/tmp/xap_String_Id.h.h:341 +#: po/tmp/xap_String_Id.h.h:361 msgid "Georgian, Academy" -msgstr "" +msgstr "Georgisk, Academy" #. ENC_GEOR_PS -#: po/tmp/xap_String_Id.h.h:343 +#: po/tmp/xap_String_Id.h.h:363 msgid "Georgian, PS" -msgstr "" +msgstr "Georgisk, PS" #. LANG_DE_AT -#: po/tmp/xap_String_Id.h.h:345 +#: po/tmp/xap_String_Id.h.h:365 msgid "German (Austria)" -msgstr "" +msgstr "Tysk (strig)" #. LANG_DE_DE -#: po/tmp/xap_String_Id.h.h:347 +#: po/tmp/xap_String_Id.h.h:367 msgid "German (Germany)" -msgstr "" +msgstr "Tysk (Tyskland)" #. LANG_DE_CH -#: po/tmp/xap_String_Id.h.h:349 +#: po/tmp/xap_String_Id.h.h:369 msgid "German (Switzerland)" -msgstr "" +msgstr "Tysk (Schweitz)" #. DLG_UP_Grayscale -#: po/tmp/xap_String_Id.h.h:351 +#: po/tmp/xap_String_Id.h.h:371 msgid "Grayscale" -msgstr "" +msgstr "Grskala" #. LANG_EL_GR -#: po/tmp/xap_String_Id.h.h:353 +#: po/tmp/xap_String_Id.h.h:373 msgid "Greek" -msgstr "" +msgstr "Grsk" #. ENC_GREE_ISO -#: po/tmp/xap_String_Id.h.h:355 +#: po/tmp/xap_String_Id.h.h:375 msgid "Greek, ISO-8859-7" -msgstr "" +msgstr "Grsk, ISO-8859-7" #. ENC_GREE_MAC -#: po/tmp/xap_String_Id.h.h:357 +#: po/tmp/xap_String_Id.h.h:377 msgid "Greek, Macintosh" -msgstr "" +msgstr "Grsk, Macintosh" #. ENC_GREE_WIN -#: po/tmp/xap_String_Id.h.h:359 +#: po/tmp/xap_String_Id.h.h:379 msgid "Greek, Windows Code Page 1253" -msgstr "" +msgstr "Grsk, Windows CP-1253" #. DLG_HTMLOPT_ExpTitle -#: po/tmp/xap_String_Id.h.h:361 +#: po/tmp/xap_String_Id.h.h:381 msgid "HTML Export Options" -msgstr "" +msgstr "HTML-eksportmuligheder" #. LANG_HA_NE -#: po/tmp/xap_String_Id.h.h:365 +#: po/tmp/xap_String_Id.h.h:385 msgid "Hausa (Niger)" -msgstr "" +msgstr "Hausa (Niger)" #. LANG_HA_NG -#: po/tmp/xap_String_Id.h.h:367 +#: po/tmp/xap_String_Id.h.h:387 msgid "Hausa (Nigeria)" -msgstr "" +msgstr "Hausa (Nigeria)" #. LANG_HAW_US -#: po/tmp/xap_String_Id.h.h:369 +#: po/tmp/xap_String_Id.h.h:389 msgid "Hawaiian" -msgstr "" +msgstr "Hawaiiansk" #. STYLE_HEADING1 -#: po/tmp/xap_String_Id.h.h:371 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:391 msgid "Heading 1" -msgstr "Brugertypografier" +msgstr "Overskrift 1" #. STYLE_HEADING2 -#: po/tmp/xap_String_Id.h.h:373 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:393 msgid "Heading 2" -msgstr "Brugertypografier" +msgstr "Overskrift 2" #. STYLE_HEADING3 -#: po/tmp/xap_String_Id.h.h:375 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:395 msgid "Heading 3" -msgstr "Brugertypografier" +msgstr "Overskrift 3" #. STYLE_HEADING4 -#: po/tmp/xap_String_Id.h.h:377 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:397 msgid "Heading 4" -msgstr "Brugertypografier" +msgstr "Overskrift 4" #. LANG_HE_IL -#: po/tmp/xap_String_Id.h.h:381 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:401 msgid "Hebrew" -msgstr "Hebraisk liste" +msgstr "Hebrisk" #. ENC_HEBR_ISO -#: po/tmp/xap_String_Id.h.h:383 +#: po/tmp/xap_String_Id.h.h:403 msgid "Hebrew, ISO-8859-8" -msgstr "" +msgstr "Hebrisk, ISO-8859-8" #. ENC_HEBR_MAC -#: po/tmp/xap_String_Id.h.h:385 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:405 msgid "Hebrew, Macintosh" -msgstr "Hebraisk liste" +msgstr "Hebrisk, Macintosh" #. ENC_HEBR_WIN -#: po/tmp/xap_String_Id.h.h:387 +#: po/tmp/xap_String_Id.h.h:407 msgid "Hebrew, Windows Code Page 1255" -msgstr "" +msgstr "Hebrisk, Windows CP-1255" #. DLG_Image_Height -#: po/tmp/xap_String_Id.h.h:389 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:409 msgid "Height:" -msgstr "&Hjde:" +msgstr "Hjde:" #. DLG_IP_Height_Label -#: po/tmp/xap_String_Id.h.h:391 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:411 msgid "Height: " -msgstr "&Hjde:" +msgstr "Hjde: " #. DLG_UFS_HiddenCheck -#: po/tmp/xap_String_Id.h.h:393 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:413 msgid "Hidden" -msgstr "Skjul" +msgstr "Skjult" #. DLG_UFS_BGColorTab -#: po/tmp/xap_String_Id.h.h:395 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:415 msgid "HighLight Color" -msgstr "Fjern markeringsfarve" +msgstr "Markeringsfarve" #. LANG_HI_IN -#: po/tmp/xap_String_Id.h.h:397 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:417 msgid "Hindi" -msgstr "Skjul" +msgstr "Hindi" #. LANG_HU_HU -#: po/tmp/xap_String_Id.h.h:399 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:419 msgid "Hungarian" -msgstr "Hngende" +msgstr "Ungarsk" #. LANG_IS_IS -#: po/tmp/xap_String_Id.h.h:401 +#: po/tmp/xap_String_Id.h.h:421 msgid "Icelandic" -msgstr "" +msgstr "Islandsk" #. ENC_ICEL_MAC -#: po/tmp/xap_String_Id.h.h:403 +#: po/tmp/xap_String_Id.h.h:423 msgid "Icelandic, Macintosh" -msgstr "" +msgstr "Islandsk, Macintosh" #. DLG_History_Id -#: po/tmp/xap_String_Id.h.h:405 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:425 msgid "Identifier:" -msgstr "Indrykning" +msgstr "ID:" #. DLG_Image_Title -#: po/tmp/xap_String_Id.h.h:407 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:427 msgid "Image Properties" -msgstr "Sidehovedegenskaber" +msgstr "Billedegenskaber" #. DLG_Image_WrappedNone -#: po/tmp/xap_String_Id.h.h:409 +#: po/tmp/xap_String_Id.h.h:429 msgid "Image floats above text" -msgstr "" +msgstr "Billede flyder over tekst" #. DLG_Image_InLine -#: po/tmp/xap_String_Id.h.h:411 +#: po/tmp/xap_String_Id.h.h:431 msgid "Image placed in-line (no text wrapping)" -msgstr "" +msgstr "Billede placeret inline (ingen tekstfoldning)" #. DLG_FOSA_ImportTitle -#: po/tmp/xap_String_Id.h.h:415 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:435 msgid "Import File" msgstr "Importr fil" #. MSG_ImportingDoc -#: po/tmp/xap_String_Id.h.h:417 -#, fuzzy -msgid "Importing Document.." -msgstr "Udskriver dokument..." +#: po/tmp/xap_String_Id.h.h:437 +msgid "Importing Document..." +msgstr "Importerer dokument..." #. LANG_ID_ID -#: po/tmp/xap_String_Id.h.h:419 +#: po/tmp/xap_String_Id.h.h:439 msgid "Indonesian" -msgstr "" +msgstr "Indonesisk" #. XIM_Methods -#: po/tmp/xap_String_Id.h.h:421 +#: po/tmp/xap_String_Id.h.h:441 msgid "Input Methods" -msgstr "" +msgstr "Input-metoder" #. DLG_FOSA_InsertObject -#: po/tmp/xap_String_Id.h.h:425 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:445 msgid "Insert Embeddable Object" -msgstr "Indst fil" +msgstr "Indst indlejringsobjekt" #. DLG_FOSA_FileInsertObject -#: po/tmp/xap_String_Id.h.h:427 +#: po/tmp/xap_String_Id.h.h:447 msgid "Insert Embeddable Object file:" -msgstr "" +msgstr "Indst indlejringsobjekt-fil:" #. DLG_FOSA_InsertTitle -#: po/tmp/xap_String_Id.h.h:429 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:449 msgid "Insert File" msgstr "Indst fil" #. DLG_FOSA_InsertMath -#: po/tmp/xap_String_Id.h.h:431 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:451 msgid "Insert Math File" -msgstr "Indst et billede fra en fil" +msgstr "Indst MATH-fil" #. DLG_FOSA_FileInsertMath -#: po/tmp/xap_String_Id.h.h:433 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:453 msgid "Insert MathML file:" -msgstr "Indst et billede fra en fil" +msgstr "Indst MATHML-fil:" #. TB_InsertNewTable -#: po/tmp/xap_String_Id.h.h:435 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:455 msgid "Insert New Table" -msgstr "Indst fil" +msgstr "Indst ny tabel" #. DLG_IP_Title -#: po/tmp/xap_String_Id.h.h:437 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:457 msgid "Insert Picture" -msgstr "Indst et billede" +msgstr "Indst billede" #. DLG_Insert_SymbolTitle -#: po/tmp/xap_String_Id.h.h:439 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:459 msgid "Insert Symbol" msgstr "Indst symbol" #. DLG_PLUGIN_MANAGER_INSTALL -#: po/tmp/xap_String_Id.h.h:441 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:461 msgid "Install new plugin" -msgstr "Unvidelsesmoduler" +msgstr "Installr nyt udvidelsesmodul" #. LANG_IA -#: po/tmp/xap_String_Id.h.h:443 +#: po/tmp/xap_String_Id.h.h:463 msgid "Interlingua" -msgstr "" +msgstr "Interlingua" #. LANG_IU_CA -#: po/tmp/xap_String_Id.h.h:445 +#: po/tmp/xap_String_Id.h.h:465 msgid "Inuktitut" -msgstr "" +msgstr "Inuktitut" #. DLG_InvalidPathname -#: po/tmp/xap_String_Id.h.h:447 +#: po/tmp/xap_String_Id.h.h:467 msgid "Invalid pathname." -msgstr "" +msgstr "Ugyldigt stinavn." #. LANG_GA_IE -#: po/tmp/xap_String_Id.h.h:449 +#: po/tmp/xap_String_Id.h.h:469 msgid "Irish" -msgstr "" +msgstr "Irsk" #. LANG_IT_IT -#: po/tmp/xap_String_Id.h.h:451 +#: po/tmp/xap_String_Id.h.h:471 msgid "Italian (Italy)" -msgstr "" +msgstr "Italiensk (Italien)" #. LANG_JA_JP -#: po/tmp/xap_String_Id.h.h:455 +#: po/tmp/xap_String_Id.h.h:475 msgid "Japanese" -msgstr "" +msgstr "Japansk" #. ENC_JAPN_EUC -#: po/tmp/xap_String_Id.h.h:457 +#: po/tmp/xap_String_Id.h.h:477 msgid "Japanese, EUC-JP" -msgstr "" +msgstr "Japansk, EUC-JP" #. ENC_JAPN_ISO -#: po/tmp/xap_String_Id.h.h:459 +#: po/tmp/xap_String_Id.h.h:479 msgid "Japanese, ISO-2022-JP" -msgstr "" +msgstr "Japansk, ISO-2022-JP" #. ENC_JAPN_SJIS -#: po/tmp/xap_String_Id.h.h:461 +#: po/tmp/xap_String_Id.h.h:481 msgid "Japanese, Shift-JIS" -msgstr "" +msgstr "Japansk, Shift-JIS" #. ENC_JAPN_WIN -#: po/tmp/xap_String_Id.h.h:463 +#: po/tmp/xap_String_Id.h.h:483 msgid "Japanese, Windows Code Page 932" -msgstr "" +msgstr "Japansk, Windows CP-932" #. LANG_KN_IN -#: po/tmp/xap_String_Id.h.h:465 +#: po/tmp/xap_String_Id.h.h:485 msgid "Kannada" -msgstr "" +msgstr "Kannada (Indien)" #. LANG_KO_KR -#: po/tmp/xap_String_Id.h.h:467 +#. LANG_KO +#: po/tmp/xap_String_Id.h.h:488 msgid "Korean" -msgstr "" +msgstr "Koreansk" #. ENC_KORE_EUC -#: po/tmp/xap_String_Id.h.h:469 +#: po/tmp/xap_String_Id.h.h:490 msgid "Korean, EUC-KR" -msgstr "" +msgstr "Koreansk, EUC-KR" #. ENC_KORE_JOHAB -#: po/tmp/xap_String_Id.h.h:471 +#: po/tmp/xap_String_Id.h.h:492 msgid "Korean, Johab" -msgstr "" +msgstr "Koreansk, Johab" #. ENC_KORE_KSC -#: po/tmp/xap_String_Id.h.h:473 +#: po/tmp/xap_String_Id.h.h:494 msgid "Korean, KSC_5601" -msgstr "" +msgstr "Koreansk, KSC_5601" #. ENC_KORE_WIN -#: po/tmp/xap_String_Id.h.h:475 +#: po/tmp/xap_String_Id.h.h:496 msgid "Korean, Windows Code Page 949" -msgstr "" +msgstr "Koreansk, Windows CP-949" #. LANG_KU -#: po/tmp/xap_String_Id.h.h:477 +#: po/tmp/xap_String_Id.h.h:498 msgid "Kurdish" -msgstr "" +msgstr "Kurdisk" #. LANG_LO_LA -#: po/tmp/xap_String_Id.h.h:479 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:500 msgid "Lao" -msgstr "Udseende" +msgstr "Lao" #. DLG_History_LastSaved -#: po/tmp/xap_String_Id.h.h:481 +#: po/tmp/xap_String_Id.h.h:502 msgid "Last saved:" -msgstr "" +msgstr "Sidst gemt:" #. LANG_LA_IT -#: po/tmp/xap_String_Id.h.h:483 +#: po/tmp/xap_String_Id.h.h:504 msgid "Latin (Renaissance)" -msgstr "" +msgstr "Latin (renssance)" #. LANG_LV_LV -#: po/tmp/xap_String_Id.h.h:485 +#: po/tmp/xap_String_Id.h.h:506 msgid "Latvian" -msgstr "" +msgstr "Lettisk" #. LANG_LT_LT -#: po/tmp/xap_String_Id.h.h:487 +#: po/tmp/xap_String_Id.h.h:508 msgid "Lithuanian" -msgstr "" +msgstr "Littauisk" + +#. DLG_CLIPART_Loading +#: po/tmp/xap_String_Id.h.h:510 +msgid "Loading Clip Art" +msgstr "Indlser Clip Art-grafik" #. LANG_MK -#: po/tmp/xap_String_Id.h.h:493 +#: po/tmp/xap_String_Id.h.h:516 msgid "Macedonian" -msgstr "" +msgstr "Makedonsk" #. DLG_ULANG_DefaultLangChkbox -#: po/tmp/xap_String_Id.h.h:495 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:518 msgid "Make default for document" -msgstr "Gem dokumentet" +msgstr "Gr til standard for dokumentet" + +#. LANG_MS_MY +#: po/tmp/xap_String_Id.h.h:520 +msgid "Malay" +msgstr "Malayisk" #. LANG_MI_NZ -#: po/tmp/xap_String_Id.h.h:497 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:522 msgid "Maori" -msgstr "&Margen" +msgstr "Maori" #. LANG_MR_IN -#: po/tmp/xap_String_Id.h.h:499 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:524 msgid "Marathi" -msgstr "&Margen" +msgstr "Marathi" #. LANG_MH_MH -#: po/tmp/xap_String_Id.h.h:501 +#: po/tmp/xap_String_Id.h.h:526 msgid "Marshallese (Marshall Islands)" -msgstr "" +msgstr "Marshallesisk (Marshallerne)" #. LANG_MH_NR -#: po/tmp/xap_String_Id.h.h:503 +#: po/tmp/xap_String_Id.h.h:528 msgid "Marshallese (Nauru)" -msgstr "" +msgstr "Marshallesisk (Nauru)" +# Samling? Kontekst? #. DLG_Merge -#: po/tmp/xap_String_Id.h.h:505 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:530 msgid "Merge" -msgstr "Hjre" +msgstr "Flet" #. LANG_MN_MN -#: po/tmp/xap_String_Id.h.h:507 +#: po/tmp/xap_String_Id.h.h:532 msgid "Mongolian" -msgstr "" +msgstr "Mongolsk" #. DLG_PLUGIN_MANAGER_NAME -#: po/tmp/xap_String_Id.h.h:509 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:534 msgid "Name:" -msgstr "&Navn:" +msgstr "Navn:" + +#. LANG_NE_NP +#: po/tmp/xap_String_Id.h.h:536 +msgid "Nepali (Nepal)" +msgstr "Nepalesisk (Nepal)" #. DLG_QNXMB_No -#: po/tmp/xap_String_Id.h.h:511 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:538 msgid "No" -msgstr "Ingen" +msgstr "Nej" #. DLG_IP_No_Picture_Label -#: po/tmp/xap_String_Id.h.h:513 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:540 msgid "No Picture" -msgstr "Billede" +msgstr "Intet billede" #. DLG_PLUGIN_MANAGER_NONE_SELECTED -#: po/tmp/xap_String_Id.h.h:515 +#: po/tmp/xap_String_Id.h.h:542 msgid "No plugin selected" -msgstr "" +msgstr "Der er ikke udvalgt en udvidelse" +# Kontekst? #. STYLE_NORMAL -#: po/tmp/xap_String_Id.h.h:517 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:544 msgid "Normal" msgstr "Normal visning" #. LANG_NB_NO -#: po/tmp/xap_String_Id.h.h:519 +#: po/tmp/xap_String_Id.h.h:546 msgid "Norwegian Bokmal" -msgstr "" +msgstr "Norsk Bokml" #. LANG_NN_NO -#: po/tmp/xap_String_Id.h.h:521 +#: po/tmp/xap_String_Id.h.h:548 msgid "Norwegian Nynorsk" -msgstr "" +msgstr "Nynorsk" +# Kontekst? "Ikke tilgngelig"? #. DLG_PLUGIN_MANAGER_NOT_AVAILABLE -#: po/tmp/xap_String_Id.h.h:523 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:550 msgid "Not available" -msgstr "Ingen fil" +msgstr "Ikke tilgngeligt" #. STYLE_NUMHEAD1 -#: po/tmp/xap_String_Id.h.h:525 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:552 msgid "Numbered Heading 1" -msgstr "Nummerering" +msgstr "Nummereret overskrift 1" #. STYLE_NUMHEAD2 -#: po/tmp/xap_String_Id.h.h:527 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:554 msgid "Numbered Heading 2" -msgstr "Nummerering" +msgstr "Nummereret overskrift 2" #. STYLE_NUMHEAD3 -#: po/tmp/xap_String_Id.h.h:529 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:556 msgid "Numbered Heading 3" -msgstr "Nummerering" +msgstr "Nummereret overskrift 3" #. DLG_OK -#: po/tmp/xap_String_Id.h.h:533 +#: po/tmp/xap_String_Id.h.h:560 msgid "OK" -msgstr "" +msgstr "OK" #. LANG_OC_FR -#: po/tmp/xap_String_Id.h.h:535 +#: po/tmp/xap_String_Id.h.h:562 msgid "Occitan" -msgstr "" +msgstr "Occitansk" #. DLG_FOSA_OpenTitle -#: po/tmp/xap_String_Id.h.h:537 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:564 msgid "Open File" msgstr "bn fil" #. DLG_FOSA_FileOpenTypeLabel -#: po/tmp/xap_String_Id.h.h:539 +#: po/tmp/xap_String_Id.h.h:566 msgid "Open file as type:" -msgstr "" +msgstr "bn fil som type:" #. DLG_LISTDOCS_Title -#: po/tmp/xap_String_Id.h.h:541 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:568 msgid "Opened Documents" -msgstr "&Dokument" +msgstr "bne dokumenter" +# Kontekst? "Andre", mske? #. TB_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:543 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:570 msgid "Other..." -msgstr "Andre" +msgstr "Andet..." #. DLG_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:547 +#: po/tmp/xap_String_Id.h.h:574 msgid "P&ercent:" -msgstr "" +msgstr "P&rocent:" #. TB_Zoom_PageWidth -#: po/tmp/xap_String_Id.h.h:549 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:576 msgid "Page Width" -msgstr "&Sidebredde" +msgstr "Sidebredde" #. DLG_UP_PageRanges -#: po/tmp/xap_String_Id.h.h:551 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:578 msgid "Page ranges:" -msgstr "Sidestrrelser:" +msgstr "Sideinterval:" + +#. LANG_PS +#: po/tmp/xap_String_Id.h.h:580 +msgid "Pashto" +msgstr "Pashto" #. DLG_Password_Password -#: po/tmp/xap_String_Id.h.h:553 +#: po/tmp/xap_String_Id.h.h:582 msgid "Password:" -msgstr "" +msgstr "Adgangskode:" #. STYLE_PLAIN_TEXT -#: po/tmp/xap_String_Id.h.h:555 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:584 msgid "Plain Text" -msgstr "Martins test" +msgstr "Ren tekst" #. DLG_PLUGIN_MANAGER_DETAILS -#: po/tmp/xap_String_Id.h.h:557 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:586 msgid "Plugin Details:" -msgstr "Moduldetaljer" +msgstr "Detaljer om udvidelsesmoduler" #. DLG_PLUGIN_MANAGER_LIST -#: po/tmp/xap_String_Id.h.h:559 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:588 msgid "Plugin List" -msgstr "&Udvidelsesmoduler" +msgstr "Liste over udvidelsesmoduler" #. LANG_PL_PL -#: po/tmp/xap_String_Id.h.h:561 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:590 msgid "Polish" msgstr "Polsk" #. LANG_PT_BR -#: po/tmp/xap_String_Id.h.h:563 +#: po/tmp/xap_String_Id.h.h:592 msgid "Portuguese (Brazil)" -msgstr "" +msgstr "Portugisisk (Brasilien)" #. LANG_PT_PT -#: po/tmp/xap_String_Id.h.h:565 +#: po/tmp/xap_String_Id.h.h:594 msgid "Portuguese (Portugal)" -msgstr "" +msgstr "Portugisisk (Portugal)" #. DLG_Image_PlaceColumn -#: po/tmp/xap_String_Id.h.h:567 +#: po/tmp/xap_String_Id.h.h:596 msgid "Position relative to its Column" -msgstr "" +msgstr "Placering relativ til kolonne" #. DLG_Image_PlacePage -#: po/tmp/xap_String_Id.h.h:569 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:598 msgid "Position relative to its Page" -msgstr "Placering:" +msgstr "Placering relativt til side" #. DLG_Image_PlaceParagraph -#: po/tmp/xap_String_Id.h.h:571 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:600 msgid "Position relative to nearest paragraph" -msgstr "Lige margener i afsnit" +msgstr "Placering relativt til nrmeste afsnit" #. DLG_Image_Aspect -#: po/tmp/xap_String_Id.h.h:573 +#: po/tmp/xap_String_Id.h.h:602 msgid "Preserve aspect ratio" -msgstr "" +msgstr "Behold aspekt" #. DLG_IP_Activate_Label -#: po/tmp/xap_String_Id.h.h:577 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:606 msgid "Preview Picture" -msgstr "Eksempel" +msgstr "Forhndsvisning af billede" #. DLG_FOSA_PrintToFileTitle -#: po/tmp/xap_String_Id.h.h:582 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:611 msgid "Print To File" -msgstr "&Fra fil" +msgstr "Udskriv til fil" #. DLG_FOSA_FilePrintTypeLabel -#: po/tmp/xap_String_Id.h.h:584 +#: po/tmp/xap_String_Id.h.h:613 msgid "Print file as type:" -msgstr "" +msgstr "Udskriv fil som type:" #. DLG_UP_PrintIn -#: po/tmp/xap_String_Id.h.h:586 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:615 msgid "Print in: " -msgstr "Udskriv" +msgstr "Udskriv i: " #. DLG_UP_PrintTo -#: po/tmp/xap_String_Id.h.h:588 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:617 msgid "Print to: " -msgstr "Udskriv" +msgstr "Udskriv til:" #. DLG_UP_Printer -#: po/tmp/xap_String_Id.h.h:590 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:619 msgid "Printer" -msgstr "Udskriv" +msgstr "Printer" #. DLG_UP_PrinterCommand -#: po/tmp/xap_String_Id.h.h:592 +#: po/tmp/xap_String_Id.h.h:621 msgid "Printer command: " -msgstr "" +msgstr "Udskriftskommando: " #. LANG_PA_IN -#: po/tmp/xap_String_Id.h.h:594 +#: po/tmp/xap_String_Id.h.h:623 msgid "Punjabi (Gurmukhi)" -msgstr "" +msgstr "Punjabi (Gurmukhi)" #. LANG_PA_PK -#: po/tmp/xap_String_Id.h.h:596 +#: po/tmp/xap_String_Id.h.h:625 msgid "Punjabi (Shahmukhi)" -msgstr "" +msgstr "Punjabi (Shahmukhi)" #. LANG_QU_BO -#: po/tmp/xap_String_Id.h.h:598 +#: po/tmp/xap_String_Id.h.h:627 msgid "Quechua" -msgstr "" +msgstr "Quechua" + +#. LANG_QUH_BO +#: po/tmp/xap_String_Id.h.h:629 +msgid "Quechua (3 vowels)" +msgstr "Quechua (3 vokaler)" + +#. LANG_QUL_BO +#: po/tmp/xap_String_Id.h.h:631 +msgid "Quechua (5 vowels)" +msgstr "Quechua (5 vokaler)" + +#. DLG_FOSA_RecordToFileTitle +#: po/tmp/xap_String_Id.h.h:633 +msgid "Record Editing to File" +msgstr "Registrr redigering i fil" #. DLG_UFS_StyleRegular -#: po/tmp/xap_String_Id.h.h:600 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:635 msgid "Regular" -msgstr "&Linial" +msgstr "Almindelig" #. DLG_DocComparison_Relationship -#: po/tmp/xap_String_Id.h.h:602 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:637 msgid "Relationship:" -msgstr "Hilsen:" +msgstr "Relation:" + +#. DLG_FOSA_ReplayFromFileTitle +#: po/tmp/xap_String_Id.h.h:639 +msgid "Replay Editing from File" +msgstr "Gengiv redigering fra fil" #. DLG_Restore -#: po/tmp/xap_String_Id.h.h:604 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:641 msgid "Restore" -msgstr "&Nulstil" +msgstr "Gendan" #. DLG_HTMLOPT_ExpRestore -#: po/tmp/xap_String_Id.h.h:606 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:643 msgid "Restore Settings" -msgstr "Nuvrende indstillinger" +msgstr "Gendan indstillinger" #. DLG_DocComparison_Results -#: po/tmp/xap_String_Id.h.h:608 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:645 msgid "Results" -msgstr "&Standard" +msgstr "Resultater" #. LANG_RO_RO -#: po/tmp/xap_String_Id.h.h:610 +#: po/tmp/xap_String_Id.h.h:647 msgid "Romanian" -msgstr "" +msgstr "Rumnsk" #. ENC_ROMA_MAC -#: po/tmp/xap_String_Id.h.h:612 +#: po/tmp/xap_String_Id.h.h:649 msgid "Romanian, Macintosh" -msgstr "" +msgstr "Rumnsk, Macintosh" #. LANG_RU_RU -#: po/tmp/xap_String_Id.h.h:614 +#: po/tmp/xap_String_Id.h.h:651 msgid "Russian (Russia)" -msgstr "" +msgstr "Russisk (Rusland)" #. DLG_UFS_SampleFrameLabel -#: po/tmp/xap_String_Id.h.h:616 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:653 msgid "Sample" msgstr "Eksempel" #. LANG_SC_IT -#: po/tmp/xap_String_Id.h.h:618 +#: po/tmp/xap_String_Id.h.h:655 msgid "Sardinian" -msgstr "" +msgstr "Sardinsk" #. DLG_FOSA_SaveAsTitle -#: po/tmp/xap_String_Id.h.h:620 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:657 msgid "Save File As" -msgstr "Gem &som" +msgstr "Gem fil som" #. DLG_HTMLOPT_ExpSave -#: po/tmp/xap_String_Id.h.h:622 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:659 msgid "Save Settings" -msgstr "Nuvrende indstillinger" +msgstr "Gem indstillinger" #. DLG_FOSA_FileSaveTypeLabel -#: po/tmp/xap_String_Id.h.h:624 +#: po/tmp/xap_String_Id.h.h:661 msgid "Save file as type:" -msgstr "" +msgstr "Gem fil som type:" #. DLG_UFS_ScriptLabel -#: po/tmp/xap_String_Id.h.h:626 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:663 msgid "Script:" -msgstr "S&kripter" +msgstr "Script:" #. STYLE_SECTHEADING -#: po/tmp/xap_String_Id.h.h:628 +#: po/tmp/xap_String_Id.h.h:665 msgid "Section Heading" -msgstr "" +msgstr "Sektionsoverskrift" #. DLG_UENC_EncLabel -#: po/tmp/xap_String_Id.h.h:632 +#: po/tmp/xap_String_Id.h.h:669 msgid "Select Encoding:" -msgstr "" +msgstr "Vlg indkodning:" #. DLG_HTMLOPT_ExpLabel -#: po/tmp/xap_String_Id.h.h:634 +#: po/tmp/xap_String_Id.h.h:671 msgid "Select HTML export options:" -msgstr "" +msgstr "Vlg HTML-eksportmuligheder:" #. DLG_ULANG_LangLabel -#: po/tmp/xap_String_Id.h.h:636 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:673 msgid "Select Language:" -msgstr "Sprog" +msgstr "Vlg sprog:" #. LANG_SR -#: po/tmp/xap_String_Id.h.h:640 +#: po/tmp/xap_String_Id.h.h:677 msgid "Serbian" -msgstr "" +msgstr "Serbisk" #. DLG_Image_ImageDesc -#: po/tmp/xap_String_Id.h.h:642 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:679 msgid "Set Image Name" -msgstr "Gem fil som" +msgstr "St navn p billede" #. DLG_Image_ImageSize -#: po/tmp/xap_String_Id.h.h:644 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:681 msgid "Set Image Size" -msgstr "Standard sidestrrelse" +msgstr "St strrelse p billede" #. DLG_ULANG_LangTitle -#: po/tmp/xap_String_Id.h.h:646 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:683 msgid "Set Language" -msgstr "Sprog" +msgstr "Vlg sprog" #. DLG_UFS_TransparencyCheck -#: po/tmp/xap_String_Id.h.h:648 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:685 msgid "Set no Highlight Color" msgstr "Fjern markeringsfarve" #. DLG_UFS_SizeLabel -#: po/tmp/xap_String_Id.h.h:652 +#: po/tmp/xap_String_Id.h.h:689 msgid "Size:" -msgstr "" +msgstr "Strrelse:" #. LANG_SK_SK -#: po/tmp/xap_String_Id.h.h:654 +#: po/tmp/xap_String_Id.h.h:691 msgid "Slovak" -msgstr "" +msgstr "Slovakisk" #. LANG_SL_SI -#: po/tmp/xap_String_Id.h.h:656 +#: po/tmp/xap_String_Id.h.h:693 msgid "Slovenian" -msgstr "" +msgstr "Slovensk" #. LANG_ES_MX -#: po/tmp/xap_String_Id.h.h:658 +#: po/tmp/xap_String_Id.h.h:695 msgid "Spanish (Mexico)" -msgstr "" +msgstr "Spansk (Mexico)" #. LANG_ES_ES -#: po/tmp/xap_String_Id.h.h:660 +#: po/tmp/xap_String_Id.h.h:697 msgid "Spanish (Spain)" -msgstr "" +msgstr "Spansk (Spanien)" #. DLG_Image_SquareWrap -#: po/tmp/xap_String_Id.h.h:664 +#: po/tmp/xap_String_Id.h.h:701 msgid "Square text wrapping" -msgstr "" +msgstr "Fold tekst i firkant" #. DLG_DocComparison_Styles -#: po/tmp/xap_String_Id.h.h:672 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:709 msgid "Styles:" -msgstr "Ny typografi" +msgstr "Typografier:" #. LANG_SW -#: po/tmp/xap_String_Id.h.h:678 +#: po/tmp/xap_String_Id.h.h:715 msgid "Swahili" -msgstr "" +msgstr "Swahili" #. LANG_SV_SE -#: po/tmp/xap_String_Id.h.h:680 +#: po/tmp/xap_String_Id.h.h:717 msgid "Swedish" -msgstr "" +msgstr "Svensk" #. TB_Font_Symbol -#: po/tmp/xap_String_Id.h.h:682 +#: po/tmp/xap_String_Id.h.h:719 msgid "Symbols" -msgstr "" +msgstr "Symboler" #. LANG_SYR -#: po/tmp/xap_String_Id.h.h:684 +#: po/tmp/xap_String_Id.h.h:721 msgid "Syriac" -msgstr "" +msgstr "Syrisk" #. LANG_TL_PH -#: po/tmp/xap_String_Id.h.h:688 +#: po/tmp/xap_String_Id.h.h:725 msgid "Tagalog" -msgstr "" +msgstr "Tagalog" #. LANG_TA_IN -#: po/tmp/xap_String_Id.h.h:690 +#: po/tmp/xap_String_Id.h.h:727 msgid "Tamil" -msgstr "" +msgstr "Tamilsk" #. LANG_TE_IN -#: po/tmp/xap_String_Id.h.h:692 +#: po/tmp/xap_String_Id.h.h:729 msgid "Telugu" -msgstr "" +msgstr "Telugu" #. DLG_UFS_ColorTab -#: po/tmp/xap_String_Id.h.h:694 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:731 msgid "Text Color" -msgstr "ndr tekstfarve" +msgstr "Tekstfarve" #. DLG_Image_WrappedBoth -#: po/tmp/xap_String_Id.h.h:696 +#: po/tmp/xap_String_Id.h.h:733 msgid "Text wrapped on both sides of the Image" -msgstr "" +msgstr "Tekst foldet om begge sider af billedet" #. DLG_Image_WrappedLeft -#: po/tmp/xap_String_Id.h.h:698 +#: po/tmp/xap_String_Id.h.h:735 msgid "Text wrapped to the Left of the Image" -msgstr "" +msgstr "Tekst foldet til venstre for billedet" #. DLG_Image_WrappedRight -#: po/tmp/xap_String_Id.h.h:700 +#: po/tmp/xap_String_Id.h.h:737 msgid "Text wrapped to the Right of the Image" -msgstr "" +msgstr "Tekst foldet til hjre for billedet" #. LANG_TH_TH -#: po/tmp/xap_String_Id.h.h:702 +#: po/tmp/xap_String_Id.h.h:739 msgid "Thai" -msgstr "" +msgstr "Thai" #. ENC_THAI_MAC -#: po/tmp/xap_String_Id.h.h:704 +#: po/tmp/xap_String_Id.h.h:741 msgid "Thai, Macintosh" -msgstr "" +msgstr "Thai, Macintosh" #. ENC_THAI_TIS -#: po/tmp/xap_String_Id.h.h:706 +#: po/tmp/xap_String_Id.h.h:743 msgid "Thai, TIS-620" -msgstr "" +msgstr "Thai, TIS-620" #. ENC_THAI_WIN -#: po/tmp/xap_String_Id.h.h:708 +#: po/tmp/xap_String_Id.h.h:745 msgid "Thai, Windows Code Page 874" -msgstr "" +msgstr "Thai, WC-Page 874" #. DLG_NoSaveFile_DirNotWriteable -#: po/tmp/xap_String_Id.h.h:710 +#: po/tmp/xap_String_Id.h.h:747 #, c-format msgid "The directory '%s' is write-protected." -msgstr "" +msgstr "Folderen '%s' er skrivebeskyttet." + +#. DLG_FOSA_ExtensionDoesNotMatch +#: po/tmp/xap_String_Id.h.h:749 +msgid "The given file extension does not match the chosen file type. Do you want to use this name anyway?" +msgstr "Den opgivne filendelse svarer ikke til den opgivne filtype. nskes dette navn alligevel anvendt?" #. MSG_HistoryPartRestore2 -#: po/tmp/xap_String_Id.h.h:712 +#: po/tmp/xap_String_Id.h.h:751 #, c-format -msgid "" -"The nearest version that can be restored fully is %d. Would you like to " -"restore this version instead? To partially restore version %d press No." -msgstr "" +msgid "The nearest version that can be restored fully is %d. Would you like to restore this version instead? To partially restore version %d press No." +msgstr "Den nrmeste version, der kan fuldt reetableres, er %d. nskes denne version reetableret i stedet? For delvist at reetablere version %d: Tryk p Nej." #. DLG_UP_InvalidPrintString -#: po/tmp/xap_String_Id.h.h:714 +#: po/tmp/xap_String_Id.h.h:753 msgid "The print command string is not valid." -msgstr "" +msgstr "Udskriftskommandoen er ikke gyldig." #. MSG_NoUndo -#: po/tmp/xap_String_Id.h.h:716 +#: po/tmp/xap_String_Id.h.h:755 msgid "This operation cannot be undone. Are you sure you want to proceed?" -msgstr "" +msgstr "Denne operation kan ikke tilbagefres. Er du sikker p, at du nsker at fortstte?" #. DLG_Image_TightWrap -#: po/tmp/xap_String_Id.h.h:720 +#: po/tmp/xap_String_Id.h.h:759 msgid "Tight text wrapping" -msgstr "" +msgstr "Tt tekstfoldning" #. MSG_HistoryPartRestore3 -#: po/tmp/xap_String_Id.h.h:724 +#: po/tmp/xap_String_Id.h.h:763 msgid "To continue anyway, press OK." -msgstr "" +msgstr "For at fortstte alligevel: Tryk OK." +# Cancel=hvilket? #. MSG_HistoryPartRestore4 -#: po/tmp/xap_String_Id.h.h:726 +#: po/tmp/xap_String_Id.h.h:765 msgid "To quit the restoration attempt, press Cancel." -msgstr "" +msgstr "Tryk Fortryd for at afbryde gendannelsesforsget." #. LANG_TR_TR -#: po/tmp/xap_String_Id.h.h:732 +#: po/tmp/xap_String_Id.h.h:771 msgid "Turkish" -msgstr "" +msgstr "Tyrkisk" #. ENC_TURK_ISO -#: po/tmp/xap_String_Id.h.h:734 +#: po/tmp/xap_String_Id.h.h:773 msgid "Turkish, ISO-8859-9" -msgstr "" +msgstr "Tyrkisk, ISO-8859-9" #. ENC_TURK_MAC -#: po/tmp/xap_String_Id.h.h:736 +#: po/tmp/xap_String_Id.h.h:775 msgid "Turkish, Macintosh" -msgstr "" +msgstr "Tyrkisk, Macintosh" #. ENC_TURK_WIN -#: po/tmp/xap_String_Id.h.h:738 +#: po/tmp/xap_String_Id.h.h:777 msgid "Turkish, Windows Code Page 1254" -msgstr "" +msgstr "Tyrkisk, Windows CP-1254" #. DLG_Image_WrapType -#: po/tmp/xap_String_Id.h.h:740 +#: po/tmp/xap_String_Id.h.h:779 msgid "Type of text wrapping" -msgstr "" +msgstr "Tekstfoldningstype" #. ENC_WEST_ASCII -#: po/tmp/xap_String_Id.h.h:742 +#: po/tmp/xap_String_Id.h.h:781 msgid "US-ASCII" -msgstr "" +msgstr "US-ASCII" #. LANG_UK_UA -#: po/tmp/xap_String_Id.h.h:744 +#: po/tmp/xap_String_Id.h.h:783 msgid "Ukrainian" -msgstr "" +msgstr "Ukrainsk" #. ENC_UKRA_KOI -#: po/tmp/xap_String_Id.h.h:746 +#: po/tmp/xap_String_Id.h.h:785 msgid "Ukrainian, KOI8-U" -msgstr "" +msgstr "Ukrainsk, KOI8-U" #. ENC_UKRA_MAC -#: po/tmp/xap_String_Id.h.h:748 +#: po/tmp/xap_String_Id.h.h:787 msgid "Ukrainian, Macintosh" -msgstr "" +msgstr "Ukrainsk, Macintosh" #. ENC_UNIC_UCS2 -#: po/tmp/xap_String_Id.h.h:752 +#: po/tmp/xap_String_Id.h.h:791 msgid "Unicode UCS-2" -msgstr "" +msgstr "Unicode UCS-2" #. ENC_UNIC_UCS_2BE -#: po/tmp/xap_String_Id.h.h:754 +#: po/tmp/xap_String_Id.h.h:793 msgid "Unicode UCS-2 Big Endian" -msgstr "" +msgstr "Unicode UCS-2 Big Endian" #. ENC_UNIC_UCS_2LE -#: po/tmp/xap_String_Id.h.h:756 +#: po/tmp/xap_String_Id.h.h:795 msgid "Unicode UCS-2 Little Endian" -msgstr "" +msgstr "Unicode UCS-2 Little Endian" #. ENC_UNIC_UCS4 -#: po/tmp/xap_String_Id.h.h:758 +#: po/tmp/xap_String_Id.h.h:797 msgid "Unicode UCS-4" -msgstr "" +msgstr "Unicode UCS-4" #. ENC_UNIC_UCS_4BE -#: po/tmp/xap_String_Id.h.h:760 +#: po/tmp/xap_String_Id.h.h:799 msgid "Unicode UCS-4 Big Endian" -msgstr "" +msgstr "Unicode UCS-4 Big Endian" #. ENC_UNIC_UCS_4LE -#: po/tmp/xap_String_Id.h.h:762 +#: po/tmp/xap_String_Id.h.h:801 msgid "Unicode UCS-4 Little Endian" -msgstr "" +msgstr "Unicode UCS-4 Little Endian" #. ENC_UNIC_UTF_16 -#: po/tmp/xap_String_Id.h.h:764 +#: po/tmp/xap_String_Id.h.h:803 msgid "Unicode UTF-16" -msgstr "" +msgstr "Unicode UTF-16" #. ENC_UNIC_UTF_16BE -#: po/tmp/xap_String_Id.h.h:766 +#: po/tmp/xap_String_Id.h.h:805 msgid "Unicode UTF-16 Big Endian" -msgstr "" +msgstr "Unicode UTF-16 Big Endian" #. ENC_UNIC_UTF_16LE -#: po/tmp/xap_String_Id.h.h:768 +#: po/tmp/xap_String_Id.h.h:807 msgid "Unicode UTF-16 Little Endian" -msgstr "" +msgstr "Unicode UTF-16 Little Endian" #. ENC_UNIC_UTF_32 -#: po/tmp/xap_String_Id.h.h:770 +#: po/tmp/xap_String_Id.h.h:809 msgid "Unicode UTF-32" -msgstr "" +msgstr "Unicode UTF-32" #. ENC_UNIC_UTF_32BE -#: po/tmp/xap_String_Id.h.h:772 +#: po/tmp/xap_String_Id.h.h:811 msgid "Unicode UTF-32 Big Endian" -msgstr "" +msgstr "Unicode UTF-32 Big Endian" #. ENC_UNIC_UTF_32LE -#: po/tmp/xap_String_Id.h.h:774 +#: po/tmp/xap_String_Id.h.h:813 msgid "Unicode UTF-32 Little Endian" -msgstr "" +msgstr "Unicode UTF-32 Little Endian" #. ENC_UNIC_UTF_7 -#: po/tmp/xap_String_Id.h.h:776 +#: po/tmp/xap_String_Id.h.h:815 msgid "Unicode UTF-7" -msgstr "" +msgstr "Unicode UTF-7" #. ENC_UNIC_UTF_8 -#: po/tmp/xap_String_Id.h.h:778 +#: po/tmp/xap_String_Id.h.h:817 msgid "Unicode UTF-8" -msgstr "" +msgstr "Unicode UTF-8" #. UntitledDocument -#: po/tmp/xap_String_Id.h.h:780 +#: po/tmp/xap_String_Id.h.h:819 #, c-format msgid "Untitled%d" -msgstr "" +msgstr "Unavngivet%d" #. DLG_Update -#: po/tmp/xap_String_Id.h.h:782 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:821 msgid "Update" -msgstr " Autoopdatr" +msgstr "Opdatr" -#. LANG_UR_PK -#: po/tmp/xap_String_Id.h.h:788 +#. LANG_UR +#: po/tmp/xap_String_Id.h.h:827 msgid "Urdu" -msgstr "" +msgstr "Urdu" + +#. LANG_UR_PK +#: po/tmp/xap_String_Id.h.h:829 +msgid "Urdu (Pakistan)" +msgstr "Urdu (Pakistan)" #. LANG_UZ_UZ -#: po/tmp/xap_String_Id.h.h:790 +#: po/tmp/xap_String_Id.h.h:831 msgid "Uzbek" -msgstr "" +msgstr "Uzbekisk" #. DLG_History_List_Title -#: po/tmp/xap_String_Id.h.h:794 +#: po/tmp/xap_String_Id.h.h:835 msgid "Version history" -msgstr "" +msgstr "Versionshistorik" #. DLG_PLUGIN_MANAGER_VERSION #. DLG_History_Version -#: po/tmp/xap_String_Id.h.h:797 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:838 msgid "Version:" -msgstr "Version" +msgstr "Version:" #. LANG_VI_VN -#: po/tmp/xap_String_Id.h.h:799 +#: po/tmp/xap_String_Id.h.h:840 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamesisk" #. ENC_VIET_TCVN -#: po/tmp/xap_String_Id.h.h:801 +#: po/tmp/xap_String_Id.h.h:842 msgid "Vietnamese, TCVN" -msgstr "" +msgstr "Vietnamesisk, TCVN" #. ENC_VIET_VISCII -#: po/tmp/xap_String_Id.h.h:803 +#: po/tmp/xap_String_Id.h.h:844 msgid "Vietnamese, VISCII" -msgstr "" +msgstr "Vietnamesisk, VISCII" #. ENC_VIET_WIN -#: po/tmp/xap_String_Id.h.h:805 +#: po/tmp/xap_String_Id.h.h:846 msgid "Vietnamese, Windows Code Page 1258" -msgstr "" +msgstr "Vietnamesisk, Windows CP-1258" #. DLG_MW_MoreWindows -#: po/tmp/xap_String_Id.h.h:807 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:848 msgid "View Document" -msgstr "&Dokument" +msgstr "Vis dokument" #. DLG_MW_Activate -#: po/tmp/xap_String_Id.h.h:809 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:850 msgid "View:" -msgstr "&Vis" +msgstr "Vis:" #. LANG_CY_GB -#: po/tmp/xap_String_Id.h.h:811 +#: po/tmp/xap_String_Id.h.h:852 msgid "Welsh" -msgstr "" +msgstr "Walisisk" #. ENC_US_DOS -#: po/tmp/xap_String_Id.h.h:813 +#: po/tmp/xap_String_Id.h.h:854 msgid "Western European, DOS/Windows Code Page 437" -msgstr "" +msgstr "Vesteuropisk, DOS/Windows CP-437" #. ENC_MLNG_DOS -#: po/tmp/xap_String_Id.h.h:815 +#: po/tmp/xap_String_Id.h.h:856 msgid "Western European, DOS/Windows Code Page 850" -msgstr "" +msgstr "Vesteruopisk, DOS/Windows CP.-850" #. ENC_WEST_HP -#: po/tmp/xap_String_Id.h.h:817 +#: po/tmp/xap_String_Id.h.h:858 msgid "Western European, HP" -msgstr "" +msgstr "Vesteuropisk, HP" #. ENC_WEST_ISO -#: po/tmp/xap_String_Id.h.h:819 +#: po/tmp/xap_String_Id.h.h:860 msgid "Western European, ISO-8859-1" -msgstr "" +msgstr "Vesteuropisk, ISO-8859-1" #. ENC_WEST_MAC -#: po/tmp/xap_String_Id.h.h:821 +#: po/tmp/xap_String_Id.h.h:862 msgid "Western European, Macintosh" -msgstr "" +msgstr "Vesteuropisk, Macintosh" #. ENC_WEST_NXT -#: po/tmp/xap_String_Id.h.h:823 +#: po/tmp/xap_String_Id.h.h:864 msgid "Western European, NeXT" -msgstr "" +msgstr "Vesteuropisk, NeXT" #. ENC_WEST_WIN -#: po/tmp/xap_String_Id.h.h:825 +#: po/tmp/xap_String_Id.h.h:866 msgid "Western European, Windows Code Page 1252" -msgstr "" +msgstr "Vesteuropisk, Windows CP-1252" #. TB_Zoom_WholePage -#: po/tmp/xap_String_Id.h.h:827 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:868 msgid "Whole Page" -msgstr "&Hele siden" +msgstr "Hele siden" #. DLG_Image_Width -#: po/tmp/xap_String_Id.h.h:829 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:870 msgid "Width:" -msgstr "&Bredde:" +msgstr "Bredde:" #. DLG_IP_Width_Label -#: po/tmp/xap_String_Id.h.h:831 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:872 msgid "Width: " -msgstr "&Bredde:" +msgstr "Bredde: " + +#. LANG_WO_SN +#: po/tmp/xap_String_Id.h.h:874 +msgid "Wolof (Senegal)" +msgstr "Wolof (Senegal)" #. DLG_QNXMB_Yes -#: po/tmp/xap_String_Id.h.h:833 +#: po/tmp/xap_String_Id.h.h:876 msgid "Yes" -msgstr "" +msgstr "Ja" #. LANG_YI -#: po/tmp/xap_String_Id.h.h:835 +#: po/tmp/xap_String_Id.h.h:878 msgid "Yiddish" -msgstr "" +msgstr "Yiddish" #. MSG_HistoryConfirmSave -#: po/tmp/xap_String_Id.h.h:837 -#, fuzzy, c-format +#: po/tmp/xap_String_Id.h.h:880 +#, c-format msgid "You have to save changes to document %s before proceeding. Save now?" -msgstr "Vis dokumentet fr det udskrives" +msgstr "ndringerne i dokumentet %s skal gemmes, inden der kan fortsttes. Gem nu?" #. DLG_Zoom_RadioFrameCaption -#: po/tmp/xap_String_Id.h.h:841 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:884 msgid "Zoom to" -msgstr "&Forstrrelse" +msgstr "Zoom til" #. DLG_UnixMB_No -#: po/tmp/xap_String_Id.h.h:843 +#: po/tmp/xap_String_Id.h.h:886 msgid "_No" -msgstr "" +msgstr "_Nej" #. DLG_UnixMB_Yes -#: po/tmp/xap_String_Id.h.h:845 +#: po/tmp/xap_String_Id.h.h:888 msgid "_Yes" -msgstr "" +msgstr "_Ja" #. DLG_Unit_cm -#: po/tmp/xap_String_Id.h.h:847 +#: po/tmp/xap_String_Id.h.h:890 msgid "cm" -msgstr "" +msgstr "cm" +# Kontekst? #. DLG_DocComparison_Different -#: po/tmp/xap_String_Id.h.h:849 +#: po/tmp/xap_String_Id.h.h:892 msgid "different" -msgstr "" +msgstr "forskellig" #. DLG_DocComparison_DivergingPos -#: po/tmp/xap_String_Id.h.h:851 +#: po/tmp/xap_String_Id.h.h:894 #, c-format msgid "diverging after document position %d" -msgstr "" +msgstr "divergerer efter dokumentposition %d" #. DLG_DocComparison_Diverging -#: po/tmp/xap_String_Id.h.h:853 +#: po/tmp/xap_String_Id.h.h:896 #, c-format msgid "diverging after version %d of %s" -msgstr "" +msgstr "divergerer efter version %d af %s" +# Kontekst? #. DLG_DocComparison_Identical -#: po/tmp/xap_String_Id.h.h:855 +#: po/tmp/xap_String_Id.h.h:898 msgid "identical" -msgstr "" +msgstr "identisk" #. DLG_Unit_inch -#: po/tmp/xap_String_Id.h.h:857 +#: po/tmp/xap_String_Id.h.h:900 msgid "inch" -msgstr "" +msgstr "tomme" #. DLG_Unit_mm -#: po/tmp/xap_String_Id.h.h:859 +#: po/tmp/xap_String_Id.h.h:902 msgid "mm" -msgstr "" +msgstr "mm" #. DLG_Unit_pica -#: po/tmp/xap_String_Id.h.h:861 +#: po/tmp/xap_String_Id.h.h:904 msgid "pica" -msgstr "" +msgstr "pica" #. DLG_Unit_points -#: po/tmp/xap_String_Id.h.h:863 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:906 msgid "points" -msgstr "Skrifttype" +msgstr "punkter" +# Ved dokumentsammenligning. #. DLG_DocComparison_Siblings -#: po/tmp/xap_String_Id.h.h:865 +#: po/tmp/xap_String_Id.h.h:908 msgid "siblings" -msgstr "" +msgstr "beslgtede" #. DLG_DocComparison_Unrelated -#: po/tmp/xap_String_Id.h.h:867 +#: po/tmp/xap_String_Id.h.h:910 msgid "unrelated" -msgstr "" +msgstr "urelateret" + +#~ msgid "&From File" +#~ msgstr "&Fra fil" +#~ msgid "Insert a picture" +#~ msgstr "Indst et billede" + +#, fuzzy +#~ msgid "M&erge documents" +#~ msgstr "Gem dokumentet" + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/po/eu-ES.po /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/po/eu-ES.po --- abiword-2.6.2/abiword/po/eu-ES.po 2008-04-06 17:00:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword/po/eu-ES.po 2009-07-15 16:56:23.000000000 +0100 @@ -17,13 +17,15 @@ # Arduraduna: # Alfredo Barrainkua , 2002, 2003. # +# Itzulpen eta zuzenketa +# Mikel Pascual Aldabaldetreku , 2008 msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Abiword 2.6.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-11 02:26+0200\n" -"PO-Revision-Date: 2003-06-12 20:00+0200\n" -"Last-Translator: Alfredo Barrainkua \n" +"POT-Creation-Date: 2008-08-26 05:26+0200\n" +"PO-Revision-Date: 2008-08-28 23:39+0100\n" +"Last-Translator: Mikel Pascual Aldabaldetreku \n" "Language-Team: eu-ES \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -70,7 +72,6 @@ #. DLG_PageSetup_Percent #: po/tmp/ap_String_Id.h.h:29 -#, c-format msgid "% of normal size" msgstr "Taimaina normalaren %" @@ -101,10 +102,10 @@ "\n" "Otherwise, please be patient." msgstr "" -"%s oraindik inplementatu gabe.\n" +"%s oraindik ez dago inplementatua.\n" ";\n" "Programatzailea bazara, inplementatzen saia zaitezke %s-n, %d lerroan\n" -"eta berrikuntzak honako helbidera bidali:\n" +"eta aldaketak honako helbidera bidali:\n" "\n" "\tabiword-dev@abisource.com \n" "Bestela, pazientzia izan." @@ -200,12 +201,12 @@ #: po/tmp/ap_String_Id.h.h:82 #, c-format msgid "&About %s" -msgstr "%s-ri buruz" +msgstr "%s-ri &buruz" #. MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION #: po/tmp/ap_String_Id.h.h:84 msgid "&Accept revision" -msgstr "&Onartu berrikuspena" +msgstr "Berrikuspena &onartu" #. DLG_Spell_AddToDict #. MENU_LABEL_SPELL_ADD @@ -231,7 +232,7 @@ #. DLG_ApplyButton #: po/tmp/ap_String_Id.h.h:95 msgid "&Apply" -msgstr "" +msgstr "&Aplikatu" #. DLG_Para_LabelAt #: po/tmp/ap_String_Id.h.h:97 @@ -241,17 +242,17 @@ #. MENU_LABEL_TOOLS_AUTOSPELL #: po/tmp/ap_String_Id.h.h:99 msgid "&Auto Spellcheck" -msgstr "Ortografia zuzentzailea" +msgstr "&Ortografia-zuzentzaile automatikoa" #. MENU_LABEL_TABLE_AUTOFIT #: po/tmp/ap_String_Id.h.h:101 msgid "&Autofit Table" -msgstr "&Taula Doitu" +msgstr "&Taula AutoDoitu" #. DLG_Options_Label_PrefsAutoSave #: po/tmp/ap_String_Id.h.h:103 msgid "&Automatically save this Scheme" -msgstr "Eskema &automatikoki gorde" +msgstr "&Automatikoki gorde eskema" #. DLG_DateTime_AvailableFormats #: po/tmp/ap_String_Id.h.h:105 @@ -271,7 +272,7 @@ #. DLG_PageSetup_Bottom #: po/tmp/ap_String_Id.h.h:111 msgid "&Bottom:" -msgstr "&Behean:" +msgstr "&Azpian:" #. MENU_LABEL_INSERT_BREAK #: po/tmp/ap_String_Id.h.h:113 @@ -281,13 +282,13 @@ #. MENU_LABEL_TABLE_SELECT_CELL #: po/tmp/ap_String_Id.h.h:115 msgid "&Cell" -msgstr "Gelaxka aukeratu" +msgstr "&Gelaxka" #. MENU_LABEL_TABLE_INSERT_CELLS #. MENU_LABEL_TABLE_DELETE_CELLS #: po/tmp/ap_String_Id.h.h:118 msgid "&Cells" -msgstr "Gelaxkak Txertatu" +msgstr "&Gelaxkak" #. MENU_LABEL_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:120 @@ -313,12 +314,12 @@ #. MENU_LABEL_TABLE_DELETE_COLUMNS #: po/tmp/ap_String_Id.h.h:129 msgid "&Column" -msgstr "Zutabeak ezabatu" +msgstr "&Zutabeak" #. DLG_Break_ColumnBreak #: po/tmp/ap_String_Id.h.h:131 msgid "&Column break" -msgstr "&Zutabe jauzia" +msgstr "&Zutabe-jauzia" #. MENU_LABEL_FMT_COLUMNS #: po/tmp/ap_String_Id.h.h:133 @@ -328,7 +329,7 @@ #. MENU_LABEL_TOOLS_REVISIONS_COMPARE_DOCUMENTS #: po/tmp/ap_String_Id.h.h:135 msgid "&Compare documents" -msgstr "" +msgstr "Dokumentuak &konparatu" #. MENU_LABEL_EDIT_COPY #: po/tmp/ap_String_Id.h.h:137 @@ -338,17 +339,17 @@ #. MENU_LABEL_FMT_STYLE_DEFINE #: po/tmp/ap_String_Id.h.h:139 msgid "&Create and Modify Styles" -msgstr "" +msgstr "Estiloak &sortu eta aldatu" #. DLG_Options_Label_PrefsCurrentScheme #: po/tmp/ap_String_Id.h.h:141 msgid "&Current Preferences Scheme" -msgstr "Uneko Lehentasunen Eskema" +msgstr "&Oraingo lehentasun-eskema" #. MENU_LABEL_TABLE_DELETE #: po/tmp/ap_String_Id.h.h:143 msgid "&Delete" -msgstr "Ezabatu" +msgstr "&Ezabatu" #. MENU_LABEL_INSERT_DELETE_HYPERLINK #: po/tmp/ap_String_Id.h.h:145 @@ -363,7 +364,7 @@ #. MENU_LABEL_INSERT_DIRECTIONMARKER #: po/tmp/ap_String_Id.h.h:149 msgid "&Direction Marker" -msgstr "" +msgstr "&Noranzko-marka" #. MENU_LABEL_FMT_DOCUMENT #: po/tmp/ap_String_Id.h.h:151 @@ -373,7 +374,7 @@ #. MENU_LABEL_TOOLS_HISTORY #: po/tmp/ap_String_Id.h.h:153 msgid "&Document History" -msgstr "" +msgstr "&Dokumentu-historia" #. MENU_LABEL_WINDOW #: po/tmp/ap_String_Id.h.h:155 @@ -383,23 +384,23 @@ #. DLG_Para_PushNoHyphenate #: po/tmp/ap_String_Id.h.h:157 msgid "&Don't hyphenate" -msgstr "&Ez moztu gidoiekin" +msgstr "&Ez gidoirik erabili" #. DLG_Options_Btn_IgnoreEdit #. MENU_LABEL_EDIT #: po/tmp/ap_String_Id.h.h:160 msgid "&Edit" -msgstr "&Edizioa" +msgstr "&Editatu" #. MENU_LABEL_INSERT_EDIT_HYPERLINK #: po/tmp/ap_String_Id.h.h:162 msgid "&Edit hyperlink" -msgstr "" +msgstr "Hiperesteka &editatu" #. DLG_Options_Label_SmartQuotesEnable #: po/tmp/ap_String_Id.h.h:164 msgid "&Enable smart quotes" -msgstr "&Komatxo argiak aktibatu" +msgstr "&Komatxo adimentsuak gaitu" #. MENU_LABEL_INSERT_ENDNOTE #: po/tmp/ap_String_Id.h.h:166 @@ -419,7 +420,7 @@ #. DLG_Field_Fields_No_Colon #: po/tmp/ap_String_Id.h.h:172 msgid "&Fields" -msgstr "" +msgstr "&Eremuak" #. DLG_Field_Fields #: po/tmp/ap_String_Id.h.h:174 @@ -434,7 +435,7 @@ #. DLG_Options_Label_FileExtension #: po/tmp/ap_String_Id.h.h:178 msgid "&File extension:" -msgstr "" +msgstr "&Hedapena:" #. MENU_LABEL_EDIT_FIND #: po/tmp/ap_String_Id.h.h:180 @@ -444,12 +445,12 @@ #. DLG_FR_FindNextButton #: po/tmp/ap_String_Id.h.h:182 msgid "&Find Next" -msgstr "Hurrengoa &Bilatu" +msgstr "Hurrengoa &bilatu" #. MENU_LABEL_FMT_FONT #: po/tmp/ap_String_Id.h.h:184 msgid "&Font" -msgstr "&Letra mota" +msgstr "&Letra-mota" #. DLG_PageSetup_Footer #: po/tmp/ap_String_Id.h.h:186 @@ -459,773 +460,785 @@ #. MENU_LABEL_TABLE_FORMAT #: po/tmp/ap_String_Id.h.h:188 msgid "&Format Table" -msgstr "&Taula Formateatu" - -#. MENU_LABEL_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:190 -msgid "&From File" -msgstr "&Fitxategitik" +msgstr "&Taula formateatu" #. MENU_LABEL_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:192 +#: po/tmp/ap_String_Id.h.h:190 msgid "&Go To" msgstr "&Joan" #. DLG_FormatTOC_HasHeading -#: po/tmp/ap_String_Id.h.h:194 +#: po/tmp/ap_String_Id.h.h:192 msgid "&Has Heading" -msgstr "" +msgstr "&Izenburua dauka" #. MENU_LABEL_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:196 +#: po/tmp/ap_String_Id.h.h:194 msgid "&Header and Footer" -msgstr "&Goiburu eta Orri-oina" +msgstr "&Goiburu eta orri-oina" #. DLG_PageSetup_Header -#: po/tmp/ap_String_Id.h.h:198 +#: po/tmp/ap_String_Id.h.h:196 msgid "&Header:" msgstr "&Goiburua:" #. DLG_PageSetup_Height -#: po/tmp/ap_String_Id.h.h:200 +#: po/tmp/ap_String_Id.h.h:198 msgid "&Height:" msgstr "&Altuera:" #. DLG_HelpButton #. MENU_LABEL_HELP -#: po/tmp/ap_String_Id.h.h:203 +#: po/tmp/ap_String_Id.h.h:201 msgid "&Help" msgstr "&Laguntza" #. DLG_Options_Label_ViewHiddenText -#: po/tmp/ap_String_Id.h.h:205 +#: po/tmp/ap_String_Id.h.h:203 msgid "&Hidden Text" -msgstr "&Izkutuko testua" +msgstr "&Ezkutuko testua" #. DLG_Options_Label_SpellHighlightMisspelledWords -#: po/tmp/ap_String_Id.h.h:207 +#: po/tmp/ap_String_Id.h.h:205 msgid "&Highlight misspelled words" -msgstr "" +msgstr "&Oker idatziak nabarmendu" #. MENU_LABEL_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:209 +#: po/tmp/ap_String_Id.h.h:207 msgid "&Hyperlink" msgstr "&Hiperesteka" #. DLG_Spell_Ignore -#: po/tmp/ap_String_Id.h.h:211 +#: po/tmp/ap_String_Id.h.h:209 msgid "&Ignore" msgstr "&Ezikusi" #. MENU_LABEL_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:213 +#: po/tmp/ap_String_Id.h.h:211 msgid "&Ignore All" -msgstr "&Denak ezikusi" +msgstr "&Guztiak ezikusi" #. MENU_LABEL_FMT_IMAGE #. MENU_LABEL_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:216 +#: po/tmp/ap_String_Id.h.h:214 msgid "&Image" -msgstr "Irudiaren tamaina aldatu" +msgstr "&Irudia" #. MENU_LABEL_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:218 +#: po/tmp/ap_String_Id.h.h:216 msgid "&Import Styles" -msgstr "" +msgstr "Estiloak &inportatu" #. MENU_LABEL_WEB_WEBPREVIEW -#: po/tmp/ap_String_Id.h.h:220 +#: po/tmp/ap_String_Id.h.h:218 msgid "&In web browser" -msgstr "&Web orrialde gisa" +msgstr "&Web-nabigatzailean" #. DLG_FormatTOC_InheritLabel -#: po/tmp/ap_String_Id.h.h:222 +#: po/tmp/ap_String_Id.h.h:220 msgid "&Inherit label" -msgstr "" +msgstr "Etiketa &heredatu" #. DLG_InsertButton #. MENU_LABEL_INSERT #. MENU_LABEL_TABLE_INSERT #. DLG_Insert -#: po/tmp/ap_String_Id.h.h:226 po/tmp/xap_String_Id.h.h:15 +#: po/tmp/ap_String_Id.h.h:224 +#: po/tmp/xap_String_Id.h.h:15 msgid "&Insert" -msgstr "&Autotestua" +msgstr "&Txertatu" #. DLG_Options_Label_AutoSaveInterval -#: po/tmp/ap_String_Id.h.h:228 +#: po/tmp/ap_String_Id.h.h:226 msgid "&Interval:" -msgstr "" +msgstr "&Tartea:" #. MENU_LABEL_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:230 +#: po/tmp/ap_String_Id.h.h:228 msgid "&Italic" msgstr "&Etzana" #. MENU_LABEL_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:232 +#: po/tmp/ap_String_Id.h.h:230 msgid "&Jump to hyperlink" -msgstr "" +msgstr "Hiperestekara &jauzi" #. MENU_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:234 +#: po/tmp/ap_String_Id.h.h:232 msgid "&Justify" -msgstr "&Justifikatuta" +msgstr "&Justifikatua" #. DLG_Para_PushKeepLinesTogether -#: po/tmp/ap_String_Id.h.h:236 +#: po/tmp/ap_String_Id.h.h:234 msgid "&Keep lines together" msgstr "&Lerroak batera mantendu" #. MENU_LABEL_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:238 +#: po/tmp/ap_String_Id.h.h:236 msgid "&LRM" -msgstr "" +msgstr "E&zker-eskuin" #. DLG_PageSetup_Landscape -#: po/tmp/ap_String_Id.h.h:240 +#: po/tmp/ap_String_Id.h.h:238 msgid "&Landscape" msgstr "&Horizontala" #. MENU_LABEL_TOOLS_LANGUAGE -#: po/tmp/ap_String_Id.h.h:242 +#: po/tmp/ap_String_Id.h.h:240 msgid "&Language" msgstr "&Hizkuntza" #. MENU_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:244 +#: po/tmp/ap_String_Id.h.h:242 msgid "&Left" -msgstr "&Ezkerrean" +msgstr "&Ezker" #. MENU_LABEL_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:246 +#: po/tmp/ap_String_Id.h.h:244 msgid "&Left-to-right text" -msgstr "" +msgstr "E&zker-eskuin testua" #. DLG_Para_LabelLeft #. DLG_PageSetup_Left -#: po/tmp/ap_String_Id.h.h:249 +#: po/tmp/ap_String_Id.h.h:247 msgid "&Left:" -msgstr "&Ezkerrean:" +msgstr "&Ezker:" #. MENU_LABEL_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:251 +#: po/tmp/ap_String_Id.h.h:249 msgid "&Lock layout" -msgstr "" +msgstr "Diseinua &lokatu" #. MENU_LABEL_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:253 +#: po/tmp/ap_String_Id.h.h:251 msgid "&Mail Merge" -msgstr "&Posta Nahastu" +msgstr "&Posta konbinatu" #. MENU_LABEL_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:255 +#: po/tmp/ap_String_Id.h.h:253 msgid "&Mail Merge Field" -msgstr "" +msgstr "&Posta-konbinatze eremua" #. MENU_LABEL_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:257 +#: po/tmp/ap_String_Id.h.h:255 msgid "&Maintain Full History" -msgstr "" +msgstr "Historia &osoa mantendu" #. MENU_LABEL_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:259 +#: po/tmp/ap_String_Id.h.h:257 msgid "&Mark revisions while typing" -msgstr "&Berrikusi idatzi bitartean" +msgstr "&Berrikuspenak markatu idatzi ahala " #. DLG_FR_MatchCase -#: po/tmp/ap_String_Id.h.h:261 +#: po/tmp/ap_String_Id.h.h:259 msgid "&Match case" -msgstr "&Letra larriak eta xeheak bereiztu" +msgstr "&Maiuskula/minuskula bereiztu" #. MENU_LABEL_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:263 +#: po/tmp/ap_String_Id.h.h:261 msgid "&Merge Cells" -msgstr "&Batu Gelaxkak" +msgstr "Gelaxkak &konbinatu" #. MENU_LABEL_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:265 +#: po/tmp/ap_String_Id.h.h:263 msgid "&More Documents" -msgstr "&Dokumentu Gehiago" +msgstr "&Dokumentu gehiago" #. DLG_Goto_Label_Name -#: po/tmp/ap_String_Id.h.h:267 +#: po/tmp/ap_String_Id.h.h:265 msgid "&Name:" msgstr "&Izena:" #. MENU_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:269 +#: po/tmp/ap_String_Id.h.h:267 msgid "&New" msgstr "&Berria" #. MENU_LABEL_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:271 +#: po/tmp/ap_String_Id.h.h:269 msgid "&New Window" msgstr "&Leiho berria" #. MENU_LABEL_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:273 +#: po/tmp/ap_String_Id.h.h:271 msgid "&New using Template" -msgstr "" +msgstr "Berria, &txantiloia erabiliz" #. DLG_Break_NextPage -#: po/tmp/ap_String_Id.h.h:275 +#: po/tmp/ap_String_Id.h.h:273 msgid "&Next page" msgstr "&Hurrengo orria" #. MENU_LABEL_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:277 +#: po/tmp/ap_String_Id.h.h:275 msgid "&Normal Layout" -msgstr "Diseinu &Normala" +msgstr "Diseinu &normala" #. DLG_Goto_Label_Number -#: po/tmp/ap_String_Id.h.h:279 +#: po/tmp/ap_String_Id.h.h:277 msgid "&Number:" msgstr "&Zenbakia:" #. DLG_FormatTOC_NumberingType -#: po/tmp/ap_String_Id.h.h:281 +#: po/tmp/ap_String_Id.h.h:279 msgid "&Numbering type:" -msgstr "" +msgstr "&Zenbakitze-mota:" #. DLG_Break_OddPage -#: po/tmp/ap_String_Id.h.h:283 +#: po/tmp/ap_String_Id.h.h:281 msgid "&Odd page" msgstr "Orri bakoitia" #. MENU_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:285 +#: po/tmp/ap_String_Id.h.h:283 msgid "&Open" msgstr "&Ireki" #. DLG_MailMerge_OpenFile -#: po/tmp/ap_String_Id.h.h:287 +#: po/tmp/ap_String_Id.h.h:285 msgid "&Open File" -msgstr "" +msgstr "&Fitxategia ireki" #. MENU_LABEL_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:289 +#: po/tmp/ap_String_Id.h.h:287 msgid "&Overline" -msgstr "&Goi-marra" +msgstr "&Goimarra" #. MENU_LABEL_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:291 +#: po/tmp/ap_String_Id.h.h:289 msgid "&Page Width" -msgstr "Orriaren zabalera" +msgstr "Orri-&zabalera" #. DLG_Break_PageBreak -#: po/tmp/ap_String_Id.h.h:293 +#: po/tmp/ap_String_Id.h.h:291 msgid "&Page break" -msgstr "&Orri jauzia" +msgstr "&Orri-jauzia" #. DLG_FormatTOC_PageNumbering -#: po/tmp/ap_String_Id.h.h:295 +#: po/tmp/ap_String_Id.h.h:293 msgid "&Page numbering:" -msgstr "" +msgstr "&Orri-zenbakitzea:" #. MENU_LABEL_FMT_PARAGRAPH -#: po/tmp/ap_String_Id.h.h:297 +#: po/tmp/ap_String_Id.h.h:295 msgid "&Paragraph" msgstr "&Paragrafoa" #. MENU_LABEL_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:299 +#: po/tmp/ap_String_Id.h.h:297 msgid "&Paste" msgstr "&Itsatsi" -#. MENU_LABEL_INSERT_PICTURE -#: po/tmp/ap_String_Id.h.h:301 +#. MENU_LABEL_INSERT_GRAPHIC +#: po/tmp/ap_String_Id.h.h:299 msgid "&Picture" msgstr "&Irudia" #. MENU_LABEL_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:303 +#: po/tmp/ap_String_Id.h.h:301 msgid "&Plugins" -msgstr "Plugin-ak" +msgstr "&Plugin-ak" #. DLG_PageSetup_Portrait -#: po/tmp/ap_String_Id.h.h:305 +#: po/tmp/ap_String_Id.h.h:303 msgid "&Portrait" msgstr "&Bertikala" #. MENU_LABEL_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:307 +#: po/tmp/ap_String_Id.h.h:305 msgid "&Print" msgstr "&Inprimatu" #. MENU_LABEL_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:309 +#: po/tmp/ap_String_Id.h.h:307 msgid "&Print Layout" -msgstr "&Inprimaketa diseinua" +msgstr "&Inprimatze-diseinua" #. MENU_LABEL_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:311 +#: po/tmp/ap_String_Id.h.h:309 msgid "&Purge History" -msgstr "" +msgstr "Historia &garbitu" #. MENU_LABEL_FILE_EXIT -#: po/tmp/ap_String_Id.h.h:313 +#: po/tmp/ap_String_Id.h.h:311 msgid "&Quit" -msgstr "Irten" +msgstr "&Irten" #. MENU_LABEL_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:315 +#: po/tmp/ap_String_Id.h.h:313 msgid "&RLM" -msgstr "" +msgstr "E&skuin-ezker" #. MENU_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:317 +#: po/tmp/ap_String_Id.h.h:315 msgid "&Redo" msgstr "&Berregin" #. MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:319 +#: po/tmp/ap_String_Id.h.h:317 msgid "&Reject revision" msgstr "&Berrikuspena ezetsi" #. DLG_FR_ReplaceButton -#: po/tmp/ap_String_Id.h.h:321 +#: po/tmp/ap_String_Id.h.h:319 msgid "&Replace" -msgstr "&Ordezkatu" +msgstr "&Ordeztu" #. DLG_Options_Btn_IgnoreReset -#: po/tmp/ap_String_Id.h.h:323 +#: po/tmp/ap_String_Id.h.h:321 msgid "&Reset" -msgstr "&Berhasi" +msgstr "&Berrezarri" #. MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:325 +#: po/tmp/ap_String_Id.h.h:323 msgid "&Reset to default layout" -msgstr "" +msgstr "Diseinu lehenetsia &berrezarri" #. MENU_LABEL_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:327 +#: po/tmp/ap_String_Id.h.h:325 msgid "&Revisions" -msgstr "&Berrikuspenak:" +msgstr "&Berrikuspenak" #. MENU_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:329 +#: po/tmp/ap_String_Id.h.h:327 msgid "&Right" -msgstr "&Eskuinean" +msgstr "&Eskuin" #. MENU_LABEL_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:331 +#: po/tmp/ap_String_Id.h.h:329 msgid "&Right-to-left text" -msgstr "" +msgstr "E&skuin-ezker testua" #. DLG_Para_LabelRight #. DLG_PageSetup_Right -#: po/tmp/ap_String_Id.h.h:334 +#: po/tmp/ap_String_Id.h.h:332 msgid "&Right:" -msgstr "&Eskuinean:" +msgstr "&Eskuin:" #. MENU_LABEL_TABLE_DELETE_ROWS #. MENU_LABEL_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:337 +#: po/tmp/ap_String_Id.h.h:335 msgid "&Row" -msgstr "E&rrenkadak Ezabatu" +msgstr "&Lerro" #. DLG_Options_Label_ViewRuler -#: po/tmp/ap_String_Id.h.h:339 +#: po/tmp/ap_String_Id.h.h:337 msgid "&Ruler" msgstr "&Erregela" #. MENU_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:341 +#: po/tmp/ap_String_Id.h.h:339 msgid "&Save" msgstr "&Gorde" #. MENU_LABEL_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:343 +#: po/tmp/ap_String_Id.h.h:341 msgid "&Save Image As" -msgstr "&Gorde honela marrazkia" +msgstr "Honela &gorde irudia" #. MENU_LABEL_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:345 +#: po/tmp/ap_String_Id.h.h:343 msgid "&Save web page" msgstr "&Web orria gorde" #. MENU_LABEL_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:347 +#: po/tmp/ap_String_Id.h.h:345 msgid "&Search for Help" msgstr "&Laguntza bilatu" #. MENU_LABEL_TABLE_SELECT -#: po/tmp/ap_String_Id.h.h:349 +#: po/tmp/ap_String_Id.h.h:347 msgid "&Select" -msgstr "Aukeratu" +msgstr "&Hautatu" #. MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL -#: po/tmp/ap_String_Id.h.h:351 +#: po/tmp/ap_String_Id.h.h:349 msgid "&Select revision" -msgstr "&Berrikuspena aukeratu" +msgstr "&Berrikuspena hautatu" #. MENU_LABEL_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:353 +#: po/tmp/ap_String_Id.h.h:351 msgid "&Show History" -msgstr "" +msgstr "Historia &erakutsi" #. MENU_LABEL_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:355 +#: po/tmp/ap_String_Id.h.h:353 msgid "&Show Status Bar" -msgstr "&Egoera-barra" +msgstr "&Egoera-barra erakutsi" #. DLG_Para_LabelSpecial -#: po/tmp/ap_String_Id.h.h:357 +#: po/tmp/ap_String_Id.h.h:355 msgid "&Special:" msgstr "&Berezia:" #. MENU_LABEL_TOOLS_SPELLING -#: po/tmp/ap_String_Id.h.h:359 +#: po/tmp/ap_String_Id.h.h:357 msgid "&Spelling" -msgstr "Ortografia zuzentzailea" +msgstr "&Ortografia" #. DLG_FormatTOC_StartAt -#: po/tmp/ap_String_Id.h.h:361 +#: po/tmp/ap_String_Id.h.h:359 msgid "&Start at:" -msgstr "" +msgstr "&Hasiera:" #. DLG_Options_Label_ViewStatusBar -#: po/tmp/ap_String_Id.h.h:363 +#: po/tmp/ap_String_Id.h.h:361 msgid "&Status bar" -msgstr "Egoera-barra" +msgstr "&Egoera-barra" #. MENU_LABEL_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:365 +#: po/tmp/ap_String_Id.h.h:363 msgid "&Subscript" -msgstr "&Azpiindizea" +msgstr "&Azpi-indizea" #. DLG_Para_PushSuppressLineNumbers -#: po/tmp/ap_String_Id.h.h:367 +#: po/tmp/ap_String_Id.h.h:365 msgid "&Suppress line numbers" -msgstr "&Lerroen zenbakia ezabatu" +msgstr "&Lerro-zenbakiak ezabatu" #. DLG_FormatTOC_TabLeader -#: po/tmp/ap_String_Id.h.h:369 +#: po/tmp/ap_String_Id.h.h:367 msgid "&Tab leader:" -msgstr "" +msgstr "&Tabulazio-gida:" #. MENU_LABEL_TABLE_INSERT_TABLE #. MENU_LABEL_TABLE_DELETE_TABLE #. MENU_LABEL_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:373 +#: po/tmp/ap_String_Id.h.h:371 msgid "&Table" -msgstr "Taula Txertatu" +msgstr "&Taula" #. MENU_LABEL_FMT_TABS -#: po/tmp/ap_String_Id.h.h:375 +#: po/tmp/ap_String_Id.h.h:373 msgid "&Tabs" -msgstr "&Tabuladoreak" +msgstr "&Tabulazioak" #. DLG_Para_ButtonTabs -#: po/tmp/ap_String_Id.h.h:377 +#: po/tmp/ap_String_Id.h.h:375 msgid "&Tabs..." msgstr "&Tabulazioak..." #. MENU_LABEL_VIEW_TOOLBARS -#: po/tmp/ap_String_Id.h.h:379 +#: po/tmp/ap_String_Id.h.h:377 msgid "&Toolbars" msgstr "&Tresna-barrak" #. MENU_LABEL_TOOLS -#: po/tmp/ap_String_Id.h.h:381 +#: po/tmp/ap_String_Id.h.h:379 msgid "&Tools" msgstr "&Tresnak" #. DLG_PageSetup_Top -#: po/tmp/ap_String_Id.h.h:383 +#: po/tmp/ap_String_Id.h.h:381 +#, fuzzy msgid "&Top:" msgstr "&Goian:" #. DLG_Field_Types_No_Colon -#: po/tmp/ap_String_Id.h.h:385 +#: po/tmp/ap_String_Id.h.h:383 msgid "&Types" -msgstr "" +msgstr "&Motak" #. DLG_Field_Types -#: po/tmp/ap_String_Id.h.h:387 +#: po/tmp/ap_String_Id.h.h:385 msgid "&Types:" msgstr "&Motak:" #. MENU_LABEL_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:389 +#: po/tmp/ap_String_Id.h.h:387 msgid "&Underline" msgstr "&Azpimarra" #. MENU_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:391 +#: po/tmp/ap_String_Id.h.h:389 msgid "&Undo" msgstr "&Desegin" #. DLG_Options_Label_ViewUnits #. DLG_PageSetup_Units -#: po/tmp/ap_String_Id.h.h:394 +#: po/tmp/ap_String_Id.h.h:392 msgid "&Units:" msgstr "&Unitateak:" #. MENU_LABEL_VIEW #. DLG_MW_ViewButton -#: po/tmp/ap_String_Id.h.h:396 po/tmp/xap_String_Id.h.h:21 +#: po/tmp/ap_String_Id.h.h:394 +#: po/tmp/xap_String_Id.h.h:21 msgid "&View" msgstr "&Ikusi" #. MENU_LABEL_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:398 +#: po/tmp/ap_String_Id.h.h:396 msgid "&Web Layout" msgstr "&Web diseinua" #. MENU_LABEL_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:400 +#: po/tmp/ap_String_Id.h.h:398 msgid "&Whole Page" -msgstr "Orri osoa" +msgstr "&Orri osoa" #. DLG_FR_WholeWord -#: po/tmp/ap_String_Id.h.h:402 +#: po/tmp/ap_String_Id.h.h:400 msgid "&Whole word" -msgstr "" +msgstr "Hitz &osoa" #. DLG_Para_PushWidowOrphanControl -#: po/tmp/ap_String_Id.h.h:404 +#: po/tmp/ap_String_Id.h.h:402 msgid "&Widow/Orphan control" -msgstr "Lerroen kontrola, umezurtz eta alargunak" +msgstr "&Alargun/umezurtz kontrola" #. DLG_PageSetup_Width -#: po/tmp/ap_String_Id.h.h:406 +#: po/tmp/ap_String_Id.h.h:404 msgid "&Width:" msgstr "&Zabalera:" #. MENU_LABEL_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:408 +#: po/tmp/ap_String_Id.h.h:406 msgid "&Word Count" -msgstr "&Hitzen zenbaketa" +msgstr "&Hitz zenbaketa" #. MENU_LABEL_VIEW_ZOOM_MENU #. MENU_LABEL_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:411 +#: po/tmp/ap_String_Id.h.h:409 msgid "&Zoom" msgstr "&Zoom-a" #. DLG_ListRevisions_LevelZero -#: po/tmp/ap_String_Id.h.h:413 +#: po/tmp/ap_String_Id.h.h:411 msgid "(All revisions visible)" -msgstr "" +msgstr "(Berrikuspen guztiak ikusgarri)" #. DLG_Spell_NoSuggestions -#: po/tmp/ap_String_Id.h.h:415 +#: po/tmp/ap_String_Id.h.h:413 msgid "(no spelling suggestions)" -msgstr "(iradokizunik ez)" +msgstr "(ortografia iradokizunik ez)" #. DLG_Para_SpecialNone -#: po/tmp/ap_String_Id.h.h:417 +#: po/tmp/ap_String_Id.h.h:415 msgid "(none)" msgstr "(bat ere ez)" #. TOOLBAR_LABEL_1COLUMN #. TOOLBAR_STATUSLINE_1COLUMN #. TOOLBAR_TOOLTIP_1COLUMN -#: po/tmp/ap_String_Id.h.h:421 +#: po/tmp/ap_String_Id.h.h:419 msgid "1 Column" -msgstr "1 Zutabea" +msgstr "1 zutabe" #. TOOLBAR_LABEL_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:423 +#: po/tmp/ap_String_Id.h.h:421 msgid "1.5 Spacing" -msgstr "1.5eko tartea" +msgstr "1.5eko lerroartea" #. DLG_Para_SpacingHalf -#: po/tmp/ap_String_Id.h.h:425 +#: po/tmp/ap_String_Id.h.h:423 msgid "1.5 lines" msgstr "1.5 lerro" #. TOOLBAR_STATUSLINE_MIDDLE_SPACE #. TOOLBAR_TOOLTIP_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:428 +#: po/tmp/ap_String_Id.h.h:426 msgid "1.5 spacing" -msgstr "1.5eko tartea" +msgstr "1.5eko lerroartea" #. TOOLBAR_LABEL_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:430 +#: po/tmp/ap_String_Id.h.h:428 msgid "12 pt before" msgstr "12 pt lehenago" #. TOOLBAR_LABEL_2COLUMN #. TOOLBAR_STATUSLINE_2COLUMN #. TOOLBAR_TOOLTIP_2COLUMN -#: po/tmp/ap_String_Id.h.h:434 +#: po/tmp/ap_String_Id.h.h:432 msgid "2 Columns" -msgstr "2 Zutabe" +msgstr "2 zutabe" #. TOOLBAR_LABEL_3COLUMN #. TOOLBAR_STATUSLINE_3COLUMN #. TOOLBAR_TOOLTIP_3COLUMN -#: po/tmp/ap_String_Id.h.h:438 +#: po/tmp/ap_String_Id.h.h:436 msgid "3 Columns" -msgstr "3 Zutabe" +msgstr "3 zutabe" #. DLG_Goto_Btn_Prev -#: po/tmp/ap_String_Id.h.h:440 +#: po/tmp/ap_String_Id.h.h:438 msgid "<< Prev" msgstr "<< Aurrekoa" #. MSG_Exception -#: po/tmp/ap_String_Id.h.h:442 +#: po/tmp/ap_String_Id.h.h:440 msgid "" -"A fatal error has just occurred. Abiword is going to shutdown.\n" +"A fatal error has just occurred. AbiWord is going to shutdown.\n" "The current document has been saved to disc with a \".saved\" extension." msgstr "" +"Errore larria gertatu da. Itxi egingo da AbiWord.\n" +"Diskoan gorde da oraingo dokumentua, \".saved\" hedapenarekin." #. DLG_Options_Label_SpellSuggest -#: po/tmp/ap_String_Id.h.h:444 +#: po/tmp/ap_String_Id.h.h:442 msgid "A&lways suggest corrections" -msgstr "Zuzenketak beti iradoki" +msgstr "&Beti iradoki zuzenketak" #. FIELD_DateTime_AMPM -#: po/tmp/ap_String_Id.h.h:446 +#: po/tmp/ap_String_Id.h.h:444 msgid "AM/PM" msgstr "AM/PM" #. MSG_IE_BogusDocument -#: po/tmp/ap_String_Id.h.h:448 +#: po/tmp/ap_String_Id.h.h:446 #, c-format msgid "AbiWord cannot open %s. It appears to be an invalid document" -msgstr "Abiword-ek ezin du %s fitxategia ireki. Hondatuta egon daiteke." +msgstr "Abiword-ek ezin du %s fitxategia ireki. Dokumentu baliogabea dirudi." #. MSG_SpellSelectionDone -#: po/tmp/ap_String_Id.h.h:450 +#: po/tmp/ap_String_Id.h.h:448 msgid "AbiWord finished checking the selection." -msgstr "AbiWord-ek bilaketa amaitu du." +msgstr "AbiWord-ek hautespena egiaztatzen amaitu du." #. DLG_FR_FinishedReplace -#: po/tmp/ap_String_Id.h.h:452 +#: po/tmp/ap_String_Id.h.h:450 #, c-format -msgid "" -"AbiWord has finished its search of the document and has made %d replacements." -msgstr "Abiword-ek bilaketa amaitu du dokumentuan eta %d aldaketa egin ditu." +msgid "AbiWord has finished its search of the document and has made %d replacements." +msgstr "Abiword-ek bilaketa amaitu du dokumentuan eta %d ordezte egin ditu." #. DLG_FR_FinishedFind -#: po/tmp/ap_String_Id.h.h:454 +#: po/tmp/ap_String_Id.h.h:452 msgid "AbiWord has finished searching the document." msgstr "AbiWord-ek bilaketa amaitu du dokumentuan." #. WINDOWS_COMCTL_WARNING -#: po/tmp/ap_String_Id.h.h:456 +#: po/tmp/ap_String_Id.h.h:454 msgid "" "AbiWord is designed for a newer version of the system file COMCTL32.DLL\n" "than the one currently on your system. (COMCTL32.DLL version 4.72 or newer)\n" -"A solution to this problem is explained in the FAQ on the AbiSource web " -"site\n" +"A solution to this problem is explained in the FAQ on the AbiSource web site\n" "\n" "\thttp://www.abisource.com\n" "\n" "You can use the program, but the toolbar may be missing." msgstr "" +"Zure sisteman daukazun COMCTL32.DLL sistema-fitxategiaren bertsio berriago\n" +"batentzat diseinatua dago AbiWord. (COMCTL32.DLL 4.72 bertsioa edo berriagoa)\n" +"Arazo honentzako konponbidea AbiSource-ren webguneko FAQ-ean (ingelesez) aurkituko duzu:\n" +"\n" +"\thttp://www.abisource.com\n" +"\n" +"Halaere, programa erabili ahalko duzu, baina tresna-barrarik gabe." #. WINDOWS_NEED_UNICOWS -#: po/tmp/ap_String_Id.h.h:458 +#: po/tmp/ap_String_Id.h.h:456 #, c-format msgid "" "AbiWord needs the file %s.dll\n" -"Please download and install it from http://www.microsoft.com/msdownload/" -"platformsdk/sdkupdate/psdkredist.htm" +"Please download and install it from http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdkredist.htm" msgstr "" +"%s.dll fitxategia behar du Abiword-ek\n" +"Hemen lortu dezakezu: http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdkredist.htm" #. MENU_LABEL_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:460 +#: po/tmp/ap_String_Id.h.h:458 msgid "About G&NOME Office" msgstr "G&NOME Office-ri buruz" #. MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:462 +#: po/tmp/ap_String_Id.h.h:460 msgid "About the GNOME Office project" msgstr "GNOME Office proiektuari buruz" #. MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION -#: po/tmp/ap_String_Id.h.h:464 +#: po/tmp/ap_String_Id.h.h:462 msgid "Accept the suggested change" msgstr "Iradokitutako aldaketak onartu" #. TOOLBAR_STATUSLINE_ADD_COLUMN #. TOOLBAR_TOOLTIP_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:467 +#: po/tmp/ap_String_Id.h.h:465 msgid "Add a column to this table after the current column" -msgstr "Aukeratutako zutabearen ostean gehitu beste zutabe bat" +msgstr "Hautatutako zutabearen ostean gehitu beste zutabe bat" #. TOOLBAR_STATUSLINE_ADD_ROW #. TOOLBAR_TOOLTIP_ADD_ROW -#: po/tmp/ap_String_Id.h.h:470 +#: po/tmp/ap_String_Id.h.h:468 msgid "Add a row to this table after the current row" -msgstr "Aukeratutako lerroaren ostean gehitu beste lerro bat" +msgstr "Hautatutako lerroaren ostean gehitu beste lerro bat" #. MENU_STATUSLINE_FMT_BORDERS -#: po/tmp/ap_String_Id.h.h:472 +#: po/tmp/ap_String_Id.h.h:470 msgid "Add borders and shading to the selection" -msgstr "Aukeratutakoari ertzak eta itzalak gehitu" +msgstr "Hautespenari ertzak eta itzalak gehitu" #. TOOLBAR_LABEL_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:474 +#: po/tmp/ap_String_Id.h.h:472 msgid "Add column after" -msgstr "Zutabea gehitu " +msgstr "Zutabea gehitu ondoren" #. MENU_STATUSLINE_FMT_BULLETS -#: po/tmp/ap_String_Id.h.h:476 +#: po/tmp/ap_String_Id.h.h:474 msgid "Add or modify bullets and numbering for selected paragraphs" -msgstr "Aukeratutako paragrafoetan buletak eta numerazioa gehitu edo aldatu" +msgstr "Hautatutako paragrafoetan buletak eta numerazioa gehitu edo aldatu" #. TOOLBAR_LABEL_ADD_ROW -#: po/tmp/ap_String_Id.h.h:478 +#: po/tmp/ap_String_Id.h.h:476 msgid "Add row after" -msgstr "Lerroa gehitu" +msgstr "Lerroa gehitu ondoren" #. MENU_STATUSLINE_SPELL_ADD -#: po/tmp/ap_String_Id.h.h:480 +#: po/tmp/ap_String_Id.h.h:478 msgid "Add this word to the custom dictionary" -msgstr "Hitz hau hiztegi pertsonalean sartu " +msgstr "Hiztegi pertsonalean sartu hitz hau" #. DLG_Styles_ModifyTemplate -#: po/tmp/ap_String_Id.h.h:482 +#: po/tmp/ap_String_Id.h.h:480 msgid "Add to template" msgstr "Txantiloira gehitu" #. DLG_Para_LabelAfter -#: po/tmp/ap_String_Id.h.h:484 +#: po/tmp/ap_String_Id.h.h:482 msgid "Aft&er:" msgstr "&Ondoren:" #. DLG_Para_LabelAlignment -#: po/tmp/ap_String_Id.h.h:486 +#: po/tmp/ap_String_Id.h.h:484 msgid "Ali&gnment:" -msgstr "Lerrokatu:" +msgstr "&Lerrokatzea:" #. DLG_Tab_Label_Alignment #. DLG_PageNumbers_Alignment_No_Colon -#: po/tmp/ap_String_Id.h.h:489 +#: po/tmp/ap_String_Id.h.h:487 msgid "Alignment" -msgstr "Lerrokatu" +msgstr "Lerrokatzea" #. DLG_PageNumbers_Alignment -#: po/tmp/ap_String_Id.h.h:491 +#: po/tmp/ap_String_Id.h.h:489 msgid "Alignment:" -msgstr "Lerrokatu:" +msgstr "Lerrokatzea:" #. DLG_Styles_LBL_All #. DLG_UP_All -#: po/tmp/ap_String_Id.h.h:493 po/tmp/xap_String_Id.h.h:51 +#: po/tmp/ap_String_Id.h.h:491 +#: po/tmp/xap_String_Id.h.h:51 msgid "All" -msgstr "" +msgstr "Guztia" #. DLG_Options_Label_CheckAllowCustomToolbars -#: po/tmp/ap_String_Id.h.h:495 +#: po/tmp/ap_String_Id.h.h:493 msgid "Allow Custom Toolbars" -msgstr "Konfiguratu daitezkeen tresna-barrak onartu" +msgstr "Tresna-barra pertsonalizatuak onartu" #. MENU_STATUSLINE_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:497 +#: po/tmp/ap_String_Id.h.h:495 msgid "Allow formatting using styles only" -msgstr "&Formatura doitzen utzi estiloarekin bakarrik" +msgstr "Estiloak bakarrik erabiltzen formateatzea onartu" #. DLG_Options_Label_CheckWhiteForTransparent -#: po/tmp/ap_String_Id.h.h:499 +#: po/tmp/ap_String_Id.h.h:497 msgid "Allow screen colors other than white" -msgstr "Zuriak ez diren pantaila koloreak onartu" +msgstr "Zuriaz gaindiko pantaila-kolore gehiago onartu" + +#. MENU_LABEL_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:499 +msgid "Annotation" +msgstr "Oharra" #. FIELD_Application #: po/tmp/ap_String_Id.h.h:501 @@ -1235,41 +1248,40 @@ #. DLG_Options_Label_AppStartup #: po/tmp/ap_String_Id.h.h:503 msgid "Application Startup" -msgstr "" +msgstr "Aplikazioaren abioa" #. DLG_Options_Btn_Apply #. DLG_Apply -#: po/tmp/ap_String_Id.h.h:505 po/tmp/xap_String_Id.h.h:63 +#: po/tmp/ap_String_Id.h.h:505 +#: po/tmp/xap_String_Id.h.h:63 msgid "Apply" -msgstr "" +msgstr "Aplikatu" #. TOOLBAR_STATUSLINE_FMTPAINTER #. TOOLBAR_TOOLTIP_FMTPAINTER #: po/tmp/ap_String_Id.h.h:508 msgid "Apply the previously copied paragraph formatting onto the selected text" -msgstr "Aplikatu paragrafotik kopiatutako formatua aukeratutako testuari" +msgstr "Lehen kopiatutako paragrafoaren formatua aplikatu hautatutako testuari" #. DLG_Lists_Apply_Current #: po/tmp/ap_String_Id.h.h:510 msgid "Apply to Current List" -msgstr "Uneko zerrendari aplikatu" +msgstr "Oraingo zerrendari aplikatu" #. DLG_FormatTable_Apply_To #: po/tmp/ap_String_Id.h.h:512 msgid "Apply to:" -msgstr "Aplikatu:" +msgstr "Honi aplikatu:" #. DLG_Lists_Arabic_List #: po/tmp/ap_String_Id.h.h:514 msgid "Arabic List" -msgstr "Arabiar Zerrenda" +msgstr "Zerrenda arabiarra" #. MSG_AutoRevisionOffWarning #: po/tmp/ap_String_Id.h.h:516 -msgid "" -"Are you sure you do not want to maintain full history record? If you " -"proceed, you will not be able to restore earlier versions of this document." -msgstr "" +msgid "Are you sure you do not want to maintain full history record? If you proceed, you will not be able to restore earlier versions of this document." +msgstr "Ziur al zaude ez duzula historia guztia mantendu nahi? Jarraituz gero, ezingo duzu dokumentu honen bertsio zaharrik berreskuratu." #. DLG_Para_SpacingAtLeast #: po/tmp/ap_String_Id.h.h:518 @@ -1279,58 +1291,59 @@ #. DLG_Lists_Resume #: po/tmp/ap_String_Id.h.h:520 msgid "Attach to Previous List" -msgstr "Aurreko Zerrendara Erantsi" +msgstr "Aurreko zerrendara erantsi" #. DLG_MetaData_Author_LBL #. DLG_PLUGIN_MANAGER_AUTHOR -#: po/tmp/ap_String_Id.h.h:522 po/tmp/xap_String_Id.h.h:83 +#: po/tmp/ap_String_Id.h.h:522 +#: po/tmp/xap_String_Id.h.h:85 msgid "Author:" msgstr "Egilea:" #. DLG_Options_Label_AutoSaveUnderline #: po/tmp/ap_String_Id.h.h:524 msgid "Auto &Save" -msgstr "" +msgstr "Auto&gorde" #. DLG_Options_Label_AutoSaveCurrent #: po/tmp/ap_String_Id.h.h:526 msgid "Auto &save current file every" -msgstr "Automatikoki fitxategia gordetzeko denbora:" +msgstr "Fitxategia auto&gordetzeko denbora tartea" #. DLG_Options_Label_AutoSave #: po/tmp/ap_String_Id.h.h:528 msgid "Auto Save" -msgstr "Automatikoki Gorde" +msgstr "Automatikoki gorde" #. DLG_Options_Label_SpellAutoReplace #: po/tmp/ap_String_Id.h.h:530 msgid "Auto replace misspelled words" -msgstr "Txarto dauden hitzak automatikoki aldatu" +msgstr "Oker idatzitako hitzak automatikoki aldatu" #. DLG_InsertTable_AutoFit_Capital #: po/tmp/ap_String_Id.h.h:532 msgid "AutoFit Behavior" -msgstr "" +msgstr "Autodoiketaren portaera" #. DLG_InsertTable_AutoFit #: po/tmp/ap_String_Id.h.h:534 msgid "AutoFit behavior" -msgstr "Doitu automatikoki portaera" +msgstr "Autodoiketaren portaera" #. MENU_STATUSLINE_TABLE_AUTOFIT #: po/tmp/ap_String_Id.h.h:536 msgid "Autofit Table" -msgstr "Taula automatikoki doitu" +msgstr "Taula autodoitu" #. DLG_Options_Label_Grammar #: po/tmp/ap_String_Id.h.h:538 msgid "Automatic Grammar Checking" -msgstr "" +msgstr "Zuzenketa gramatiko automatikoa" #. DLG_InsertTable_AutoColSize #: po/tmp/ap_String_Id.h.h:540 msgid "Automatic column size" -msgstr "Zutabearen tamaina lehenetsi" +msgstr "Zutabe-tamaina automatikoa" #. DLG_Options_Label_CheckAutoLoadPlugins #: po/tmp/ap_String_Id.h.h:542 @@ -1340,7 +1353,7 @@ #. MENU_STATUSLINE_TOOLS_AUTOSPELL #: po/tmp/ap_String_Id.h.h:544 msgid "Automatically spell-check the document" -msgstr "Fitxategia automatikoki gainbegiratu" +msgstr "Automatikoki zuzendu ortografia" #. DLG_Styles_ModifyAutomatic #: po/tmp/ap_String_Id.h.h:546 @@ -1350,17 +1363,17 @@ #. MSG_AutoMerge #: po/tmp/ap_String_Id.h.h:548 msgid "Automerge" -msgstr "" +msgstr "Autokonbinatu" #. DLG_MailMerge_AvailableFields #: po/tmp/ap_String_Id.h.h:550 msgid "Available Fields" -msgstr "" +msgstr "Eremu erabilgarriak" #. DLG_DateTime_AvailableFormats_Capital #: po/tmp/ap_String_Id.h.h:552 msgid "Available Formats" -msgstr "" +msgstr "Formatu erabilgarriak" #. DLG_Styles_Available #: po/tmp/ap_String_Id.h.h:554 @@ -1376,13 +1389,13 @@ #. DLG_FormatTable_Background #: po/tmp/ap_String_Id.h.h:559 msgid "Background" -msgstr "&Atzeko planoa" +msgstr "Atzealdea" #. DLG_FormatFrame_Background_Color #. DLG_FormatTable_Background_Color #: po/tmp/ap_String_Id.h.h:562 msgid "Background color:" -msgstr "Atzeko planoaren kolorea:" +msgstr "Atzealdeko kolorea:" #. DLG_Tab_Radio_Bar #: po/tmp/ap_String_Id.h.h:564 @@ -1392,25 +1405,26 @@ #. TabToggleBarTab #: po/tmp/ap_String_Id.h.h:566 msgid "Bar Tab" -msgstr "Tabuladore Barra" +msgstr "Tabulazio-barra" #. DLG_Styles_ModifyBasedOn #: po/tmp/ap_String_Id.h.h:568 msgid "Based On:" -msgstr "Non oinarritua:" +msgstr "Oinarria:" #. DLG_Options_Label_BiDiOptions #: po/tmp/ap_String_Id.h.h:570 msgid "Bi-Directional Options" -msgstr "Bi Norabideko Aukerak " +msgstr "Noranzko-aukerak " #. TOOLBAR_LABEL_FMT_BOLD #. TOOLBAR_STATUSLINE_FMT_BOLD #. TOOLBAR_TOOLTIP_FMT_BOLD #. DLG_UFS_StyleBold -#: po/tmp/ap_String_Id.h.h:574 po/tmp/xap_String_Id.h.h:111 +#: po/tmp/ap_String_Id.h.h:574 +#: po/tmp/xap_String_Id.h.h:119 msgid "Bold" -msgstr "" +msgstr "Lodia" #. MENU_LABEL_INSERT_BOOKMARK #: po/tmp/ap_String_Id.h.h:576 @@ -1443,54 +1457,57 @@ #. MENU_LABEL_FMT_BORDERS #: po/tmp/ap_String_Id.h.h:588 msgid "Borders and Shading" -msgstr "Ertzak eta Itzalak" +msgstr "Ertzak eta itzalak" #. BottomMarginStatus #: po/tmp/ap_String_Id.h.h:590 #, c-format msgid "Bottom Margin [%s]" -msgstr "Behe Marjina [%s]" +msgstr "Behe marjina [%s]" #. MENU_LABEL_FMT_BOTTOMLINE #. TOOLBAR_LABEL_FMT_BOTTOMLINE #. TOOLBAR_STATUSLINE_FMT_BOTTOMLINE #. TOOLBAR_TOOLTIP_FMT_BOTTOMLINE #. DLG_UFS_BottomlineCheck -#: po/tmp/ap_String_Id.h.h:595 po/tmp/xap_String_Id.h.h:115 +#: po/tmp/ap_String_Id.h.h:595 +#: po/tmp/xap_String_Id.h.h:123 msgid "Bottomline" -msgstr "" +msgstr "Azpilinea" #. DLG_Lists_Box_List #. STYLE_BOXLIST -#: po/tmp/ap_String_Id.h.h:597 po/tmp/xap_String_Id.h.h:117 +#: po/tmp/ap_String_Id.h.h:597 +#: po/tmp/xap_String_Id.h.h:125 msgid "Box List" -msgstr "" +msgstr "Kutxa-zerrenda" #. FIELD_Application_BuildId #: po/tmp/ap_String_Id.h.h:599 msgid "Build Id." -msgstr "Id. egin" +msgstr "Konpilazio Id." #. FIELD_Application_Options #: po/tmp/ap_String_Id.h.h:601 msgid "Build Options" -msgstr "Konpilazio aukerak" +msgstr "Konpilazio-aukerak" #. FIELD_Application_Target #: po/tmp/ap_String_Id.h.h:603 msgid "Build Target" -msgstr "Konpilatu" +msgstr "Konpilazio-helburua" #. DLG_Lists_Type_bullet #: po/tmp/ap_String_Id.h.h:605 msgid "Bullet" -msgstr "Buletak" +msgstr "Buleta" #. DLG_Lists_Bullet_List #. STYLE_BULLETLIST -#: po/tmp/ap_String_Id.h.h:607 po/tmp/xap_String_Id.h.h:125 +#: po/tmp/ap_String_Id.h.h:607 +#: po/tmp/xap_String_Id.h.h:133 msgid "Bullet List" -msgstr "" +msgstr "Buleta-zerrenda" #. TOOLBAR_LABEL_LISTS_BULLETS #. TOOLBAR_STATUSLINE_LISTS_BULLETS @@ -1502,52 +1519,52 @@ #. MENU_LABEL_FMT_BULLETS #: po/tmp/ap_String_Id.h.h:613 msgid "Bullets and &Numbering" -msgstr "&Buletak eta numerazioa" +msgstr "&Buletak eta zenbakitzea" #. DLG_Options_Label_Look #: po/tmp/ap_String_Id.h.h:615 msgid "Button Style" -msgstr "Botoi Motak" +msgstr "Botoi motak" #. MENU_LABEL_FMT_TOGGLECASE #: po/tmp/ap_String_Id.h.h:617 msgid "C&hange Case" -msgstr "Letra Larria eta Xehea Aldatu" +msgstr "Maiuskula/minuskula &aldatu" #. MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION #: po/tmp/ap_String_Id.h.h:619 msgid "C&opy hyperlink location" -msgstr "" +msgstr "Hiperestekaren kokapena &kopiatu" #. MENU_LABEL_HELP_CREDITS #: po/tmp/ap_String_Id.h.h:621 msgid "C&redits" -msgstr "Kredituak" +msgstr "&Kredituak" #. MSG_NoBreakInsideTable #: po/tmp/ap_String_Id.h.h:623 msgid "Can not insert a Break inside a table" -msgstr "Taula barruan ezin da jauzia egin" +msgstr "Ezin da jauzi bat txertatu taula batean" #. MSG_NoBreakInsideFrame #: po/tmp/ap_String_Id.h.h:625 msgid "Can not insert a Break inside a text box" -msgstr "" +msgstr "Ezin da jauzi bat txertatu testu-kutxa batean" #. DLG_Styles_ErrStyleCantDelete #: po/tmp/ap_String_Id.h.h:627 msgid "Cannot delete this style" -msgstr "Ezin daiteke estilo hau ezabatu" +msgstr "Ezin da estilo hau ezabatu" #. DLG_Styles_ErrStyleBuiltin #: po/tmp/ap_String_Id.h.h:629 msgid "Cannot modify a builtin style" -msgstr "Ezin daiteke barne estiloa aldatu" +msgstr "Ezin da barne-estilorik aldatu" #. PRINT_CANNOTSTARTPRINTJOB #: po/tmp/ap_String_Id.h.h:631 msgid "Cannot start print job" -msgstr "" +msgstr "Ezin inprimatze-lana hasi" #. DLG_MetaData_Category_LBL #: po/tmp/ap_String_Id.h.h:633 @@ -1570,12 +1587,12 @@ #. TOOLBAR_TOOLTIP_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:642 msgid "Center alignment" -msgstr "Erdian Lerrokatu" +msgstr "Erdian lerrokatu" #. MENU_STATUSLINE_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:644 msgid "Center-align the paragraph" -msgstr "Parrafoa erdian lerrokatu" +msgstr "Erdialdean lerrokatu paragrafoa" #. DLG_Para_AlignCentered #: po/tmp/ap_String_Id.h.h:646 @@ -1585,76 +1602,78 @@ #. DLG_Spell_ChangeTo #: po/tmp/ap_String_Id.h.h:648 msgid "Change &to:" -msgstr "Aldatu hona:" +msgstr "&Hona aldatu:" #. DLG_Spell_ChangeAll #: po/tmp/ap_String_Id.h.h:650 msgid "Change A&ll" -msgstr "Aldatu &dena" +msgstr "&Guztiak aldatu" #. DLG_Background_Title #: po/tmp/ap_String_Id.h.h:652 msgid "Change Background Color" -msgstr "Atzeko planoaren kolorea aldatu" +msgstr "Atzealdearen kolorea aldatu" #. DLG_ToggleCase_Title #: po/tmp/ap_String_Id.h.h:654 msgid "Change Case" -msgstr "Letra Larri eta Xehea aldatu" +msgstr "Maiuskula/minuskula aldatu" #. DLG_Lists_Cur_Change_Start #: po/tmp/ap_String_Id.h.h:656 msgid "" "Change Current \n" "List" -msgstr "Uneko zerrenda aldatu" +msgstr "" +"Oraingo zerrenda \n" +"aldatu" #. DLG_Background_TitleHighlight #: po/tmp/ap_String_Id.h.h:658 msgid "Change Highlight Color" -msgstr "Aldatu Nabarmentze Kolorea" +msgstr "Nabarmentze-kolorea aldatu" #. DLG_FormatTOC_ChangeStyle #: po/tmp/ap_String_Id.h.h:660 msgid "Change Style" -msgstr "" +msgstr "Estiloa aldatu" #. DLG_Background_TitleFore #: po/tmp/ap_String_Id.h.h:662 msgid "Change Text Color" -msgstr "Aldatu Testuaren Kolorea" +msgstr "Testua-kolorea aldatu" #. MENU_STATUSLINE_FMT_DIRECTION #: po/tmp/ap_String_Id.h.h:664 msgid "Change directional properties of text" -msgstr "" +msgstr "Testuaren noranzko-propietateak aldatu" #. TOOLBAR_STATUSLINE_FMT_DOM_DIRECTION #. TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION #: po/tmp/ap_String_Id.h.h:667 msgid "Change dominant direction of paragraph" -msgstr "Paragrafoaren norabide nagusia aldatu" +msgstr "Paragrafoaren noranzko nagusia aldatu" #. MENU_STATUSLINE_FMT_TOGGLECASE #: po/tmp/ap_String_Id.h.h:669 msgid "Change the case of the selected text" -msgstr "Aukeratutako testuan letra larri eta xeheak aldatu" +msgstr "Hautespenaren maiuskulak/minuskulak aldatu" #. MENU_STATUSLINE_FMT_FONT #: po/tmp/ap_String_Id.h.h:671 msgid "Change the font of the selected text" -msgstr "Aukeratutako testuaren letra-mota aldatu" +msgstr "Hautatutako testuaren letra-mota aldatu" #. MENU_STATUSLINE_FMT_PARAGRAPH #: po/tmp/ap_String_Id.h.h:673 msgid "Change the format of the selected paragraph" -msgstr "Aukeratutako parrafoaren formatua aldatu" +msgstr "Hautatutako paragrafoaren formatua aldatu" #. MENU_STATUSLINE_FMT_LANGUAGE #. MENU_STATUSLINE_TOOLS_LANGUAGE #: po/tmp/ap_String_Id.h.h:676 msgid "Change the language of the selected text" -msgstr "Aukeratutako testuaren hizkuntza aldatu" +msgstr "Hautatutako testuaren hizkuntza aldatu" #. MENU_STATUSLINE_FMT_COLUMNS #: po/tmp/ap_String_Id.h.h:678 @@ -1664,12 +1683,12 @@ #. MENU_STATUSLINE_FILE_PAGESETUP #: po/tmp/ap_String_Id.h.h:680 msgid "Change the printing options" -msgstr "Inprimaketa aukerak aldatu" +msgstr "Inprimatze-aukerak aldatu" #. MENU_STATUSLINE_FMT_FRAME #: po/tmp/ap_String_Id.h.h:682 msgid "Change the properties of the Text Box" -msgstr "" +msgstr "Testu-kutxaren propietateak aldatu" #. MENU_STATUSLINE_SPELL_SUGGEST_1 #. MENU_STATUSLINE_SPELL_SUGGEST_2 @@ -1682,17 +1701,17 @@ #. MENU_STATUSLINE_SPELL_SUGGEST_9 #: po/tmp/ap_String_Id.h.h:692 msgid "Change to this suggested spelling" -msgstr "Iradokizunera aldatu" +msgstr "Iradokizun honetara aldatu" #. MENU_STATUSLINE_FMT_BACKGROUND #: po/tmp/ap_String_Id.h.h:694 msgid "Change your document's page background" -msgstr "Dokumentuaren atzeko planoaren kolorea aldatu" +msgstr "Zure dokumentuaren orri-atzealdea aldatu" #. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_COLOR #: po/tmp/ap_String_Id.h.h:696 msgid "Change your document's page color" -msgstr "" +msgstr "Zure dokumentuaren orri-kolorea aldatu" #. DLG_Styles_ModifyCharacter #: po/tmp/ap_String_Id.h.h:698 @@ -1707,88 +1726,81 @@ #. FIELD_Numbers_NbspCount #: po/tmp/ap_String_Id.h.h:702 msgid "Character Count (w/o spaces)" -msgstr "Karaktere kopurua zuriunerik gabe" +msgstr "Karaktere kopurua (hutsunerik gabe)" #. DLG_Styles_CharPrev #: po/tmp/ap_String_Id.h.h:704 msgid "Character Preview" -msgstr "Testua aurreikusi" +msgstr "Karakterearen aurrebista" #. DLG_WordCount_Characters_No #: po/tmp/ap_String_Id.h.h:706 msgid "Characters (no spaces):" -msgstr "Karaktereak (zuriunerik gabe)" +msgstr "Karaktereak (hutsunerik gabe):" #. DLG_WordCount_Characters_Sp #: po/tmp/ap_String_Id.h.h:708 msgid "Characters (with spaces):" -msgstr "Karaktereak (zuriuneekin)" +msgstr "Karaktereak (hutsuneekin):" #. MENU_LABEL_TOOLS_SPELL #: po/tmp/ap_String_Id.h.h:710 msgid "Check &Spelling" -msgstr "&Ortografia zuzentzailea" +msgstr "&Ortografia zuzendu" #. DLG_Options_Label_GrammarCheck #: po/tmp/ap_String_Id.h.h:712 msgid "Check &grammar as you type" -msgstr "" +msgstr "&Gramatika zuzendu idatzi ahala" #. MENU_LABEL_HELP_CHECKVER #: po/tmp/ap_String_Id.h.h:714 -#, fuzzy msgid "Check for &Updates" -msgstr " Autoeguneratu" +msgstr "&Eguneraketak bilatu" #. MENU_STATUSLINE_HELP_CHECKVER #: po/tmp/ap_String_Id.h.h:716 msgid "Check online for newer versions of AbiWord" -msgstr "" +msgstr "AbiWord-en bertsio berriak bilatu online" #. DLG_Options_Label_SpellCheckAsType #: po/tmp/ap_String_Id.h.h:718 msgid "Check s&pelling as you type" -msgstr "Idazten den bitartean ortografia zuzendu" +msgstr "Ortografia zuzendu idatzi ahala" #. MENU_STATUSLINE_TOOLS_SPELL #: po/tmp/ap_String_Id.h.h:720 msgid "Check the document for incorrect spelling" -msgstr "Fitxategiaren ortografia gainbegiratu" +msgstr "Dokumentuaren ortografia zuzendu" #. DLG_NEW_Choose #: po/tmp/ap_String_Id.h.h:722 msgid "Choose" -msgstr "Aukeratu" +msgstr "Hautatu" #. DLG_Options_Label_ChooseForTransparent #: po/tmp/ap_String_Id.h.h:724 msgid "Choose Screen Color" -msgstr "Pantailako kolorea aukeratu" +msgstr "Pantaila-kolorea hautatu" #. DLG_Options_Label_ColorChooserLabel #: po/tmp/ap_String_Id.h.h:726 msgid "Choose screen color for AbiWord" -msgstr "AbiWord-entzat pantailako kolorea aukeratu" +msgstr "AbiWord-en pantaila-kolorea hautatu" #. MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL #: po/tmp/ap_String_Id.h.h:728 msgid "Choose which revision you wish to view" -msgstr "Aukeratu berrikuspena ikusteko" +msgstr "Zein berrikuspen ikusi hautatu" #. DLG_Goto_Label_Help #: po/tmp/ap_String_Id.h.h:730 msgid "" "Choose your target in the left side.\n" -"If you want to use the \"Go To\" button, just fill the Number Entry with the " -"desired number. You can use + and - to perform relative movement.\tI.e., if " -"you write \"+2\" and you select \"Line\", the \"Go To\" will go 2 lines " -"below your current position." +"If you want to use the \"Go To\" button, just fill the Number Entry with the desired number. You can use + and - to perform relative movement.\tI.e., if you write \"+2\" and you select \"Line\", the \"Go To\" will go 2 lines below your current position." msgstr "" -"Helburua ezkerraldean aukeratu.\n" -"\"Nora-Joan\" botoia erabili nahi baduzu, hutsunea nahi duzun zenbakiarekin " -"bete. + eta - erabil daitezke, era erlatiboan mugitzeko. Hau da, \"+2" -"\"idazten baduzu eta \"Lerroa\" aukeratzen baduzu, \"Nora Joan\" aukerak, 2 " -"lerro mugituko zaitu zauden lerrotik." +"Ezkerraldean hautatu ezazu zure helburua.\n" +"\"Hona joan\" botoia erabiltzeko, nahi duzun zenbakia sartu ezazu gaineko Zenbakia eremuan. Mugimentu erlatiboak burutzeko, + eta - erabili.\tAdibidez, \"+2\" idatzi eta \"Lerroa\" hautatu, eta oraingo puntutik 2 lerro beherago joango zara." #. MENU_LABEL_EDIT_CLEAR #: po/tmp/ap_String_Id.h.h:732 @@ -1803,27 +1815,27 @@ #. DLG_Tab_Button_ClearAll #: po/tmp/ap_String_Id.h.h:736 msgid "Clear &All" -msgstr "Den&a Garbitu" +msgstr "G&uztia garbitu" #. DLG_Background_ClearClr #: po/tmp/ap_String_Id.h.h:738 msgid "Clear Background Color" -msgstr "Atzeko planoaren kolorea kendu" +msgstr "Atzealdearen kolorea garbitu" #. DLG_Background_ClearHighlight #: po/tmp/ap_String_Id.h.h:740 msgid "Clear Highlight Color" -msgstr "Nabarmentzeko kolorea kendu" +msgstr "Nabarmentze-kolorea garbitu" #. MSG_QueryExit #: po/tmp/ap_String_Id.h.h:742 msgid "Close all windows and exit?" -msgstr "Itxi leiho guztiak eta irten?" +msgstr "Leiho guztiak itxi eta irten?" #. MENU_STATUSLINE_FILE_EXIT #: po/tmp/ap_String_Id.h.h:744 msgid "Close all windows in the application and exit" -msgstr "Itxi aplikazioaren leiho guztiak eta irten" +msgstr "Aplikazioaren leiho guztiak itxi eta irten" #. MENU_STATUSLINE_FILE_CLOSE #: po/tmp/ap_String_Id.h.h:746 @@ -1833,25 +1845,26 @@ #. MENU_LABEL_TABLE_SELECT_COLUMN #: po/tmp/ap_String_Id.h.h:748 msgid "Co&lumn" -msgstr "Zutabea aukeratu" +msgstr "&Zutabea" #. DLG_FormatFrame_Color #. DLG_FormatTable_Color #. DLG_UFS_ColorLabel -#: po/tmp/ap_String_Id.h.h:751 po/tmp/xap_String_Id.h.h:177 +#: po/tmp/ap_String_Id.h.h:751 +#: po/tmp/xap_String_Id.h.h:191 msgid "Color:" -msgstr "" +msgstr "Kolorea:" #. DLG_FormatTable_Apply_To_Column #: po/tmp/ap_String_Id.h.h:753 msgid "Column" -msgstr "" +msgstr "Zutabea" #. ColumnGapStatus #: po/tmp/ap_String_Id.h.h:755 #, c-format msgid "Column Gap [%s]" -msgstr "Zutabearen zatiketa [%s]" +msgstr "Zutabe-tartea [%s]" #. ColumnStatus #: po/tmp/ap_String_Id.h.h:757 @@ -1867,625 +1880,636 @@ #. MENU_LABEL_TABLE_INSERT_COLUMNS_BEFORE #: po/tmp/ap_String_Id.h.h:761 msgid "Columns &Left" -msgstr "Txertatu zutabeak aurrean" +msgstr "Zutabeak e&zkerrean" #. MENU_LABEL_TABLE_INSERT_COLUMNS_AFTER #: po/tmp/ap_String_Id.h.h:763 msgid "Columns &Right" -msgstr "Txertatu zutabeak ostean" +msgstr "Zutabeak e&skuinean" #. DLG_ListRevisions_Column3Label #: po/tmp/ap_String_Id.h.h:765 msgid "Comment" -msgstr "" +msgstr "Oharra" #. DLG_MarkRevisions_Comment2Label #: po/tmp/ap_String_Id.h.h:767 msgid "Comment to be associated with the revision:" -msgstr "Berrikuspenari gehituko zaion oharra" +msgstr "Berrikuspenari lotuko zaion oharra:" #. MENU_STATUSLINE_TOOLS_REVISIONS_COMPARE_DOCUMENTS #: po/tmp/ap_String_Id.h.h:769 msgid "Compare active document to another document" -msgstr "" +msgstr "Oraingo dokumentua beste dokumentu batekin konparatu" #. FIELD_Application_CompileDate #: po/tmp/ap_String_Id.h.h:771 msgid "Compile Date" -msgstr "Konpilazio data" +msgstr "Konpilazio-data" #. FIELD_Application_CompileTime #: po/tmp/ap_String_Id.h.h:773 msgid "Compile Time" -msgstr "Konpilazio denbora" +msgstr "Konpilazio-denbora" #. DLG_Break_Continuous #: po/tmp/ap_String_Id.h.h:775 msgid "Con&tinuous" msgstr "&Jarraia" -#. DLG_MarkRevisions_Check1Label +#. TOC_TocHeading #: po/tmp/ap_String_Id.h.h:777 +msgid "Contents" +msgstr "Edukiak" + +#. DLG_MarkRevisions_Check1Label +#: po/tmp/ap_String_Id.h.h:779 #, c-format msgid "Continue previous revision (number %d)" -msgstr "Aurreko berrikuspena jarraitu ( %d. zenbakia)" +msgstr "Aurreko berrikuspena jarraitu ( %d zenbakia)" #. FIELD_Document_Contributor -#: po/tmp/ap_String_Id.h.h:779 +#: po/tmp/ap_String_Id.h.h:781 msgid "Contributor" msgstr "Laguntzailea" #. DLG_MetaData_CoAuthor_LBL -#: po/tmp/ap_String_Id.h.h:781 +#: po/tmp/ap_String_Id.h.h:783 msgid "Contributor(s):" msgstr "Laguntzailea(k):" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:783 +#: po/tmp/ap_String_Id.h.h:785 msgid "Convert Selected Text to a Table" -msgstr "" +msgstr "Hautatutako testua taula bihurtu" #. MENU_LABEL_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:785 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:787 msgid "Convert Table to Text" -msgstr "Taula Txertatu" +msgstr "Taula testu bihurtu" #. MENU_LABEL_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:787 +#: po/tmp/ap_String_Id.h.h:789 msgid "Convert Text to Table" -msgstr "" +msgstr "Testua taula bihurtu" #. MENU_STATUSLINE_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:789 +#: po/tmp/ap_String_Id.h.h:791 msgid "Convert from a Table to Text" -msgstr "" +msgstr "Taulatik testura bihurtu" #. TOOLBAR_LABEL_EDIT_COPY #. TOOLBAR_STATUSLINE_EDIT_COPY #. TOOLBAR_TOOLTIP_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:793 +#: po/tmp/ap_String_Id.h.h:795 msgid "Copy" -msgstr "&Kopiatu" +msgstr "Kopiatu" #. MENU_STATUSLINE_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:795 +#: po/tmp/ap_String_Id.h.h:797 msgid "Copy Embedded Object" -msgstr "" +msgstr "Kapsulatutako objetua kopiatu" #. MENU_LABEL_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:797 +#: po/tmp/ap_String_Id.h.h:799 msgid "Copy Image" -msgstr "" +msgstr "Irudia kopiatu" #. MENU_LABEL_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:799 +#: po/tmp/ap_String_Id.h.h:801 msgid "Copy Object" -msgstr "" +msgstr "Objektua kopiatu" #. MENU_LABEL_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:801 +#: po/tmp/ap_String_Id.h.h:803 msgid "Copy Text Box" -msgstr "" +msgstr "Testu-kutxa kopiatu" #. MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION -#: po/tmp/ap_String_Id.h.h:803 +#: po/tmp/ap_String_Id.h.h:805 msgid "Copy hyperlink location" -msgstr "" +msgstr "Hiperestekaren kokapena kopiatu" #. MENU_STATUSLINE_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:805 +#: po/tmp/ap_String_Id.h.h:807 msgid "Copy the Text Box to the clipboard" -msgstr "" +msgstr "Testu-kutxa arbelera kopiatu" #. MENU_STATUSLINE_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:807 +#: po/tmp/ap_String_Id.h.h:809 msgid "Copy the Text Box to the clipboard then remove it" -msgstr "" +msgstr "Testu-kutxa arbelera kopiatu eta ezabatu" #. MENU_STATUSLINE_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:809 +#: po/tmp/ap_String_Id.h.h:811 msgid "Copy the selection and put it on the Clipboard" msgstr "Hautatutakoa kopiatu eta arbelean jarri" #. MSG_IE_CouldNotOpen -#: po/tmp/ap_String_Id.h.h:811 +#: po/tmp/ap_String_Id.h.h:813 #, c-format msgid "Could not open file %s for writing" -msgstr "Ezin daiteke %s fitxategia ireki idazteko" +msgstr "Ezin da %s fitxategia ireki idazteko" #. MSG_OpenFailed -#: po/tmp/ap_String_Id.h.h:813 +#: po/tmp/ap_String_Id.h.h:815 #, c-format msgid "Could not open file %s." -msgstr "Ezin daiteke %s fitxategia ireki." +msgstr "Ezin da %s fitxategia ireki." #. MSG_IE_CouldNotWrite -#: po/tmp/ap_String_Id.h.h:815 +#: po/tmp/ap_String_Id.h.h:817 #, c-format msgid "Could not write to file %s" -msgstr "Ezin daiteke %s fitxategian idatzi" +msgstr "Ezin da %s fitxategian idatzi" #. MSG_SaveFailed -#: po/tmp/ap_String_Id.h.h:817 +#: po/tmp/ap_String_Id.h.h:819 #, c-format msgid "Could not write to the file %s." -msgstr "Ezin daiteke %s fitxategian idatzi." +msgstr "Ezin da %s fitxategian idatzi." #. MENU_STATUSLINE_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:819 +#: po/tmp/ap_String_Id.h.h:821 msgid "Count the number of words in the document" -msgstr "Fitxategian dagoen hitz kopurua zenbatu" +msgstr "Dokumentuan dagoen hitz kopurua zenbatu" #. FIELD_Document_Coverage -#: po/tmp/ap_String_Id.h.h:821 +#: po/tmp/ap_String_Id.h.h:823 msgid "Coverage" -msgstr "Eremu" +msgstr "Estaldura" #. DLG_MetaData_Coverage_LBL -#: po/tmp/ap_String_Id.h.h:823 +#: po/tmp/ap_String_Id.h.h:825 msgid "Coverage:" -msgstr "Eremu" +msgstr "Estaldura:" #. DLG_NEW_Tab1_FAX1 -#: po/tmp/ap_String_Id.h.h:825 +#: po/tmp/ap_String_Id.h.h:827 msgid "Create a fax" msgstr "Fax-a sortu" #. DLG_NEW_Tab1_WP1 -#: po/tmp/ap_String_Id.h.h:827 +#: po/tmp/ap_String_Id.h.h:829 msgid "Create a new blank document" -msgstr "Dokumentu berri bat sortu" +msgstr "Dokumentu berri huts bat sortu" #. MENU_STATUSLINE_FILE_NEW #. TOOLBAR_STATUSLINE_FILE_NEW #. TOOLBAR_TOOLTIP_FILE_NEW -#: po/tmp/ap_String_Id.h.h:831 +#: po/tmp/ap_String_Id.h.h:833 msgid "Create a new document" msgstr "Dokumentu berri bat sortu" #. DLG_NEW_Create -#: po/tmp/ap_String_Id.h.h:833 +#: po/tmp/ap_String_Id.h.h:835 msgid "Create a new document from a template" -msgstr "Txantiloi batekin dokumentu berri bat sortu" +msgstr "Dokumentu berri bat sortu, txantiloi bat erabiliz" #. MENU_STATUSLINE_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:835 +#: po/tmp/ap_String_Id.h.h:837 msgid "Create a new document using a template" -msgstr "" +msgstr "Dokumentu berri bat sortu, txantiloi bat erabiliz" #. DLG_NEW_StartEmpty -#: po/tmp/ap_String_Id.h.h:837 +#: po/tmp/ap_String_Id.h.h:839 msgid "Create an empty document" -msgstr "Dokumentu berri batekin hasi" +msgstr "Dokumentu huts bat sortu" #. FIELD_Document_Creator -#: po/tmp/ap_String_Id.h.h:839 +#: po/tmp/ap_String_Id.h.h:841 msgid "Creator" -msgstr "Sortzaile" +msgstr "Sortzailea" #. MENU_LABEL_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:841 +#: po/tmp/ap_String_Id.h.h:843 msgid "Cu&t" -msgstr "Ebaki" +msgstr "&Ebaki" #. FIELD_Datetime_CurrentDate -#: po/tmp/ap_String_Id.h.h:843 +#: po/tmp/ap_String_Id.h.h:845 msgid "Current Date" -msgstr "Gaurko Data" +msgstr "Gaurko data" #. DLG_Lists_Current_Font -#: po/tmp/ap_String_Id.h.h:845 +#: po/tmp/ap_String_Id.h.h:847 msgid "Current Font" -msgstr "Uneko letra-mota" +msgstr "Oraingo letra-mota" #. DLG_Lists_Current_List_Label -#: po/tmp/ap_String_Id.h.h:847 +#: po/tmp/ap_String_Id.h.h:849 msgid "Current List Label" -msgstr "Uneko etiketa zerrenda" +msgstr "Oraingo zerrenda-etiketa" #. DLG_Lists_Current_List_Type -#: po/tmp/ap_String_Id.h.h:849 +#: po/tmp/ap_String_Id.h.h:851 msgid "Current List Type" -msgstr "Uneko Zerrenda Mota" +msgstr "Oraingo zerrenda-mota" #. MSG_EmptySelection -#: po/tmp/ap_String_Id.h.h:851 +#: po/tmp/ap_String_Id.h.h:853 msgid "Current Selection is Empty" -msgstr "Uneko selekzioa hutsik dago" +msgstr "Oraingo hautespena hutsik dago" #. DLG_Styles_DefCurrent -#: po/tmp/ap_String_Id.h.h:853 +#: po/tmp/ap_String_Id.h.h:855 msgid "Current Settings" -msgstr "Uneko ezarpena" +msgstr "Oraingo ezarpenak" #. FIELD_Datetime_CurrentTime -#: po/tmp/ap_String_Id.h.h:855 +#: po/tmp/ap_String_Id.h.h:857 msgid "Current Time" -msgstr "Uneko Ordua" +msgstr "Oraingo ordua" #. DLG_Options_Label_ViewCursorBlink -#: po/tmp/ap_String_Id.h.h:857 +#: po/tmp/ap_String_Id.h.h:859 msgid "Cursor &blink" -msgstr "Kurtsorearen keinua" +msgstr "Kurtsorearen &keinua" #. DLG_Options_Label_SpellCustomDict -#: po/tmp/ap_String_Id.h.h:859 +#: po/tmp/ap_String_Id.h.h:861 msgid "Custom Dictionary:" -msgstr "Hiztegi Pertsonalizatua:" +msgstr "Hiztegi pertsonalizatua:" #. FIELD_DateTime_Custom -#: po/tmp/ap_String_Id.h.h:861 +#: po/tmp/ap_String_Id.h.h:863 msgid "Customizable date/time" -msgstr "Data/denbora aldatzeko" +msgstr "Data/denbora pertsonalizatua" #. DLG_Lists_Customize -#: po/tmp/ap_String_Id.h.h:863 +#: po/tmp/ap_String_Id.h.h:865 msgid "Customized List" -msgstr "Zerrenda Pertsonalizatua" +msgstr "Zerrenda pertsonalizatua" #. TOOLBAR_LABEL_EDIT_CUT #. TOOLBAR_STATUSLINE_EDIT_CUT #. TOOLBAR_TOOLTIP_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:867 +#: po/tmp/ap_String_Id.h.h:869 msgid "Cut" msgstr "Ebaki" #. MENU_STATUSLINE_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:869 +#: po/tmp/ap_String_Id.h.h:871 msgid "Cut Embedded Object" -msgstr "" +msgstr "Kapsulatutako objektua ebaki" #. MENU_LABEL_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:871 +#: po/tmp/ap_String_Id.h.h:873 msgid "Cut Image" -msgstr "" +msgstr "Irudia ebaki" #. MENU_LABEL_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:873 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:875 msgid "Cut Object" -msgstr "Gaia" +msgstr "Objektua ebaki" #. MENU_LABEL_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:875 +#: po/tmp/ap_String_Id.h.h:877 msgid "Cut Text Box" -msgstr "" +msgstr "Testu-kutxa ebaki" #. MENU_STATUSLINE_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:877 +#: po/tmp/ap_String_Id.h.h:879 msgid "Cut the selection and put it on the Clipboard" -msgstr "Hautatutakoa moztu eta arbelean itsatsi" +msgstr "Hautespena ebaki eta arbelean jarri" #. MENU_LABEL_FMT_DIRECTION -#: po/tmp/ap_String_Id.h.h:879 +#: po/tmp/ap_String_Id.h.h:881 msgid "D&irectional" -msgstr "" +msgstr "&Noranzkoa" #. DLG_Lists_Dashed_List #. STYLE_DASHEDLIST -#: po/tmp/ap_String_Id.h.h:881 po/tmp/xap_String_Id.h.h:225 +#: po/tmp/ap_String_Id.h.h:883 +#: po/tmp/xap_String_Id.h.h:241 msgid "Dashed List" -msgstr "" +msgstr "Zerrenda gidoiduna" #. FIELD_Document_Date #. DLG_ListRevisions_Column2Label -#: po/tmp/ap_String_Id.h.h:884 +#: po/tmp/ap_String_Id.h.h:886 msgid "Date" msgstr "Data" #. MENU_LABEL_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:886 +#: po/tmp/ap_String_Id.h.h:888 msgid "Date and &Time" -msgstr "&Data eta Ordua" +msgstr "&Data eta ordua" #. FIELD_Type_Datetime -#: po/tmp/ap_String_Id.h.h:888 +#: po/tmp/ap_String_Id.h.h:890 msgid "Date and Time" msgstr "Data eta ordua" #. FIELD_DateTime_DOY -#: po/tmp/ap_String_Id.h.h:890 +#: po/tmp/ap_String_Id.h.h:892 msgid "Day # in the year" -msgstr "Urteko egun kopurua" +msgstr "Urteko egun #" #. DLG_Options_Btn_Default -#: po/tmp/ap_String_Id.h.h:892 +#: po/tmp/ap_String_Id.h.h:894 msgid "De&faults" -msgstr "Balore lehenetsiak" +msgstr "&Lehenetsiak" #. DLG_Tab_Radio_Decimal -#: po/tmp/ap_String_Id.h.h:894 +#: po/tmp/ap_String_Id.h.h:896 msgid "Decimal" msgstr "Hamartarra" #. TabToggleDecimalTab -#: po/tmp/ap_String_Id.h.h:896 +#: po/tmp/ap_String_Id.h.h:898 msgid "Decimal Tab" msgstr "Tabulazio hamartarra" #. TOOLBAR_LABEL_UNINDENT #. TOOLBAR_STATUSLINE_UNINDENT #. TOOLBAR_TOOLTIP_UNINDENT -#: po/tmp/ap_String_Id.h.h:900 +#: po/tmp/ap_String_Id.h.h:902 msgid "Decrease indent" -msgstr "Txikitu koska" +msgstr "Koska txikitu" #. FIELD_DateTime_DefaultDateNoTime -#: po/tmp/ap_String_Id.h.h:902 +#: po/tmp/ap_String_Id.h.h:904 msgid "Default date (w/o time)" -msgstr "Defektuzko data (ordurik gabe)" +msgstr "Data lehenetsia (ordurik gabe)" #. FIELD_DateTime_DefaultDate -#: po/tmp/ap_String_Id.h.h:904 +#: po/tmp/ap_String_Id.h.h:906 msgid "Default date representation" -msgstr "Dataren defektuzko irudikapena" +msgstr "Dataren irudikapen lehenetsia" #. DLG_Options_Label_DefaultPageSize -#: po/tmp/ap_String_Id.h.h:906 +#: po/tmp/ap_String_Id.h.h:908 msgid "Default page size" -msgstr " Defektuzko Orriaren tamaina " +msgstr "Orri-tamaina lehenetsia" #. DLG_Tab_Label_DefaultTS -#: po/tmp/ap_String_Id.h.h:908 +#: po/tmp/ap_String_Id.h.h:910 msgid "Default tab stops:" -msgstr "Defektuzko tabuladorearen geldiuneak:" +msgstr "Geldiune lehenetsiak:" #. DLG_Options_Label_DirectionRtl -#: po/tmp/ap_String_Id.h.h:910 +#: po/tmp/ap_String_Id.h.h:912 msgid "Default to right-to-left direction of text" -msgstr "Eskumatik ezkerrera idatzi defektuz" +msgstr "Eskuin-ezker noranzkoa lehenetsi" #. DLG_FormatTOC_LevelDefs -#: po/tmp/ap_String_Id.h.h:912 +#: po/tmp/ap_String_Id.h.h:914 msgid "Define Main Properties" -msgstr "" +msgstr "Propietate orokorrak ezarri" #. MENU_STATUSLINE_FMT_STYLE #. MENU_STATUSLINE_FMT_STYLE_DEFINE -#: po/tmp/ap_String_Id.h.h:915 +#: po/tmp/ap_String_Id.h.h:917 msgid "Define or apply style for the selection" -msgstr "Aukeratutakoarentzat estilo bat definitu edo aplikatu" +msgstr "Hautespenarentzako estiloa ezarri edo aplikatu" #. DLG_Styles_Delete #. MENU_STATUSLINE_TABLE_DELETE #. DLG_Delete -#: po/tmp/ap_String_Id.h.h:918 po/tmp/xap_String_Id.h.h:239 +#: po/tmp/ap_String_Id.h.h:920 +#: po/tmp/xap_String_Id.h.h:255 msgid "Delete" -msgstr "Gelaxkak ezabatu" +msgstr "Ezabatu" #. MENU_STATUSLINE_TABLE_DELETE_CELLS -#: po/tmp/ap_String_Id.h.h:920 +#: po/tmp/ap_String_Id.h.h:922 msgid "Delete Cells" msgstr "Gelaxkak ezabatu" #. MENU_LABEL_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:922 +#: po/tmp/ap_String_Id.h.h:924 msgid "Delete Co&lumn" -msgstr "" +msgstr "&Zutabea ezabatu" #. MENU_STATUSLINE_TABLE_DELETE_COLUMNS #. MENU_STATUSLINE_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:925 +#: po/tmp/ap_String_Id.h.h:927 msgid "Delete Column" -msgstr "Zutabeak ezabatu" +msgstr "Zutabea ezabatu" #. MENU_STATUSLINE_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:927 +#: po/tmp/ap_String_Id.h.h:929 msgid "Delete Embedded Object" -msgstr "" +msgstr "Kapsulatutako objektua ezabatu" #. MENU_LABEL_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:929 +#: po/tmp/ap_String_Id.h.h:931 msgid "Delete Image" -msgstr "" +msgstr "Irudia ezabatu" #. MENU_LABEL_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:931 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:933 msgid "Delete Object" -msgstr "Taula ezabatu" +msgstr "Objektua ezabatu" #. MENU_LABEL_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:933 +#: po/tmp/ap_String_Id.h.h:935 msgid "Delete Ro&w" -msgstr "" +msgstr "&Lerroa ezabatu" #. MENU_STATUSLINE_TABLE_DELETE_ROWS #. MENU_STATUSLINE_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:936 +#: po/tmp/ap_String_Id.h.h:938 msgid "Delete Row" -msgstr "Errenkadak Ezabatu" +msgstr "Lerroa ezabatu" #. MENU_LABEL_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:938 +#: po/tmp/ap_String_Id.h.h:940 msgid "Delete Tabl&e" -msgstr "" +msgstr "&Taula ezabatu" #. MENU_STATUSLINE_TABLE_DELETE_TABLE #. MENU_STATUSLINE_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:941 +#: po/tmp/ap_String_Id.h.h:943 msgid "Delete Table" msgstr "Taula ezabatu" #. MENU_LABEL_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:943 +#: po/tmp/ap_String_Id.h.h:945 msgid "Delete Text Box" -msgstr "" +msgstr "Testu-kutxa ezabatu" #. TOOLBAR_LABEL_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:945 +#: po/tmp/ap_String_Id.h.h:947 msgid "Delete column" -msgstr "Zutabeak Ezabatu" +msgstr "Zutabea ezabatu" #. MENU_STATUSLINE_INSERT_DELETE_HYPERLINK -#: po/tmp/ap_String_Id.h.h:947 +#: po/tmp/ap_String_Id.h.h:949 msgid "Delete hyperlink" msgstr "Hiperesteka ezabatu" #. TOOLBAR_LABEL_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:949 +#: po/tmp/ap_String_Id.h.h:951 msgid "Delete row" -msgstr "Errenkada Ezabatu" +msgstr "Lerroa ezabatu" #. MENU_STATUSLINE_EDIT_CLEAR -#: po/tmp/ap_String_Id.h.h:951 +#: po/tmp/ap_String_Id.h.h:953 msgid "Delete the selection" -msgstr "Hautatutakoa ezabatu" +msgstr "Hautespena ezabatu" #. TOOLBAR_STATUSLINE_DELETE_COLUMN #. TOOLBAR_TOOLTIP_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:954 +#: po/tmp/ap_String_Id.h.h:956 msgid "Delete this column from its table" -msgstr "Taulako zutabe hau ezabatu" +msgstr "Zutabe hau ezabatu taulatik" #. TOOLBAR_STATUSLINE_DELETE_ROW #. TOOLBAR_TOOLTIP_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:957 +#: po/tmp/ap_String_Id.h.h:959 msgid "Delete this row from its table" -msgstr "Taulako errenkada hau ezabatu" +msgstr "Lerro hau ezabatu taulatik" #. DLG_Styles_Description #. DLG_Styles_ModifyDescription #. FIELD_Document_Description -#: po/tmp/ap_String_Id.h.h:961 +#: po/tmp/ap_String_Id.h.h:963 msgid "Description" -msgstr "" +msgstr "Deskribapena" #. DLG_MetaData_Description_LBL #. DLG_PLUGIN_MANAGER_DESC #. DLG_Image_LblDescription -#: po/tmp/ap_String_Id.h.h:963 po/tmp/xap_String_Id.h.h:242 +#: po/tmp/ap_String_Id.h.h:965 +#: po/tmp/xap_String_Id.h.h:258 msgid "Description:" -msgstr "Deskribapena" +msgstr "Deskribapena:" #. DLG_Lists_Diamond_List #. STYLE_DIAMONLIST -#: po/tmp/ap_String_Id.h.h:965 po/tmp/xap_String_Id.h.h:244 +#: po/tmp/ap_String_Id.h.h:967 +#: po/tmp/xap_String_Id.h.h:260 msgid "Diamond List" -msgstr "" +msgstr "Diamante-zerrenda" #. DLG_Options_Label_SpellDictionaries -#: po/tmp/ap_String_Id.h.h:967 +#: po/tmp/ap_String_Id.h.h:969 msgid "Dictionaries" -msgstr "" +msgstr "Hiztegiak" #. DLG_HdrFtr_FooterEven -#: po/tmp/ap_String_Id.h.h:969 +#: po/tmp/ap_String_Id.h.h:971 msgid "Different footer on facing pages" -msgstr "Orri-oin ezberdinak aurrez-aurreko orrietan" +msgstr "Orri-oin ezberdina aurrez-aurreko orrietan" #. DLG_HdrFtr_FooterFirst -#: po/tmp/ap_String_Id.h.h:971 +#: po/tmp/ap_String_Id.h.h:973 msgid "Different footer on first page" -msgstr "Orri-oin ezberdinak lehenengo orrian" +msgstr "Orri-oin ezberdina lehen orrian" #. DLG_HdrFtr_FooterLast -#: po/tmp/ap_String_Id.h.h:973 +#: po/tmp/ap_String_Id.h.h:975 msgid "Different footer on last page" -msgstr "Orri-oin ezberdinak azken orrian" +msgstr "Orri-oin ezberdina azken orrian" #. DLG_HdrFtr_HeaderEven -#: po/tmp/ap_String_Id.h.h:975 +#: po/tmp/ap_String_Id.h.h:977 msgid "Different header on facing pages" -msgstr "Goiburu ezberdinak aurrez-aurreko orrietan" +msgstr "Goiburu ezberdina aurrez-aurreko orrietan" #. DLG_HdrFtr_HeaderFirst -#: po/tmp/ap_String_Id.h.h:977 +#: po/tmp/ap_String_Id.h.h:979 msgid "Different header on first page" -msgstr "Goiburu ezberdina lehenengo orrialdean" +msgstr "Goiburu ezberdina lehen orrian" #. DLG_HdrFtr_HeaderLast -#: po/tmp/ap_String_Id.h.h:979 +#: po/tmp/ap_String_Id.h.h:981 msgid "Different header on last page" -msgstr "Goiburu ezberdina azkenengo orrialdean" +msgstr "Goiburu ezberdina azken orrian" #. DLG_Styles_StylesLocked -#: po/tmp/ap_String_Id.h.h:981 +#: po/tmp/ap_String_Id.h.h:983 msgid "Disable all formatting commands, except styles" -msgstr "Ezgaitu eta formateatu komandoak, estiloak ezik" +msgstr "Formatu-komando guztiak ezgaitu, estiloak izan ezik" #. MENU_STATUSLINE_HELP_CREDITS -#: po/tmp/ap_String_Id.h.h:983 +#: po/tmp/ap_String_Id.h.h:985 msgid "Display Credits" msgstr "Kredituak erakutsi" #. MENU_STATUSLINE_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:985 +#: po/tmp/ap_String_Id.h.h:987 msgid "Display Help Contents" msgstr "Laguntzaren edukia erakutsi" #. MENU_STATUSLINE_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:987 +#: po/tmp/ap_String_Id.h.h:989 msgid "Display Help Index" msgstr "Laguntzaren aurkibidea erakutsi" #. MENU_STATUSLINE_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:989 +#: po/tmp/ap_String_Id.h.h:991 msgid "Display non-printing characters" msgstr "Karaktere ez inprimagarriak erakutsi" #. MENU_STATUSLINE_HELP_ABOUT -#: po/tmp/ap_String_Id.h.h:991 +#: po/tmp/ap_String_Id.h.h:993 msgid "Display program information, version number, and copyright" msgstr "Programaren informazioa, bertsio zenbakia eta copyright-a erakutsi" #. DLG_FormatTOC_DispStyle -#: po/tmp/ap_String_Id.h.h:993 +#: po/tmp/ap_String_Id.h.h:995 msgid "Display style:" -msgstr "" +msgstr "Bistaratze-estiloa:" #. DLG_Options_Prompt_IgnoreResetAll -#: po/tmp/ap_String_Id.h.h:995 +#: po/tmp/ap_String_Id.h.h:997 msgid "Do you want to reset ignored words in all the documents?" -msgstr "Dokumento guztietan ezikusitako hitzak berrezarri nahi dituzu?" +msgstr "Dokumentu guztietako hitz ezikusiak berrezarri nahi al dituzu?" #. DLG_Options_Prompt_IgnoreResetCurrent -#: po/tmp/ap_String_Id.h.h:997 +#: po/tmp/ap_String_Id.h.h:999 msgid "Do you want to reset ignored words in the current document?" -msgstr "Dokumentu honetan ezikusitako hitzak berhasi nahi dituzu?" +msgstr "Dokumentu honetako hitz ezikusiak berrezarri nahi al dituzu?" #. FIELD_Type_Document -#: po/tmp/ap_String_Id.h.h:999 +#: po/tmp/ap_String_Id.h.h:1001 msgid "Document" -msgstr "&Dokumentua" +msgstr "Dokumentua" #. DLG_MetaData_Title -#: po/tmp/ap_String_Id.h.h:1001 +#: po/tmp/ap_String_Id.h.h:1003 msgid "Document Properties" -msgstr "Dokumentuaren Propietateak" +msgstr "Dokumentuaren propietateak" #. DLG_Options_Label_Documents -#: po/tmp/ap_String_Id.h.h:1003 +#: po/tmp/ap_String_Id.h.h:1005 msgid "Documents" -msgstr "" +msgstr "Dokumentuak" #. DLG_FormatFootnotes_FootRestartNone -#: po/tmp/ap_String_Id.h.h:1005 +#: po/tmp/ap_String_Id.h.h:1007 msgid "Don't restart" -msgstr "" +msgstr "Ez berrabiarazi" #. DLG_Para_SpacingDouble -#: po/tmp/ap_String_Id.h.h:1007 +#: po/tmp/ap_String_Id.h.h:1009 msgid "Double" msgstr "Bikoitza" #. TOOLBAR_LABEL_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1009 +#: po/tmp/ap_String_Id.h.h:1011 msgid "Double Spacing" -msgstr "Zuriune bikoitza" +msgstr "Lerroarte bikoitza" #. TOOLBAR_STATUSLINE_DOUBLE_SPACE #. TOOLBAR_TOOLTIP_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1012 +#: po/tmp/ap_String_Id.h.h:1014 msgid "Double spacing" -msgstr "Zuriune bikoitza" +msgstr "Lerroarte bikoitza" + +#. MENU_LABEL_EDIT_LATEXEQUATION +#: po/tmp/ap_String_Id.h.h:1016 +msgid "Edit Equation" +msgstr "Ekuazioa editatu" #. MENU_LABEL_EDIT_EDITFOOTER #. TOOLBAR_LABEL_EDIT_FOOTER #. TOOLBAR_STATUSLINE_EDIT_FOOTER #. TOOLBAR_TOOLTIP_EDIT_FOOTER -#: po/tmp/ap_String_Id.h.h:1017 +#: po/tmp/ap_String_Id.h.h:1021 msgid "Edit Footer" msgstr "Orri-oina editatu" @@ -2493,279 +2517,284 @@ #. TOOLBAR_LABEL_EDIT_HEADER #. TOOLBAR_STATUSLINE_EDIT_HEADER #. TOOLBAR_TOOLTIP_EDIT_HEADER -#: po/tmp/ap_String_Id.h.h:1022 +#: po/tmp/ap_String_Id.h.h:1026 msgid "Edit Header" msgstr "Goiburua editatu" +#. MENU_STATUSLINE_EDIT_LATEXEQUATION +#: po/tmp/ap_String_Id.h.h:1028 +msgid "Edit Latex Equation" +msgstr "Latex ekuazioa editatu" + #. MENU_STATUSLINE_INSERT_EDIT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1024 +#: po/tmp/ap_String_Id.h.h:1030 msgid "Edit hyperlink" -msgstr "" +msgstr "Hiperesteka editatu" #. MENU_STATUSLINE_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:1026 +#: po/tmp/ap_String_Id.h.h:1032 msgid "Edit text at the top or bottom of every page" -msgstr "Orri bakoitzeko goiburu edo orri oina editatu" +msgstr "Orri bakoitzeko goialde edo azpialdeko testua editatu" #. MENU_STATUSLINE_EDIT_EDITFOOTER -#: po/tmp/ap_String_Id.h.h:1028 +#: po/tmp/ap_String_Id.h.h:1034 msgid "Edit the Footer on the current page" -msgstr "Orri honetako goiburua editatu" +msgstr "Orri honetako orri-oina editatu" #. MENU_STATUSLINE_EDIT_EDITHEADER -#: po/tmp/ap_String_Id.h.h:1030 +#: po/tmp/ap_String_Id.h.h:1036 msgid "Edit the Header on the current page" msgstr "Orri honetako goiburua editatu" +#. TB_Embedded +#: po/tmp/ap_String_Id.h.h:1038 +msgid "Embedded" +msgstr "Kapsulatuta" + #. MENU_LABEL_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:1032 +#: po/tmp/ap_String_Id.h.h:1040 msgid "Enable F&ormatting Tools" -msgstr "Formartu tresnak gaitu" +msgstr "&Formatu-tresnak gaitu" #. DLG_Options_Label_CheckEnableSmoothScrolling -#: po/tmp/ap_String_Id.h.h:1034 +#: po/tmp/ap_String_Id.h.h:1042 msgid "Enable Smooth Scrolling" -msgstr "" +msgstr "Korritze leuna gaitu" #. FIELD_Numbers_EndnoteAnchor -#: po/tmp/ap_String_Id.h.h:1036 +#: po/tmp/ap_String_Id.h.h:1044 msgid "Endnote anchor" msgstr "Bukaerako oharraren aingura" #. FIELD_Numbers_EndnoteReference -#: po/tmp/ap_String_Id.h.h:1038 +#: po/tmp/ap_String_Id.h.h:1046 msgid "Endnote reference" msgstr "Bukaerako oharraren erreferentzia" #. DLG_FormatFootnotes_EndStyle -#: po/tmp/ap_String_Id.h.h:1040 +#: po/tmp/ap_String_Id.h.h:1048 msgid "Endnote style" -msgstr "&Bukaerako oharraren estiloa" +msgstr "Bukaerako oharraren estiloa" #. MENU_LABEL_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1042 +#: po/tmp/ap_String_Id.h.h:1050 msgid "Equation" -msgstr "" +msgstr "Ekuazioa" #. FIELD_Error -#: po/tmp/ap_String_Id.h.h:1044 +#: po/tmp/ap_String_Id.h.h:1052 msgid "Error calculating value!" -msgstr "Errorea, balioa kalkulatzen!" +msgstr "Errorea balioa kalkulatzean!" #. SCRIPT_CANTRUN -#: po/tmp/ap_String_Id.h.h:1046 +#: po/tmp/ap_String_Id.h.h:1054 #, c-format msgid "Error executing script %s" -msgstr "Errorea %s skript-a exekutatzerakoan" +msgstr "Errorea %s skript-a exekutatzean" #. MSG_ImportError -#: po/tmp/ap_String_Id.h.h:1048 +#: po/tmp/ap_String_Id.h.h:1056 #, c-format msgid "Error importing file %s." -msgstr "Errorea %s fitxategia inportatzerakoan." +msgstr "Errorea %s fitxategia inportatzean." #. MSG_SaveFailedExport -#: po/tmp/ap_String_Id.h.h:1050 +#: po/tmp/ap_String_Id.h.h:1058 #, c-format msgid "Error while attempting to save %s: could not construct exporter" -msgstr "Errorea %s gordetzen saiatzean: filtroa ezin izan da erabili." +msgstr "Errorea %s gordetzen saiatzean: ezin esportatzailea sortu" #. MSG_SaveFailedName -#: po/tmp/ap_String_Id.h.h:1052 +#: po/tmp/ap_String_Id.h.h:1060 #, c-format msgid "Error while attempting to save %s: invalid name" -msgstr "Errorea %s gordetzen saiatzean: fitxategiaren izena desegokia" +msgstr "Errorea %s gordetzen saiatzean: izen baliogabea" #. TOOLBAR_LABEL_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1054 +#: po/tmp/ap_String_Id.h.h:1062 msgid "Ex. script" -msgstr "Ex. script-a" +msgstr "Script-a exek." #. DLG_Para_SpacingExactly -#: po/tmp/ap_String_Id.h.h:1056 +#: po/tmp/ap_String_Id.h.h:1064 msgid "Exactly" -msgstr "Zehatz" +msgstr "Zehazki" #. DLG_Latex_Example -#: po/tmp/ap_String_Id.h.h:1058 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1066 msgid "Example:" -msgstr "Adibidea" +msgstr "Adibidea:" #. MENU_STATUSLINE_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1060 +#: po/tmp/ap_String_Id.h.h:1068 msgid "Execute helper scripts" -msgstr "Laguntzako scriptak erabili" +msgstr "Laguntzako script-ak exekutatu" #. TOOLBAR_STATUSLINE_SCRIPT_PLAY #. TOOLBAR_TOOLTIP_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1063 +#: po/tmp/ap_String_Id.h.h:1071 msgid "Execute script" -msgstr "Scriptak erabili" +msgstr "Script-a exekutatu" #. DLG_ListRevisions_Label1 -#: po/tmp/ap_String_Id.h.h:1065 +#: po/tmp/ap_String_Id.h.h:1073 msgid "Existing revisions:" msgstr "Lehendik dauden berrikuspenak: " #. TB_Extra -#: po/tmp/ap_String_Id.h.h:1067 +#: po/tmp/ap_String_Id.h.h:1075 msgid "Extra" -msgstr "" +msgstr "Extra" #. DLG_Field_Parameters_Capital -#: po/tmp/ap_String_Id.h.h:1069 +#: po/tmp/ap_String_Id.h.h:1077 msgid "Extra Parameters" -msgstr "" +msgstr "Parametro extrak" #. DLG_Options_Label_ViewExtraTB -#: po/tmp/ap_String_Id.h.h:1071 +#: po/tmp/ap_String_Id.h.h:1079 msgid "Extra Toolbar" -msgstr "Tresna barra extra" +msgstr "Tresna-barra extra" #. DLG_Field_Parameters -#: po/tmp/ap_String_Id.h.h:1073 +#: po/tmp/ap_String_Id.h.h:1081 msgid "Extra parameters:" -msgstr "Gainerako parametroak:" +msgstr "Parametro extrak:" #. MENU_LABEL_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1075 +#: po/tmp/ap_String_Id.h.h:1083 msgid "F&ile" -msgstr "&Txertatu fitxategia" +msgstr "&Fitxategia" #. MENU_LABEL_FORMAT -#: po/tmp/ap_String_Id.h.h:1077 +#: po/tmp/ap_String_Id.h.h:1085 msgid "F&ormat" -msgstr "Formatua" +msgstr "F&ormatua" #. MENU_LABEL_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:1079 +#: po/tmp/ap_String_Id.h.h:1087 msgid "F&ull Screen" -msgstr "Pantaila osoa" +msgstr "Pantaila &osoa" #. DLG_FR_FindLabel -#: po/tmp/ap_String_Id.h.h:1081 +#: po/tmp/ap_String_Id.h.h:1089 msgid "Fi&nd what:" msgstr "Bilatu:" #. DLG_MailMerge_Insert_No_Colon -#: po/tmp/ap_String_Id.h.h:1083 +#: po/tmp/ap_String_Id.h.h:1091 msgid "Field Name" -msgstr "" +msgstr "Eremu-izena" #. DLG_MailMerge_Insert -#: po/tmp/ap_String_Id.h.h:1085 +#: po/tmp/ap_String_Id.h.h:1093 msgid "Field Name:" -msgstr "" +msgstr "Eremu-izena:" #. MSG_IE_UnsupportedType -#: po/tmp/ap_String_Id.h.h:1087 +#: po/tmp/ap_String_Id.h.h:1095 #, c-format msgid "File %s is not of a currently supported file type" -msgstr "%s fitxategia ez dago fitxategi motetan onarturik" +msgstr "%s fitxategia ez dago fitxategi-mota onartuen artean" #. MSG_IE_FakeType -#: po/tmp/ap_String_Id.h.h:1089 +#: po/tmp/ap_String_Id.h.h:1097 #, c-format msgid "File %s is not of the type it claims to be" -msgstr "%s fitxategia ez da dirudien motatakoa" +msgstr "%s fitxategia ez da berak dioen motakoa" #. MSG_IE_UnknownType -#: po/tmp/ap_String_Id.h.h:1091 +#: po/tmp/ap_String_Id.h.h:1099 #, c-format msgid "File %s is of unknown type" msgstr "%s fitxategiaren mota ezezaguna da" #. MSG_IE_FileNotFound -#: po/tmp/ap_String_Id.h.h:1093 +#: po/tmp/ap_String_Id.h.h:1101 #, c-format msgid "File %s not found" msgstr "Ez da %s fitxategia aurkitu" #. FIELD_Application_Filename -#: po/tmp/ap_String_Id.h.h:1095 +#: po/tmp/ap_String_Id.h.h:1103 msgid "File Name" -msgstr "Fitxategi izena" +msgstr "Fitxategi-izena" #. DLG_FormatTOC_FillStyle -#: po/tmp/ap_String_Id.h.h:1097 +#: po/tmp/ap_String_Id.h.h:1105 msgid "Fill style:" -msgstr "" +msgstr "Betegarri-estiloa:" #. DLG_FR_FindTitle -#: po/tmp/ap_String_Id.h.h:1099 +#: po/tmp/ap_String_Id.h.h:1107 msgid "Find" msgstr "Bilatu" #. MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1101 +#: po/tmp/ap_String_Id.h.h:1109 msgid "Find &next revision" -msgstr "" +msgstr "&Hurrengo berrikuspena bilatu" #. MENU_LABEL_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1103 +#: po/tmp/ap_String_Id.h.h:1111 msgid "Find &previous revision" -msgstr "" +msgstr "&Aurreko berrikuspena bilatu" #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1105 +#: po/tmp/ap_String_Id.h.h:1113 msgid "Find next visible revision in the document" -msgstr "" +msgstr "Dokumentuko hurrengo berrikuspen ikusgarria bilatu" #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1107 +#: po/tmp/ap_String_Id.h.h:1115 msgid "Find previous visible revision in the document" -msgstr "" +msgstr "Dokumentuko aurreko berrikuspen ikusgarria bilatu" #. MENU_STATUSLINE_EDIT_FIND -#: po/tmp/ap_String_Id.h.h:1109 +#: po/tmp/ap_String_Id.h.h:1117 msgid "Find the specified text" msgstr "Zehaztutako testua bilatu" #. FirstLineIndentStatus -#: po/tmp/ap_String_Id.h.h:1111 +#: po/tmp/ap_String_Id.h.h:1119 #, c-format msgid "First Line Indent [%s]" -msgstr "Lehengo lerroaren koska [%s]" +msgstr "Lehenengo lerroaren koska [%s]" #. DLG_Para_SpecialFirstLine -#: po/tmp/ap_String_Id.h.h:1113 +#: po/tmp/ap_String_Id.h.h:1121 msgid "First line" msgstr "Lehenengo lerroa" #. DLG_InsertTable_FixedColSize -#: po/tmp/ap_String_Id.h.h:1115 +#: po/tmp/ap_String_Id.h.h:1123 msgid "Fixed column size:" -msgstr "Zutabeen tamaina finkoa" +msgstr "Zutabe-tamaina finkoa:" #. DLG_Lists_FoldingLevel1 -#: po/tmp/ap_String_Id.h.h:1117 +#: po/tmp/ap_String_Id.h.h:1125 msgid "Fold below level 1" -msgstr "" +msgstr "1go mailaren azpitik tolestu" #. DLG_Lists_FoldingLevel2 -#: po/tmp/ap_String_Id.h.h:1119 +#: po/tmp/ap_String_Id.h.h:1127 msgid "Fold below level 2" -msgstr "" +msgstr "2. mailaren azpitik tolestu" #. DLG_Lists_FoldingLevel3 -#: po/tmp/ap_String_Id.h.h:1121 +#: po/tmp/ap_String_Id.h.h:1129 msgid "Fold below level 3" -msgstr "" +msgstr "3. mailaren azpitik tolestu" #. DLG_Lists_FoldingLevel4 -#: po/tmp/ap_String_Id.h.h:1123 +#: po/tmp/ap_String_Id.h.h:1131 msgid "Fold below level 4" -msgstr "" +msgstr "4. mailaren azpitik tolestu" #. DLG_Para_PreviewFollowParagraph -#: po/tmp/ap_String_Id.h.h:1125 -msgid "" -"Following Paragraph Following Paragraph Following Paragraph Following " -"Paragraph Following Paragraph Following Paragraph Following Paragraph" -msgstr "" -"Hurrengo Paragrafoa Hurrengo Paragrafoa Hurrengo Paragrafoa Hurrengo " -"Paragrafoa Hurrengo Paragrafoa Hurrengo Paragrafoa Hurrengo Paragrafoa" +#: po/tmp/ap_String_Id.h.h:1133 +msgid "Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph" +msgstr "Hurrengo Paragrafoa Hurrengo Paragrafoa Hurrengo Paragrafoa Hurrengo Paragrafoa Hurrengo Paragrafoa Hurrengo Paragrafoa Hurrengo Paragrafoa" #. DLG_Styles_ModifyFont #. TOOLBAR_LABEL_FMT_FONT @@ -2773,1187 +2802,1214 @@ #. TOOLBAR_TOOLTIP_FMT_FONT #. DLG_UFS_FontTitle #. DLG_UFS_FontTab -#: po/tmp/ap_String_Id.h.h:1130 po/tmp/xap_String_Id.h.h:315 +#: po/tmp/ap_String_Id.h.h:1138 +#: po/tmp/xap_String_Id.h.h:335 msgid "Font" -msgstr "" +msgstr "Letra-mota" + +#. TOOLBAR_STATUSLINE_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:1140 +msgid "Font Choose" +msgstr "Letra-mota hautatu" #. TOOLBAR_LABEL_FMT_SIZE #. TOOLBAR_STATUSLINE_FMT_SIZE #. TOOLBAR_TOOLTIP_FMT_SIZE -#: po/tmp/ap_String_Id.h.h:1134 +#: po/tmp/ap_String_Id.h.h:1144 msgid "Font Size" -msgstr "Letra tamaina" +msgstr "Letra-tamaina" + +#. TOOLBAR_LABEL_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:1146 +msgid "Font choose" +msgstr "Letra-mota hautatu" #. TOOLBAR_LABEL_COLOR_FORE #. TOOLBAR_STATUSLINE_COLOR_FORE #. TOOLBAR_TOOLTIP_COLOR_FORE -#: po/tmp/ap_String_Id.h.h:1138 +#: po/tmp/ap_String_Id.h.h:1150 msgid "Font color" -msgstr "Testu kolorea" +msgstr "Testu-kolorea" #. DLG_Lists_ButtonFont -#: po/tmp/ap_String_Id.h.h:1140 +#: po/tmp/ap_String_Id.h.h:1152 msgid "Font..." msgstr "Letra-mota..." #. DLG_Lists_Font #. DLG_UFS_FontLabel -#: po/tmp/ap_String_Id.h.h:1142 po/tmp/xap_String_Id.h.h:317 +#: po/tmp/ap_String_Id.h.h:1154 +#: po/tmp/xap_String_Id.h.h:337 msgid "Font:" -msgstr "" +msgstr "Letra-mota:" #. MENU_LABEL_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1144 +#: po/tmp/ap_String_Id.h.h:1156 msgid "Foot¬e" -msgstr "Orri oineko oharra" +msgstr "Orri-&oina" #. DLG_PageNumbers_Footer #. MENU_LABEL_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1147 +#: po/tmp/ap_String_Id.h.h:1159 msgid "Footer" msgstr "Orri-oina" #. DLG_HdrFtr_FooterFrame -#: po/tmp/ap_String_Id.h.h:1149 +#: po/tmp/ap_String_Id.h.h:1161 msgid "Footer Properties" -msgstr "Orri-oinaren propietateak" +msgstr "Orri-oinen propietateak" #. FooterStatus -#: po/tmp/ap_String_Id.h.h:1151 +#: po/tmp/ap_String_Id.h.h:1163 #, c-format msgid "Footer [%s]" -msgstr "Orri oina [%s]" +msgstr "Orri-oina [%s]" #. FIELD_Numbers_FootnoteAnchor -#: po/tmp/ap_String_Id.h.h:1153 +#: po/tmp/ap_String_Id.h.h:1165 msgid "Footnote anchor" -msgstr "Orri oineko oharraren aingura" +msgstr "Orri-oin aingura" #. FIELD_Numbers_FootnoteReference -#: po/tmp/ap_String_Id.h.h:1155 +#: po/tmp/ap_String_Id.h.h:1167 msgid "Footnote reference" -msgstr "Orri oineko oharraren erreferentzia" +msgstr "Orri-oin erreferentzia" #. DLG_FormatFootnotes_FootStyle -#: po/tmp/ap_String_Id.h.h:1157 +#: po/tmp/ap_String_Id.h.h:1169 msgid "Footnote style" -msgstr "Orri oineko ohar motak" +msgstr "Orri-oin estiloa" #. MENU_LABEL_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:1159 +#: po/tmp/ap_String_Id.h.h:1171 msgid "Footnotes and Endnotes" -msgstr "Bukaerako eta orri-oineko oharrak" +msgstr "Orri-oin eta bukaerako oharrak" #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1162 +#: po/tmp/ap_String_Id.h.h:1174 msgid "Force LTR direction of text" -msgstr "Ezkerretik eskumara idatzi defektuz" +msgstr "Ezker-eskuin noranzkoa behartu" #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_RTL #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1165 +#: po/tmp/ap_String_Id.h.h:1177 msgid "Force RTL direction of text" -msgstr "Eskumatik ezkerrera idatzi defektuz" +msgstr "Eskuin-ezker noranzkoa behartu" #. MENU_STATUSLINE_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:1167 +#: po/tmp/ap_String_Id.h.h:1179 msgid "Force left-to-right direction of text" -msgstr "" +msgstr "Testuaren ezker-eskuin noranzkoa behartu" #. MENU_STATUSLINE_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:1169 +#: po/tmp/ap_String_Id.h.h:1181 msgid "Force right-to-left direction of text" -msgstr "" +msgstr "Testuaren eskuin-ezker noranzkoa behartu" #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1171 +#: po/tmp/ap_String_Id.h.h:1183 msgid "Force text LTR" -msgstr "Ezkerretik eskumara idatzi" +msgstr "Ezker-eskuin behartu" #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1173 +#: po/tmp/ap_String_Id.h.h:1185 msgid "Force text RTL" -msgstr "Eskumatik ezkerrera idatzi" +msgstr "Eskuin-ezker behartu" #. DLG_Styles_ModifyFormat #. TB_Format -#: po/tmp/ap_String_Id.h.h:1176 +#: po/tmp/ap_String_Id.h.h:1188 msgid "Format" msgstr "Formatua" #. MENU_STATUSLINE_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1178 +#: po/tmp/ap_String_Id.h.h:1190 msgid "Format Embedded Object" -msgstr "" +msgstr "Kapsulatutako objektuaren formatua" #. DLG_FormatFootnotes_Endnotes -#: po/tmp/ap_String_Id.h.h:1180 +#: po/tmp/ap_String_Id.h.h:1192 msgid "Format Endnotes" -msgstr "" +msgstr "Bukaerako oharren formatua" #. DLG_FormatFootnotes_Footnotes -#: po/tmp/ap_String_Id.h.h:1182 +#: po/tmp/ap_String_Id.h.h:1194 msgid "Format Footnotes" -msgstr "" +msgstr "Orri-oinen formatua" #. DLG_FormatFootnotes_Title -#: po/tmp/ap_String_Id.h.h:1184 +#: po/tmp/ap_String_Id.h.h:1196 msgid "Format Footnotes and Endnotes" -msgstr "Bukaerako eta orri oineko oharren formatua" +msgstr "Orri-oin eta bukaerako oharren formatua" #. DLG_HdrFtr_Title -#: po/tmp/ap_String_Id.h.h:1186 +#: po/tmp/ap_String_Id.h.h:1198 msgid "Format Header/Footers" msgstr "Goiburu/Orri-oinen formatua" #. MENU_LABEL_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1188 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1200 msgid "Format Object" -msgstr "&Taula formateatu" +msgstr "Objektuaren formatua" #. TOOLBAR_LABEL_FMTPAINTER -#: po/tmp/ap_String_Id.h.h:1190 +#: po/tmp/ap_String_Id.h.h:1202 msgid "Format Painter" -msgstr "&Formatu Margolea" +msgstr "Brotxaren formatua" #. DLG_FormatTableTitle #. MENU_STATUSLINE_TABLE_FORMAT -#: po/tmp/ap_String_Id.h.h:1193 +#: po/tmp/ap_String_Id.h.h:1205 msgid "Format Table" -msgstr "&Taula formateatu" +msgstr "Taularen formatua" #. DLG_FormatTOC_Title -#: po/tmp/ap_String_Id.h.h:1195 +#: po/tmp/ap_String_Id.h.h:1207 msgid "Format Table of Contents" -msgstr "" +msgstr "Eduki-taularen formatua" #. DLG_FormatFrameTitle -#: po/tmp/ap_String_Id.h.h:1197 +#: po/tmp/ap_String_Id.h.h:1209 msgid "Format Text Box" -msgstr "" +msgstr "Testu-kutxaren formatua" #. DLG_Options_Label_ViewFormatTB -#: po/tmp/ap_String_Id.h.h:1199 +#: po/tmp/ap_String_Id.h.h:1211 msgid "Format Toolbar" -msgstr "Formatuaren tresna-barra" +msgstr "Tresna-barraren formatua" #. MENU_STATUSLINE_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:1201 +#: po/tmp/ap_String_Id.h.h:1213 msgid "Format this image" -msgstr "" +msgstr "Irudi honen formatua" #. MENU_STATUSLINE_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:1203 +#: po/tmp/ap_String_Id.h.h:1215 msgid "Format your document using styles" -msgstr "" +msgstr "Estiloak erabiliz formateatu zure dokumentua" #. DLG_Lists_Format #. DLG_DocComparison_Fmt -#: po/tmp/ap_String_Id.h.h:1205 po/tmp/xap_String_Id.h.h:323 +#: po/tmp/ap_String_Id.h.h:1217 +#: po/tmp/xap_String_Id.h.h:343 msgid "Format:" msgstr "Formatua:" #. MENU_LABEL_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1207 +#: po/tmp/ap_String_Id.h.h:1219 msgid "From File" -msgstr "" +msgstr "Artxibo honetatik" #. MENU_LABEL_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1209 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1221 msgid "From LaTeX" -msgstr "Nondik: " +msgstr "LaTeX-etik" + +#. TOOLBAR_LABEL_VIEW_FULL_SCREEN +#. TOOLBAR_STATUSLINE_VIEW_FULL_SCREEN +#. TOOLBAR_TOOLTIP_VIEW_FULL_SCREEN +#: po/tmp/ap_String_Id.h.h:1225 +msgid "Full Screen" +msgstr "Pantaila osoa" #. DLG_FormatTOC_General #. DLG_Options_Label_General #. DLG_MetaData_TAB_General -#: po/tmp/ap_String_Id.h.h:1213 +#: po/tmp/ap_String_Id.h.h:1229 msgid "General" msgstr "Orokorra" #. DLG_Goto_Btn_Goto -#: po/tmp/ap_String_Id.h.h:1215 +#: po/tmp/ap_String_Id.h.h:1231 msgid "Go To" -msgstr "Hona Joan" +msgstr "Hona joan" #. DLG_Goto_Label_What -#: po/tmp/ap_String_Id.h.h:1217 +#: po/tmp/ap_String_Id.h.h:1233 msgid "Go To &What:" -msgstr "Hona Joan:" +msgstr "&Zertara joan:" #. DLG_Goto_Title -#: po/tmp/ap_String_Id.h.h:1219 +#: po/tmp/ap_String_Id.h.h:1235 msgid "Go to..." msgstr "Hona joan..." #. DLG_FormatTOC_HasLabel -#: po/tmp/ap_String_Id.h.h:1221 +#: po/tmp/ap_String_Id.h.h:1237 msgid "H&as label" -msgstr "" +msgstr "Etiketa &dauka" #. DLG_FormatTOC_HeadingText -#: po/tmp/ap_String_Id.h.h:1223 +#: po/tmp/ap_String_Id.h.h:1239 msgid "H&eading text:" -msgstr "" +msgstr "&Izenburuko testua:" #. DLG_Lists_Hand_List #. STYLE_HANDLIST -#: po/tmp/ap_String_Id.h.h:1225 po/tmp/xap_String_Id.h.h:363 +#: po/tmp/ap_String_Id.h.h:1241 +#: po/tmp/xap_String_Id.h.h:383 msgid "Hand List" -msgstr "" +msgstr "Esku-zerrenda" #. DLG_Para_SpecialHanging -#: po/tmp/ap_String_Id.h.h:1227 +#: po/tmp/ap_String_Id.h.h:1243 +#, fuzzy msgid "Hanging" msgstr "Eskegitzen" #. DLG_PageNumbers_Header #. MENU_LABEL_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1230 +#: po/tmp/ap_String_Id.h.h:1246 msgid "Header" msgstr "Goiburua" #. DLG_HdrFtr_HeaderFrame -#: po/tmp/ap_String_Id.h.h:1232 +#: po/tmp/ap_String_Id.h.h:1248 msgid "Header Properties" msgstr "Goiburuaren propietateak" #. HeaderStatus -#: po/tmp/ap_String_Id.h.h:1234 +#: po/tmp/ap_String_Id.h.h:1250 #, c-format msgid "Header [%s]" msgstr "Goiburua [%s]" #. MENU_LABEL_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:1236 +#: po/tmp/ap_String_Id.h.h:1252 msgid "Header/Footers" msgstr "Goiburu/Orri-oinak " #. MSG_CHECK_PRINT_MODE -#: po/tmp/ap_String_Id.h.h:1238 +#: po/tmp/ap_String_Id.h.h:1254 msgid "" -"Headers and Footers can only be created and edited while in Print View " -"Mode. \n" +"Headers and Footers can only be created and edited while in Print View Mode. \n" " To enter this mode choose View then Print Layout from the Menus. \n" " Would you like to enter Print Layout mode right now?" msgstr "" -"Goiburuak eta Orri-oinak soilik editatu daitezke inprimaketan ikusiko den " -"moduan. \n" -"Modu hau aukeratzeko, hautatu Ikusi eta ondoren Inprimaketa Diseinua, " -"menuetan.\n" -"Sartu nahi al duzu Inprimaketa Diseinu moduan orain?" +"Inprimatze-aurrebistan bakarrik sortu eta editatu daitezke goiburuak eta orri-oinak. \n" +" Modu honetan sartzeko, Ikusi menuko Inprimatze-diseinua aukera hautatu ezazu. \n" +" Sartu nahi al duzu Inprimatze-diseinu moduan orain?" #. DLG_Stylist_HeadingStyles -#: po/tmp/ap_String_Id.h.h:1240 +#: po/tmp/ap_String_Id.h.h:1256 msgid "Heading Styles" -msgstr "" +msgstr "Izenburu-estiloak" #. DLG_FormatTOC_HeadingStyle -#: po/tmp/ap_String_Id.h.h:1242 +#: po/tmp/ap_String_Id.h.h:1258 msgid "Heading style:" -msgstr "" +msgstr "Izenburu-estiloa:" #. DLG_Lists_Heart_List #. STYLE_HEARTLIST -#: po/tmp/ap_String_Id.h.h:1244 po/tmp/xap_String_Id.h.h:379 +#: po/tmp/ap_String_Id.h.h:1260 +#: po/tmp/xap_String_Id.h.h:399 msgid "Heart List" -msgstr "" +msgstr "Bihotz-zerrenda" #. DLG_Lists_Hebrew_List -#: po/tmp/ap_String_Id.h.h:1246 +#: po/tmp/ap_String_Id.h.h:1262 msgid "Hebrew List" -msgstr "Hebraitar zerrenda" +msgstr "Zerrenda hebraitarra" #. TOOLBAR_LABEL_HELP #. TOOLBAR_STATUSLINE_HELP #. TOOLBAR_TOOLTIP_HELP -#: po/tmp/ap_String_Id.h.h:1250 +#: po/tmp/ap_String_Id.h.h:1266 msgid "Help" -msgstr "&Laguntza" +msgstr "Laguntza" #. MENU_LABEL_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:1252 +#: po/tmp/ap_String_Id.h.h:1268 msgid "Help &Contents" -msgstr "Laguntzaren Edukiak" +msgstr "Laguntzaren &edukiak" #. MENU_LABEL_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:1254 +#: po/tmp/ap_String_Id.h.h:1270 msgid "Help &Introduction" -msgstr "Laguntzaren sarrera" +msgstr "Laguntzaren &sarrera" #. DLG_Options_Label_Hide -#: po/tmp/ap_String_Id.h.h:1256 +#: po/tmp/ap_String_Id.h.h:1272 msgid "Hide" -msgstr "Izkutatu" +msgstr "Ezkutatu" #. DLG_Options_Label_SpellHideErrors -#: po/tmp/ap_String_Id.h.h:1258 +#: po/tmp/ap_String_Id.h.h:1274 msgid "Hide &spelling errors in the document" -msgstr "Ortografia akatsak izkutatu" +msgstr "Dokumentuko &ortografia akatsak ezkutatu" #. DLG_Lists_FoldingLevelexp -#: po/tmp/ap_String_Id.h.h:1260 +#: po/tmp/ap_String_Id.h.h:1276 +#, fuzzy msgid "Hide text below List Levels" -msgstr "" +msgstr "Zerrenda-mailen azpiko testua ezkutatu" #. TOOLBAR_LABEL_COLOR_BACK #. TOOLBAR_STATUSLINE_COLOR_BACK #. TOOLBAR_TOOLTIP_COLOR_BACK -#: po/tmp/ap_String_Id.h.h:1264 +#: po/tmp/ap_String_Id.h.h:1280 msgid "Highlight" -msgstr "Nabarmentzeko kolorea" +msgstr "Nabarmendu" #. DLG_Spell_IgnoreAll -#: po/tmp/ap_String_Id.h.h:1266 +#: po/tmp/ap_String_Id.h.h:1282 msgid "I&gnore All" -msgstr "Ezikusi dena" +msgstr "&Guztiak ezikusi" #. DLG_FormatTOC_Indent -#: po/tmp/ap_String_Id.h.h:1268 +#: po/tmp/ap_String_Id.h.h:1284 msgid "I&ndent:" -msgstr "" +msgstr "&Koska:" #. InsertModeFieldINS -#: po/tmp/ap_String_Id.h.h:1270 +#: po/tmp/ap_String_Id.h.h:1286 msgid "INS" msgstr "INS" #. DLG_Options_Label_Icons -#: po/tmp/ap_String_Id.h.h:1272 +#: po/tmp/ap_String_Id.h.h:1288 msgid "Icons" msgstr "Ikonoak" #. DLG_Options_Label_Ignore -#: po/tmp/ap_String_Id.h.h:1274 +#: po/tmp/ap_String_Id.h.h:1290 msgid "Ignore" msgstr "Ezikusi" #. DLG_Options_Label_SpellIgnoreWords -#: po/tmp/ap_String_Id.h.h:1276 +#: po/tmp/ap_String_Id.h.h:1292 msgid "Ignore Words" -msgstr "" +msgstr "Hitz ezikusiak" #. MENU_STATUSLINE_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:1278 +#: po/tmp/ap_String_Id.h.h:1294 msgid "Ignore all occurrences of this word in the document" -msgstr "Ezikusi fitxategian hitz hau" +msgstr "Hitz honen agerpen guztiak ezikusi dokumentu honetan" #. DLG_Options_Label_SpellIgnoredWord -#: po/tmp/ap_String_Id.h.h:1280 +#: po/tmp/ap_String_Id.h.h:1296 msgid "Ignored words:" msgstr "Hitz ezikusiak:" #. DLG_FormatFrame_SetImageBackground #. DLG_FormatTable_SetImageBackground -#: po/tmp/ap_String_Id.h.h:1283 +#: po/tmp/ap_String_Id.h.h:1299 msgid "Image For Background" -msgstr "" +msgstr "Atzealderako irudia" #. DLG_Lists_Implies_List #. STYLE_IMPLIES_LIST -#: po/tmp/ap_String_Id.h.h:1285 po/tmp/xap_String_Id.h.h:413 +#: po/tmp/ap_String_Id.h.h:1301 +#: po/tmp/xap_String_Id.h.h:433 msgid "Implies List" -msgstr "" +msgstr "Inplikazio-zerrenda" #. MENU_STATUSLINE_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:1287 +#: po/tmp/ap_String_Id.h.h:1303 msgid "Import style definitions from a document" -msgstr "" +msgstr "Estilo-definizioak inportatu dokumentu batetik" #. DLG_Styles_LBL_InUse -#: po/tmp/ap_String_Id.h.h:1289 +#: po/tmp/ap_String_Id.h.h:1305 msgid "In Use" msgstr "Erabiltzen" #. WORD_PassInvalid -#: po/tmp/ap_String_Id.h.h:1291 +#: po/tmp/ap_String_Id.h.h:1307 msgid "Incorrect Password" msgstr "Pasahitz okerra" #. TOOLBAR_LABEL_INDENT #. TOOLBAR_STATUSLINE_INDENT #. TOOLBAR_TOOLTIP_INDENT -#: po/tmp/ap_String_Id.h.h:1295 +#: po/tmp/ap_String_Id.h.h:1311 msgid "Increase indent" -msgstr "Txikitu koska" +msgstr "Koska handitu" #. DLG_Para_LabelIndentation -#: po/tmp/ap_String_Id.h.h:1297 +#: po/tmp/ap_String_Id.h.h:1313 msgid "Indentation" msgstr "Koska" #. DLG_Para_TabLabelIndentsAndSpacing -#: po/tmp/ap_String_Id.h.h:1299 +#: po/tmp/ap_String_Id.h.h:1315 msgid "Indents and Spacing" -msgstr "&Koskak eta Tarteak" +msgstr "Koskak eta lerroarteak" #. DLG_ToggleCase_FirstUpperCase -#: po/tmp/ap_String_Id.h.h:1301 +#: po/tmp/ap_String_Id.h.h:1317 msgid "Initial Caps" -msgstr "Lehenengo letra larriz" +msgstr "Maiuskulaz hasi guztiak" #. DLG_FormatFootnotes_EndInitialVal -#: po/tmp/ap_String_Id.h.h:1303 +#: po/tmp/ap_String_Id.h.h:1319 msgid "Initial Endnote value" -msgstr "Lehen bukaerako oharraren balioa" +msgstr "Bukaerako oharraren hasierako balioa" #. DLG_FormatFootnotes_FootInitialVal -#: po/tmp/ap_String_Id.h.h:1305 +#: po/tmp/ap_String_Id.h.h:1321 msgid "Initial Footnote value" -msgstr "Lehen orri oineko oharraren balioa" +msgstr "Orri-oinaren hasierako balioa" #. DLG_Break_Insert #. MENU_STATUSLINE_TABLE_INSERT #. DLG_IP_Button_Label -#: po/tmp/ap_String_Id.h.h:1308 po/tmp/xap_String_Id.h.h:423 +#: po/tmp/ap_String_Id.h.h:1324 +#: po/tmp/xap_String_Id.h.h:443 msgid "Insert" -msgstr "Gelaxkak Txertatu" +msgstr "Txertatu" #. MENU_LABEL_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1310 +#: po/tmp/ap_String_Id.h.h:1326 msgid "Insert &Columns" -msgstr "" +msgstr "&Zutabeak txertatu" #. MENU_LABEL_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1312 +#: po/tmp/ap_String_Id.h.h:1328 msgid "Insert &Rows" -msgstr "" +msgstr "&Lerroak txertatu" #. MENU_LABEL_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1314 +#: po/tmp/ap_String_Id.h.h:1330 msgid "Insert &Table" -msgstr "" +msgstr "&Taula txertatu" #. DLG_InsertBookmark_Title #. TOOLBAR_LABEL_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1317 +#: po/tmp/ap_String_Id.h.h:1333 msgid "Insert Bookmark" msgstr "Liburu-marka txertatu" #. DLG_Break_BreakTitle_Capital -#: po/tmp/ap_String_Id.h.h:1319 +#: po/tmp/ap_String_Id.h.h:1335 msgid "Insert Break" -msgstr "" +msgstr "Jauzia txertatu" #. MENU_STATUSLINE_TABLE_INSERT_CELLS -#: po/tmp/ap_String_Id.h.h:1321 +#: po/tmp/ap_String_Id.h.h:1337 msgid "Insert Cells" -msgstr "Gelaxkak Txertatu" +msgstr "Gelaxkak txertatu" #. MENU_STATUSLINE_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1323 +#: po/tmp/ap_String_Id.h.h:1339 msgid "Insert Clipboard contents" msgstr "Arbeleko edukia txertatu" #. DLG_DateTime_DateTimeTitle -#: po/tmp/ap_String_Id.h.h:1325 +#: po/tmp/ap_String_Id.h.h:1341 msgid "Insert Date and Time" -msgstr "Data eta ordua" +msgstr "Data eta ordua txertatu" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1327 +#: po/tmp/ap_String_Id.h.h:1343 msgid "Insert Equation" -msgstr "" +msgstr "Ekuazioa txertatu" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1329 +#: po/tmp/ap_String_Id.h.h:1345 msgid "Insert Equation from a LaTeX expression" -msgstr "" +msgstr "Ekuazioa txertatu LaTeX espresio batetik" #. DLG_Field_FieldTitle_Capital -#: po/tmp/ap_String_Id.h.h:1331 +#: po/tmp/ap_String_Id.h.h:1347 msgid "Insert Field" -msgstr "" +msgstr "Eremua txertatu" #. DLG_InsertHyperlink_Title #. TOOLBAR_LABEL_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1334 +#: po/tmp/ap_String_Id.h.h:1350 msgid "Insert Hyperlink" msgstr "Hiperesteka txertatu" #. TOOLBAR_LABEL_IMG -#: po/tmp/ap_String_Id.h.h:1336 +#: po/tmp/ap_String_Id.h.h:1352 msgid "Insert Image" -msgstr "Txertatu Irudia" +msgstr "Irudia txertatu" #. DLG_MailMerge_MailMergeTitle -#: po/tmp/ap_String_Id.h.h:1338 +#: po/tmp/ap_String_Id.h.h:1354 msgid "Insert Mail Merge Field" -msgstr "" +msgstr "Posta-konbinatze eremua txertatu" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1340 +#: po/tmp/ap_String_Id.h.h:1356 msgid "Insert MathML from a file" -msgstr "" +msgstr "MathML txertatu fitxategi batetik" #. DLG_InsertTable_TableTitle #. MENU_STATUSLINE_TABLE_INSERT_TABLE #. MENU_STATUSLINE_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1344 +#: po/tmp/ap_String_Id.h.h:1360 msgid "Insert Table" -msgstr "Taula Txertatu" +msgstr "Taula txertatu" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER -#: po/tmp/ap_String_Id.h.h:1346 +#: po/tmp/ap_String_Id.h.h:1362 msgid "Insert Unicode direction marker into the document" -msgstr "" +msgstr "Unicode noranzko-marka txertatu dokumentuan" #. MENU_STATUSLINE_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1348 +#: po/tmp/ap_String_Id.h.h:1364 msgid "Insert a Footer" -msgstr "" +msgstr "Orri-oina txertatu" #. MENU_STATUSLINE_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1350 +#: po/tmp/ap_String_Id.h.h:1366 msgid "Insert a Header" -msgstr "" +msgstr "Goiburua txertatu" #. MENU_STATUSLINE_INSERT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:1352 +#: po/tmp/ap_String_Id.h.h:1368 msgid "Insert a Table of Contents based on Headings" -msgstr "" +msgstr "Izenburuetan oinarritutako eduki-taula txertatu" #. MENU_STATUSLINE_INSERT_TEXTBOX -#: po/tmp/ap_String_Id.h.h:1354 +#: po/tmp/ap_String_Id.h.h:1370 msgid "Insert a Text Box" -msgstr "" +msgstr "Testu-kutxa txertatu" #. TOOLBAR_STATUSLINE_FMT_BOOKMARK #. TOOLBAR_TOOLTIP_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1357 +#: po/tmp/ap_String_Id.h.h:1373 msgid "Insert a bookmark into the document" -msgstr "Liburu-marka dokumentuan txertatu" +msgstr "Liburu-marka txertatu dokumentuan" #. MENU_STATUSLINE_INSERT_FIELD -#: po/tmp/ap_String_Id.h.h:1359 +#: po/tmp/ap_String_Id.h.h:1375 msgid "Insert a calculated field" -msgstr "Kalkulatutako eremu bat txertatu" +msgstr "Kalkulatutako eremua txertatu" #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_BEFORE -#: po/tmp/ap_String_Id.h.h:1361 +#: po/tmp/ap_String_Id.h.h:1377 msgid "Insert a column to the left" -msgstr "Txertatu Zutabeak Aurrean" +msgstr "Zutabea txertatu ezkerrean" #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_AFTER #. MENU_STATUSLINE_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1364 +#: po/tmp/ap_String_Id.h.h:1380 msgid "Insert a column to the right" -msgstr "Txertatu zutabeak ostean" +msgstr "Zutabea txertatu eskubian" #. MENU_STATUSLINE_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1366 +#: po/tmp/ap_String_Id.h.h:1382 msgid "Insert a footnote" -msgstr "Txertatu orri oineko oharra" +msgstr "Orri-oina txertatu" #. TOOLBAR_STATUSLINE_FMT_HYPERLINK #. TOOLBAR_TOOLTIP_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1369 +#: po/tmp/ap_String_Id.h.h:1385 msgid "Insert a hyperlink into the document" msgstr "Hiperesteka txertatu dokumentuan" #. MENU_STATUSLINE_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1371 +#: po/tmp/ap_String_Id.h.h:1387 msgid "Insert a mail merge field" -msgstr "" +msgstr "Posta-konbinatze eremua txertatu" #. TOOLBAR_STATUSLINE_INSERT_TABLE #. TOOLBAR_TOOLTIP_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1374 +#: po/tmp/ap_String_Id.h.h:1390 msgid "Insert a new table into your document" -msgstr "Taula berria txertatu dokumentuan" +msgstr "Taula berria txertatu zure dokumentuan" #. MENU_STATUSLINE_INSERT_BREAK -#: po/tmp/ap_String_Id.h.h:1376 +#: po/tmp/ap_String_Id.h.h:1392 msgid "Insert a page, column, or section break" -msgstr "Orri, zutabe edo sekzio jauzia txertatu" - -#. MENU_STATUSLINE_INSERT_PICTURE -#: po/tmp/ap_String_Id.h.h:1378 -msgid "Insert a picture" -msgstr "Irudia txertatu" +msgstr "Orri-, zutabe- edo sekzio-jauzia txertatu" #. MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1380 +#: po/tmp/ap_String_Id.h.h:1394 msgid "Insert a row above" -msgstr "Txertatu errenkadak aurrean" +msgstr "Lerroa txertatu gainean" #. MENU_STATUSLINE_TABLE_INSERT_ROWS_AFTER #. MENU_STATUSLINE_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1383 +#: po/tmp/ap_String_Id.h.h:1397 msgid "Insert a row below" -msgstr "Txertatu errenkadak ostean" +msgstr "Lerroa txertatu azpian" #. MENU_STATUSLINE_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1385 +#: po/tmp/ap_String_Id.h.h:1399 msgid "Insert a symbol or other special character" -msgstr "Karaktere berezi edo ikurra txertatu" +msgstr "Sinboloa edo karaktere berezia txertatu" + +#. MENU_STATUSLINE_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:1401 +msgid "Insert an Annotation" +msgstr "Oharra txertatu" #. MENU_STATUSLINE_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1387 +#: po/tmp/ap_String_Id.h.h:1403 msgid "Insert an automatically-updated page number" -msgstr "Automatikoki eguneratutako orri zenbakia txertatu" +msgstr "Automatikoki eguneratutako orri-zenbakia txertatu" #. MENU_STATUSLINE_INSERT_ENDNOTE -#: po/tmp/ap_String_Id.h.h:1389 +#: po/tmp/ap_String_Id.h.h:1405 msgid "Insert an endnote" -msgstr "Txertatu bukaerako ohar bat" +msgstr "Bukaerako oharra txertatu" #. MENU_STATUSLINE_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:1391 +#: po/tmp/ap_String_Id.h.h:1407 msgid "Insert an existing picture from another file" -msgstr "Irudi bat txertatu beste fitxategi batetik" +msgstr "Irudia txertatu beste fitxategi batetik" #. TOOLBAR_STATUSLINE_IMG #. TOOLBAR_TOOLTIP_IMG -#: po/tmp/ap_String_Id.h.h:1394 +#: po/tmp/ap_String_Id.h.h:1410 msgid "Insert an image into the document" msgstr "Irudia txertatu dokumentuan" #. MENU_STATUSLINE_INSERT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1396 +#: po/tmp/ap_String_Id.h.h:1412 msgid "Insert bookmark" msgstr "Liburu-marka txertatu" #. DLG_Break_BreakTitle -#: po/tmp/ap_String_Id.h.h:1398 +#: po/tmp/ap_String_Id.h.h:1414 msgid "Insert break" -msgstr "Jauzia" +msgstr "Jauzia txertatu" #. MENU_STATUSLINE_INSERT_CLIPART -#: po/tmp/ap_String_Id.h.h:1400 +#: po/tmp/ap_String_Id.h.h:1416 msgid "Insert clipart" msgstr "Clip Art irudia txertatu" #. DLG_Field_FieldTitle -#: po/tmp/ap_String_Id.h.h:1402 +#: po/tmp/ap_String_Id.h.h:1418 msgid "Insert field" -msgstr "Eremu" +msgstr "Eremua txertatu" #. MENU_STATUSLINE_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1404 +#: po/tmp/ap_String_Id.h.h:1420 msgid "Insert hyperlink" msgstr "Hiperesteka txertatu" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:1406 +#: po/tmp/ap_String_Id.h.h:1422 msgid "Insert left-to-right direction marker (LRM)" -msgstr "" +msgstr "Ezker-eskuin noranzko-marka (LRM) txertatu" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:1408 +#: po/tmp/ap_String_Id.h.h:1424 msgid "Insert right-to-left direction marker (RLM)" -msgstr "" +msgstr "Eskuin-ezker noranzko-marka (RLM) txertatu" #. TOOLBAR_STATUSLINE_INSERT_SYMBOL #. TOOLBAR_TOOLTIP_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1411 +#: po/tmp/ap_String_Id.h.h:1427 msgid "Insert symbol" -msgstr "Sinboloa Txertatu" +msgstr "Sinboloa txertatu" #. TOOLBAR_LABEL_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1413 +#: po/tmp/ap_String_Id.h.h:1429 msgid "Insert table" -msgstr "Taula Txertatu" +msgstr "Taula txertatu" #. MENU_STATUSLINE_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:1415 +#: po/tmp/ap_String_Id.h.h:1431 msgid "Insert the Sum of a Table Column" -msgstr "" +msgstr "Taula bateko zutabe baten batura txertatu" #. MENU_STATUSLINE_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:1417 +#: po/tmp/ap_String_Id.h.h:1433 msgid "Insert the Sum of a Table Row" -msgstr "" +msgstr "Taula bateko lerro baten batura txertatu" #. MENU_STATUSLINE_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1419 +#: po/tmp/ap_String_Id.h.h:1435 msgid "Insert the contents of another file" msgstr "Beste fitxategi baten edukiak txertatu" #. MENU_STATUSLINE_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:1421 +#: po/tmp/ap_String_Id.h.h:1437 msgid "Insert the date and/or time" -msgstr "Data edota ordua txertatu" +msgstr "Data edo/eta ordua txertatu" #. MENU_STATUSLINE_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1423 +#: po/tmp/ap_String_Id.h.h:1439 msgid "Insert unformatted clipboard contents" -msgstr "Arbeleko edukia txertatu formatu gabe" +msgstr "Arbeleko edukia txertatu formaturik gabe" #. DLG_Options_Label_ViewUnprintable -#: po/tmp/ap_String_Id.h.h:1425 +#: po/tmp/ap_String_Id.h.h:1441 msgid "Invisible &Layout Marks" -msgstr "Diseinu marka ikusezinak" +msgstr "&Diseinu-marka ikusezinak" #. TOOLBAR_LABEL_FMT_ITALIC #. TOOLBAR_STATUSLINE_FMT_ITALIC #. TOOLBAR_TOOLTIP_FMT_ITALIC #. DLG_UFS_StyleItalic -#: po/tmp/ap_String_Id.h.h:1429 po/tmp/xap_String_Id.h.h:453 +#: po/tmp/ap_String_Id.h.h:1445 +#: po/tmp/xap_String_Id.h.h:473 msgid "Italic" -msgstr "" +msgstr "Etzana" #. MENU_STATUSLINE_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1431 +#: po/tmp/ap_String_Id.h.h:1447 msgid "Jump to hyperlink" -msgstr "" +msgstr "Hiperestekara jauzi" #. DLG_Para_AlignJustified -#: po/tmp/ap_String_Id.h.h:1433 +#: po/tmp/ap_String_Id.h.h:1449 msgid "Justified" msgstr "Justifikatuta" #. TOOLBAR_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1435 +#: po/tmp/ap_String_Id.h.h:1451 msgid "Justify" -msgstr "&Justifikatu" +msgstr "Justifikatu" #. TOOLBAR_STATUSLINE_ALIGN_JUSTIFY #. TOOLBAR_TOOLTIP_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1438 +#: po/tmp/ap_String_Id.h.h:1454 msgid "Justify paragraph" msgstr "Paragrafoa justifikatu" #. MENU_STATUSLINE_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1440 +#: po/tmp/ap_String_Id.h.h:1456 msgid "Justify the paragraph" -msgstr "Paragrafoa Justifikatu" +msgstr "Paragrafoa justifikatu" #. DLG_Para_PushKeepWithNext -#: po/tmp/ap_String_Id.h.h:1442 +#: po/tmp/ap_String_Id.h.h:1458 msgid "Keep with ne&xt" -msgstr "Hurrengoarekin mantendu" +msgstr "&Hurrengoarekin mantendu" #. FIELD_PieceTable_Test -#: po/tmp/ap_String_Id.h.h:1444 +#: po/tmp/ap_String_Id.h.h:1460 msgid "Kevins Test" msgstr "Kevin-en test-a" #. FIELD_Document_Keywords -#: po/tmp/ap_String_Id.h.h:1446 +#: po/tmp/ap_String_Id.h.h:1462 msgid "Keywords" -msgstr "Hitz klabeak" +msgstr "Gako-hitzak" #. DLG_MetaData_Keywords_LBL -#: po/tmp/ap_String_Id.h.h:1448 +#: po/tmp/ap_String_Id.h.h:1464 msgid "Keywords:" -msgstr "Hitz klabeak:" +msgstr "Gako-hitzak:" #. DLG_Latex_LatexTitle #. DLG_Latex_LatexEquation -#: po/tmp/ap_String_Id.h.h:1451 +#: po/tmp/ap_String_Id.h.h:1467 msgid "LaTeX Equation" -msgstr "" +msgstr "LaTeX ekuazioa" #. DLG_Lists_Indent -#: po/tmp/ap_String_Id.h.h:1453 +#: po/tmp/ap_String_Id.h.h:1469 msgid "Label Align:" -msgstr "Etiketa lerrokatu:" +msgstr "Etiketa-lerrokatzea:" #. DLG_FormatTOC_DetailsTop -#: po/tmp/ap_String_Id.h.h:1455 +#: po/tmp/ap_String_Id.h.h:1471 msgid "Label Definitions" -msgstr "" +msgstr "Etiketa-definizioak" #. DLG_Styles_ModifyLanguage #. DLG_Options_Label_Language #. FIELD_Document_Language -#: po/tmp/ap_String_Id.h.h:1459 +#: po/tmp/ap_String_Id.h.h:1475 msgid "Language" -msgstr "" +msgstr "Hizkuntza" #. DLG_Options_Label_LangSettings -#: po/tmp/ap_String_Id.h.h:1461 +#: po/tmp/ap_String_Id.h.h:1477 msgid "Language settings" msgstr "Lengoaia ezarpenak" #. DLG_MetaData_Languages_LBL -#: po/tmp/ap_String_Id.h.h:1463 +#: po/tmp/ap_String_Id.h.h:1479 msgid "Language(s):" msgstr "Lengoaia(k):" #. DLG_Options_Label_Layout -#: po/tmp/ap_String_Id.h.h:1465 +#: po/tmp/ap_String_Id.h.h:1481 msgid "Layout" msgstr "Diseinua" #. DLG_FormatTOC_LayoutDetails -#: po/tmp/ap_String_Id.h.h:1467 +#: po/tmp/ap_String_Id.h.h:1483 msgid "Layout Details" -msgstr "" +msgstr "Diseinuaren xehetasunak" #. DLG_Tab_Label_Leader -#: po/tmp/ap_String_Id.h.h:1469 +#: po/tmp/ap_String_Id.h.h:1485 +#, fuzzy msgid "Leader" -msgstr "Lider" +msgstr "Betegarria" #. DLG_Para_AlignLeft #. DLG_Tab_Radio_Left #. DLG_PageNumbers_Left #. TOOLBAR_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1474 +#: po/tmp/ap_String_Id.h.h:1490 msgid "Left" -msgstr "Ezkerrean" +msgstr "Ezker" #. LeftIndentStatus -#: po/tmp/ap_String_Id.h.h:1476 +#: po/tmp/ap_String_Id.h.h:1492 #, c-format msgid "Left Indent [%s]" -msgstr "Ezkerreko koska [%s]" +msgstr "Ezker koska [%s]" #. LeftIndentTextIndentStatus -#: po/tmp/ap_String_Id.h.h:1478 +#: po/tmp/ap_String_Id.h.h:1494 #, c-format msgid "Left Indent [%s] First Line Indent [%s]" -msgstr "Ezkerreko koska [%s] Lehenengo lerroko koska [%s]" +msgstr "Ezker koska [%s] Lehenengo lerroaren koska [%s]" #. LeftMarginStatus -#: po/tmp/ap_String_Id.h.h:1480 +#: po/tmp/ap_String_Id.h.h:1496 #, c-format msgid "Left Margin [%s]" -msgstr "Ezkerreko marjina [%s]" +msgstr "Ezker marjina [%s]" #. TabToggleLeftTab -#: po/tmp/ap_String_Id.h.h:1482 +#: po/tmp/ap_String_Id.h.h:1498 msgid "Left Tab" -msgstr "Ezkerreko tabulazioa" +msgstr "Ezker tabulazioa" #. TOOLBAR_STATUSLINE_ALIGN_LEFT #. TOOLBAR_TOOLTIP_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1485 +#: po/tmp/ap_String_Id.h.h:1501 msgid "Left alignment" -msgstr "Ezkerreko Lerrokaketa" +msgstr "Ezker lerrokatzea" #. MENU_STATUSLINE_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1487 +#: po/tmp/ap_String_Id.h.h:1503 msgid "Left-align the paragraph" -msgstr "Ezkerraldean justifikatu paragrafoa" +msgstr "Ezkerraldean lerrokatu paragrafoa" #. DLG_FormatTOC_Level1 -#: po/tmp/ap_String_Id.h.h:1489 +#: po/tmp/ap_String_Id.h.h:1505 msgid "Level 1" -msgstr "" +msgstr "1. maila" #. DLG_FormatTOC_Level2 -#: po/tmp/ap_String_Id.h.h:1491 +#: po/tmp/ap_String_Id.h.h:1507 msgid "Level 2" -msgstr "" +msgstr "2. maila" #. DLG_FormatTOC_Level3 -#: po/tmp/ap_String_Id.h.h:1493 +#: po/tmp/ap_String_Id.h.h:1509 msgid "Level 3" -msgstr "" +msgstr "3. maila" #. DLG_FormatTOC_Level4 -#: po/tmp/ap_String_Id.h.h:1495 +#: po/tmp/ap_String_Id.h.h:1511 msgid "Level 4" -msgstr "" +msgstr "4. maila" #. DLG_Lists_DelimiterString -#: po/tmp/ap_String_Id.h.h:1497 +#: po/tmp/ap_String_Id.h.h:1513 msgid "Level Delimiter:" -msgstr "Maila Mugatzailea:" +msgstr "Maila-mugatzailea:" #. DLG_Lists_Level -#: po/tmp/ap_String_Id.h.h:1499 +#: po/tmp/ap_String_Id.h.h:1515 msgid "Level:" msgstr "Maila:" #. DLG_Para_LabelLineSpacing -#: po/tmp/ap_String_Id.h.h:1501 +#: po/tmp/ap_String_Id.h.h:1517 msgid "Li&ne spacing:" -msgstr "Lerro tarteak:" +msgstr "&Lerroarteak:" #. DLG_Goto_Target_Line -#: po/tmp/ap_String_Id.h.h:1503 +#: po/tmp/ap_String_Id.h.h:1519 msgid "Line" msgstr "Lerroa" #. FIELD_Numbers_LineCount -#: po/tmp/ap_String_Id.h.h:1505 +#: po/tmp/ap_String_Id.h.h:1521 msgid "Line Count" msgstr "Lerro kopurua" #. MENU_STATUSLINE_FMT_TOPLINE -#: po/tmp/ap_String_Id.h.h:1507 +#: po/tmp/ap_String_Id.h.h:1523 msgid "Line above the selection (toggle)" -msgstr "Aukeratutakoa gainmarratu" +msgstr "Hautespena gainmarratu/desmarratu" #. DLG_Para_TabLabelLineAndPageBreaks -#: po/tmp/ap_String_Id.h.h:1509 +#: po/tmp/ap_String_Id.h.h:1525 msgid "Line and Page Breaks" -msgstr "Lerro eta orri jauziak" +msgstr "Lerro- eta orri-jauziak" #. MENU_STATUSLINE_FMT_BOTTOMLINE -#: po/tmp/ap_String_Id.h.h:1511 +#: po/tmp/ap_String_Id.h.h:1527 msgid "Line below the selection (toggle)" -msgstr "Aukeratutakoa azpimarratu" +msgstr "Hautespena azpimarratu/desmarratu" #. DLG_Column_Line_Between -#: po/tmp/ap_String_Id.h.h:1513 +#: po/tmp/ap_String_Id.h.h:1529 msgid "Line between" -msgstr "Marratu zutabe tartean" +msgstr "Zutabe arteko marra" #. DLG_WordCount_Lines -#: po/tmp/ap_String_Id.h.h:1515 +#: po/tmp/ap_String_Id.h.h:1531 msgid "Lines:" -msgstr "Lerroak" +msgstr "Lerroak:" #. DLG_Styles_List -#: po/tmp/ap_String_Id.h.h:1517 +#: po/tmp/ap_String_Id.h.h:1533 msgid "List" msgstr "Zerrenda" #. FIELD_Numbers_ListLabel -#: po/tmp/ap_String_Id.h.h:1519 +#: po/tmp/ap_String_Id.h.h:1535 msgid "List Label" -msgstr "Etiketa Zerrenda" +msgstr "Zerrenda-etiketa" #. DLG_Lists_PageProperties -#: po/tmp/ap_String_Id.h.h:1521 +#: po/tmp/ap_String_Id.h.h:1537 msgid "List Properties" -msgstr "" +msgstr "Zerrenden propietateak" #. DLG_Stylist_ListStyles -#: po/tmp/ap_String_Id.h.h:1523 +#: po/tmp/ap_String_Id.h.h:1539 msgid "List Styles" -msgstr "" +msgstr "Zerrenden estiloak" #. DLG_Lists_Title -#: po/tmp/ap_String_Id.h.h:1525 +#: po/tmp/ap_String_Id.h.h:1541 msgid "Lists for " -msgstr "Zerrendak " +msgstr "Zerrendak" #. MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1527 +#: po/tmp/ap_String_Id.h.h:1543 msgid "Lock the layout of the current toolbars" -msgstr "" +msgstr "Oraingo tresna-barren diseinua lokatu" #. DLG_Lists_Lower_Case_List #. STYLE_LOWERCASELIST -#: po/tmp/ap_String_Id.h.h:1529 po/tmp/xap_String_Id.h.h:489 +#: po/tmp/ap_String_Id.h.h:1545 +#: po/tmp/xap_String_Id.h.h:512 msgid "Lower Case List" -msgstr "" +msgstr "Zerrenda minuskulaz" #. DLG_Lists_Lower_Roman_List #. STYLE_LOWERROMANLIST -#: po/tmp/ap_String_Id.h.h:1531 po/tmp/xap_String_Id.h.h:491 +#: po/tmp/ap_String_Id.h.h:1547 +#: po/tmp/xap_String_Id.h.h:514 msgid "Lower Roman List" -msgstr "" - -#. MENU_LABEL_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1533 -msgid "M&erge documents" -msgstr "" +msgstr "Zerrenda erromatarra, minuskulaz" #. FIELD_Application_MailMerge #. MENU_STATUSLINE_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1536 +#: po/tmp/ap_String_Id.h.h:1550 msgid "Mail Merge" -msgstr "Posta batu" +msgstr "Posta konbinatu" #. MENU_STATUSLINE_FMT_BOLD -#: po/tmp/ap_String_Id.h.h:1538 +#: po/tmp/ap_String_Id.h.h:1552 msgid "Make the selection bold (toggle)" -msgstr "Aukeratutakoa lodi bihurtu" +msgstr "Hautespena lodi bihurtu" #. MENU_STATUSLINE_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:1540 +#: po/tmp/ap_String_Id.h.h:1554 msgid "Make the selection italic (toggle)" -msgstr "Aukeratutakoa etzan bihurtu" +msgstr "Hautespena etzan bihurtu" #. MENU_STATUSLINE_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:1542 +#: po/tmp/ap_String_Id.h.h:1556 msgid "Make the selection subscript (toggle)" -msgstr "Aukeratutakoa azpiindize bihurtu" +msgstr "Hautespena azpiindize bihurtu" #. MENU_STATUSLINE_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:1544 +#: po/tmp/ap_String_Id.h.h:1558 msgid "Make the selection superscript (toggle)" -msgstr "Aukeratutakoa superindize bihurtu" +msgstr "Hautespena superindize bihurtu" #. MENU_STATUSLINE_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:1546 +#: po/tmp/ap_String_Id.h.h:1560 msgid "Manage changes in document" -msgstr "Dokumentuan kudeatu aldaketak" +msgstr "Dokumentuaren aldaketak kudeatu" #. MENU_STATUSLINE_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:1548 +#: po/tmp/ap_String_Id.h.h:1562 msgid "Manage plugins" -msgstr "Plugin-ak administratu" +msgstr "Plugin-ak kudeatu" #. DLG_PageSetup_Margin -#: po/tmp/ap_String_Id.h.h:1550 +#: po/tmp/ap_String_Id.h.h:1564 msgid "Margin" -msgstr "&Marjina" +msgstr "Marjina" #. DLG_MarkRevisions_Title -#: po/tmp/ap_String_Id.h.h:1552 +#: po/tmp/ap_String_Id.h.h:1566 msgid "Mark Revisions" msgstr "Berrikuspenak markatu" #. MENU_STATUSLINE_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:1554 +#: po/tmp/ap_String_Id.h.h:1568 msgid "Mark changes as you type" -msgstr "Idazten den bitartean ortografia zuzendu" +msgstr "Aldaketak markatu idatzi ahala" #. FIELD_PieceTable_MartinTest -#: po/tmp/ap_String_Id.h.h:1556 +#: po/tmp/ap_String_Id.h.h:1570 msgid "Martins Test" msgstr "Martin-en test-a" #. DLG_Column_Size -#: po/tmp/ap_String_Id.h.h:1558 +#: po/tmp/ap_String_Id.h.h:1572 msgid "Max Column size" -msgstr "Zutabeen gehiengo tamaina" +msgstr "Zutabe-tamaina maximoa" + +#. TOOLBAR_LABEL_MENU +#. TOOLBAR_STATUSLINE_MENU +#. TOOLBAR_TOOLTIP_MENU +#: po/tmp/ap_String_Id.h.h:1576 +msgid "Menu" +msgstr "Menua" #. DLG_MergeCells_Above -#: po/tmp/ap_String_Id.h.h:1560 +#: po/tmp/ap_String_Id.h.h:1578 msgid "Merge Above" -msgstr "Batu goian" +msgstr "Goian konbinatu" #. DLG_MergeCells_Below -#: po/tmp/ap_String_Id.h.h:1562 +#: po/tmp/ap_String_Id.h.h:1580 msgid "Merge Below" -msgstr "Batu behean" +msgstr "Azpian konbinatu" #. DLG_MergeCellsTitle #. DLG_MergeCells_Frame #. MENU_STATUSLINE_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1566 +#: po/tmp/ap_String_Id.h.h:1584 msgid "Merge Cells" -msgstr "Gelaxkak batu" +msgstr "Gelaxkak konbinatu" #. DLG_MergeCells_Left -#: po/tmp/ap_String_Id.h.h:1568 +#: po/tmp/ap_String_Id.h.h:1586 msgid "Merge Left" -msgstr "Batu ezkerrean" +msgstr "Ezkerrean konbinatu" #. DLG_MergeCells_Right -#: po/tmp/ap_String_Id.h.h:1570 +#: po/tmp/ap_String_Id.h.h:1588 msgid "Merge Right" -msgstr "Batu Eskuinean" +msgstr "Eskuinean konbinatu" #. TOOLBAR_LABEL_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1572 +#: po/tmp/ap_String_Id.h.h:1590 msgid "Merge above" -msgstr "Batu goian" +msgstr "Gainean konbinatu" #. MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1574 +#: po/tmp/ap_String_Id.h.h:1592 msgid "Merge another document into the active document using revision marks" -msgstr "" +msgstr "Beste dokumentu bat konbinatu oraingo dokumentuarekin, berrikuspen markak erabiliz" #. TOOLBAR_LABEL_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1576 +#: po/tmp/ap_String_Id.h.h:1594 msgid "Merge below" -msgstr "Batu behean" +msgstr "Azpian konbinatu" #. TOOLBAR_LABEL_MERGE_CELLS #. TOOLBAR_STATUSLINE_MERGE_CELLS #. TOOLBAR_TOOLTIP_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1580 +#: po/tmp/ap_String_Id.h.h:1598 msgid "Merge cells" -msgstr "Gelaxkak batu" +msgstr "Gelaxkak konbinatu" #. TOOLBAR_LABEL_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1582 +#: po/tmp/ap_String_Id.h.h:1600 msgid "Merge left" -msgstr "Batu ezkerrean" +msgstr "Ezkerrean konbinatu" #. TOOLBAR_LABEL_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1584 +#: po/tmp/ap_String_Id.h.h:1602 msgid "Merge right" -msgstr "Batu eskuinean" +msgstr "Eskuinean konbinatu" #. TOOLBAR_STATUSLINE_MERGEABOVE #. TOOLBAR_TOOLTIP_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1587 +#: po/tmp/ap_String_Id.h.h:1605 msgid "Merge with cell above" -msgstr "Batu goiko gelaxkarekin" +msgstr "Gaineko gelaxkarekin konbinatu" #. TOOLBAR_STATUSLINE_MERGEBELOW #. TOOLBAR_TOOLTIP_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1590 +#: po/tmp/ap_String_Id.h.h:1608 msgid "Merge with cell below" -msgstr "Batu beheko gelaxkarekin" +msgstr "Azpiko gelaxkarekin konbinatu" #. TOOLBAR_STATUSLINE_MERGELEFT #. TOOLBAR_TOOLTIP_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1593 +#: po/tmp/ap_String_Id.h.h:1611 msgid "Merge with left cell" -msgstr "Batu ezkerreko gelaxkarekin" +msgstr "Ezkerreko gelaxkarekin konbinatu" #. TOOLBAR_STATUSLINE_MERGERIGHT #. TOOLBAR_TOOLTIP_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1596 +#: po/tmp/ap_String_Id.h.h:1614 msgid "Merge with right cell" -msgstr "Batu eskuineko gelaxkarekin" +msgstr "Eskuineko gelaxkarekin konbinatu" #. FIELD_DateTime_MilTime -#: po/tmp/ap_String_Id.h.h:1598 +#: po/tmp/ap_String_Id.h.h:1616 msgid "Military Time" msgstr "Ordua (0tik 24ra)" #. DLG_Options_TabLabel_Misc -#: po/tmp/ap_String_Id.h.h:1600 +#: po/tmp/ap_String_Id.h.h:1618 msgid "Misc." msgstr "Denetarik" #. DLG_Stylist_MiscStyles -#: po/tmp/ap_String_Id.h.h:1602 +#: po/tmp/ap_String_Id.h.h:1620 msgid "Miscellaneous Styles" -msgstr "" +msgstr "Hainbat estilo" #. DLG_Styles_ModifyTitle -#: po/tmp/ap_String_Id.h.h:1604 +#: po/tmp/ap_String_Id.h.h:1622 msgid "Modify Styles" -msgstr "Estiloak aldatu" +msgstr "Estiloak modifikatu" #. DLG_Styles_Modify -#: po/tmp/ap_String_Id.h.h:1606 +#: po/tmp/ap_String_Id.h.h:1624 msgid "Modify..." -msgstr "Aldatu..." +msgstr "Midifikatu..." #. FIELD_DateTime_MonthDayYear -#: po/tmp/ap_String_Id.h.h:1608 +#: po/tmp/ap_String_Id.h.h:1626 msgid "Month Day, Year" -msgstr "Hilea Eguna, Urtea" +msgstr "Hila eguna, urtea" #. MENU_STATUSLINE_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:1610 +#: po/tmp/ap_String_Id.h.h:1628 msgid "Move the insertion point to a specific location" -msgstr "Mugi txertatzeko puntua leku konkretu batera" +msgstr "Txertatze-puntua kokapen jakin batera mugitu" #. FIELD_DateTime_MthDayYear -#: po/tmp/ap_String_Id.h.h:1612 +#: po/tmp/ap_String_Id.h.h:1630 msgid "Mth. Day, Year" -msgstr "Hilea. Eguna, Urtea" +msgstr "Hila (lab.) eguna, urtea" #. DLG_Para_SpacingMultiple -#: po/tmp/ap_String_Id.h.h:1614 +#: po/tmp/ap_String_Id.h.h:1632 msgid "Multiple" msgstr "Anitza" #. TOOLBAR_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:1616 +#: po/tmp/ap_String_Id.h.h:1634 msgid "New" -msgstr "&Berria" +msgstr "Berria" #. DLG_NEW_Title -#: po/tmp/ap_String_Id.h.h:1618 +#: po/tmp/ap_String_Id.h.h:1636 msgid "New Document" -msgstr "Txantiloi bat aukeratu" +msgstr "Dokumentu berria" #. DLG_Lists_New_List_Label -#: po/tmp/ap_String_Id.h.h:1620 +#: po/tmp/ap_String_Id.h.h:1638 msgid "New List Label" -msgstr "Etiketa Zerrenda Berria" +msgstr "Zerrenda-etiketa berria" #. DLG_Lists_New_List_Type -#: po/tmp/ap_String_Id.h.h:1622 +#: po/tmp/ap_String_Id.h.h:1640 msgid "" "New List \n" "Type" @@ -3962,176 +4018,177 @@ "Mota" #. DLG_Lists_Starting_Value -#: po/tmp/ap_String_Id.h.h:1624 +#: po/tmp/ap_String_Id.h.h:1642 msgid "" "New Starting \n" "Value" msgstr "" -"Berria hasi \n" -"Balioa" +"Berria lehenetsi \n" +"berria" #. DLG_Styles_NewTitle -#: po/tmp/ap_String_Id.h.h:1626 +#: po/tmp/ap_String_Id.h.h:1644 msgid "New Style" msgstr "Estilo berria" #. DLG_Styles_New -#: po/tmp/ap_String_Id.h.h:1628 +#: po/tmp/ap_String_Id.h.h:1646 msgid "New..." msgstr "Berria..." #. DLG_Goto_Btn_Next -#: po/tmp/ap_String_Id.h.h:1630 +#: po/tmp/ap_String_Id.h.h:1648 msgid "Next >>" msgstr "Hurrengoa >>" #. DLG_NEW_NoFile -#: po/tmp/ap_String_Id.h.h:1632 +#: po/tmp/ap_String_Id.h.h:1650 msgid "No File" -msgstr "Fitxategi bat ere ez" +msgstr "Fitxategirik ez" #. DLG_Lists_FoldingLevel0 -#: po/tmp/ap_String_Id.h.h:1634 +#: po/tmp/ap_String_Id.h.h:1652 msgid "No Folding" -msgstr "" +msgstr "Ez tolestu" #. DLG_Styles_ErrNoStyle -#: po/tmp/ap_String_Id.h.h:1636 +#: po/tmp/ap_String_Id.h.h:1654 msgid "" "No Style selected \n" " so it cannot be modified" msgstr "" -"Ez da estiloa aukeratu \n" -" beraz ezin daiteke aldatu" +"Ez da estilorik hautatu, \n" +" beraz, ezin da modifikatu" #. SCRIPT_NOSCRIPTS -#: po/tmp/ap_String_Id.h.h:1638 +#: po/tmp/ap_String_Id.h.h:1656 msgid "No scripts found" -msgstr "Ez dira aurkitu script-ak" +msgstr "Ez da script-ik aurkitu" #. DLG_FormatTOC_None #. DLG_Styles_DefNone #. DLG_Tab_Radio_NoAlign #. DLG_Lists_Type_none -#: po/tmp/ap_String_Id.h.h:1643 +#: po/tmp/ap_String_Id.h.h:1661 msgid "None" -msgstr "Inon ere ez" +msgstr "Bat ere ez" #. TOOLBAR_LABEL_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:1645 +#: po/tmp/ap_String_Id.h.h:1663 msgid "None before" -msgstr "Aurretik bat ere ez" +msgstr "Bat ere ez aurretik" #. MENU_STATUSLINE_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:1647 +#: po/tmp/ap_String_Id.h.h:1665 msgid "Normal View" -msgstr "Ikuspen Arrunta" +msgstr "Ikuspen normala" #. DLG_Spell_UnknownWord -#: po/tmp/ap_String_Id.h.h:1649 +#: po/tmp/ap_String_Id.h.h:1667 msgid "Not in dictionary&:" -msgstr "Ez dago hiztegian:" +msgstr "Ez dago &hiztegian:" #. DLG_Stylist_FootnoteStyles -#: po/tmp/ap_String_Id.h.h:1651 +#: po/tmp/ap_String_Id.h.h:1669 msgid "Note Styles" -msgstr "" +msgstr "Oharren estiloak" #. DLG_Column_Number_Cols -#: po/tmp/ap_String_Id.h.h:1653 +#: po/tmp/ap_String_Id.h.h:1671 msgid "Number of Columns" msgstr "Zutabe kopurua" #. FIELD_Numbers_PagesCount -#: po/tmp/ap_String_Id.h.h:1655 +#: po/tmp/ap_String_Id.h.h:1673 msgid "Number of Pages" -msgstr "Orrialde kopurua" +msgstr "Orri kopurua" #. DLG_Column_Number -#: po/tmp/ap_String_Id.h.h:1657 +#: po/tmp/ap_String_Id.h.h:1675 msgid "Number of columns" msgstr "Zutabe kopurua" #. DLG_InsertTable_NumCols -#: po/tmp/ap_String_Id.h.h:1659 +#: po/tmp/ap_String_Id.h.h:1677 msgid "Number of columns:" msgstr "Zutabe kopurua:" #. DLG_InsertTable_NumRows -#: po/tmp/ap_String_Id.h.h:1661 +#: po/tmp/ap_String_Id.h.h:1679 msgid "Number of rows:" -msgstr "Errenkada kopurua:" +msgstr "Lerro kopurua:" #. DLG_Lists_Type_numbered -#: po/tmp/ap_String_Id.h.h:1663 +#: po/tmp/ap_String_Id.h.h:1681 msgid "Numbered" -msgstr "Zenbatua" +msgstr "Zenbakitua" #. DLG_Lists_Numbered_List #. STYLE_NUMBER_LIST -#: po/tmp/ap_String_Id.h.h:1665 po/tmp/xap_String_Id.h.h:531 +#: po/tmp/ap_String_Id.h.h:1683 +#: po/tmp/xap_String_Id.h.h:558 msgid "Numbered List" -msgstr "" +msgstr "Zerrenda zenbakitua" #. DLG_FormatFootnotes_FootnoteRestart #. DLG_Styles_ModifyNumbering #. TOOLBAR_LABEL_LISTS_NUMBERS #. TOOLBAR_STATUSLINE_LISTS_NUMBERS #. TOOLBAR_TOOLTIP_LISTS_NUMBERS -#: po/tmp/ap_String_Id.h.h:1671 +#: po/tmp/ap_String_Id.h.h:1689 msgid "Numbering" -msgstr "Zenbaketa" +msgstr "Zenbakitzea" #. FIELD_Type_Numbers -#: po/tmp/ap_String_Id.h.h:1673 +#: po/tmp/ap_String_Id.h.h:1691 msgid "Numbers" msgstr "Zenbakiak" #. InsertModeFieldOVR -#: po/tmp/ap_String_Id.h.h:1675 +#: po/tmp/ap_String_Id.h.h:1693 msgid "OVR" msgstr "SOB" #. DLG_Column_One -#: po/tmp/ap_String_Id.h.h:1677 +#: po/tmp/ap_String_Id.h.h:1695 msgid "One" msgstr "Bat" #. MENU_LABEL_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1679 +#: po/tmp/ap_String_Id.h.h:1697 msgid "Op&en Copy" -msgstr "&Inportatu" +msgstr "&Kopia ireki" #. TOOLBAR_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1681 +#: po/tmp/ap_String_Id.h.h:1699 msgid "Open" -msgstr "&Ireki" +msgstr "Ireki" #. MENU_LABEL_OPEN_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1683 +#: po/tmp/ap_String_Id.h.h:1701 msgid "Open Template" -msgstr "Txantiloia Ireki" +msgstr "Txantiloia ireki" #. MENU_STATUSLINE_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1685 +#: po/tmp/ap_String_Id.h.h:1703 msgid "Open a document by making a copy" -msgstr "Dokumentua inportatu" +msgstr "Dokumentua ireki, kopia bat eginez" #. MENU_STATUSLINE_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1687 +#: po/tmp/ap_String_Id.h.h:1705 msgid "Open a recently used document" -msgstr "Azken erabilitako dokumentua ireki" +msgstr "Azkenaldian erabilitako dokumentu bat ireki" #. DLG_NEW_Open #. MENU_STATUSLINE_FILE_OPEN #. TOOLBAR_STATUSLINE_FILE_OPEN #. TOOLBAR_TOOLTIP_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1692 +#: po/tmp/ap_String_Id.h.h:1710 msgid "Open an existing document" msgstr "Dokumentu bat ireki" #. MENU_STATUSLINE_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:1694 +#: po/tmp/ap_String_Id.h.h:1712 msgid "Open another window for the document" msgstr "Leiho berri bat ireki dokumentuarentzat" @@ -4144,254 +4201,255 @@ #. MENU_STATUSLINE_FILE_RECENT_7 #. MENU_STATUSLINE_FILE_RECENT_8 #. MENU_STATUSLINE_FILE_RECENT_9 -#: po/tmp/ap_String_Id.h.h:1704 +#: po/tmp/ap_String_Id.h.h:1722 msgid "Open this document" msgstr "Dokumentu hau ireki" #. DLG_PageSetup_Orient -#: po/tmp/ap_String_Id.h.h:1706 +#: po/tmp/ap_String_Id.h.h:1724 msgid "Orientation..." msgstr "Orientazioa..." #. DLG_Options_TabLabel_Other -#: po/tmp/ap_String_Id.h.h:1708 +#: po/tmp/ap_String_Id.h.h:1726 +#, fuzzy msgid "Other" msgstr "Beste batzuk" #. MSG_IE_NoMemory -#: po/tmp/ap_String_Id.h.h:1710 +#: po/tmp/ap_String_Id.h.h:1728 #, c-format msgid "Out of memory attempting to open %s" -msgstr "Memoria agortua %s zabaltzen saiatzean" +msgstr "Memoria agortu da %s zabaltzen saiatzean" #. TOOLBAR_LABEL_FMT_OVERLINE #. TOOLBAR_STATUSLINE_FMT_OVERLINE #. TOOLBAR_TOOLTIP_FMT_OVERLINE #. DLG_UFS_OverlineCheck -#: po/tmp/ap_String_Id.h.h:1714 po/tmp/xap_String_Id.h.h:545 +#: po/tmp/ap_String_Id.h.h:1732 +#: po/tmp/xap_String_Id.h.h:572 msgid "Overline" -msgstr "" +msgstr "Goimarratu" #. MENU_STATUSLINE_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:1716 +#: po/tmp/ap_String_Id.h.h:1734 msgid "Overline the selection (toggle)" -msgstr "Aukeratutakoa goimarratu" +msgstr "Hautespena goimarratu/desgoimarratu" #. MENU_LABEL_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:1718 +#: po/tmp/ap_String_Id.h.h:1736 msgid "P&roperties" -msgstr "Propietateak" +msgstr "&Propietateak" #. MENU_LABEL_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1720 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1738 msgid "P&urge revisions" -msgstr "&Berrikuspenak:" +msgstr "Berrikuspenak &ezabatu" #. MENU_LABEL_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1722 +#: po/tmp/ap_String_Id.h.h:1740 msgid "Pa&ste Unformatted" -msgstr "Formatu gabe itsatsi" +msgstr "&Formaturik gabe itsatsi" #. DLG_Goto_Target_Page #. DLG_PageSetup_Page -#: po/tmp/ap_String_Id.h.h:1725 +#: po/tmp/ap_String_Id.h.h:1743 msgid "Page" msgstr "Orria" #. DLG_Para_PushPageBreakBefore -#: po/tmp/ap_String_Id.h.h:1727 +#: po/tmp/ap_String_Id.h.h:1745 msgid "Page &break before" -msgstr "Aurretik moztu orria" +msgstr "Orri-jauzia &aurretik" #. MENU_LABEL_FMT_BACKGROUND -#: po/tmp/ap_String_Id.h.h:1729 +#: po/tmp/ap_String_Id.h.h:1747 msgid "Page Background" -msgstr "&Atzeko planoa" +msgstr "Orriaren atzealdea" #. MENU_LABEL_FMT_BACKGROUND_PAGE_COLOR -#: po/tmp/ap_String_Id.h.h:1731 +#: po/tmp/ap_String_Id.h.h:1749 msgid "Page C&olor" -msgstr "" +msgstr "Orriaren &kolorea" #. MENU_LABEL_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:1733 +#: po/tmp/ap_String_Id.h.h:1751 msgid "Page Image" -msgstr "" +msgstr "Orriaren irudia" #. MENU_LABEL_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1735 +#: po/tmp/ap_String_Id.h.h:1753 msgid "Page N&umbers" -msgstr "&Orri zenbakiak" +msgstr "Orri-&zenbakiak" #. FIELD_Numbers_PageNumber -#: po/tmp/ap_String_Id.h.h:1737 +#: po/tmp/ap_String_Id.h.h:1755 msgid "Page Number" -msgstr "Orri zenbakia" +msgstr "Orri-zenbakia" #. DLG_HdrFtr_PageNumberProperties -#: po/tmp/ap_String_Id.h.h:1739 +#: po/tmp/ap_String_Id.h.h:1757 msgid "Page Number Properties" -msgstr "Orri zenbakiaren Propietateak" +msgstr "Orri-zenbakiaren propietateak" #. DLG_PageNumbers_Title -#: po/tmp/ap_String_Id.h.h:1741 +#: po/tmp/ap_String_Id.h.h:1759 msgid "Page Numbers" -msgstr "Orri zenbakiak" +msgstr "Orri-zenbakiak" #. FIELD_Numbers_PageReference -#: po/tmp/ap_String_Id.h.h:1743 +#: po/tmp/ap_String_Id.h.h:1761 msgid "Page Reference" -msgstr "Orriaren erreferentzia" +msgstr "Orri-erreferentzia" #. MENU_LABEL_FILE_PAGESETUP -#: po/tmp/ap_String_Id.h.h:1745 +#: po/tmp/ap_String_Id.h.h:1763 msgid "Page Set&up" -msgstr "Orria konfiguratu" +msgstr "Orria &konfiguratu" #. DLG_PageSetup_Title -#: po/tmp/ap_String_Id.h.h:1747 +#: po/tmp/ap_String_Id.h.h:1765 msgid "Page Setup" msgstr "Orria konfiguratu" #. PageInfoField -#: po/tmp/ap_String_Id.h.h:1749 +#: po/tmp/ap_String_Id.h.h:1767 #, c-format msgid "Page: %d/%d" msgstr "Orria: %d/%d" #. DLG_WordCount_Pages -#: po/tmp/ap_String_Id.h.h:1751 +#: po/tmp/ap_String_Id.h.h:1769 msgid "Pages:" -msgstr "Orriak" +msgstr "Orriak:" #. DLG_Para_LabelPagination -#: po/tmp/ap_String_Id.h.h:1753 +#: po/tmp/ap_String_Id.h.h:1771 msgid "Pagination" -msgstr "Orrikatze" +msgstr "Orrikatzea" #. DLG_PageSetup_Paper_Size -#: po/tmp/ap_String_Id.h.h:1755 +#: po/tmp/ap_String_Id.h.h:1773 msgid "Paper Si&ze:" -msgstr "Paperaren tamaina:" +msgstr "Paper-&tamaina:" #. DLG_PageSetup_Paper -#: po/tmp/ap_String_Id.h.h:1757 +#: po/tmp/ap_String_Id.h.h:1775 msgid "Paper..." msgstr "Papera..." #. DLG_Styles_ModifyParagraph #. DLG_Para_ParaTitle -#: po/tmp/ap_String_Id.h.h:1760 +#: po/tmp/ap_String_Id.h.h:1778 msgid "Paragraph" msgstr "Paragrafoa" #. FIELD_Numbers_ParaCount -#: po/tmp/ap_String_Id.h.h:1762 +#: po/tmp/ap_String_Id.h.h:1780 msgid "Paragraph Count" -msgstr "Paragrafo Kopurua" +msgstr "Paragrafo kopurua" #. TOOLBAR_LABEL_FMT_DOM_DIRECTION -#: po/tmp/ap_String_Id.h.h:1764 +#: po/tmp/ap_String_Id.h.h:1782 msgid "Paragraph Direction" -msgstr "Paragrafoaren norabidea" +msgstr "Paragrafoen norabidea" #. DLG_Styles_ParaPrev -#: po/tmp/ap_String_Id.h.h:1766 +#: po/tmp/ap_String_Id.h.h:1784 msgid "Paragraph Preview" -msgstr "Paragrafoaren Aurrebista" +msgstr "Paragrafo-aurrebista" #. DLG_WordCount_Paragraphs -#: po/tmp/ap_String_Id.h.h:1768 +#: po/tmp/ap_String_Id.h.h:1786 msgid "Paragraphs:" -msgstr "Paragrafoak" +msgstr "Paragrafoak:" #. WORD_PassRequired -#: po/tmp/ap_String_Id.h.h:1770 +#: po/tmp/ap_String_Id.h.h:1788 msgid "Password required, this is an encrypted document" msgstr "Pasahitza behar da, dokumentua enkriptatuta dago" #. TOOLBAR_LABEL_EDIT_PASTE #. TOOLBAR_STATUSLINE_EDIT_PASTE #. TOOLBAR_TOOLTIP_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1774 +#: po/tmp/ap_String_Id.h.h:1792 msgid "Paste" -msgstr "&Itsatsi" +msgstr "Itsatsi" #. DLG_MetaData_TAB_Permission -#: po/tmp/ap_String_Id.h.h:1776 +#: po/tmp/ap_String_Id.h.h:1794 msgid "Permissions" msgstr "Baimenak" #. DLG_Goto_Target_Picture -#: po/tmp/ap_String_Id.h.h:1778 +#: po/tmp/ap_String_Id.h.h:1796 msgid "Picture" msgstr "Irudia" #. FIELD_Type_PieceTable -#: po/tmp/ap_String_Id.h.h:1780 +#: po/tmp/ap_String_Id.h.h:1798 msgid "Piece Table" -msgstr "Taula zatia" +msgstr "Zati-taula" #. DLG_FormatFootnotes_EndPlaceEndDoc -#: po/tmp/ap_String_Id.h.h:1782 +#: po/tmp/ap_String_Id.h.h:1800 msgid "Place at end of document" msgstr "Dokumentuaren amaieran jarri" #. DLG_FormatFootnotes_EndPlaceEndSec -#: po/tmp/ap_String_Id.h.h:1784 +#: po/tmp/ap_String_Id.h.h:1802 msgid "Place at end of section" -msgstr "Atalaren amaieran jarri" +msgstr "Sekzioaren amaieran jarri" #. DLG_FormatFootnotes_EndPlacement -#: po/tmp/ap_String_Id.h.h:1786 +#: po/tmp/ap_String_Id.h.h:1804 msgid "Placement" -msgstr "" +msgstr "Kokapena" #. DLG_Tab_Label_Position #. DLG_PageNumbers_Position_No_Colon -#: po/tmp/ap_String_Id.h.h:1789 +#: po/tmp/ap_String_Id.h.h:1807 msgid "Position" -msgstr "" +msgstr "Posizioa" #. DLG_FormatFrame_PositionTo -#: po/tmp/ap_String_Id.h.h:1791 +#: po/tmp/ap_String_Id.h.h:1809 msgid "Position Text Box" -msgstr "" +msgstr "Testu-kutxa kokatu" #. DLG_FormatFrame_SetToColumn -#: po/tmp/ap_String_Id.h.h:1793 +#: po/tmp/ap_String_Id.h.h:1811 msgid "Position to Column" -msgstr "" +msgstr "Zutabearekiko posizioa" #. DLG_FormatFrame_SetToPage -#: po/tmp/ap_String_Id.h.h:1795 +#: po/tmp/ap_String_Id.h.h:1813 msgid "Position to Page" -msgstr "" +msgstr "Orriarekiko posizioa" #. DLG_FormatFrame_SetToParagraph -#: po/tmp/ap_String_Id.h.h:1797 +#: po/tmp/ap_String_Id.h.h:1815 msgid "Position to Paragraph" -msgstr "" +msgstr "Paragrafoarekiko posizioa" #. DLG_PageNumbers_Position -#: po/tmp/ap_String_Id.h.h:1799 +#: po/tmp/ap_String_Id.h.h:1817 msgid "Position:" -msgstr "Tokia:" +msgstr "Posizioa:" #. MENU_LABEL_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:1801 +#: po/tmp/ap_String_Id.h.h:1819 msgid "Pr&eferences" -msgstr "&Aukerak" +msgstr "&Hobespenak" #. DLG_Options_TabLabel_Preferences #. DLG_Options_Label_Schemes -#: po/tmp/ap_String_Id.h.h:1804 +#: po/tmp/ap_String_Id.h.h:1822 msgid "Preference Schemes" -msgstr "Lehentasun Eskemak" +msgstr "Lehentasun eskemak" #. DLG_Options_OptionsTitle -#: po/tmp/ap_String_Id.h.h:1806 +#: po/tmp/ap_String_Id.h.h:1824 msgid "Preferences" msgstr "Hobespenak" @@ -4403,784 +4461,812 @@ #. DLG_Lists_Preview #. DLG_PageNumbers_Preview #. DLG_Zoom_PreviewFrame -#: po/tmp/ap_String_Id.h.h:1814 po/tmp/xap_String_Id.h.h:575 +#: po/tmp/ap_String_Id.h.h:1832 +#: po/tmp/xap_String_Id.h.h:604 msgid "Preview" -msgstr "" +msgstr "Aurrebista" #. MENU_STATUSLINE_WEB_WEBPREVIEW #. MENU_STATUSLINE_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:1817 +#: po/tmp/ap_String_Id.h.h:1835 msgid "Preview the document as a web page" -msgstr "Web orri bat bezala aurreikusi fitxategia" +msgstr "Web orri bat bezala aurreikusi dokumentua" #. MENU_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1821 +#: po/tmp/ap_String_Id.h.h:1839 msgid "Preview the document before printing" -msgstr "Aurreikusi inprimatu aurretik" +msgstr "Dokumentua aurreikusi inprimatu aurretik" #. DLG_Para_PreviewPrevParagraph -#: po/tmp/ap_String_Id.h.h:1823 -msgid "" -"Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph " -"Previous Paragraph Previous Paragraph Previous Paragraph" -msgstr "" -"Aurreko Paragrafoa Aurreko Paragrafoa Aurreko Paragrafoa Aurreko Paragrafoa " -"Aurreko Paragrafoa Aurreko Paragrafoa Aurreko Paragrafoa" +#: po/tmp/ap_String_Id.h.h:1841 +msgid "Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph" +msgstr "Aurreko Paragrafoa Aurreko Paragrafoa Aurreko Paragrafoa Aurreko Paragrafoa Aurreko Paragrafoa Aurreko Paragrafoa Aurreko Paragrafoa" #. TOOLBAR_LABEL_FILE_PRINT #. DLG_UP_PrintTitle #. DLG_UP_PrintButton -#: po/tmp/ap_String_Id.h.h:1825 po/tmp/xap_String_Id.h.h:580 +#: po/tmp/ap_String_Id.h.h:1843 +#: po/tmp/xap_String_Id.h.h:609 msgid "Print" -msgstr "&Inprimaketaren Aurreikuspena" +msgstr "Inprimatu" #. MENU_LABEL_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1827 +#: po/tmp/ap_String_Id.h.h:1845 msgid "Print &directly" -msgstr "Zuzenean inprimatu" +msgstr "&Zuzenean inprimatu" #. MENU_STATUSLINE_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:1829 +#: po/tmp/ap_String_Id.h.h:1847 msgid "Print Layout" -msgstr "Inprimaketa Diseinua" +msgstr "Inprimatze-diseinua" #. MENU_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1831 +#: po/tmp/ap_String_Id.h.h:1849 msgid "Print P&review" -msgstr "&Inprimaketaren Aurreikuspena" +msgstr "Inprimatze-&aurrebista" #. TOOLBAR_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1833 +#: po/tmp/ap_String_Id.h.h:1851 msgid "Print Preview" -msgstr "&Inprimaketaren Aurreikuspena" +msgstr "Inprimatze-aurrebista" #. MENU_STATUSLINE_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1835 +#: po/tmp/ap_String_Id.h.h:1853 msgid "Print all or part of the document" msgstr "Dokumentu osoa edo zati bat inprimatu" #. TOOLBAR_STATUSLINE_FILE_PRINT #. TOOLBAR_TOOLTIP_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1838 +#: po/tmp/ap_String_Id.h.h:1856 msgid "Print the document" msgstr "Dokumentua inprimatu" #. MENU_STATUSLINE_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1840 +#: po/tmp/ap_String_Id.h.h:1858 msgid "Print using the internal PS driver" -msgstr "PS barne kontroladorea erabiliz inprimatu" +msgstr "PS barne-kontroladorea erabiliz inprimatu" #. MSG_PrintingDoc -#: po/tmp/ap_String_Id.h.h:1842 +#: po/tmp/ap_String_Id.h.h:1860 msgid "Printing Document.." msgstr "Dokumentua imprimatzen..." #. MSG_PrintStatus -#: po/tmp/ap_String_Id.h.h:1844 +#: po/tmp/ap_String_Id.h.h:1862 #, c-format msgid "Printing page %d of %d" -msgstr "%2d orritik, %1d.a inprimatzen" +msgstr "%d/%d orria inprimatzen" #. FIELD_Document_Publisher -#: po/tmp/ap_String_Id.h.h:1846 +#: po/tmp/ap_String_Id.h.h:1864 msgid "Publisher" msgstr "Argitaratzailea" #. DLG_MetaData_Publisher_LBL -#: po/tmp/ap_String_Id.h.h:1848 +#: po/tmp/ap_String_Id.h.h:1866 msgid "Publisher:" -msgstr "Argitatzailea:" +msgstr "Argitaratzailea:" #. MENU_LABEL_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1850 +#: po/tmp/ap_String_Id.h.h:1868 msgid "R&eplace" -msgstr "Or&dezkatu" +msgstr "Or&deztu" + +#. MENU_LABEL_FMT_DIRECTION_DOCD_RTL +#: po/tmp/ap_String_Id.h.h:1870 +msgid "RTL &Document" +msgstr "Eskuin-ezker &okumentua" #. MENU_LABEL_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:1852 +#: po/tmp/ap_String_Id.h.h:1872 msgid "RTL &Paragraph" -msgstr "" +msgstr "Eskuin-ezker ¶grafoa" + +#. MENU_LABEL_FMT_DIRECTION_SD_RTL +#: po/tmp/ap_String_Id.h.h:1874 +msgid "RTL &Section" +msgstr "Eskuin-ezker &sekzioa" #. DLG_FR_ReplaceWithLabel -#: po/tmp/ap_String_Id.h.h:1854 +#: po/tmp/ap_String_Id.h.h:1876 msgid "Re&place with:" -msgstr "Honekin Ordezkatu:" +msgstr "Honekin &ordeztu:" #. DLG_FR_ReverseFind -#: po/tmp/ap_String_Id.h.h:1856 +#: po/tmp/ap_String_Id.h.h:1878 msgid "Re&verse find" -msgstr "" +msgstr "&Alderantzizko bilaketa" #. MENU_LABEL_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1858 +#: po/tmp/ap_String_Id.h.h:1880 msgid "Re&vert" -msgstr "Gordetako bertsiora itzuli" +msgstr "&Desegin" #. MENU_LABEL_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1860 +#: po/tmp/ap_String_Id.h.h:1882 msgid "Recent &Files" -msgstr "Azken fitxategiak" +msgstr "&Azken fitxategiak" #. TOOLBAR_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1862 +#: po/tmp/ap_String_Id.h.h:1884 msgid "Redo" -msgstr "&Berregin" +msgstr "Berregin" #. TOOLBAR_STATUSLINE_EDIT_REDO #. TOOLBAR_TOOLTIP_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1865 +#: po/tmp/ap_String_Id.h.h:1887 msgid "Redo editing" msgstr "Edizioa berregin" #. MENU_STATUSLINE_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1867 +#: po/tmp/ap_String_Id.h.h:1889 msgid "Redo previously undone editing" msgstr "Aurretik desegindako edizioa berregin" #. MENU_STATUSLINE_VIEW_ZOOM_MENU #. MENU_STATUSLINE_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:1870 +#: po/tmp/ap_String_Id.h.h:1892 msgid "Reduce or enlarge the document display" -msgstr "Dokumentua handitu edo txikitu" +msgstr "Dokumentuaren bistaratzea handitu edo txikitu" #. DLG_MetaData_Relation_LBL -#: po/tmp/ap_String_Id.h.h:1872 +#: po/tmp/ap_String_Id.h.h:1894 msgid "Relation:" msgstr "Erlazioa:" #. DLG_Styles_RemoveButton -#: po/tmp/ap_String_Id.h.h:1874 +#: po/tmp/ap_String_Id.h.h:1896 msgid "Remove" -msgstr "Kendu" +msgstr "Ezabatu" #. MENU_LABEL_EDIT_REMOVEFOOTER #. TOOLBAR_LABEL_EDIT_REMOVEFOOTER #. TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER #. TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1879 +#: po/tmp/ap_String_Id.h.h:1901 msgid "Remove Footer" -msgstr "Kendu orri-oina" +msgstr "Orri-oina ezabatu" #. MENU_LABEL_EDIT_REMOVEHEADER #. TOOLBAR_LABEL_EDIT_REMOVEHEADER #. TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER #. TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1884 +#: po/tmp/ap_String_Id.h.h:1906 msgid "Remove Header" -msgstr "Kendu goiburua" +msgstr "Goiburua ezabatu" #. DLG_Styles_RemoveLab -#: po/tmp/ap_String_Id.h.h:1886 +#: po/tmp/ap_String_Id.h.h:1908 msgid "Remove Property from Style" -msgstr "Kendu estiloren propietatea" +msgstr "Propietatea ezabatu estilotik" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1888 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1910 msgid "Remove Row as Heading" -msgstr "Errepikatu errenkada titulu bezala" +msgstr "Lerroa izenburutik kendu" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1890 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1912 msgid "Remove Row as the page Heading" -msgstr "Errepikatu errenkada titulu bezala" +msgstr "Lerroa orriaren izenburutik kendu" #. MENU_STATUSLINE_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1892 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1914 msgid "Remove all revision information from the document" -msgstr "Kendu orri honen goiburua dokumentutik" +msgstr "Berrikuspenen inguruko informazio guztia ezabatu dokumentutik" #. MENU_STATUSLINE_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:1894 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1916 msgid "Remove full document history from the document" -msgstr "Kendu orri honen goiburua dokumentutik" +msgstr "Dokumentuaren historia osoa ezabatu" #. MENU_STATUSLINE_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1896 +#: po/tmp/ap_String_Id.h.h:1918 msgid "Remove the Footer on this page from the Document" -msgstr "Kendu orri honen oina dokumentutik" +msgstr "Orri honen orri-oina ezabatu dokumentutik" #. MENU_STATUSLINE_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1898 +#: po/tmp/ap_String_Id.h.h:1920 msgid "Remove the Header on this page from the Document" -msgstr "Kendu orri honen goiburua dokumentutik" +msgstr "Orri honen goiburua ezabatu dokumentutik" #. MENU_STATUSLINE_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:1900 +#: po/tmp/ap_String_Id.h.h:1922 msgid "Remove the Image and save a copy on the clipboard" -msgstr "" +msgstr "Irudia ezabatu eta arbelean kopia bat gorde" #. MENU_STATUSLINE_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:1902 +#: po/tmp/ap_String_Id.h.h:1924 msgid "Remove the Image from the Document" -msgstr "" +msgstr "Irudia dokumentutik ezabatu" #. MENU_STATUSLINE_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:1904 +#: po/tmp/ap_String_Id.h.h:1926 msgid "Remove the Text Box from the Document" -msgstr "" +msgstr "Testu-kutxa ezabatu dokumentutik" #. MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:1906 +#: po/tmp/ap_String_Id.h.h:1928 msgid "Remove the suggested change" -msgstr "Kendu Iradokitutako aldaketa" +msgstr "Iradokitutako aldaketa ezabatu" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1908 +#: po/tmp/ap_String_Id.h.h:1930 msgid "Repeat Row as Heading" -msgstr "Errepikatu errenkada titulu bezala" +msgstr "Lerroa errepikatu izenburu modura" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1910 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1932 msgid "Repeat Row as Heading on each new page" -msgstr "Errepikatu errenkada titulu bezala" +msgstr "Lerroa errepikatu orrialde berri bakoitzaren izenburu modura" #. DLG_FR_ReplaceTitle -#: po/tmp/ap_String_Id.h.h:1912 +#: po/tmp/ap_String_Id.h.h:1934 msgid "Replace" -msgstr "Ordezkatu" +msgstr "Ordeztu" #. DLG_FR_ReplaceAllButton -#: po/tmp/ap_String_Id.h.h:1914 +#: po/tmp/ap_String_Id.h.h:1936 msgid "Replace &All" -msgstr "Ordezkatu Dena" +msgstr "&Guztiak ordeztu" #. MENU_STATUSLINE_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1916 +#: po/tmp/ap_String_Id.h.h:1938 msgid "Replace the specified text with different text" -msgstr "Ordezkatu aukeratutako testua beste testu batekin" +msgstr "Zehaztutako testua beste testu batekin ordeztu" #. MENU_LABEL_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1918 +#: po/tmp/ap_String_Id.h.h:1940 msgid "Report a &Bug" -msgstr "Programazio-akatsez ohartarazi" +msgstr "Programazio-&akatsez ohartarazi" #. MENU_STATUSLINE_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1920 +#: po/tmp/ap_String_Id.h.h:1942 msgid "Report a bug and help AbiWord become a better product" -msgstr "Programazio-akatsez ohartarazi eta lagundu AbiWord produktu hobetzen" +msgstr "Programazio-akatsez ohartarazi eta AbiWord hobetzen lagundu" #. MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1922 +#: po/tmp/ap_String_Id.h.h:1944 msgid "Reset the current toolbar layout to its defaults" -msgstr "" +msgstr "Tresna-barraren diseinu lehenetsia berrezarri" #. MENU_STATUSLINE_FMT_IMAGE -#: po/tmp/ap_String_Id.h.h:1924 +#: po/tmp/ap_String_Id.h.h:1946 msgid "Resize this image" msgstr "Irudiaren tamaina aldatu" #. DLG_HdrFtr_RestartNumbers -#: po/tmp/ap_String_Id.h.h:1926 +#: po/tmp/ap_String_Id.h.h:1948 msgid "Restart numbering at:" -msgstr "Berhasi zenbaketa...:" +msgstr "Hemen berhasi zenbakitzea:" #. DLG_FormatFootnotes_FootRestartPage -#: po/tmp/ap_String_Id.h.h:1928 +#: po/tmp/ap_String_Id.h.h:1950 msgid "Restart on each page" -msgstr "Berhasi orri bakoitzean" +msgstr "Orri bakoitzean berhasi" #. DLG_FormatFootnotes_FootRestartSec #. DLG_FormatFootnotes_EndRestartSec -#: po/tmp/ap_String_Id.h.h:1931 +#: po/tmp/ap_String_Id.h.h:1953 msgid "Restart on each section" -msgstr "Berhasi sekzio bakoitzean" +msgstr "Sekzio bakoitzean berhasi" #. DLG_HdrFtr_RestartCheck -#: po/tmp/ap_String_Id.h.h:1933 +#: po/tmp/ap_String_Id.h.h:1955 msgid "Restart page numbers on new sections" -msgstr "Berhasi orri zenbakiak sekzio berrietan" +msgstr "Orri-zenbakiak berhasi sekzio berrietan" #. DLG_Lists_Resume_Previous_List -#: po/tmp/ap_String_Id.h.h:1935 +#: po/tmp/ap_String_Id.h.h:1957 msgid "Resume Previous List" msgstr "Aurreko zerrendarekin jarraitu" #. MENU_STATUSLINE_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:1937 +#: po/tmp/ap_String_Id.h.h:1959 msgid "Retain all document changes" -msgstr "" +msgstr "Dokumentuaren aldaketa guztiak mantendu" #. MSG_RevertFile -#: po/tmp/ap_String_Id.h.h:1939 +#: po/tmp/ap_String_Id.h.h:1961 msgid "Revert file to last saved state?" -msgstr "Itzuli fitxategia azkenengoz gorde gabeko egoerara?" +msgstr "Gordetako azken egoerara itzuli fitxategia?" #. MENU_STATUSLINE_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1941 +#: po/tmp/ap_String_Id.h.h:1963 msgid "Revert the document to the last saved state" -msgstr "Itzuli fitxategia azkenengoz gordetako egoerara?" +msgstr "Gordetako azken egoerara itzuli dokumentua" #. MSG_RevertBuffer -#: po/tmp/ap_String_Id.h.h:1943 +#: po/tmp/ap_String_Id.h.h:1965 #, c-format msgid "Revert to saved copy of %s?" -msgstr "Itzuli %s-ren gordetako kopiara?" +msgstr "%s-ren gordetako kopiara itzuli?" #. DLG_ListRevisions_Column1Label -#: po/tmp/ap_String_Id.h.h:1945 +#: po/tmp/ap_String_Id.h.h:1967 msgid "Revision ID" -msgstr "Berrikusi ID-a" +msgstr "ID" #. DLG_Para_AlignRight #. DLG_Tab_Radio_Right #. DLG_PageNumbers_Right #. TOOLBAR_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1950 +#: po/tmp/ap_String_Id.h.h:1972 msgid "Right" -msgstr "Eskuinean" +msgstr "Eskuin" #. RightIndentStatus -#: po/tmp/ap_String_Id.h.h:1952 +#: po/tmp/ap_String_Id.h.h:1974 #, c-format msgid "Right Indent [%s]" -msgstr "Eskuineko koska [%s]" +msgstr "Eskuin koska [%s]" #. RightMarginStatus -#: po/tmp/ap_String_Id.h.h:1954 +#: po/tmp/ap_String_Id.h.h:1976 #, c-format msgid "Right Margin [%s]" -msgstr "Eskuineko Marjina [%s]" +msgstr "Eskuin marjina [%s]" #. TabToggleRightTab -#: po/tmp/ap_String_Id.h.h:1956 +#: po/tmp/ap_String_Id.h.h:1978 msgid "Right Tab" -msgstr "Eskuineko tabuladorea" +msgstr "Eskuin tabulazioa" #. TOOLBAR_STATUSLINE_ALIGN_RIGHT #. TOOLBAR_TOOLTIP_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1959 +#: po/tmp/ap_String_Id.h.h:1981 msgid "Right alignment" -msgstr "Eskuinean Lerrokatu" +msgstr "Eskuin lerrokatzea" #. MENU_STATUSLINE_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1961 +#: po/tmp/ap_String_Id.h.h:1983 msgid "Right-align the paragraph" -msgstr "Paragrafoa eskuinaldean justifikatu" +msgstr "Eskuinaldean lerrokatu paragrafoa" #. DLG_Para_DomDirection -#: po/tmp/ap_String_Id.h.h:1963 +#: po/tmp/ap_String_Id.h.h:1985 msgid "Right-to-left &dominant" -msgstr "Eskumatik Ezkerrera nagusi" +msgstr "Eskuin-ezker &nagusi" #. FIELD_Document_Rights -#: po/tmp/ap_String_Id.h.h:1965 +#: po/tmp/ap_String_Id.h.h:1987 msgid "Rights" -msgstr "Eskuinak" +msgstr "Eskubideak" #. DLG_MetaData_Rights_LBL -#: po/tmp/ap_String_Id.h.h:1967 +#: po/tmp/ap_String_Id.h.h:1989 msgid "Rights:" -msgstr "&Eskuinak:" +msgstr "Eskubideak:" #. DLG_FormatTable_Apply_To_Row -#: po/tmp/ap_String_Id.h.h:1969 +#: po/tmp/ap_String_Id.h.h:1991 msgid "Row" -msgstr "" +msgstr "Lerroa" #. MENU_LABEL_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1971 +#: po/tmp/ap_String_Id.h.h:1993 msgid "Rows &Above" -msgstr "Txertatu errenkadak aurrean" +msgstr "Lerroak &gainean" #. MENU_LABEL_TABLE_INSERT_ROWS_AFTER -#: po/tmp/ap_String_Id.h.h:1973 +#: po/tmp/ap_String_Id.h.h:1995 msgid "Rows &Below" -msgstr "Txertatu errenkadak ostean" +msgstr "Lerroak &azpian" #. MENU_LABEL_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1975 +#: po/tmp/ap_String_Id.h.h:1997 msgid "S&cripts" -msgstr "Skript-ak" +msgstr "%Skript-ak" #. MENU_LABEL_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:1977 +#: po/tmp/ap_String_Id.h.h:1999 msgid "S&how revisions" -msgstr "" +msgstr "&Berrikuspenak bistaratu" #. MENU_LABEL_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:1979 +#: po/tmp/ap_String_Id.h.h:2001 msgid "S&plit Cells" -msgstr "Zatitu gelaxkak" +msgstr "Gelaxkak &zatitu" #. DLG_Options_Btn_Save -#: po/tmp/ap_String_Id.h.h:1981 +#: po/tmp/ap_String_Id.h.h:2003 msgid "Sa&ve" msgstr "&Gorde" #. MENU_LABEL_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:1983 +#: po/tmp/ap_String_Id.h.h:2005 msgid "Sav&e Copy" -msgstr "&Esportatu" +msgstr "&Kopia gorde" #. TOOLBAR_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:1985 +#: po/tmp/ap_String_Id.h.h:2007 msgid "Save" -msgstr "&Gorde" +msgstr "Gorde" #. MENU_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:1987 +#: po/tmp/ap_String_Id.h.h:2009 msgid "Save &As" -msgstr "Gorde honela" +msgstr "Gorde &honela" #. MENU_LABEL_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1989 +#: po/tmp/ap_String_Id.h.h:2011 msgid "Save &Template" -msgstr "Txantiloia gorde" +msgstr "&Txantiloia gorde" #. TOOLBAR_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:1991 +#: po/tmp/ap_String_Id.h.h:2013 msgid "Save As" msgstr "Gorde honela" #. MENU_STATUSLINE_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:1993 +#: po/tmp/ap_String_Id.h.h:2015 msgid "Save a copy of the image on the clipboard" -msgstr "" +msgstr "Irudiaren kopia bat gorde arbelean" #. MSG_ConfirmSave -#: po/tmp/ap_String_Id.h.h:1995 +#: po/tmp/ap_String_Id.h.h:2017 #, c-format msgid "Save changes to document %s before closing?" -msgstr " %s dokumetuaren aldaketak gorde irten aurretik?" +msgstr " %s dokumentuaren aldaketak gorde irten aurretik?" #. MENU_STATUSLINE_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:1997 +#: po/tmp/ap_String_Id.h.h:2019 msgid "Save the Embedded Object" -msgstr "" +msgstr "Kapsulatutako objektua gorde" #. MENU_STATUSLINE_FILE_SAVE #. TOOLBAR_STATUSLINE_FILE_SAVE #. TOOLBAR_TOOLTIP_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:2001 +#: po/tmp/ap_String_Id.h.h:2023 msgid "Save the document" msgstr "Dokumentua gorde" #. MENU_STATUSLINE_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:2003 +#: po/tmp/ap_String_Id.h.h:2025 msgid "Save the document as a template" -msgstr "Txantiloi bezala gorde fitxategia" +msgstr "Txantiloi bezala gorde dokumentua" #. MENU_STATUSLINE_FILE_SAVEAS #. TOOLBAR_STATUSLINE_FILE_SAVEAS #. TOOLBAR_TOOLTIP_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:2007 +#: po/tmp/ap_String_Id.h.h:2029 msgid "Save the document under a different name" -msgstr "Dokumentua izen desberdinarekin gorde" +msgstr "Beste izen batekin gorde dokumentua" #. MENU_STATUSLINE_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:2009 +#: po/tmp/ap_String_Id.h.h:2031 msgid "Save the document without changing the current name" -msgstr "Dokumentua gorde izena aldatu gabe" +msgstr "Izena aldatu gabe gorde dokumentua" #. MENU_STATUSLINE_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:2011 +#: po/tmp/ap_String_Id.h.h:2033 msgid "Save the selected image to a file" -msgstr "Aukeratutako irudia fitxategi batetan gorde" +msgstr "Hautatutako irudia fitxategi batean gorde" #. MENU_LABEL_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:2013 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2035 msgid "Save to file" -msgstr "Fitxategia honela gorde" +msgstr "Fitxategira gorde" #. DLG_PageSetup_Scale -#: po/tmp/ap_String_Id.h.h:2015 +#: po/tmp/ap_String_Id.h.h:2037 msgid "Scale..." msgstr "Eskala.." #. MENU_STATUSLINE_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:2017 +#: po/tmp/ap_String_Id.h.h:2039 msgid "Search for help about..." -msgstr "Bilatu laguntza: " +msgstr "Laguntzan zerbait bilatu..." #. DLG_WordCount_Update_Rate -#: po/tmp/ap_String_Id.h.h:2019 +#: po/tmp/ap_String_Id.h.h:2041 msgid "Seconds between updates" -msgstr "Segunduak eguneratze tartean" +msgstr "Eguneratzeen arteko segundoak" #. FIELD_DateTime_Epoch -#: po/tmp/ap_String_Id.h.h:2021 +#: po/tmp/ap_String_Id.h.h:2043 +#, fuzzy msgid "Seconds since the epoch" msgstr "Data eta ordua segundotan" #. DLG_Break_SectionBreaks_Capital -#: po/tmp/ap_String_Id.h.h:2023 +#: po/tmp/ap_String_Id.h.h:2045 msgid "Section Breaks" -msgstr "" +msgstr "Sekzio-jauziak" #. DLG_Break_SectionBreaks -#: po/tmp/ap_String_Id.h.h:2025 +#: po/tmp/ap_String_Id.h.h:2047 msgid "Section breaks" -msgstr "Atalaren jauzia" +msgstr "Sekzio-jauziak" #. MENU_STATUSLINE_TOOLS_HISTORY -#: po/tmp/ap_String_Id.h.h:2027 +#: po/tmp/ap_String_Id.h.h:2049 msgid "See history of the current document" -msgstr "" +msgstr "Oraingo dokumentuaren historia ikusi" #. MENU_STATUSLINE_TABLE_SELECT #. DLG_Select -#: po/tmp/ap_String_Id.h.h:2029 po/tmp/xap_String_Id.h.h:630 +#: po/tmp/ap_String_Id.h.h:2051 +#: po/tmp/xap_String_Id.h.h:667 msgid "Select" -msgstr "Aukeratu" +msgstr "Hautatu" #. MENU_LABEL_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2031 +#: po/tmp/ap_String_Id.h.h:2053 msgid "Select A&ll" -msgstr "Dena aukeratu" +msgstr "&Guztia hautatu" #. MENU_STATUSLINE_TABLE_SELECT_CELL -#: po/tmp/ap_String_Id.h.h:2033 +#: po/tmp/ap_String_Id.h.h:2055 msgid "Select Cell" -msgstr "Gelaxka aukeratu" +msgstr "Gelaxka hautatu" #. MENU_STATUSLINE_TABLE_SELECT_COLUMN -#: po/tmp/ap_String_Id.h.h:2035 +#: po/tmp/ap_String_Id.h.h:2057 msgid "Select Column" -msgstr "Zutabea aukeratu" +msgstr "Zutabea hautatu" + +#. TOOLBAR_TOOLTIP_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:2059 +msgid "Select Font" +msgstr "Letra-mota hautatu" #. DLG_ListRevisions_Title -#: po/tmp/ap_String_Id.h.h:2037 +#: po/tmp/ap_String_Id.h.h:2061 msgid "Select Revision" -msgstr "Berrikuspena aukeratu" +msgstr "Berrikuspena hautatu" #. MENU_STATUSLINE_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:2039 +#: po/tmp/ap_String_Id.h.h:2063 msgid "Select Row" -msgstr "Errenkada aukeratu" +msgstr "Lerroa hautatu" #. MENU_STATUSLINE_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:2041 +#: po/tmp/ap_String_Id.h.h:2065 msgid "Select Table" -msgstr "Taula aukeratu" +msgstr "Taula hautatu" #. MENU_LABEL_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2043 +#: po/tmp/ap_String_Id.h.h:2067 msgid "Select Text Box" -msgstr "" +msgstr "Testu-kutxa hautatu" #. DLG_InsertHyperlink_Msg -#: po/tmp/ap_String_Id.h.h:2045 +#: po/tmp/ap_String_Id.h.h:2069 msgid "Select a target bookmark from the list." -msgstr "Zerrendako liburu-marka bat aukeratu." +msgstr "Zerrendako liburu-marka bat hautatu." #. DLG_FormatFrame_SelectImage #. DLG_FormatTable_SelectImage -#: po/tmp/ap_String_Id.h.h:2048 +#: po/tmp/ap_String_Id.h.h:2072 msgid "Select image from File" -msgstr "" +msgstr "Irudia hautatu fitxategitik" #. MENU_STATUSLINE_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2050 +#: po/tmp/ap_String_Id.h.h:2074 msgid "Select the Text Box" -msgstr "" +msgstr "Testu-kutxa hautatu" #. MENU_STATUSLINE_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2052 +#: po/tmp/ap_String_Id.h.h:2076 msgid "Select the entire document" -msgstr "Dokumentu osoa aukeratu" +msgstr "Dokumentu osoa hautatu" #. DLG_FormatTable_Apply_To_Selection #. DLG_UP_Selection -#: po/tmp/ap_String_Id.h.h:2054 po/tmp/xap_String_Id.h.h:638 +#: po/tmp/ap_String_Id.h.h:2078 +#: po/tmp/xap_String_Id.h.h:675 msgid "Selection" -msgstr "" +msgstr "Hautespena" #. DLG_ToggleCase_SentenceCase -#: po/tmp/ap_String_Id.h.h:2056 +#: po/tmp/ap_String_Id.h.h:2080 msgid "Sentence case" -msgstr "Letra larri eta xeheak aldatu" +msgstr "Esaldi baten modura" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2058 +#: po/tmp/ap_String_Id.h.h:2082 msgid "Separate table items with commas" -msgstr "" +msgstr "Komekin banatu taulako elementuak" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2060 +#: po/tmp/ap_String_Id.h.h:2084 msgid "Separate table items with commas and tabs" -msgstr "" +msgstr "Koma eta tabulazioekin banatu taulako elementuak" #. MENU_STATUSLINE_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2062 +#: po/tmp/ap_String_Id.h.h:2086 msgid "Separate table items with tabs" -msgstr "" +msgstr "Tabulazioekin banatu taulako elementuak" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2064 +#: po/tmp/ap_String_Id.h.h:2088 msgid "Separate with commas" -msgstr "" +msgstr "Komekin banatu" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2066 +#: po/tmp/ap_String_Id.h.h:2090 msgid "Separate with commas and tabs" -msgstr "" +msgstr "Koma eta tabulazioekin banatu" #. MENU_LABEL_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2068 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2092 msgid "Separate with tabs" -msgstr "Karaktereak (zuriuneekin)" +msgstr "Tabulazioekin banatu" #. DLG_Tab_Button_Set -#: po/tmp/ap_String_Id.h.h:2070 +#: po/tmp/ap_String_Id.h.h:2094 msgid "Set" msgstr "Ezarri" #. MENU_LABEL_FMT_LANGUAGE -#: po/tmp/ap_String_Id.h.h:2072 +#: po/tmp/ap_String_Id.h.h:2096 msgid "Set &Language" msgstr "&Hizkuntza ezarri" #. DLG_Lists_SetDefault -#: po/tmp/ap_String_Id.h.h:2074 +#: po/tmp/ap_String_Id.h.h:2098 msgid "Set Default Values" msgstr "Balio lehenetsiak ezarri" #. DLG_FormatFrame_SetImage #. DLG_FormatTable_SetImage -#: po/tmp/ap_String_Id.h.h:2077 +#: po/tmp/ap_String_Id.h.h:2101 msgid "Set Image" -msgstr "" +msgstr "Irudia ezarri" + +#. MENU_LABEL_FMT_SETPOSIMAGE +#: po/tmp/ap_String_Id.h.h:2103 +msgid "Set Positioned Image" +msgstr "Irudi posizionatua ezarri" #. DLG_FormatFrame_SetTextWrapping -#: po/tmp/ap_String_Id.h.h:2079 +#: po/tmp/ap_String_Id.h.h:2105 msgid "Set Text Wrapping" -msgstr "" +msgstr "Testu-egokitzea ezarri" #. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:2081 +#: po/tmp/ap_String_Id.h.h:2107 msgid "Set an image as a background for your page" -msgstr "" +msgstr "Irudi bat jarri zure orrialdearen atzealdean" + +#. MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL +#: po/tmp/ap_String_Id.h.h:2109 +msgid "Set dominant direction of document to RTL" +msgstr "Eskuin-ezker (RTL) noranzko nagusia ezarri dokumentuan" #. MENU_STATUSLINE_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:2083 +#: po/tmp/ap_String_Id.h.h:2111 msgid "Set dominant direction of paragraph to RTL" -msgstr "" +msgstr "Eskuin-ezker (RTL) noranzko nagusia ezarri paragrafoan" + +#. MENU_STATUSLINE_FMT_DIRECTION_SD_RTL +#: po/tmp/ap_String_Id.h.h:2113 +msgid "Set dominant direction of section to RTL" +msgstr "Eskuin-ezker (RTL) noranzko nagusia ezarri sekzioan" #. MENU_STATUSLINE_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:2085 +#: po/tmp/ap_String_Id.h.h:2115 msgid "Set meta-data properties" -msgstr "Ezarri meta-data propietateak" +msgstr "Meta-data propietateak ezarri" #. DLG_Tab_Label_New -#: po/tmp/ap_String_Id.h.h:2087 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2117 msgid "Set new Tab" -msgstr "Taula berria txertatu" +msgstr "Tabulazio berria ezarri" #. DLG_FormatFrame_NoImageBackground #. DLG_FormatTable_NoImageBackground -#: po/tmp/ap_String_Id.h.h:2090 +#: po/tmp/ap_String_Id.h.h:2120 msgid "Set no image" -msgstr "" +msgstr "Irudirik ez ezarri" #. MENU_STATUSLINE_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:2092 +#: po/tmp/ap_String_Id.h.h:2122 msgid "Set preferences" msgstr "Hobespenak ezarri" #. MENU_STATUSLINE_FMT_TABS -#: po/tmp/ap_String_Id.h.h:2094 +#: po/tmp/ap_String_Id.h.h:2124 msgid "Set tab stops" -msgstr "Tabulazio markak ezarri" +msgstr "Tabulazioak ezarri" #. MENU_STATUSLINE_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2096 +#: po/tmp/ap_String_Id.h.h:2126 msgid "Set the type and styles of the Table of Contents" -msgstr "" +msgstr "Eduki-taularen mota eta estiloak ezarri" #. MENU_STATUSLINE_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:2098 +#: po/tmp/ap_String_Id.h.h:2128 msgid "Set the types of Footnotes and Endnotes" -msgstr "Ezarri bukaera eta orri oineko oharren motak" +msgstr "Orri-oin eta bukaerako ohar motak ezarri" #. MENU_STATUSLINE_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:2100 +#: po/tmp/ap_String_Id.h.h:2130 msgid "Set the types of Headers and Footers" -msgstr "Goiburu eta Orri oin motak ezarri" +msgstr "Goiburu eta orri-oin motak ezarri" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2102 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2132 msgid "Set this Row as Heading" -msgstr "Errepikatu errenkada titulu bezala" +msgstr "Lerro hau ezarri izenburu modura" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2104 +#: po/tmp/ap_String_Id.h.h:2134 msgid "Set this Row as the Heading on each page" -msgstr "" +msgstr "Lerro hau ezarri orri bakoitzaren izenburu modura" + +#. MENU_STATUSLINE_FMT_SETPOSIMAGE +#: po/tmp/ap_String_Id.h.h:2136 +msgid "Set this image to be positioned" +msgstr "Irudi hau ezarri posizionatua izateko" #. MENU_STATUSLINE_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2106 +#: po/tmp/ap_String_Id.h.h:2138 msgid "Set your spelling preferences" msgstr "Ortografia hobespenak ezarri" #. MENU_STATUSLINE_FMT_DOCUMENT -#: po/tmp/ap_String_Id.h.h:2108 +#: po/tmp/ap_String_Id.h.h:2140 msgid "Setup your document's page properties such as page size and margins" -msgstr "Prestatu dokumetuaren orri propietateak, tamaina eta marjinekin" +msgstr "Zure dokumentuaren orri-propietateak ezarri (tamaina, marjinak,...)" #. DLG_Styles_ModifyShortCut -#: po/tmp/ap_String_Id.h.h:2110 +#: po/tmp/ap_String_Id.h.h:2142 msgid "Shortcut Key" -msgstr "Laster-Tekla " +msgstr "Laster-tekla " #. DLG_Options_Label_Show #. DLG_Show -#: po/tmp/ap_String_Id.h.h:2112 po/tmp/xap_String_Id.h.h:650 +#: po/tmp/ap_String_Id.h.h:2144 +#: po/tmp/xap_String_Id.h.h:687 msgid "Show" msgstr "Erakutsi" #. MENU_LABEL_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2114 +#: po/tmp/ap_String_Id.h.h:2146 msgid "Show &Ruler" -msgstr "&Erregela" +msgstr "&Erregela erakutsi" #. TOOLBAR_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2116 +#: po/tmp/ap_String_Id.h.h:2148 msgid "Show All" -msgstr "Dena Erakutsi" +msgstr "Guztia erakutsi" #. MENU_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2118 +#: po/tmp/ap_String_Id.h.h:2150 msgid "Show For&matting Marks" -msgstr "Formatu markak" +msgstr "Formatu-markak erakutsi" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2120 +#: po/tmp/ap_String_Id.h.h:2152 msgid "Show document &before revisions" -msgstr "" +msgstr "Berrikusteen &aurreko dokumentua erakutsi" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2122 +#: po/tmp/ap_String_Id.h.h:2154 msgid "Show document a&fter revisions" -msgstr "" +msgstr "Berrikusteen &ondorengo dokumentua erakutsi" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2124 +#: po/tmp/ap_String_Id.h.h:2156 msgid "Show document after &previous revisions" -msgstr "" +msgstr "A&urreko berrikusteen ondorengo dokumentua erakutsi" #. MENU_STATUSLINE_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:2126 +#: po/tmp/ap_String_Id.h.h:2158 msgid "Show full list of documents" msgstr "Dokumentuen zerrenda osoa erakutsi" #. MENU_STATUSLINE_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2128 +#: po/tmp/ap_String_Id.h.h:2160 msgid "Show or hide the rulers" msgstr "Erregelak erakutsi edo ezkutatu" #. MENU_STATUSLINE_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:2130 +#: po/tmp/ap_String_Id.h.h:2162 msgid "Show or hide the status bar" msgstr "Egoera-barra erakutsi edo ezkutatu" @@ -5188,388 +5274,396 @@ #. MENU_STATUSLINE_VIEW_TB_2 #. MENU_STATUSLINE_VIEW_TB_3 #. MENU_STATUSLINE_VIEW_TB_4 -#: po/tmp/ap_String_Id.h.h:2135 +#: po/tmp/ap_String_Id.h.h:2167 msgid "Show or hide the toolbar" -msgstr "" +msgstr "Tresna-barra erakutsi edo ezkutatu" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:2137 +#: po/tmp/ap_String_Id.h.h:2169 msgid "Show revisions that are present in document" -msgstr "" - -#. DLG_Options_Label_ShowSplash -#: po/tmp/ap_String_Id.h.h:2139 -msgid "Show the AbiWord splash screen on application startup" -msgstr "Aplikazioaren hasieran AbiWord aurkezpen pantaila erakutsi" +msgstr "Dokumentuan dauden berrikusteak erakutsi" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2141 +#: po/tmp/ap_String_Id.h.h:2171 msgid "Show what the document looks like after previous revisions" -msgstr "" +msgstr "Dokumentuak aurreko berrikusteen ondoren duen itxura erakutsi" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2143 +#: po/tmp/ap_String_Id.h.h:2173 msgid "Show what the document looks like after revisions" -msgstr "" +msgstr "Dokumentuak berrikusteen ondoren duen itxura erakutsi" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2145 +#: po/tmp/ap_String_Id.h.h:2175 msgid "Show what the document looks like before revisions" -msgstr "" +msgstr "Dokumentuak berrikusteen aurretik duen itxura erakutsi" #. DLG_Options_Label_ViewShowHide -#: po/tmp/ap_String_Id.h.h:2147 +#: po/tmp/ap_String_Id.h.h:2177 msgid "Show..." msgstr "Erakutsi..." #. TOOLBAR_STATUSLINE_VIEW_SHOWPARA #. TOOLBAR_TOOLTIP_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2150 +#: po/tmp/ap_String_Id.h.h:2180 msgid "Show/hide formatting marks" -msgstr "Formatu markak erakutsi/ezkutatu" +msgstr "Formatu-markak erakutsi/ezkutatu" + +#. TB_Simple +#: po/tmp/ap_String_Id.h.h:2182 +msgid "Simple" +msgstr "Sinplea" + +#. DLG_Options_Label_ViewSimpleTB +#: po/tmp/ap_String_Id.h.h:2184 +msgid "Simple Toolbar" +msgstr "Tresna-barra sinplea" #. DLG_Para_SpacingSingle -#: po/tmp/ap_String_Id.h.h:2152 +#: po/tmp/ap_String_Id.h.h:2186 msgid "Single" msgstr "Sinplea" #. TOOLBAR_LABEL_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2154 +#: po/tmp/ap_String_Id.h.h:2188 msgid "Single Spacing" -msgstr "Lerroarte normala:" +msgstr "Lerroarte sinplea" #. TOOLBAR_STATUSLINE_SINGLE_SPACE #. TOOLBAR_TOOLTIP_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2157 +#: po/tmp/ap_String_Id.h.h:2191 msgid "Single spacing" -msgstr "Lerroarte normala:" +msgstr "Lerroarte sinplea:" #. MENU_LABEL_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2159 +#: po/tmp/ap_String_Id.h.h:2193 msgid "So&rt Table" -msgstr "Taula ordenatu" +msgstr "Taula &antolatu" #. MENU_LABEL_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2161 +#: po/tmp/ap_String_Id.h.h:2195 msgid "Sort Columns in Ascending Order" -msgstr "" +msgstr "Goranzko ordenean antolatu zutabeak" #. MENU_STATUSLINE_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2163 +#: po/tmp/ap_String_Id.h.h:2197 msgid "Sort Columns in Ascending Order based on Selected Row" -msgstr "" +msgstr "Goranzko ordenean antolatu zutabeak, hautatutako lerroan oinarrituz" #. MENU_LABEL_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2165 +#: po/tmp/ap_String_Id.h.h:2199 msgid "Sort Columns in Descending Order" -msgstr "" +msgstr "Beheranzko ordenean antolatu zutabeak" #. MENU_STATUSLINE_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2167 +#: po/tmp/ap_String_Id.h.h:2201 msgid "Sort Columns in Descending Order based on Selected Row" -msgstr "" +msgstr "Beheranzko ordenean antolatu zutabeak, hautatutako lerroan oinarrituz" #. MENU_LABEL_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2169 +#: po/tmp/ap_String_Id.h.h:2203 msgid "Sort Rows in Ascending Order" -msgstr "" +msgstr "Goranzko ordenean antolatu lerroak" #. MENU_STATUSLINE_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2171 +#: po/tmp/ap_String_Id.h.h:2205 msgid "Sort Rows in Ascending Order based on selected Column" -msgstr "" +msgstr "Goranzko ordenean antolatu lerroak, hautatutako zutabean oinarrituz" #. MENU_LABEL_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2173 +#: po/tmp/ap_String_Id.h.h:2207 msgid "Sort Rows in Descending Order" -msgstr "" +msgstr "Beheranzko ordenean antolatu lerroak" #. MENU_STATUSLINE_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2175 +#: po/tmp/ap_String_Id.h.h:2209 msgid "Sort Rows in Descending Order based on Selected Column" -msgstr "" +msgstr "Beheranzko ordenean antolatu lerroak, hautatutako zutabean oinarrituz" #. MENU_STATUSLINE_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2177 +#: po/tmp/ap_String_Id.h.h:2211 msgid "Sort Table" -msgstr "Taula ordenatu" +msgstr "Taula antolatu" #. DLG_MetaData_Source_LBL -#: po/tmp/ap_String_Id.h.h:2179 +#: po/tmp/ap_String_Id.h.h:2213 msgid "Source:" msgstr "Iturburua:" #. DLG_Column_Space_After -#: po/tmp/ap_String_Id.h.h:2181 +#: po/tmp/ap_String_Id.h.h:2215 msgid "Space after Column" -msgstr "Zutabe osteko zuriunea" +msgstr "Zutabe ondorengo hutsunea" #. TOOLBAR_STATUSLINE_PARA_12BEFORE #. TOOLBAR_TOOLTIP_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:2184 +#: po/tmp/ap_String_Id.h.h:2218 msgid "Space before: 12 pt" -msgstr "Aurreko zuriunea: 12 pt" +msgstr "Aurreko hutsunea: 12 pt" #. TOOLBAR_STATUSLINE_PARA_0BEFORE #. TOOLBAR_TOOLTIP_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:2187 +#: po/tmp/ap_String_Id.h.h:2221 msgid "Space before: None" -msgstr "Aurreko zuriunea: Bat ere ez" +msgstr "Aurreko hutsunea: Bat ere ez" #. DLG_Para_LabelSpacing -#: po/tmp/ap_String_Id.h.h:2189 +#: po/tmp/ap_String_Id.h.h:2223 msgid "Spacing" -msgstr "Zuriunea" +msgstr "Lerroartea" #. DLG_Options_SpellCheckingTitle -#: po/tmp/ap_String_Id.h.h:2191 +#: po/tmp/ap_String_Id.h.h:2225 msgid "Spell Checking" -msgstr "" +msgstr "Ortografia zuzenketa" #. TOOLBAR_LABEL_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2193 +#: po/tmp/ap_String_Id.h.h:2227 msgid "Spellcheck" -msgstr "Zuzentzaile ortografikoa" +msgstr "Zuzenketa ortografikoa" #. TOOLBAR_STATUSLINE_SPELLCHECK #. TOOLBAR_TOOLTIP_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2196 +#: po/tmp/ap_String_Id.h.h:2230 msgid "Spellcheck the document" -msgstr "Dokumentua zuzendu" +msgstr "Dokumentuaren ortografia zuzendu" #. DLG_Spell_SpellTitle #. DLG_Options_TabLabel_Spelling -#: po/tmp/ap_String_Id.h.h:2199 +#: po/tmp/ap_String_Id.h.h:2233 msgid "Spelling" msgstr "Ortografia" #. MENU_LABEL_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2201 +#: po/tmp/ap_String_Id.h.h:2235 msgid "Spelling &Options" -msgstr "&Ortografia aukerak" +msgstr "&Ortografia-aukerak" #. MENU_LABEL_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2203 +#: po/tmp/ap_String_Id.h.h:2237 msgid "Spli&t Table" -msgstr "Taula zatia" +msgstr "Taula &zatitu" #. DLG_SplitCellsTitle #. DLG_SplitCells_Frame #. MENU_STATUSLINE_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2207 +#: po/tmp/ap_String_Id.h.h:2241 msgid "Split Cells" msgstr "Gelaxkak zatitu" #. MENU_STATUSLINE_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2209 +#: po/tmp/ap_String_Id.h.h:2243 msgid "Split Table" msgstr "Taula zatitu" #. TOOLBAR_LABEL_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2211 +#: po/tmp/ap_String_Id.h.h:2245 msgid "Split cells" msgstr "Gelaxkak zatitu" #. DLG_SplitCells_HoriMid #. DLG_SplitCells_VertMid -#: po/tmp/ap_String_Id.h.h:2214 +#: po/tmp/ap_String_Id.h.h:2248 msgid "Split in Middle" -msgstr "" +msgstr "Erditik zatitu" #. DLG_SplitCells_Below -#: po/tmp/ap_String_Id.h.h:2216 +#: po/tmp/ap_String_Id.h.h:2250 msgid "Split on Bottom Side" -msgstr "" +msgstr "Azpialdetik zatitu" #. DLG_SplitCells_Left -#: po/tmp/ap_String_Id.h.h:2218 +#: po/tmp/ap_String_Id.h.h:2252 msgid "Split on Left Side" -msgstr "" +msgstr "Ezkerraldetik zatitu" #. DLG_SplitCells_Right -#: po/tmp/ap_String_Id.h.h:2220 +#: po/tmp/ap_String_Id.h.h:2254 msgid "Split on Right Side" -msgstr "" +msgstr "Eskuinaldetik zatitu" #. DLG_SplitCells_Above -#: po/tmp/ap_String_Id.h.h:2222 +#: po/tmp/ap_String_Id.h.h:2256 msgid "Split on Top Side" -msgstr "" +msgstr "Goialdetik zatitu" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2224 +#: po/tmp/ap_String_Id.h.h:2258 msgid "Split on all delimiters except spaces" -msgstr "" +msgstr "Bereizle guztietan zatitu, hutsuneetan izan ezik" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2226 +#: po/tmp/ap_String_Id.h.h:2260 msgid "Split on all word delimiters including spaces" -msgstr "" +msgstr "Hitz-bereizle guztietan zatitu, hutsuneak barne" #. MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2228 +#: po/tmp/ap_String_Id.h.h:2262 msgid "Split text at commas or tabs" -msgstr "" +msgstr "Koma edo tabulazioetan zatitu testua" #. MENU_LABEL_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2230 +#: po/tmp/ap_String_Id.h.h:2264 msgid "Split text at spaces, commas, or tabs" -msgstr "" +msgstr "Hutsune, koma edo tabulazioetan zatitu testua" #. TOOLBAR_STATUSLINE_SPLIT_CELLS #. TOOLBAR_TOOLTIP_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2233 +#: po/tmp/ap_String_Id.h.h:2267 msgid "Split this cell" msgstr "Gelaxka hau zatitu" #. DLG_Lists_Square_List #. STYLE_SQUARELIST -#: po/tmp/ap_String_Id.h.h:2235 po/tmp/xap_String_Id.h.h:662 +#: po/tmp/ap_String_Id.h.h:2269 +#: po/tmp/xap_String_Id.h.h:699 msgid "Square List" -msgstr "" +msgstr "Karratu-zerrenda" #. MENU_LABEL_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2237 +#: po/tmp/ap_String_Id.h.h:2271 msgid "St&yle" msgstr "&Estiloa" #. TB_Standard -#: po/tmp/ap_String_Id.h.h:2239 +#: po/tmp/ap_String_Id.h.h:2273 msgid "Standard" -msgstr "" +msgstr "Estandar" #. DLG_Options_Label_ViewStandardTB -#: po/tmp/ap_String_Id.h.h:2241 +#: po/tmp/ap_String_Id.h.h:2275 msgid "Standard Toolbar" msgstr "Tresna-barra estandarra" #. DLG_Lists_Star_List #. STYLE_STARLIST -#: po/tmp/ap_String_Id.h.h:2243 po/tmp/xap_String_Id.h.h:666 +#: po/tmp/ap_String_Id.h.h:2277 +#: po/tmp/xap_String_Id.h.h:703 msgid "Star List" -msgstr "" +msgstr "Izar-zerrenda" #. DLG_Lists_Start -#: po/tmp/ap_String_Id.h.h:2245 +#: po/tmp/ap_String_Id.h.h:2279 msgid "Start At:" msgstr "Hasi:" #. DLG_Lists_Start_New_List #. DLG_Lists_Start_New -#: po/tmp/ap_String_Id.h.h:2248 +#: po/tmp/ap_String_Id.h.h:2282 msgid "Start New List" msgstr "Zerrenda berria hasi" #. DLG_Lists_Start_Sub -#: po/tmp/ap_String_Id.h.h:2250 +#: po/tmp/ap_String_Id.h.h:2284 msgid "Start Sublist" msgstr "Azpizerrenda hasi" #. DLG_MarkRevisions_Check2Label -#: po/tmp/ap_String_Id.h.h:2252 +#: po/tmp/ap_String_Id.h.h:2286 msgid "Start a new revision" msgstr "Berrikuspen berria hasi" #. MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2254 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2288 msgid "Start ne&w revision" -msgstr "Berrikuspen berria hasi" +msgstr "Berrikuspen &berria hasi" #. MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2256 +#: po/tmp/ap_String_Id.h.h:2290 msgid "Start revision distinct from the current one" -msgstr "" +msgstr "Oraingoaren berrikuspen ezberdin bat hasi" #. DLG_WordCount_Statistics -#: po/tmp/ap_String_Id.h.h:2258 +#: po/tmp/ap_String_Id.h.h:2292 msgid "Statistics:" msgstr "Estatistikak:" #. DLG_Lists_Stop_Current_List -#: po/tmp/ap_String_Id.h.h:2260 +#: po/tmp/ap_String_Id.h.h:2294 msgid "Stop Current List" -msgstr "Uneko zerrenda gelditu" +msgstr "Oraingo zerrenda gelditu" #. MENU_LABEL_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2262 +#: po/tmp/ap_String_Id.h.h:2296 msgid "Stri&ke" -msgstr "&Marratua" +msgstr "&Marratu" #. TOOLBAR_LABEL_FMT_STRIKE #. TOOLBAR_STATUSLINE_FMT_STRIKE #. TOOLBAR_TOOLTIP_FMT_STRIKE #. DLG_UFS_StrikeoutCheck -#: po/tmp/ap_String_Id.h.h:2266 po/tmp/xap_String_Id.h.h:668 +#: po/tmp/ap_String_Id.h.h:2300 +#: po/tmp/xap_String_Id.h.h:705 msgid "Strike" -msgstr "" +msgstr "Marratu" #. MENU_STATUSLINE_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2268 +#: po/tmp/ap_String_Id.h.h:2302 msgid "Strikeout the selection (toggle)" -msgstr "Aukeratutakoa marratu" +msgstr "Hautespena marratu/desmarratu" #. MENU_LABEL_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:2270 +#: po/tmp/ap_String_Id.h.h:2304 msgid "Sty&list" -msgstr "" +msgstr "&Estilista" #. TOOLBAR_LABEL_FMT_STYLE #. TOOLBAR_STATUSLINE_FMT_STYLE #. TOOLBAR_TOOLTIP_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2274 +#: po/tmp/ap_String_Id.h.h:2308 msgid "Style" msgstr "Estiloa" #. DLG_Styles_ErrNotTitle1 -#: po/tmp/ap_String_Id.h.h:2276 +#: po/tmp/ap_String_Id.h.h:2310 msgid "Style Name - " msgstr "Estiloaren izena - " #. DLG_Styles_ModifyName -#: po/tmp/ap_String_Id.h.h:2278 +#: po/tmp/ap_String_Id.h.h:2312 msgid "Style Name:" msgstr "Estiloaren izena:" #. DLG_Styles_ModifyType -#: po/tmp/ap_String_Id.h.h:2280 +#: po/tmp/ap_String_Id.h.h:2314 msgid "Style Type" msgstr "Estilo mota" #. DLG_Styles_ModifyFollowing -#: po/tmp/ap_String_Id.h.h:2282 +#: po/tmp/ap_String_Id.h.h:2316 msgid "Style for following paragraph" -msgstr "Hurrengo paragrafoaren estiloa" +msgstr "Hurrengo paragrafoarentzako estiloa" #. DLG_Styles_ErrBlankName -#: po/tmp/ap_String_Id.h.h:2284 +#: po/tmp/ap_String_Id.h.h:2318 msgid "Style name cannot be left blank" -msgstr "Estiloaren izena ezin da zuriz utzi" +msgstr "Estiloaren izena ezin da hutsik utzi" #. DLG_Lists_Style #. DLG_UFS_StyleLabel -#: po/tmp/ap_String_Id.h.h:2286 po/tmp/xap_String_Id.h.h:670 +#: po/tmp/ap_String_Id.h.h:2320 +#: po/tmp/xap_String_Id.h.h:707 msgid "Style:" -msgstr "" +msgstr "Estiloa:" #. DLG_Styles_StylesTitle #. DLG_Stylist_Styles -#: po/tmp/ap_String_Id.h.h:2289 +#: po/tmp/ap_String_Id.h.h:2323 msgid "Styles" msgstr "Estiloak" #. DLG_Stylist_Title -#: po/tmp/ap_String_Id.h.h:2291 +#: po/tmp/ap_String_Id.h.h:2325 msgid "Stylist" -msgstr "" +msgstr "Estilista" #. FIELD_Document_Subject -#: po/tmp/ap_String_Id.h.h:2293 +#: po/tmp/ap_String_Id.h.h:2327 msgid "Subject" msgstr "Gaia" #. DLG_MetaData_Subject_LBL -#: po/tmp/ap_String_Id.h.h:2295 +#: po/tmp/ap_String_Id.h.h:2329 msgid "Subject:" msgstr "Gaia:" @@ -5577,301 +5671,282 @@ #. TOOLBAR_STATUSLINE_FMT_SUBSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUBSCRIPT #. DLG_UFS_SubScript -#: po/tmp/ap_String_Id.h.h:2299 po/tmp/xap_String_Id.h.h:674 +#: po/tmp/ap_String_Id.h.h:2333 +#: po/tmp/xap_String_Id.h.h:711 msgid "Subscript" -msgstr "" +msgstr "Azpi-indize" #. DLG_Spell_Suggestions -#: po/tmp/ap_String_Id.h.h:2301 +#: po/tmp/ap_String_Id.h.h:2335 msgid "Sugg&estions:" -msgstr "Iradokizunak:" +msgstr "&Iradokizunak:" #. DLG_Options_Label_SpellMainOnly -#: po/tmp/ap_String_Id.h.h:2303 +#: po/tmp/ap_String_Id.h.h:2337 msgid "Suggest from &main dictionary only" -msgstr "Hiztegi nagusiaren iradokizunak soilik" +msgstr "Hiztegi &nagusiko iradokizunak bakarrik" #. MENU_LABEL_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:2305 +#: po/tmp/ap_String_Id.h.h:2339 msgid "Sum a Column" -msgstr "" +msgstr "Zutabe bat batu" #. MENU_LABEL_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:2307 +#: po/tmp/ap_String_Id.h.h:2341 msgid "Sum a Row" -msgstr "" +msgstr "Lerro bat batu" #. FIELD_Numbers_TableSumRows -#: po/tmp/ap_String_Id.h.h:2309 +#: po/tmp/ap_String_Id.h.h:2343 msgid "Sum a Table Column" -msgstr "" +msgstr "Taulako zutabe bat batu" #. FIELD_Numbers_TableSumCols -#: po/tmp/ap_String_Id.h.h:2311 +#: po/tmp/ap_String_Id.h.h:2345 msgid "Sum a Table Row" -msgstr "" +msgstr "Taulako lerro bat batu" #. DLG_MetaData_TAB_Summary -#: po/tmp/ap_String_Id.h.h:2313 +#: po/tmp/ap_String_Id.h.h:2347 msgid "Summary" msgstr "Laburpena" #. MENU_LABEL_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:2315 +#: po/tmp/ap_String_Id.h.h:2349 msgid "Supe&rscript" -msgstr "&Gainindizea" +msgstr "&Goi-indizea" #. TOOLBAR_LABEL_FMT_SUPERSCRIPT #. TOOLBAR_STATUSLINE_FMT_SUPERSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUPERSCRIPT #. DLG_UFS_SuperScript -#: po/tmp/ap_String_Id.h.h:2319 po/tmp/xap_String_Id.h.h:676 +#: po/tmp/ap_String_Id.h.h:2353 +#: po/tmp/xap_String_Id.h.h:713 msgid "Superscript" -msgstr "" +msgstr "Goi-indizea" #. MENU_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2321 +#: po/tmp/ap_String_Id.h.h:2355 msgid "Sy&mbol" msgstr "&Sinboloa" #. TOOLBAR_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2323 +#: po/tmp/ap_String_Id.h.h:2357 msgid "Symbol" -msgstr "&Sinboloa" +msgstr "Sinboloa" #. MENU_LABEL_TABLE -#: po/tmp/ap_String_Id.h.h:2325 +#: po/tmp/ap_String_Id.h.h:2359 msgid "T&able" -msgstr "Taula" +msgstr "&Taula" #. TabStopStatus -#: po/tmp/ap_String_Id.h.h:2327 +#: po/tmp/ap_String_Id.h.h:2361 #, c-format msgid "Tab Stop [%s]" -msgstr "Tabulazio geldiguneak [%s]" +msgstr "Tabulazioa [%s]" #. DLG_Tab_Label_TabPosition -#: po/tmp/ap_String_Id.h.h:2329 +#: po/tmp/ap_String_Id.h.h:2363 msgid "Tab stop position:" -msgstr "Tabulazio geldiuneen posizioa:" +msgstr "Tabulazioen posizioa:" #. DLG_Tab_Label_TabToClear -#: po/tmp/ap_String_Id.h.h:2331 +#: po/tmp/ap_String_Id.h.h:2365 msgid "Tab stops to be cleared:" -msgstr "Tabulazio geldiuneak ezabatzeko:" +msgstr "Ezabatu beharreko tabulazioak:" #. DLG_FormatTable_Apply_To_Table #. MENU_STATUSLINE_TABLE #. TB_Table -#: po/tmp/ap_String_Id.h.h:2335 po/tmp/xap_String_Id.h.h:686 +#: po/tmp/ap_String_Id.h.h:2369 +#: po/tmp/xap_String_Id.h.h:723 msgid "Table" -msgstr "Taula automatikoki doitu" +msgstr "Taula" #. DLG_InsertTable_TableSize_Capital -#: po/tmp/ap_String_Id.h.h:2337 +#: po/tmp/ap_String_Id.h.h:2371 msgid "Table Size" -msgstr "" +msgstr "Taula-tamaina" #. DLG_Options_Label_ViewTableTB -#: po/tmp/ap_String_Id.h.h:2339 +#: po/tmp/ap_String_Id.h.h:2373 msgid "Table Toolbar" -msgstr "" +msgstr "Taula tresna-barra" -#. TOC_TocHeading #. MENU_LABEL_INSERT_TABLEOFCONTENTS #. MENU_LABEL_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2343 +#: po/tmp/ap_String_Id.h.h:2376 msgid "Table of Contents" -msgstr "" +msgstr "Eduki-taula" #. FIELD_Numbers_TOCListLabel -#: po/tmp/ap_String_Id.h.h:2345 +#: po/tmp/ap_String_Id.h.h:2378 msgid "Table of Contents List Label" -msgstr "" +msgstr "Eduki-taularen zerrenda-etiketa" #. FIELD_Numbers_TOCPageNumber -#: po/tmp/ap_String_Id.h.h:2347 +#: po/tmp/ap_String_Id.h.h:2380 msgid "Table of Contents Page" -msgstr "" +msgstr "Eduki-taularen orria" #. DLG_InsertTable_TableSize -#: po/tmp/ap_String_Id.h.h:2349 +#: po/tmp/ap_String_Id.h.h:2382 msgid "Table size" msgstr "Taularen tamaina" #. DLG_Styles_ModifyTabs #. DLG_Tab_TabTitle -#: po/tmp/ap_String_Id.h.h:2352 +#: po/tmp/ap_String_Id.h.h:2385 msgid "Tabs" msgstr "Tabulazioak" #. DLG_FormatTOC_DetailsTabPage -#: po/tmp/ap_String_Id.h.h:2354 +#: po/tmp/ap_String_Id.h.h:2387 msgid "Tabs and Page Numbering" -msgstr "" +msgstr "Tabulazioak eta orri-zenbakitzea" #. MENU_LABEL_FMT -#: po/tmp/ap_String_Id.h.h:2356 +#: po/tmp/ap_String_Id.h.h:2389 msgid "Te&xt Formatting" -msgstr "Testuaren formatua" +msgstr "Te&stuaren formatua" #. DLG_Options_Label_Text -#: po/tmp/ap_String_Id.h.h:2358 +#: po/tmp/ap_String_Id.h.h:2391 msgid "Text" msgstr "Testua" #. DLG_FormatTOC_TextAfter -#: po/tmp/ap_String_Id.h.h:2360 +#: po/tmp/ap_String_Id.h.h:2393 msgid "Text &after:" -msgstr "" +msgstr "&Ondorengo testua:" #. DLG_FormatTOC_TextBefore -#: po/tmp/ap_String_Id.h.h:2362 +#: po/tmp/ap_String_Id.h.h:2395 msgid "Text &before:" -msgstr "" +msgstr "&Aurreko testua:" #. DLG_Lists_Align -#: po/tmp/ap_String_Id.h.h:2364 +#: po/tmp/ap_String_Id.h.h:2397 msgid "Text Align:" -msgstr "Testuaren lerrokaketa:" +msgstr "Testuaren lerrokatzea" #. MENU_LABEL_INSERT_TEXTBOX #. MENU_LABEL_FMT_FRAME -#: po/tmp/ap_String_Id.h.h:2367 +#: po/tmp/ap_String_Id.h.h:2400 msgid "Text Box" -msgstr "" +msgstr "Testu-kutxa" #. DLG_Lists_PageFolding -#: po/tmp/ap_String_Id.h.h:2369 +#: po/tmp/ap_String_Id.h.h:2402 msgid "Text Folding" -msgstr "" +msgstr "Testu-tolestea" #. DLG_FormatFrame_TextWrapping -#: po/tmp/ap_String_Id.h.h:2371 +#: po/tmp/ap_String_Id.h.h:2404 msgid "Text Wrapping" -msgstr "" +msgstr "Testu-egokitzea" #. DLG_Options_Label_Both -#: po/tmp/ap_String_Id.h.h:2373 +#: po/tmp/ap_String_Id.h.h:2406 msgid "Text and Icon" -msgstr "Testua eta Ikonoa" - -#. MSG_MergeDocsNotRelated -#: po/tmp/ap_String_Id.h.h:2375 -msgid "" -"The documents you are trying to merge are unrelated. AbiWord will attempt to " -"merge them, but the result might be meaningless." -msgstr "" +msgstr "Testua eta ikonoa" #. DLG_PageSetup_ErrBigMargins -#: po/tmp/ap_String_Id.h.h:2377 +#: po/tmp/ap_String_Id.h.h:2408 msgid "The margins selected are too large to fit on the page." -msgstr "Aukeratutako marjinak handiegiak dira orrian sartzeko." +msgstr "Hautatutako marjinak handiegiak dira orrian sartzeko." #. DLG_Options_Prompt_YouMustRestart -#: po/tmp/ap_String_Id.h.h:2379 -msgid "" -"The new user interface language will take effect the next time that you " -"start the application" -msgstr "" +#: po/tmp/ap_String_Id.h.h:2410 +msgid "The new user interface language will take effect the next time that you start the application" +msgstr "Aplikazioa berriro abiarazten duzun hurrengoan hasiko da hizkuntza berria erabiltzen" #. MSG_SpellDone -#: po/tmp/ap_String_Id.h.h:2381 +#: po/tmp/ap_String_Id.h.h:2412 msgid "The spelling check is complete." -msgstr "Zuzenketa Ortografikoa amaitu da." +msgstr "Zuzenketa ortografikoa amaitu da." #. MSG_HyperlinkCrossesBoundaries -#: po/tmp/ap_String_Id.h.h:2383 -msgid "" -"The text to which the hyperlink is to be attached must be within a single " -"paragraph." -msgstr "Hiper-lotura egingo zaion testua paragrafo bakar bat izan behar da." +#: po/tmp/ap_String_Id.h.h:2414 +msgid "The text to which the hyperlink is to be attached must be within a single paragraph." +msgstr "Hiperesteka egingo zaion testua paragrafo bakar batean egon behar du." #. FIELD_DateTime_Wkday -#: po/tmp/ap_String_Id.h.h:2385 +#: po/tmp/ap_String_Id.h.h:2416 msgid "The weekday" -msgstr "Aste eguna" +msgstr "Asteko eguna" #. DLG_FormatTable_Thickness -#: po/tmp/ap_String_Id.h.h:2387 +#: po/tmp/ap_String_Id.h.h:2418 msgid "Thickness:" -msgstr "" +msgstr "Lodiera:" #. MSG_AfterRestartNew -#: po/tmp/ap_String_Id.h.h:2389 -msgid "" -"This change will only take effect when you restart AbiWord or create a new " -"document." -msgstr "" -"Aldaketa honek Abiword berhastean edo dokumentu berri bat sortzen denean " -"bakarrik izango du eragina." +#: po/tmp/ap_String_Id.h.h:2420 +msgid "This change will only take effect when you restart AbiWord or create a new document." +msgstr "Aldaketa honek Abiword berhastean edo dokumentu berri bat sortzen denean bakarrik izango du eragina." #. MSG_HiddenRevisions -#: po/tmp/ap_String_Id.h.h:2391 -msgid "" -"This document contains revisions which are currently hidden from view. " -"Please see AbiWord documentation for information on working with revisions." -msgstr "" +#: po/tmp/ap_String_Id.h.h:2422 +msgid "This document contains revisions which are currently hidden from view. Please see AbiWord documentation for information on working with revisions." +msgstr "Oraintxe ezkutatuta dauden berrikuspenak dauzka dokumentu honek. AbiWord-en dokumentazioa irakurri dezakezu berrikuspenekin nola lan egin ikasteko." #. DLG_Para_PreviewSampleFallback -#: po/tmp/ap_String_Id.h.h:2393 -msgid "" -"This paragraph represents words as they might appear in your document. To " -"see text from your document used in this preview, position your cursor in a " -"document paragraph with some text in it and open this dialog." -msgstr "" -"Paragrafo honek testu bat ordezkatzen du, dokumentuan ikusten den bezala. " -"Aurrebista honetako testua ikusteko, aukeratu dokumentuko testu zati bat " -"eta zabaldu elkarrizketa kuadroa." +#: po/tmp/ap_String_Id.h.h:2424 +msgid "This paragraph represents words as they might appear in your document. To see text from your document used in this preview, position your cursor in a document paragraph with some text in it and open this dialog." +msgstr "Paragrafo honek zure dokumentuan ikusiko diren moduan agertzen ditu hitzak. Zure dokumentu baten testua ikusi nahi baduzu aurrebista honetan, dokumentuko paragrafo batean kokatu ezazu kurtsorea eta elkarrizketa hau ireki ezazu." #. DLG_Styles_ErrStyleNot -#: po/tmp/ap_String_Id.h.h:2395 +#: po/tmp/ap_String_Id.h.h:2426 msgid "" "This style does not exist \n" " so it cannot be modified" msgstr "" "Estilo hau ez da existitzen, \n" -" eta beraz, ezin daiteke aldatu" +" beraz, ezin da modifikatu" #. DLG_Column_Three -#: po/tmp/ap_String_Id.h.h:2397 +#: po/tmp/ap_String_Id.h.h:2428 msgid "Three" msgstr "Hiru" #. DLG_Lists_Tick_List #. STYLE_TICKLIST -#: po/tmp/ap_String_Id.h.h:2399 po/tmp/xap_String_Id.h.h:718 +#: po/tmp/ap_String_Id.h.h:2430 +#: po/tmp/xap_String_Id.h.h:757 msgid "Tick List" -msgstr "" +msgstr "Egiaztatze-zerrenda" #. FIELD_DateTime_TimeZone -#: po/tmp/ap_String_Id.h.h:2401 +#: po/tmp/ap_String_Id.h.h:2432 msgid "Time Zone" -msgstr "Ordu zona" +msgstr "Ordu-zona" #. FIELD_Document_Title -#: po/tmp/ap_String_Id.h.h:2403 +#: po/tmp/ap_String_Id.h.h:2434 msgid "Title" -msgstr "Titulua" +msgstr "Izenburua" #. DLG_ToggleCase_TitleCase -#: po/tmp/ap_String_Id.h.h:2405 +#: po/tmp/ap_String_Id.h.h:2436 msgid "Title Case" -msgstr "Tituluaren letra larri eta xeheak" +msgstr "Izenburuaren maiuskula/minuskula" #. DLG_MetaData_Title_LBL #. DLG_Image_LblTitle -#: po/tmp/ap_String_Id.h.h:2407 po/tmp/xap_String_Id.h.h:722 +#: po/tmp/ap_String_Id.h.h:2438 +#: po/tmp/xap_String_Id.h.h:761 msgid "Title:" -msgstr "Titulua:" +msgstr "Izenburua:" #. DLG_Options_Label_Toolbars -#: po/tmp/ap_String_Id.h.h:2409 +#: po/tmp/ap_String_Id.h.h:2440 msgid "Toolbars" msgstr "Tresna-barrak" #. TopMarginStatus -#: po/tmp/ap_String_Id.h.h:2411 +#: po/tmp/ap_String_Id.h.h:2442 #, c-format msgid "Top Margin [%s]" msgstr "Goi marjina [%s]" @@ -5881,132 +5956,137 @@ #. TOOLBAR_STATUSLINE_FMT_TOPLINE #. TOOLBAR_TOOLTIP_FMT_TOPLINE #. DLG_UFS_ToplineCheck -#: po/tmp/ap_String_Id.h.h:2416 po/tmp/xap_String_Id.h.h:728 +#: po/tmp/ap_String_Id.h.h:2447 +#: po/tmp/xap_String_Id.h.h:767 msgid "Topline" -msgstr "" +msgstr "Goimarra" #. DLG_Lists_Triangle_List #. STYLE_TRIANGLELIST -#: po/tmp/ap_String_Id.h.h:2418 po/tmp/xap_String_Id.h.h:730 +#: po/tmp/ap_String_Id.h.h:2449 +#: po/tmp/xap_String_Id.h.h:769 msgid "Triangle List" -msgstr "" +msgstr "Triangelu-zerrenda" #. DLG_Column_Two -#: po/tmp/ap_String_Id.h.h:2420 +#: po/tmp/ap_String_Id.h.h:2451 msgid "Two" msgstr "Bi" #. FIELD_Document_Type -#: po/tmp/ap_String_Id.h.h:2422 +#: po/tmp/ap_String_Id.h.h:2453 msgid "Type" -msgstr "Mota:" +msgstr "Mota" #. DLG_InsertBookmark_Msg -#: po/tmp/ap_String_Id.h.h:2424 +#: po/tmp/ap_String_Id.h.h:2455 msgid "Type a name for the bookmark, or select an existing from the list." -msgstr "Liburu-markarentzat izen bat idatzi, edo zerrendako bat aukeratu." +msgstr "Liburu-markarentzako izen bat idatzi, edo zerrendako bat hautatu." #. DLG_Lists_Type -#: po/tmp/ap_String_Id.h.h:2426 +#: po/tmp/ap_String_Id.h.h:2457 msgid "Type:" msgstr "Mota:" #. DLG_ToggleCase_UpperCase -#: po/tmp/ap_String_Id.h.h:2428 +#: po/tmp/ap_String_Id.h.h:2459 msgid "UPPERCASE" -msgstr "Letra LARRIAK" +msgstr "MAIUSKULA" #. TOOLBAR_LABEL_FMT_UNDERLINE #. TOOLBAR_STATUSLINE_FMT_UNDERLINE #. TOOLBAR_TOOLTIP_FMT_UNDERLINE #. DLG_UFS_UnderlineCheck -#: po/tmp/ap_String_Id.h.h:2432 po/tmp/xap_String_Id.h.h:750 +#: po/tmp/ap_String_Id.h.h:2463 +#: po/tmp/xap_String_Id.h.h:789 msgid "Underline" -msgstr "" +msgstr "Azpimarratu" #. MENU_STATUSLINE_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:2434 +#: po/tmp/ap_String_Id.h.h:2465 msgid "Underline the selection (toggle)" -msgstr "Aukeratutakoa azpimarratu" +msgstr "Hautespena azpimarratu/desmarratu" #. TOOLBAR_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2436 +#: po/tmp/ap_String_Id.h.h:2467 msgid "Undo" -msgstr "&Desegin" +msgstr "Desegin" #. MENU_STATUSLINE_EDIT_UNDO #. TOOLBAR_STATUSLINE_EDIT_UNDO #. TOOLBAR_TOOLTIP_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2440 +#: po/tmp/ap_String_Id.h.h:2471 msgid "Undo editing" msgstr "Edizioa desegin" #. DLG_Lists_Upper_Case_List #. STYLE_UPPERCASTELIST -#: po/tmp/ap_String_Id.h.h:2442 po/tmp/xap_String_Id.h.h:784 +#: po/tmp/ap_String_Id.h.h:2473 +#: po/tmp/xap_String_Id.h.h:823 msgid "Upper Case List" -msgstr "" +msgstr "Zerrenda, maiuskulaz" #. DLG_Lists_Upper_Roman_List #. STYLE_UPPERROMANLIST -#: po/tmp/ap_String_Id.h.h:2444 po/tmp/xap_String_Id.h.h:786 +#: po/tmp/ap_String_Id.h.h:2475 +#: po/tmp/xap_String_Id.h.h:825 msgid "Upper Roman List" -msgstr "" +msgstr "Zerrenda erromatarra, maiuskulaz" #. DLG_Column_RtlOrder -#: po/tmp/ap_String_Id.h.h:2446 +#: po/tmp/ap_String_Id.h.h:2477 msgid "Use RTL Order" -msgstr "Erabili RTL ordena" +msgstr "Eskuin-ezker ordena erabili" #. DLG_Options_Label_HebrewContextGlyphs -#: po/tmp/ap_String_Id.h.h:2448 +#: po/tmp/ap_String_Id.h.h:2479 msgid "Use glyph shaping for Hebrew" -msgstr "Erabili glyph itxura hebreotarrarentzako" +msgstr "Glifo formak erabili hebreerarako" #. DLG_Options_Label_UI -#: po/tmp/ap_String_Id.h.h:2450 +#: po/tmp/ap_String_Id.h.h:2481 msgid "User Interface" -msgstr "Hizkuntza Aukeratu:" +msgstr "Erabiltzaile-interfazea" #. DLG_Options_Label_UILang -#: po/tmp/ap_String_Id.h.h:2452 +#: po/tmp/ap_String_Id.h.h:2483 msgid "User Interface Language" -msgstr "Hizkuntza Aukeratu:" +msgstr "Erabiltzaile-interfazearen hizkuntza" #. DLG_Stylist_UserStyles -#: po/tmp/ap_String_Id.h.h:2454 +#: po/tmp/ap_String_Id.h.h:2485 msgid "User defined Styles" -msgstr "" +msgstr "Erabiltzaileak zehaztutako estiloak" #. DLG_Tab_Label_Existing -#: po/tmp/ap_String_Id.h.h:2456 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2487 msgid "User-defined Tabs" -msgstr "Erabiltzaileak zehaztutako estiloak" +msgstr "Erabiltzaileak zehaztutako tabulazioak" #. DLG_Styles_LBL_UserDefined -#: po/tmp/ap_String_Id.h.h:2458 +#: po/tmp/ap_String_Id.h.h:2489 msgid "User-defined styles" msgstr "Erabiltzaileak zehaztutako estiloak" #. FIELD_Application_Version #. DLG_History_Version_Version -#: po/tmp/ap_String_Id.h.h:2460 po/tmp/xap_String_Id.h.h:792 +#: po/tmp/ap_String_Id.h.h:2491 +#: po/tmp/xap_String_Id.h.h:833 msgid "Version" -msgstr "" +msgstr "Bertsioa" #. DLG_Options_TabLabel_View -#: po/tmp/ap_String_Id.h.h:2462 +#: po/tmp/ap_String_Id.h.h:2493 msgid "View" msgstr "Ikusi" #. MENU_STATUSLINE_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:2464 +#: po/tmp/ap_String_Id.h.h:2495 msgid "View document history" -msgstr "" +msgstr "Dokumentuaren historia ikusi" #. MENU_STATUSLINE_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:2466 +#: po/tmp/ap_String_Id.h.h:2497 msgid "View the document in full screen mode" msgstr "Dokumentua pantaila osoan ikusi" @@ -6019,106 +6099,105 @@ #. MENU_STATUSLINE_WINDOW_7 #. MENU_STATUSLINE_WINDOW_8 #. MENU_STATUSLINE_WINDOW_9 -#: po/tmp/ap_String_Id.h.h:2476 +#: po/tmp/ap_String_Id.h.h:2507 msgid "View this document" -msgstr "Dokumentu hau ireki" +msgstr "Dokumentu hau ikusi" #. DLG_Options_Label_ViewTooltips -#: po/tmp/ap_String_Id.h.h:2478 +#: po/tmp/ap_String_Id.h.h:2509 msgid "View tooltips" msgstr "Argibideak ikusi" #. DLG_Options_Label_ViewViewFrame -#: po/tmp/ap_String_Id.h.h:2480 +#: po/tmp/ap_String_Id.h.h:2511 msgid "View..." msgstr "Ikusi..." #. DLG_Options_Label_Visible -#: po/tmp/ap_String_Id.h.h:2482 +#: po/tmp/ap_String_Id.h.h:2513 msgid "Visible" -msgstr "Agerian" +msgstr "Ikusgarri" #. MSG_HyperlinkNoBookmark -#: po/tmp/ap_String_Id.h.h:2484 +#: po/tmp/ap_String_Id.h.h:2515 #, c-format msgid "Warning: the bookmark you provided [%s] does not exist." -msgstr "Kontuz: [%s]liburu-marka ez da existitzen." +msgstr "Kontuz: [%s] liburu-marka ez da existitzen." #. MENU_STATUSLINE_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:2486 +#: po/tmp/ap_String_Id.h.h:2517 msgid "Web Layout" msgstr "Web diseinua" #. DLG_Styles_LBL_TxtMsg -#: po/tmp/ap_String_Id.h.h:2488 +#: po/tmp/ap_String_Id.h.h:2519 msgid "What Hath God Wrought" -msgstr "Idatzi nahi duzuna" +msgstr "Lorem ipsum dolor" #. DLG_Options_Label_WithExtension -#: po/tmp/ap_String_Id.h.h:2490 +#: po/tmp/ap_String_Id.h.h:2521 msgid "With extension:" msgstr "Luzapen honekin:" #. DLG_WordCount_WordCountTitle #. FIELD_Numbers_WordCount -#: po/tmp/ap_String_Id.h.h:2493 +#: po/tmp/ap_String_Id.h.h:2524 msgid "Word Count" -msgstr "Hitzak zenbatu" +msgstr "Hitz zenbaketa" #. DLG_NEW_Tab1 -#: po/tmp/ap_String_Id.h.h:2495 +#: po/tmp/ap_String_Id.h.h:2526 msgid "Wordprocessing" msgstr "Hitzak prozesatzen" #. DLG_WordCount_Words_No_Notes -#: po/tmp/ap_String_Id.h.h:2497 +#: po/tmp/ap_String_Id.h.h:2528 msgid "Words (no footnotes/endnotes):" -msgstr "" +msgstr "Hitzak (orri-oinak/bukaerako oharrak ez):" #. DLG_Options_Label_SpellUppercase -#: po/tmp/ap_String_Id.h.h:2499 +#: po/tmp/ap_String_Id.h.h:2530 msgid "Words in &UPPERCASE" -msgstr "Hitzak letra LARRIZ" +msgstr "Hitzak &MAIUSKULAZ" #. DLG_Options_Label_SpellNumbers -#: po/tmp/ap_String_Id.h.h:2501 +#: po/tmp/ap_String_Id.h.h:2532 msgid "Words with num&bers" -msgstr "Hitzak zenbakiekin" +msgstr "Hitz &zenbakidunak" #. DLG_WordCount_Words -#: po/tmp/ap_String_Id.h.h:2503 +#: po/tmp/ap_String_Id.h.h:2534 msgid "Words:" -msgstr "Hitzak" +msgstr "Hitzak:" #. MSG_SaveFailedWrite -#: po/tmp/ap_String_Id.h.h:2505 +#: po/tmp/ap_String_Id.h.h:2536 #, c-format msgid "Writing error when attempting to save %s" -msgstr "Idazkera akatsa %s gordetzen saiatzean" +msgstr "Idazketa-errorea %s gordetzen saiatzean" #. MSG_DefaultDirectionChg -#: po/tmp/ap_String_Id.h.h:2507 +#: po/tmp/ap_String_Id.h.h:2538 msgid "You have changed the default direction." -msgstr "Norabide lehenetsia aldatu duzu." +msgstr "Noranzko lehenetsia aldatu duzu." #. MSG_DirectionModeChg -#: po/tmp/ap_String_Id.h.h:2509 +#: po/tmp/ap_String_Id.h.h:2540 msgid "You have changed the direction mode." -msgstr "Idazkeraren norabidea aldatu duzu." +msgstr "Noranzko-modua aldatu duzu." #. MSG_HyperlinkNoSelection -#: po/tmp/ap_String_Id.h.h:2511 +#: po/tmp/ap_String_Id.h.h:2542 msgid "You must select a portion of the document before inserting a hyperlink." -msgstr "" -"Dokumentuaren zati bat aukeratu behar da hiperesteka bat txertatu aurretik." +msgstr "Dokumentuaren zati bat hautatu behar duzu hiperesteka txertatu aurretik." #. DLG_Options_Label_InvalidRangeForAutoSave -#: po/tmp/ap_String_Id.h.h:2513 +#: po/tmp/ap_String_Id.h.h:2544 msgid "You should choose a range from 1 to 120 for the auto save frequency" -msgstr "Automatikoki gordetzeko maiztasuna 1 eta 120 bitartean aukeratu" +msgstr "Automatikoki gordetzeko maiztasuna 1 eta 120 bitartekoa izan behar da" #. MSG_ConfirmSaveSecondary -#: po/tmp/ap_String_Id.h.h:2515 +#: po/tmp/ap_String_Id.h.h:2546 msgid "Your changes will be lost if you don't save them." msgstr "Aldaketak galdu egingo dira ez badituzu gordetzen." @@ -6126,89 +6205,90 @@ #. TOOLBAR_STATUSLINE_ZOOM #. TOOLBAR_TOOLTIP_ZOOM #. DLG_Zoom_ZoomTitle -#: po/tmp/ap_String_Id.h.h:2519 po/tmp/xap_String_Id.h.h:839 +#: po/tmp/ap_String_Id.h.h:2550 +#: po/tmp/xap_String_Id.h.h:882 msgid "Zoom" -msgstr "" +msgstr "Zoom" #. MENU_LABEL_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2521 +#: po/tmp/ap_String_Id.h.h:2552 msgid "Zoom to &100%" -msgstr "Zoom-a %&100ean" +msgstr "%&100eko zooma" #. MENU_LABEL_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2523 +#: po/tmp/ap_String_Id.h.h:2554 msgid "Zoom to &200%" -msgstr "Zoom-a %&200ean" +msgstr "%&200eko zooma" #. MENU_LABEL_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2525 +#: po/tmp/ap_String_Id.h.h:2556 msgid "Zoom to &50%" -msgstr "Zoom-a %&50ean" +msgstr "%&50eko zooma" #. MENU_LABEL_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2527 +#: po/tmp/ap_String_Id.h.h:2558 msgid "Zoom to &75%" -msgstr "Zoom-a %&75ean" +msgstr "%&75eko zooma" #. MENU_STATUSLINE_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2529 +#: po/tmp/ap_String_Id.h.h:2560 msgid "Zoom to 100%" -msgstr "Zoom-a %100ean" +msgstr "%100eko zooma" #. MENU_STATUSLINE_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2531 +#: po/tmp/ap_String_Id.h.h:2562 msgid "Zoom to 200%" -msgstr "Zoom-a %200ean" +msgstr "%200eko zooma" #. MENU_STATUSLINE_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2533 +#: po/tmp/ap_String_Id.h.h:2564 msgid "Zoom to 50%" -msgstr "Zoom-a %50ean" +msgstr "%50eko zooma" #. MENU_STATUSLINE_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2535 +#: po/tmp/ap_String_Id.h.h:2566 msgid "Zoom to 75%" -msgstr "Zoom-a %75ean" +msgstr "%75eko zooma" #. MENU_STATUSLINE_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:2537 +#: po/tmp/ap_String_Id.h.h:2568 msgid "Zoom to page width" -msgstr "Zoom-a orri zabaleraren tamainan" +msgstr "Orri-zabalerara zoom" #. MENU_STATUSLINE_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:2539 +#: po/tmp/ap_String_Id.h.h:2570 msgid "Zoom to whole page" -msgstr "Zoom-a orri guztira" +msgstr "Orri osora zoom" #. DLG_Options_Label_CustomDict -#: po/tmp/ap_String_Id.h.h:2541 +#: po/tmp/ap_String_Id.h.h:2572 msgid "custom.dic" msgstr "custom.dic" #. FIELD_DateTime_DDMMYY -#: po/tmp/ap_String_Id.h.h:2543 +#: po/tmp/ap_String_Id.h.h:2574 msgid "dd/mm/yy" msgstr "ee/hh/uu" #. DLG_ToggleCase_LowerCase -#: po/tmp/ap_String_Id.h.h:2545 +#: po/tmp/ap_String_Id.h.h:2576 msgid "lowercase" -msgstr "Letra xeheak" +msgstr "minuskula" #. DLG_Options_Label_Minutes -#: po/tmp/ap_String_Id.h.h:2547 +#: po/tmp/ap_String_Id.h.h:2578 msgid "minutes" msgstr "minutuak" #. FIELD_DateTime_MMDDYY -#: po/tmp/ap_String_Id.h.h:2549 +#: po/tmp/ap_String_Id.h.h:2580 msgid "mm/dd/yy" msgstr "hh/ee/uu" #. DLG_ToggleCase_ToggleCase -#: po/tmp/ap_String_Id.h.h:2551 +#: po/tmp/ap_String_Id.h.h:2582 msgid "tOGGLE cASE" -msgstr "aLDATU lETRA lARRI eTA xEHEAK" +msgstr "mAIUSKULA eTA mINISKULAK aLDATU" #. #. * Translatable strings file generated by extract-ui. @@ -6216,6 +6296,7 @@ #. #. DLG_UP_To #: po/tmp/xap_String_Id.h.h:7 +#, fuzzy msgid " to " msgstr " -raino " @@ -6237,37 +6318,37 @@ #. DLG_Zoom_PageWidth #: po/tmp/xap_String_Id.h.h:17 msgid "&Page width" -msgstr "Orri zabalera" +msgstr "Orri-&zabalera" #. DLG_ULANG_SetLangButton #: po/tmp/xap_String_Id.h.h:19 msgid "&Set Language" -msgstr "" +msgstr "Hizkuntza &ezarri" #. DLG_Zoom_WholePage #: po/tmp/xap_String_Id.h.h:23 msgid "&Whole page" -msgstr "Orri osoa" +msgstr "Orri &osoa" #. LANG_0 #: po/tmp/xap_String_Id.h.h:25 msgid "(no proofing)" -msgstr "Hizkuntza bat ere ez" +msgstr "(probarik gabe)" #. DLG_DocComparison_TestSkipped #: po/tmp/xap_String_Id.h.h:27 msgid "(test skipped)" -msgstr "" +msgstr "(proba saltatua)" #. DLG_NoSaveFile_DirNotExist #: po/tmp/xap_String_Id.h.h:29 msgid "A directory in the given pathname does not exist." -msgstr "Sartutako bidean direktorioa ez da existitzen." +msgstr "Direktorioren bat ez da existitzen zehaztutako bidean." #. DLG_PLUGIN_MANAGER_TITLE #: po/tmp/xap_String_Id.h.h:31 msgid "AbiWord Plugin Manager" -msgstr "Abiword Plugin Administratzailea" +msgstr "Abiword plugin-kudeatzailea" #. SPELL_CANTLOAD_DLL #: po/tmp/xap_String_Id.h.h:33 @@ -6276,27 +6357,25 @@ "AbiWord cannot find the spelling file %s.dll\n" "Please download and install Aspell from http://aspell.net/win32/" msgstr "" +"AbiWord-ek ezin du %s.dll ortografia-fitxategia aurkitu\n" +"Aspell deskargatu eta instalatu ezazu: http://aspell.net/win32/" #. MSG_HistoryPartRestore1 #: po/tmp/xap_String_Id.h.h:35 #, c-format -msgid "" -"AbiWord cannot fully restore version %d of the document because the version " -"information is incomplete." -msgstr "" +msgid "AbiWord cannot fully restore version %d of the document because the version information is incomplete." +msgstr "AbiWord-ek ezin du dokumentuaren %d bertsioa erabat berreskuratu, ez dagoelako bertsio-informazio guztia." #. MSG_HistoryNoRestore #: po/tmp/xap_String_Id.h.h:37 #, c-format -msgid "" -"AbiWord cannot restore version %d of the document because the version " -"information is missing." -msgstr "" +msgid "AbiWord cannot restore version %d of the document because the version information is missing." +msgstr "AbiWord-ek ezin du dokumentuaren %d bertsioa berreskuratu, ez dagoelako bertsio-informaziorik." #. DLG_UP_PrintPreviewTitle #: po/tmp/xap_String_Id.h.h:39 msgid "AbiWord: Print Preview" -msgstr "AbiWord: Inprimatu Aurreikuspena" +msgstr "AbiWord: Inprimatze-aurrebista" #. DLG_ABOUT_Title #: po/tmp/xap_String_Id.h.h:41 @@ -6307,7 +6386,7 @@ #. DLG_PLUGIN_MANAGER_ACTIVE #: po/tmp/xap_String_Id.h.h:43 msgid "Active Plugins" -msgstr "Plugin Aktiboak" +msgstr "Plugin gaituak" #. LANG_AF_ZA #: po/tmp/xap_String_Id.h.h:45 @@ -6316,9 +6395,8 @@ #. LANG_AK_GH #: po/tmp/xap_String_Id.h.h:47 -#, fuzzy msgid "Akan" -msgstr "Afrikaans" +msgstr "Akanera" #. LANG_SQ_AL #: po/tmp/xap_String_Id.h.h:49 @@ -6328,1961 +6406,2025 @@ #. DLG_FOSA_ALL #: po/tmp/xap_String_Id.h.h:53 msgid "All (*.*)" -msgstr "Denak(*.*)" +msgstr "Guztiak (*.*)" #. DLG_FOSA_ALLDOCS #: po/tmp/xap_String_Id.h.h:55 msgid "All Documents" -msgstr "Dokumentu Guztiak" +msgstr "Dokumentu guztiak" #. DLG_FOSA_ALLIMAGES #: po/tmp/xap_String_Id.h.h:57 msgid "All Image Files" -msgstr "Irudi Fitxategi Guztiak" +msgstr "Irudi-fitxategi guztiak" #. DLG_HTMLOPT_ExpAllowAWML #: po/tmp/xap_String_Id.h.h:59 msgid "Allow extra markup in AWML namespace" -msgstr "Gaitu marka bereziak AWML izen inguruan" +msgstr "Marka bereziak gaitu AWML izen-inguruan" #. LANG_AM_ET #: po/tmp/xap_String_Id.h.h:61 msgid "Amharic (Ethiopia)" -msgstr "Amharic-era (Etiopia)" +msgstr "Amharera (Etiopia)" -#. LANG_AR_EG +#. LANG_AR #: po/tmp/xap_String_Id.h.h:65 +msgid "Arabic" +msgstr "Arabiera" + +#. LANG_AR_EG +#: po/tmp/xap_String_Id.h.h:67 msgid "Arabic (Egypt)" msgstr "Arabiera (Egipto)" #. LANG_AR_SA -#: po/tmp/xap_String_Id.h.h:67 +#: po/tmp/xap_String_Id.h.h:69 msgid "Arabic (Saudi Arabia)" msgstr "Arabiera (Saudi Arabia)" #. ENC_ARAB_ISO -#: po/tmp/xap_String_Id.h.h:69 +#: po/tmp/xap_String_Id.h.h:71 msgid "Arabic, ISO-8859-6" msgstr "Arabiera, ISO-8859-6" #. ENC_ARAB_MAC -#: po/tmp/xap_String_Id.h.h:71 +#: po/tmp/xap_String_Id.h.h:73 msgid "Arabic, Macintosh" msgstr "Arabiera, Macintosh" #. ENC_ARAB_WIN -#: po/tmp/xap_String_Id.h.h:73 +#: po/tmp/xap_String_Id.h.h:75 msgid "Arabic, Windows Code Page 1256" -msgstr "Arabiera, Windows 1256 Orri Kodea" +msgstr "Arabiera, Windows 1256 kode-orria" #. LANG_HY_AM -#: po/tmp/xap_String_Id.h.h:75 +#: po/tmp/xap_String_Id.h.h:77 msgid "Armenian" msgstr "Armeniera" #. ENC_ARME_ARMSCII -#: po/tmp/xap_String_Id.h.h:77 +#: po/tmp/xap_String_Id.h.h:79 msgid "Armenian, ARMSCII-8" msgstr "Armeniera, ARMSCII-8" #. LANG_AS_IN -#: po/tmp/xap_String_Id.h.h:79 +#: po/tmp/xap_String_Id.h.h:81 msgid "Assamese" msgstr "Assamera" #. LANG_AST_ES -#: po/tmp/xap_String_Id.h.h:81 +#: po/tmp/xap_String_Id.h.h:83 msgid "Asturian (Spain)" -msgstr "" +msgstr "Asturiera (Espainia)" #. DLG_Options_Label_DirMarkerAfterClosingParenthesis -#: po/tmp/xap_String_Id.h.h:85 +#: po/tmp/xap_String_Id.h.h:87 msgid "Auto-insert direction markers" -msgstr "" +msgstr "Noranzko-markak autotxertatu" #. DLG_History_Version_AutoRevisioned -#: po/tmp/xap_String_Id.h.h:87 +#: po/tmp/xap_String_Id.h.h:89 msgid "Auto-revision" -msgstr "" +msgstr "Auto-berrikuspena" #. DLG_FOSA_FileTypeAutoDetect -#: po/tmp/xap_String_Id.h.h:89 +#: po/tmp/xap_String_Id.h.h:91 msgid "Automatically Detected" -msgstr "Automatikoki Detektatua" +msgstr "Automatikoki detektatua" #. MSG_AutoRevision -#: po/tmp/xap_String_Id.h.h:91 +#: po/tmp/xap_String_Id.h.h:93 msgid "Autorevision" -msgstr "" +msgstr "Autoberrikuspena" #. DLG_MW_AvailableDocuments -#: po/tmp/xap_String_Id.h.h:93 +#: po/tmp/xap_String_Id.h.h:95 msgid "Available Documents" -msgstr "" +msgstr "Dokumentu erabilgarriak" #. DLG_ULANG_AvailableLanguages -#: po/tmp/xap_String_Id.h.h:95 +#: po/tmp/xap_String_Id.h.h:97 msgid "Available Languages" -msgstr "" +msgstr "Hizkuntza erabilgarriak" + +#. LANG_AYM_BO +#: po/tmp/xap_String_Id.h.h:99 +msgid "Aymara (La Paz)" +msgstr "Aimara (La Paz)" + +#. LANG_AYC_BO +#: po/tmp/xap_String_Id.h.h:101 +msgid "Aymara (Oruro)" +msgstr "Aimara (Oruro)" #. ENC_BALT_ISO -#: po/tmp/xap_String_Id.h.h:97 +#: po/tmp/xap_String_Id.h.h:103 msgid "Baltic, ISO-8859-4" -msgstr "Baltikoa, ISO-8859-4" +msgstr "Baltar hizkuntzak, ISO-8859-4" #. ENC_BALT_WIN -#: po/tmp/xap_String_Id.h.h:99 +#: po/tmp/xap_String_Id.h.h:105 msgid "Baltic, Windows Code Page 1257" -msgstr "Baltikoa, Windows 1257 Orri Kodea" +msgstr "Baltar hizkuntzak, Windows 1257 kode-orria" #. LANG_EU_ES -#: po/tmp/xap_String_Id.h.h:101 +#: po/tmp/xap_String_Id.h.h:107 msgid "Basque" msgstr "Euskara" #. LANG_BE_BY -#: po/tmp/xap_String_Id.h.h:103 +#: po/tmp/xap_String_Id.h.h:109 msgid "Belarusian" msgstr "Bielorrusiera" +#. LANG_BE_LATIN +#: po/tmp/xap_String_Id.h.h:111 +msgid "Belarusian, Latin" +msgstr "Bielorrusiera, Latin" + #. LANG_BN_IN -#: po/tmp/xap_String_Id.h.h:105 +#: po/tmp/xap_String_Id.h.h:113 msgid "Bengali" -msgstr "" +msgstr "Bengalera" #. DLG_UP_BlackWhite -#: po/tmp/xap_String_Id.h.h:107 +#: po/tmp/xap_String_Id.h.h:115 msgid "Black & White" -msgstr "Zuria eta Beltza" +msgstr "Zuria eta beltza" #. STYLE_BLOCKTEXT -#: po/tmp/xap_String_Id.h.h:109 +#: po/tmp/xap_String_Id.h.h:117 msgid "Block Text" -msgstr "Testu blokea" +msgstr "Testu-blokea" #. DLG_UFS_StyleBoldItalic -#: po/tmp/xap_String_Id.h.h:113 +#: po/tmp/xap_String_Id.h.h:121 msgid "Bold Italic" -msgstr "Lodia eta Etzana" +msgstr "Lodia eta etzana" #. LANG_BR_FR -#: po/tmp/xap_String_Id.h.h:119 +#: po/tmp/xap_String_Id.h.h:127 msgid "Breton" -msgstr "Bretoniera" +msgstr "Bretainiera" #. MSG_BuildingDoc -#: po/tmp/xap_String_Id.h.h:121 +#: po/tmp/xap_String_Id.h.h:129 msgid "Building Document:" -msgstr "Dokumentua sortzen.." +msgstr "Dokumentua sortzen:" #. LANG_BG_BG -#: po/tmp/xap_String_Id.h.h:123 +#: po/tmp/xap_String_Id.h.h:131 msgid "Bulgarian" msgstr "Bulgariera" #. DLG_Cancel -#: po/tmp/xap_String_Id.h.h:127 +#: po/tmp/xap_String_Id.h.h:135 msgid "Cancel" msgstr "Utzi" #. LANG_CA_ES -#: po/tmp/xap_String_Id.h.h:129 +#: po/tmp/xap_String_Id.h.h:137 msgid "Catalan" -msgstr "Katalana" +msgstr "Katalan" + +#. LANG_AYR +#: po/tmp/xap_String_Id.h.h:139 +msgid "Central Aymara" +msgstr "Erdialdeko Aimara" #. ENC_CENT_ISO -#: po/tmp/xap_String_Id.h.h:131 +#: po/tmp/xap_String_Id.h.h:141 msgid "Central European, ISO-8859-2" msgstr "Erdialdeko Europa, ISO-8859-2" #. ENC_CENT_MAC -#: po/tmp/xap_String_Id.h.h:133 +#: po/tmp/xap_String_Id.h.h:143 msgid "Central European, Macintosh" msgstr "Erdialdeko Europa, Macintosh" #. ENC_CENT_WIN -#: po/tmp/xap_String_Id.h.h:135 +#: po/tmp/xap_String_Id.h.h:145 msgid "Central European, Windows Code Page 1250" -msgstr "Erdialdeko Europa, Windows 1250 Orri Kodea" +msgstr "Erdialdeko Europa, Windows 1250 kode-orria" #. DLG_Options_Label_LangWithKeyboard -#: po/tmp/xap_String_Id.h.h:137 +#: po/tmp/xap_String_Id.h.h:147 msgid "Change Language when changing keyboard" -msgstr "Aldatu hizkuntza teklatua aldatzean" +msgstr "Hizkuntza aldatu teklatua aldatzean" #. STYLE_CHAPHEADING -#: po/tmp/xap_String_Id.h.h:139 +#: po/tmp/xap_String_Id.h.h:149 msgid "Chapter Heading" -msgstr "Kapituluaren titulua" +msgstr "Kapituluaren izenburua" #. LANG_ZH_HK -#: po/tmp/xap_String_Id.h.h:141 +#: po/tmp/xap_String_Id.h.h:151 msgid "Chinese (Hong Kong)" msgstr "Txinera (Hong Kong)" #. LANG_ZH_CN -#: po/tmp/xap_String_Id.h.h:143 +#: po/tmp/xap_String_Id.h.h:153 msgid "Chinese (PRC)" msgstr "Txinera (PRC)" #. LANG_ZH_SG -#: po/tmp/xap_String_Id.h.h:145 +#: po/tmp/xap_String_Id.h.h:155 msgid "Chinese (Singapore)" msgstr "Txinera (Singapur)" #. LANG_ZH_TW -#: po/tmp/xap_String_Id.h.h:147 +#: po/tmp/xap_String_Id.h.h:157 msgid "Chinese (Taiwan)" msgstr "Txinera (Taiwan)" #. ENC_CHSI_EUC -#: po/tmp/xap_String_Id.h.h:149 +#: po/tmp/xap_String_Id.h.h:159 msgid "Chinese Simplified, EUC-CN (GB2312)" -msgstr "Txinera Erraztua, EUC-CN (GB2312)" +msgstr "Txinera sinplifikatua, EUC-CN (GB2312)" #. ENC_CHSI_GB -#: po/tmp/xap_String_Id.h.h:151 +#: po/tmp/xap_String_Id.h.h:161 msgid "Chinese Simplified, GB_2312-80" -msgstr "Txinera Erraztua, GB_2312-80" +msgstr "Txinera sinplifikatua, GB_2312-80" #. ENC_CHSI_HZ -#: po/tmp/xap_String_Id.h.h:153 +#: po/tmp/xap_String_Id.h.h:163 msgid "Chinese Simplified, HZ" -msgstr "Txinera Erraztua, HZ" +msgstr "Txinera sinplifikatua, HZ" #. ENC_CHSI_WIN -#: po/tmp/xap_String_Id.h.h:155 +#: po/tmp/xap_String_Id.h.h:165 msgid "Chinese Simplified, Windows Code Page 936" -msgstr "Txinera Erraztua, Windows 936 Orri Kodea" +msgstr "Txinera sinplifikatua, Windows 936 kode-orria" #. ENC_CHTR_BIG5 -#: po/tmp/xap_String_Id.h.h:157 +#: po/tmp/xap_String_Id.h.h:167 msgid "Chinese Traditional, BIG5" -msgstr "Ohiko Txinera, BIG5" +msgstr "Txinera tradizionala, BIG5" #. ENC_CHTR_BIG5HKSCS -#: po/tmp/xap_String_Id.h.h:159 +#: po/tmp/xap_String_Id.h.h:169 msgid "Chinese Traditional, BIG5-HKSCS" -msgstr "Ohiko Txinera, BIG5-HKSCS" +msgstr "Txinera tradizionala, BIG5-HKSCS" #. ENC_CHTR_EUC -#: po/tmp/xap_String_Id.h.h:161 +#: po/tmp/xap_String_Id.h.h:171 msgid "Chinese Traditional, EUC-TW" -msgstr "Ohiko Txinera, EUC-TW" +msgstr "Txinera tradizionala, EUC-TW" #. ENC_CHTR_WIN -#: po/tmp/xap_String_Id.h.h:163 +#: po/tmp/xap_String_Id.h.h:173 msgid "Chinese Traditional, Windows Code Page 950" -msgstr "Ohiko Txinera, 950 Windows Orri Kodea" +msgstr "Txinera tradizionala, Windows 950 kode-orria" #. DLG_LISTDOCS_Heading1 -#: po/tmp/xap_String_Id.h.h:165 +#: po/tmp/xap_String_Id.h.h:175 msgid "Choose document from the list:" -msgstr "" +msgstr "Zerrendako dokumentu bat hautatu:" + +#. TB_ClearBackground +#: po/tmp/xap_String_Id.h.h:177 +msgid "Clear Background" +msgstr "Atzealdea garbitu" #. DLG_CLIPART_Title -#: po/tmp/xap_String_Id.h.h:167 +#: po/tmp/xap_String_Id.h.h:179 msgid "Clip Art" msgstr "Clip Art" +#. DLG_CLIPART_Error +#: po/tmp/xap_String_Id.h.h:181 +msgid "Clip Art could not be loaded" +msgstr "Ezin izan da Clip Art irudia kargatu" + #. DLG_Close -#: po/tmp/xap_String_Id.h.h:169 +#: po/tmp/xap_String_Id.h.h:183 msgid "Close" msgstr "Itxi" #. DLG_Exit_CloseWithoutSaving -#: po/tmp/xap_String_Id.h.h:171 +#: po/tmp/xap_String_Id.h.h:185 msgid "Close &Without Saving" -msgstr "Itxi gorde gabe" +msgstr "&Ez gorde" #. DLG_UP_Collate -#: po/tmp/xap_String_Id.h.h:173 +#: po/tmp/xap_String_Id.h.h:187 msgid "Collate" -msgstr "Tartekatu kopiak" +msgstr "Tartekatu" #. DLG_UP_Color -#: po/tmp/xap_String_Id.h.h:175 +#: po/tmp/xap_String_Id.h.h:189 msgid "Color" msgstr "Kolorea" #. DLG_Compare -#: po/tmp/xap_String_Id.h.h:179 +#: po/tmp/xap_String_Id.h.h:193 msgid "Compare" -msgstr "" +msgstr "Konparatu" #. DLG_DocComparison_Content -#: po/tmp/xap_String_Id.h.h:181 +#: po/tmp/xap_String_Id.h.h:195 msgid "Content:" -msgstr "" +msgstr "Edukia:" #. STYLE_TOCHEADING1 -#: po/tmp/xap_String_Id.h.h:183 +#: po/tmp/xap_String_Id.h.h:197 msgid "Contents 1" -msgstr "" +msgstr "Edukiak 1" #. STYLE_TOCHEADING2 -#: po/tmp/xap_String_Id.h.h:185 +#: po/tmp/xap_String_Id.h.h:199 msgid "Contents 2" -msgstr "" +msgstr "Edukiak 2" #. STYLE_TOCHEADING3 -#: po/tmp/xap_String_Id.h.h:187 +#: po/tmp/xap_String_Id.h.h:201 msgid "Contents 3" -msgstr "" +msgstr "Edukiak 3" #. STYLE_TOCHEADING4 -#: po/tmp/xap_String_Id.h.h:189 +#: po/tmp/xap_String_Id.h.h:203 msgid "Contents 4" -msgstr "" +msgstr "Edukiak 4" #. STYLE_TOCHEADING -#: po/tmp/xap_String_Id.h.h:191 +#: po/tmp/xap_String_Id.h.h:205 msgid "Contents Header" -msgstr "" +msgstr "Edukien izenburua" #. DLG_UP_Copies -#: po/tmp/xap_String_Id.h.h:193 +#: po/tmp/xap_String_Id.h.h:207 msgid "Copies: " msgstr "Kopiak: " +#. LANG_COP_EG +#: po/tmp/xap_String_Id.h.h:209 +msgid "Coptic" +msgstr "Coptic (Egipto)" + #. LANG_KW_GB -#: po/tmp/xap_String_Id.h.h:195 +#: po/tmp/xap_String_Id.h.h:211 msgid "Cornish" -msgstr "Kornuailes-era" +msgstr "Kornubiera" #. LANG_CO_FR -#: po/tmp/xap_String_Id.h.h:197 +#: po/tmp/xap_String_Id.h.h:213 msgid "Corsican" msgstr "Korsikera" #. DLG_PLUGIN_MANAGER_COULDNT_LOAD -#: po/tmp/xap_String_Id.h.h:199 +#: po/tmp/xap_String_Id.h.h:215 msgid "Could not activate/load plugin" -msgstr "Ezin izan da aktibatu/kargatu plugina" +msgstr "Ezin izan da plugina gaitu/kargatu" #. DLG_PLUGIN_MANAGER_COULDNT_UNLOAD -#: po/tmp/xap_String_Id.h.h:201 +#: po/tmp/xap_String_Id.h.h:217 msgid "Could not deactivate plugin" -msgstr "Ezin izan da plugina desaktibatu" +msgstr "Ezin izan da plugina ezgaitu" #. SPELL_CANTLOAD_DICT -#: po/tmp/xap_String_Id.h.h:203 +#: po/tmp/xap_String_Id.h.h:219 #, c-format msgid "Could not load the dictionary for the %s language" -msgstr "" +msgstr "Ezin izan da %s hizkuntzaren hiztegia kargatu" #. DLG_History_Version_Started -#: po/tmp/xap_String_Id.h.h:205 +#: po/tmp/xap_String_Id.h.h:221 msgid "Created" -msgstr "" +msgstr "Sortua" #. DLG_History_Created -#: po/tmp/xap_String_Id.h.h:207 +#: po/tmp/xap_String_Id.h.h:223 msgid "Created:" -msgstr "" +msgstr "Sortua:" -#. LANG_HR -#: po/tmp/xap_String_Id.h.h:209 +#. LANG_HR_HR +#: po/tmp/xap_String_Id.h.h:225 msgid "Croatian" msgstr "Kroaziera" #. ENC_CROA_MAC -#: po/tmp/xap_String_Id.h.h:211 +#: po/tmp/xap_String_Id.h.h:227 msgid "Croatian, Macintosh" msgstr "Kroaziera, Macintosh" #. ENC_CYRL_ISO -#: po/tmp/xap_String_Id.h.h:213 +#: po/tmp/xap_String_Id.h.h:229 msgid "Cyrillic, ISO-8859-5" msgstr "Zirilikoa, ISO-8859-5" #. ENC_CYRL_KOI -#: po/tmp/xap_String_Id.h.h:215 +#: po/tmp/xap_String_Id.h.h:231 msgid "Cyrillic, KOI8-R" msgstr "Zirilikoa, KOI8-R" #. ENC_CYRL_MAC -#: po/tmp/xap_String_Id.h.h:217 +#: po/tmp/xap_String_Id.h.h:233 msgid "Cyrillic, Macintosh" msgstr "Zirilikoa, Macintosh" #. ENC_CYRL_WIN -#: po/tmp/xap_String_Id.h.h:219 +#: po/tmp/xap_String_Id.h.h:235 msgid "Cyrillic, Windows Code Page 1251" -msgstr "Zirilikoa, Windows 1251 Orri Kodea" +msgstr "Zirilikoa, Windows 1251 kode-orria" #. LANG_CS_CZ -#: po/tmp/xap_String_Id.h.h:221 +#: po/tmp/xap_String_Id.h.h:237 msgid "Czech" msgstr "Txekiera" #. LANG_DA_DK -#: po/tmp/xap_String_Id.h.h:223 +#: po/tmp/xap_String_Id.h.h:239 msgid "Danish" msgstr "Daniera" #. DLG_PLUGIN_MANAGER_DEACTIVATE_ALL -#: po/tmp/xap_String_Id.h.h:227 +#: po/tmp/xap_String_Id.h.h:243 msgid "Deactivate all plugins" -msgstr "Plugin guztiak desaktibatu" +msgstr "Plugin guztiak ezgaitu" #. DLG_PLUGIN_MANAGER_DEACTIVATE -#: po/tmp/xap_String_Id.h.h:229 +#: po/tmp/xap_String_Id.h.h:245 msgid "Deactivate plugin" -msgstr "Plugina desaktibatu" +msgstr "Plugina ezgaitu" #. DLG_HTMLOPT_ExpDeclareXML -#: po/tmp/xap_String_Id.h.h:231 +#: po/tmp/xap_String_Id.h.h:247 msgid "Declare as XML (version 1.0)" -msgstr "Deklaratu XML (1.0 bertsioa) bezala" +msgstr "XML (1.0 bertsioa) bezala deklaratu" #. DLG_ULANG_DefaultLangLabel -#: po/tmp/xap_String_Id.h.h:233 +#: po/tmp/xap_String_Id.h.h:249 msgid "Default language: " -msgstr "" +msgstr "Hizkuntza lehenetsia:" #. DLG_Image_Placement -#: po/tmp/xap_String_Id.h.h:235 +#: po/tmp/xap_String_Id.h.h:251 msgid "Define Image Placement" -msgstr "" +msgstr "Irudiaren kokalekua definitu" #. DLG_Image_TextWrapping -#: po/tmp/xap_String_Id.h.h:237 +#: po/tmp/xap_String_Id.h.h:253 msgid "Define Text Wrapping" -msgstr "" +msgstr "Testu-egokitzea definitu" #. DLG_Remove_Icon -#: po/tmp/xap_String_Id.h.h:246 +#: po/tmp/xap_String_Id.h.h:262 msgid "Do you want to remove this icon from the toolbar?" -msgstr "Nahi al duzu ikono hau tresna-barratik kentzea?" +msgstr "Ikono hau tresna-barratik kendu nahi al duzu?" #. DLG_DocComparison_WindowLabel -#: po/tmp/xap_String_Id.h.h:248 +#: po/tmp/xap_String_Id.h.h:264 msgid "Document Comparison" -msgstr "" +msgstr "Dokumentuen konparazioa" #. DLG_History_DocumentDetails -#: po/tmp/xap_String_Id.h.h:250 +#: po/tmp/xap_String_Id.h.h:266 msgid "Document Details" -msgstr "" +msgstr "Dokumentuaren xehetasunak" #. DLG_History_WindowLabel -#: po/tmp/xap_String_Id.h.h:252 +#: po/tmp/xap_String_Id.h.h:268 msgid "Document History" -msgstr "" +msgstr "Dokumentuaren historia" #. DLG_History_Path -#: po/tmp/xap_String_Id.h.h:254 +#: po/tmp/xap_String_Id.h.h:270 msgid "Document name:" -msgstr "" +msgstr "Dokumentuaren izena:" #. DLG_DocComparison_DocsCompared -#: po/tmp/xap_String_Id.h.h:256 +#: po/tmp/xap_String_Id.h.h:272 msgid "Documents compared" -msgstr "" +msgstr "Konparatutako dokumentuak" #. LANG_NL_NL -#: po/tmp/xap_String_Id.h.h:258 +#: po/tmp/xap_String_Id.h.h:274 msgid "Dutch (Netherlands)" msgstr "Nederlandera (Holanda)" #. DLG_History_EditTime -#: po/tmp/xap_String_Id.h.h:260 +#: po/tmp/xap_String_Id.h.h:276 msgid "Editing time:" -msgstr "" +msgstr "Edizio-denbora:" #. DLG_UFS_EffectsFrameLabel -#: po/tmp/xap_String_Id.h.h:262 +#: po/tmp/xap_String_Id.h.h:278 msgid "Effects" msgstr "Efektuak" #. DLG_HTMLOPT_ExpEmbedCSS -#: po/tmp/xap_String_Id.h.h:264 +#: po/tmp/xap_String_Id.h.h:280 msgid "Embed (CSS) style sheet" -msgstr "Hartu (CSS) estilo-orria" +msgstr "Estilo-orria (CSS) kapsulatu" #. DLG_UP_EmbedFonts -#: po/tmp/xap_String_Id.h.h:266 +#: po/tmp/xap_String_Id.h.h:282 msgid "Embed Fonts" -msgstr "Letra motak sartu" +msgstr "Letra-motak kapsulatu" #. DLG_HTMLOPT_ExpEmbedImages -#: po/tmp/xap_String_Id.h.h:268 +#: po/tmp/xap_String_Id.h.h:284 +#, fuzzy msgid "Embed images in URLs (Base64-encoded)" -msgstr "Kodeketa" +msgstr "URL-etako irudiak kapsulatu (Base64 kodeketa)" #. DLG_UENC_EncTitle -#: po/tmp/xap_String_Id.h.h:270 +#: po/tmp/xap_String_Id.h.h:286 msgid "Encoding" msgstr "Kodeketa" #. DLG_UFS_EncodingLabel -#: po/tmp/xap_String_Id.h.h:272 +#: po/tmp/xap_String_Id.h.h:288 msgid "Encoding:" msgstr "Kodeketa:" #. STYLE_ENDREFERENCE -#: po/tmp/xap_String_Id.h.h:274 +#: po/tmp/xap_String_Id.h.h:290 msgid "Endnote Reference" -msgstr "Bukaerako oharraren erreferentzia" +msgstr "Bukaerako oharrera erreferentzia" #. STYLE_ENDTEXT -#: po/tmp/xap_String_Id.h.h:276 +#: po/tmp/xap_String_Id.h.h:292 msgid "Endnote Text" -msgstr "&Bukaerako oharreko testua" +msgstr "Bukaerako oharreko testua" #. LANG_EN_AU -#: po/tmp/xap_String_Id.h.h:278 +#: po/tmp/xap_String_Id.h.h:294 msgid "English (Australia)" msgstr "Ingelesa (Australia)" #. LANG_EN_CA -#: po/tmp/xap_String_Id.h.h:280 +#: po/tmp/xap_String_Id.h.h:296 msgid "English (Canada)" msgstr "Ingelesa (Kanada)" #. LANG_EN_IE -#: po/tmp/xap_String_Id.h.h:282 +#: po/tmp/xap_String_Id.h.h:298 msgid "English (Ireland)" msgstr "Ingelesa (Irlanda)" #. LANG_EN_NZ -#: po/tmp/xap_String_Id.h.h:284 +#: po/tmp/xap_String_Id.h.h:300 msgid "English (New Zealand)" msgstr "Ingelesa (Zelanda Berria)" #. LANG_EN_ZA -#: po/tmp/xap_String_Id.h.h:286 +#: po/tmp/xap_String_Id.h.h:302 msgid "English (South Africa)" msgstr "Ingelesa (Hego Afrika)" #. LANG_EN_GB -#: po/tmp/xap_String_Id.h.h:288 +#: po/tmp/xap_String_Id.h.h:304 msgid "English (UK)" msgstr "Ingelesa (BH)" #. LANG_EN_US -#: po/tmp/xap_String_Id.h.h:290 +#: po/tmp/xap_String_Id.h.h:306 msgid "English (US)" msgstr "Ingelesa (AEB)" #. DLG_Password_Title -#: po/tmp/xap_String_Id.h.h:292 +#: po/tmp/xap_String_Id.h.h:308 msgid "Enter Password" -msgstr "Sartu Pasahitza" +msgstr "Pasahitza sartu" #. LANG_EO -#: po/tmp/xap_String_Id.h.h:294 +#: po/tmp/xap_String_Id.h.h:310 msgid "Esperanto" msgstr "Esperanto" #. LANG_ET -#: po/tmp/xap_String_Id.h.h:296 +#: po/tmp/xap_String_Id.h.h:312 msgid "Estonian" msgstr "Estoniera" #. DLG_FOSA_ExportTitle -#: po/tmp/xap_String_Id.h.h:298 +#: po/tmp/xap_String_Id.h.h:314 msgid "Export File" msgstr "Fitxategia esportatu" #. DLG_HTMLOPT_ExpIs4 -#: po/tmp/xap_String_Id.h.h:300 +#: po/tmp/xap_String_Id.h.h:316 msgid "Export as HTML 4.01" msgstr "HTML 4.01 bezala esportatu" #. DLG_HTMLOPT_ExpAbiWebDoc -#: po/tmp/xap_String_Id.h.h:302 +#: po/tmp/xap_String_Id.h.h:318 msgid "Export with PHP instructions" msgstr "PHP instrukzioekin esportatu" #. LANG_FA_IR -#: po/tmp/xap_String_Id.h.h:304 +#: po/tmp/xap_String_Id.h.h:320 msgid "Farsi" msgstr "Persiera" #. DLG_UP_File -#: po/tmp/xap_String_Id.h.h:306 +#: po/tmp/xap_String_Id.h.h:322 msgid "File" msgstr "Fitxategia" #. DLG_OverwriteFile -#: po/tmp/xap_String_Id.h.h:308 +#: po/tmp/xap_String_Id.h.h:324 #, c-format msgid "File already exists. Overwrite file '%s'?" -msgstr "'%s' fitxategia existitzen da. Ordezkatu nahi al duzu?" +msgstr "Fitxategia existitzen da jada. '%s' fitxategia gainidatzi?" + +#. DLG_FOSA_RecordToFileLabel +#: po/tmp/xap_String_Id.h.h:326 +msgid "File to record editing:" +msgstr "Edizioa gordetzeko fitxategia:" + +#. DLG_FOSA_ReplayFromFileLabel +#: po/tmp/xap_String_Id.h.h:328 +msgid "File to replay editing:" +msgstr "Edizioa erreproduzitzeko fitxategia:" #. LANG_FI_FI -#: po/tmp/xap_String_Id.h.h:310 +#: po/tmp/xap_String_Id.h.h:330 msgid "Finnish" msgstr "Finlandiera" #. LANG_NL_BE -#: po/tmp/xap_String_Id.h.h:312 +#: po/tmp/xap_String_Id.h.h:332 msgid "Flemish (Belgium)" -msgstr "Flamengera (Belgika)" +msgstr "Flandriera (Belgika)" #. STYLE_FOOTREFERENCE -#: po/tmp/xap_String_Id.h.h:319 +#: po/tmp/xap_String_Id.h.h:339 msgid "Footnote Reference" -msgstr "Orri oineko oharraren erreferentzia" +msgstr "Orri-oinera erreferentzia" #. STYLE_FOOTTEXT -#: po/tmp/xap_String_Id.h.h:321 +#: po/tmp/xap_String_Id.h.h:341 msgid "Footnote Text" -msgstr "Orri oineko oharraren testua" +msgstr "Orri-oineko testua" #. LANG_FR_BE -#: po/tmp/xap_String_Id.h.h:325 +#: po/tmp/xap_String_Id.h.h:345 msgid "French (Belgium)" -msgstr "Frantseza (Belgika)" +msgstr "Frantsesa (Belgika)" #. LANG_FR_CA -#: po/tmp/xap_String_Id.h.h:327 +#: po/tmp/xap_String_Id.h.h:347 msgid "French (Canada)" -msgstr "Frantseza (Kanada)" +msgstr "Frantsesa (Kanada)" #. LANG_FR_FR -#: po/tmp/xap_String_Id.h.h:329 +#: po/tmp/xap_String_Id.h.h:349 msgid "French (France)" -msgstr "Frantseza (Frantzia)" +msgstr "Frantsesa (Frantzia)" #. LANG_FR_CH -#: po/tmp/xap_String_Id.h.h:331 +#: po/tmp/xap_String_Id.h.h:351 msgid "French (Switzerland)" -msgstr "Frantseza (Suitza)" +msgstr "Frantsesa (Suitza)" #. LANG_FY_NL -#: po/tmp/xap_String_Id.h.h:333 +#: po/tmp/xap_String_Id.h.h:353 msgid "Frisian" msgstr "Frisiera" #. DLG_UP_From -#: po/tmp/xap_String_Id.h.h:335 +#: po/tmp/xap_String_Id.h.h:355 msgid "From: " msgstr "Nondik: " -#. LANG_GL_ES -#: po/tmp/xap_String_Id.h.h:337 -msgid "Galician" +#. LANG_GL +#: po/tmp/xap_String_Id.h.h:357 +msgid "Galician (Galego)" msgstr "Galiziera" #. LANG_KA_GE -#: po/tmp/xap_String_Id.h.h:339 +#: po/tmp/xap_String_Id.h.h:359 msgid "Georgian" msgstr "Georgiera" #. ENC_GEOR_ACADEMY -#: po/tmp/xap_String_Id.h.h:341 +#: po/tmp/xap_String_Id.h.h:361 msgid "Georgian, Academy" -msgstr "Georgiera, Academy" +msgstr "Georgiera, akademikoa" #. ENC_GEOR_PS -#: po/tmp/xap_String_Id.h.h:343 +#: po/tmp/xap_String_Id.h.h:363 msgid "Georgian, PS" msgstr "Georgiera, PS" #. LANG_DE_AT -#: po/tmp/xap_String_Id.h.h:345 +#: po/tmp/xap_String_Id.h.h:365 msgid "German (Austria)" msgstr "Alemaniera (Austria)" #. LANG_DE_DE -#: po/tmp/xap_String_Id.h.h:347 +#: po/tmp/xap_String_Id.h.h:367 msgid "German (Germany)" msgstr "Alemaniera (Alemania)" #. LANG_DE_CH -#: po/tmp/xap_String_Id.h.h:349 +#: po/tmp/xap_String_Id.h.h:369 msgid "German (Switzerland)" msgstr "Alemaniera (Suitza)" #. DLG_UP_Grayscale -#: po/tmp/xap_String_Id.h.h:351 +#: po/tmp/xap_String_Id.h.h:371 msgid "Grayscale" msgstr "Gris eskala" #. LANG_EL_GR -#: po/tmp/xap_String_Id.h.h:353 +#: po/tmp/xap_String_Id.h.h:373 msgid "Greek" -msgstr "Grekera" +msgstr "Greziera" #. ENC_GREE_ISO -#: po/tmp/xap_String_Id.h.h:355 +#: po/tmp/xap_String_Id.h.h:375 msgid "Greek, ISO-8859-7" -msgstr "Grekera, ISO-8859-7" +msgstr "Greziera, ISO-8859-7" #. ENC_GREE_MAC -#: po/tmp/xap_String_Id.h.h:357 +#: po/tmp/xap_String_Id.h.h:377 msgid "Greek, Macintosh" -msgstr "Grekera, Macintosh" +msgstr "Greziera, Macintosh" #. ENC_GREE_WIN -#: po/tmp/xap_String_Id.h.h:359 +#: po/tmp/xap_String_Id.h.h:379 msgid "Greek, Windows Code Page 1253" -msgstr "Grekera, Windows 1253 Orri Kodea" +msgstr "Greziera, Windows 1253 kode-orria" #. DLG_HTMLOPT_ExpTitle -#: po/tmp/xap_String_Id.h.h:361 +#: po/tmp/xap_String_Id.h.h:381 msgid "HTML Export Options" -msgstr "HTML esportatzeko aukerak" +msgstr "HTML esportatze-aukerak" #. LANG_HA_NE -#: po/tmp/xap_String_Id.h.h:365 +#: po/tmp/xap_String_Id.h.h:385 msgid "Hausa (Niger)" -msgstr "Hausa (Nigeria)" +msgstr "Hausa (Nigeri)" #. LANG_HA_NG -#: po/tmp/xap_String_Id.h.h:367 +#: po/tmp/xap_String_Id.h.h:387 msgid "Hausa (Nigeria)" -msgstr "Hausa (NIgeria)" +msgstr "Hausa (Nigeria)" #. LANG_HAW_US -#: po/tmp/xap_String_Id.h.h:369 +#: po/tmp/xap_String_Id.h.h:389 msgid "Hawaiian" -msgstr "" +msgstr "Hawaiera" #. STYLE_HEADING1 -#: po/tmp/xap_String_Id.h.h:371 +#: po/tmp/xap_String_Id.h.h:391 msgid "Heading 1" -msgstr "1 Izenburua" +msgstr "Izenburua 1" #. STYLE_HEADING2 -#: po/tmp/xap_String_Id.h.h:373 +#: po/tmp/xap_String_Id.h.h:393 msgid "Heading 2" -msgstr "2. Izenburua" +msgstr "Izenburua 2" #. STYLE_HEADING3 -#: po/tmp/xap_String_Id.h.h:375 +#: po/tmp/xap_String_Id.h.h:395 msgid "Heading 3" -msgstr "3. Titulua" +msgstr "Izenburua 3" #. STYLE_HEADING4 -#: po/tmp/xap_String_Id.h.h:377 +#: po/tmp/xap_String_Id.h.h:397 msgid "Heading 4" -msgstr "" +msgstr "Izenburua 4" #. LANG_HE_IL -#: po/tmp/xap_String_Id.h.h:381 +#: po/tmp/xap_String_Id.h.h:401 msgid "Hebrew" -msgstr "Hebraitar" +msgstr "Hebreera" #. ENC_HEBR_ISO -#: po/tmp/xap_String_Id.h.h:383 +#: po/tmp/xap_String_Id.h.h:403 msgid "Hebrew, ISO-8859-8" -msgstr "Hebraitar, ISO-8859-8" +msgstr "Hebreera, ISO-8859-8" #. ENC_HEBR_MAC -#: po/tmp/xap_String_Id.h.h:385 +#: po/tmp/xap_String_Id.h.h:405 msgid "Hebrew, Macintosh" -msgstr "Hebraitar, Macintosh" +msgstr "Hebreera, Macintosh" #. ENC_HEBR_WIN -#: po/tmp/xap_String_Id.h.h:387 +#: po/tmp/xap_String_Id.h.h:407 msgid "Hebrew, Windows Code Page 1255" -msgstr "Hebraitar, Windows 1255 Orria Kodea" +msgstr "Hebreera, Windows 1255 Orria Kodea" #. DLG_Image_Height -#: po/tmp/xap_String_Id.h.h:389 +#: po/tmp/xap_String_Id.h.h:409 msgid "Height:" msgstr "Altuera:" #. DLG_IP_Height_Label -#: po/tmp/xap_String_Id.h.h:391 +#: po/tmp/xap_String_Id.h.h:411 msgid "Height: " msgstr "Altuera: " #. DLG_UFS_HiddenCheck -#: po/tmp/xap_String_Id.h.h:393 +#: po/tmp/xap_String_Id.h.h:413 msgid "Hidden" -msgstr "Izkutatu" +msgstr "Ezkutukoa" #. DLG_UFS_BGColorTab -#: po/tmp/xap_String_Id.h.h:395 +#: po/tmp/xap_String_Id.h.h:415 msgid "HighLight Color" -msgstr "Nabaritzeko kolorea" +msgstr "Nabarmentze-kolorea" #. LANG_HI_IN -#: po/tmp/xap_String_Id.h.h:397 +#: po/tmp/xap_String_Id.h.h:417 msgid "Hindi" -msgstr "Hindiera" +msgstr "Hindi" #. LANG_HU_HU -#: po/tmp/xap_String_Id.h.h:399 +#: po/tmp/xap_String_Id.h.h:419 msgid "Hungarian" msgstr "Hungariera" #. LANG_IS_IS -#: po/tmp/xap_String_Id.h.h:401 +#: po/tmp/xap_String_Id.h.h:421 msgid "Icelandic" msgstr "Islandiera" #. ENC_ICEL_MAC -#: po/tmp/xap_String_Id.h.h:403 +#: po/tmp/xap_String_Id.h.h:423 msgid "Icelandic, Macintosh" msgstr "Islandiera, Macintosh" #. DLG_History_Id -#: po/tmp/xap_String_Id.h.h:405 +#: po/tmp/xap_String_Id.h.h:425 msgid "Identifier:" -msgstr "" +msgstr "Identifikatzailea:" #. DLG_Image_Title -#: po/tmp/xap_String_Id.h.h:407 +#: po/tmp/xap_String_Id.h.h:427 msgid "Image Properties" -msgstr "Irudi Propietateak" +msgstr "Irudi-propietateak" #. DLG_Image_WrappedNone -#: po/tmp/xap_String_Id.h.h:409 +#: po/tmp/xap_String_Id.h.h:429 msgid "Image floats above text" -msgstr "" +msgstr "Irudiak testuaren gainean flotatzen du" #. DLG_Image_InLine -#: po/tmp/xap_String_Id.h.h:411 +#: po/tmp/xap_String_Id.h.h:431 msgid "Image placed in-line (no text wrapping)" -msgstr "" +msgstr "Lerroan sartu irudia (testu-egokitzerik ez)" #. DLG_FOSA_ImportTitle -#: po/tmp/xap_String_Id.h.h:415 +#: po/tmp/xap_String_Id.h.h:435 msgid "Import File" msgstr "Fitxategia inportatu" #. MSG_ImportingDoc -#: po/tmp/xap_String_Id.h.h:417 -msgid "Importing Document.." -msgstr "Dokumentua Inportatzen.." +#: po/tmp/xap_String_Id.h.h:437 +msgid "Importing Document..." +msgstr "Dokumentua inportatzen..." #. LANG_ID_ID -#: po/tmp/xap_String_Id.h.h:419 +#: po/tmp/xap_String_Id.h.h:439 msgid "Indonesian" msgstr "Indonesiera" #. XIM_Methods -#: po/tmp/xap_String_Id.h.h:421 +#: po/tmp/xap_String_Id.h.h:441 msgid "Input Methods" -msgstr "Metodoak sartu" +msgstr "Sarrera metodoak" #. DLG_FOSA_InsertObject -#: po/tmp/xap_String_Id.h.h:425 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:445 msgid "Insert Embeddable Object" -msgstr "Taula Txertatu" +msgstr "Objektu kapsulagarria txertatu" #. DLG_FOSA_FileInsertObject -#: po/tmp/xap_String_Id.h.h:427 +#: po/tmp/xap_String_Id.h.h:447 msgid "Insert Embeddable Object file:" -msgstr "" +msgstr "Objektu kapsulagarri baten fitxategia txertatu:" #. DLG_FOSA_InsertTitle -#: po/tmp/xap_String_Id.h.h:429 +#: po/tmp/xap_String_Id.h.h:449 msgid "Insert File" -msgstr "Fitxategia Txertatu" +msgstr "Fitxategia txertatu" #. DLG_FOSA_InsertMath -#: po/tmp/xap_String_Id.h.h:431 +#: po/tmp/xap_String_Id.h.h:451 msgid "Insert Math File" -msgstr "" +msgstr "Matematica fitxategia txertatu" #. DLG_FOSA_FileInsertMath -#: po/tmp/xap_String_Id.h.h:433 +#: po/tmp/xap_String_Id.h.h:453 msgid "Insert MathML file:" -msgstr "" +msgstr "MathML fitxategia txertatu:" #. TB_InsertNewTable -#: po/tmp/xap_String_Id.h.h:435 +#: po/tmp/xap_String_Id.h.h:455 msgid "Insert New Table" msgstr "Taula berria txertatu" #. DLG_IP_Title -#: po/tmp/xap_String_Id.h.h:437 +#: po/tmp/xap_String_Id.h.h:457 msgid "Insert Picture" -msgstr "Irudia Txertatu" +msgstr "Irudia txertatu" #. DLG_Insert_SymbolTitle -#: po/tmp/xap_String_Id.h.h:439 +#: po/tmp/xap_String_Id.h.h:459 msgid "Insert Symbol" -msgstr "Sinboloa Txertatu" +msgstr "Sinboloa txertatu" #. DLG_PLUGIN_MANAGER_INSTALL -#: po/tmp/xap_String_Id.h.h:441 +#: po/tmp/xap_String_Id.h.h:461 msgid "Install new plugin" msgstr "Plugin berria instalatu" #. LANG_IA -#: po/tmp/xap_String_Id.h.h:443 +#: po/tmp/xap_String_Id.h.h:463 msgid "Interlingua" msgstr "Interlingua" #. LANG_IU_CA -#: po/tmp/xap_String_Id.h.h:445 +#: po/tmp/xap_String_Id.h.h:465 msgid "Inuktitut" -msgstr "" +msgstr "Inuitera" #. DLG_InvalidPathname -#: po/tmp/xap_String_Id.h.h:447 +#: po/tmp/xap_String_Id.h.h:467 msgid "Invalid pathname." -msgstr "Fitxategi helbidea ez da zuzena." +msgstr "Bide baliogabea." #. LANG_GA_IE -#: po/tmp/xap_String_Id.h.h:449 +#: po/tmp/xap_String_Id.h.h:469 msgid "Irish" -msgstr "Irlandera" +msgstr "Gaelera" #. LANG_IT_IT -#: po/tmp/xap_String_Id.h.h:451 +#: po/tmp/xap_String_Id.h.h:471 msgid "Italian (Italy)" msgstr "Italiera (Italia)" #. LANG_JA_JP -#: po/tmp/xap_String_Id.h.h:455 +#: po/tmp/xap_String_Id.h.h:475 msgid "Japanese" msgstr "Japoniera" #. ENC_JAPN_EUC -#: po/tmp/xap_String_Id.h.h:457 +#: po/tmp/xap_String_Id.h.h:477 msgid "Japanese, EUC-JP" msgstr "Japoniera, EUC-JP" #. ENC_JAPN_ISO -#: po/tmp/xap_String_Id.h.h:459 +#: po/tmp/xap_String_Id.h.h:479 msgid "Japanese, ISO-2022-JP" msgstr "Japoniera, ISO-2022-JP" #. ENC_JAPN_SJIS -#: po/tmp/xap_String_Id.h.h:461 +#: po/tmp/xap_String_Id.h.h:481 msgid "Japanese, Shift-JIS" msgstr "Japoniera, Shift-JIS" #. ENC_JAPN_WIN -#: po/tmp/xap_String_Id.h.h:463 +#: po/tmp/xap_String_Id.h.h:483 msgid "Japanese, Windows Code Page 932" -msgstr "Japoniera, Windows 932 Orri Kodea" +msgstr "Japoniera, Windows 932 kode-orria" #. LANG_KN_IN -#: po/tmp/xap_String_Id.h.h:465 +#: po/tmp/xap_String_Id.h.h:485 msgid "Kannada" -msgstr "" +msgstr "Kannadera" #. LANG_KO_KR -#: po/tmp/xap_String_Id.h.h:467 +#. LANG_KO +#: po/tmp/xap_String_Id.h.h:488 msgid "Korean" msgstr "Koreera" #. ENC_KORE_EUC -#: po/tmp/xap_String_Id.h.h:469 +#: po/tmp/xap_String_Id.h.h:490 msgid "Korean, EUC-KR" msgstr "Koreera, EUC-KR" #. ENC_KORE_JOHAB -#: po/tmp/xap_String_Id.h.h:471 +#: po/tmp/xap_String_Id.h.h:492 msgid "Korean, Johab" msgstr "Koreera, Johab" #. ENC_KORE_KSC -#: po/tmp/xap_String_Id.h.h:473 +#: po/tmp/xap_String_Id.h.h:494 msgid "Korean, KSC_5601" msgstr "Koreera, KSC_5601" #. ENC_KORE_WIN -#: po/tmp/xap_String_Id.h.h:475 +#: po/tmp/xap_String_Id.h.h:496 msgid "Korean, Windows Code Page 949" -msgstr "Koreera, Windows 949 Orri Kodea" +msgstr "Koreera, Windows 949 kode-orria" #. LANG_KU -#: po/tmp/xap_String_Id.h.h:477 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:498 msgid "Kurdish" -msgstr "Turkiera" +msgstr "Kurduera" #. LANG_LO_LA -#: po/tmp/xap_String_Id.h.h:479 +#: po/tmp/xap_String_Id.h.h:500 msgid "Lao" -msgstr "" +msgstr "Laoera" #. DLG_History_LastSaved -#: po/tmp/xap_String_Id.h.h:481 +#: po/tmp/xap_String_Id.h.h:502 msgid "Last saved:" -msgstr "" +msgstr "Azkenekoz gordea:" #. LANG_LA_IT -#: po/tmp/xap_String_Id.h.h:483 +#: po/tmp/xap_String_Id.h.h:504 msgid "Latin (Renaissance)" -msgstr "Latinera (Berpizkundea)" +msgstr "Latin (Berpizkundea)" #. LANG_LV_LV -#: po/tmp/xap_String_Id.h.h:485 +#: po/tmp/xap_String_Id.h.h:506 msgid "Latvian" msgstr "Letoniera" #. LANG_LT_LT -#: po/tmp/xap_String_Id.h.h:487 +#: po/tmp/xap_String_Id.h.h:508 msgid "Lithuanian" msgstr "Lituaniera" +#. DLG_CLIPART_Loading +#: po/tmp/xap_String_Id.h.h:510 +msgid "Loading Clip Art" +msgstr "Clip Art irudia kargatzen" + #. LANG_MK -#: po/tmp/xap_String_Id.h.h:493 +#: po/tmp/xap_String_Id.h.h:516 msgid "Macedonian" msgstr "Mazedoniera" #. DLG_ULANG_DefaultLangChkbox -#: po/tmp/xap_String_Id.h.h:495 +#: po/tmp/xap_String_Id.h.h:518 msgid "Make default for document" -msgstr "" +msgstr "Dokumentuentzako lehenetsi" + +#. LANG_MS_MY +#: po/tmp/xap_String_Id.h.h:520 +msgid "Malay" +msgstr "Malaysiera" #. LANG_MI_NZ -#: po/tmp/xap_String_Id.h.h:497 +#: po/tmp/xap_String_Id.h.h:522 msgid "Maori" -msgstr "" +msgstr "Maoriera" #. LANG_MR_IN -#: po/tmp/xap_String_Id.h.h:499 +#: po/tmp/xap_String_Id.h.h:524 msgid "Marathi" -msgstr "" +msgstr "Marathera" #. LANG_MH_MH -#: po/tmp/xap_String_Id.h.h:501 +#: po/tmp/xap_String_Id.h.h:526 msgid "Marshallese (Marshall Islands)" msgstr "Marshallera (Marshall Irlak)" #. LANG_MH_NR -#: po/tmp/xap_String_Id.h.h:503 +#: po/tmp/xap_String_Id.h.h:528 msgid "Marshallese (Nauru)" msgstr "Marshallera (Nauru)" #. DLG_Merge -#: po/tmp/xap_String_Id.h.h:505 +#: po/tmp/xap_String_Id.h.h:530 msgid "Merge" -msgstr "" +msgstr "Konbinatu" #. LANG_MN_MN -#: po/tmp/xap_String_Id.h.h:507 +#: po/tmp/xap_String_Id.h.h:532 msgid "Mongolian" -msgstr "" +msgstr "Mongoliera" #. DLG_PLUGIN_MANAGER_NAME -#: po/tmp/xap_String_Id.h.h:509 +#: po/tmp/xap_String_Id.h.h:534 msgid "Name:" -msgstr "Izena" +msgstr "Izena:" + +#. LANG_NE_NP +#: po/tmp/xap_String_Id.h.h:536 +msgid "Nepali (Nepal)" +msgstr "Nepalera" #. DLG_QNXMB_No -#: po/tmp/xap_String_Id.h.h:511 +#: po/tmp/xap_String_Id.h.h:538 msgid "No" msgstr "Ez" #. DLG_IP_No_Picture_Label -#: po/tmp/xap_String_Id.h.h:513 +#: po/tmp/xap_String_Id.h.h:540 msgid "No Picture" msgstr "Irudirik ez" #. DLG_PLUGIN_MANAGER_NONE_SELECTED -#: po/tmp/xap_String_Id.h.h:515 +#: po/tmp/xap_String_Id.h.h:542 msgid "No plugin selected" -msgstr "Ez da pluginik aukeratu" +msgstr "Ez da pluginik hautatu" #. STYLE_NORMAL -#: po/tmp/xap_String_Id.h.h:517 +#: po/tmp/xap_String_Id.h.h:544 msgid "Normal" -msgstr "Ikuspen Arrunta" +msgstr "Normala" #. LANG_NB_NO -#: po/tmp/xap_String_Id.h.h:519 +#: po/tmp/xap_String_Id.h.h:546 msgid "Norwegian Bokmal" -msgstr "Bokmal Norbegiera" +msgstr "Bokmal Norvegiera" #. LANG_NN_NO -#: po/tmp/xap_String_Id.h.h:521 +#: po/tmp/xap_String_Id.h.h:548 msgid "Norwegian Nynorsk" -msgstr "Nynorsk Norbegiera" +msgstr "Nynorsk Norvegiera" #. DLG_PLUGIN_MANAGER_NOT_AVAILABLE -#: po/tmp/xap_String_Id.h.h:523 +#: po/tmp/xap_String_Id.h.h:550 msgid "Not available" -msgstr "" +msgstr "Eskuragaitz" #. STYLE_NUMHEAD1 -#: po/tmp/xap_String_Id.h.h:525 +#: po/tmp/xap_String_Id.h.h:552 msgid "Numbered Heading 1" -msgstr "1. Titulu zenbakitua" +msgstr "Izenburu zenbakitua 1" #. STYLE_NUMHEAD2 -#: po/tmp/xap_String_Id.h.h:527 +#: po/tmp/xap_String_Id.h.h:554 msgid "Numbered Heading 2" -msgstr "2. Titulu zenbakitua" +msgstr "Izenburu zenbakitua 2" #. STYLE_NUMHEAD3 -#: po/tmp/xap_String_Id.h.h:529 +#: po/tmp/xap_String_Id.h.h:556 msgid "Numbered Heading 3" -msgstr "3. Titulu zenbakitua" +msgstr "Izenburu zenbakitua 3" #. DLG_OK -#: po/tmp/xap_String_Id.h.h:533 +#: po/tmp/xap_String_Id.h.h:560 msgid "OK" -msgstr "Onartu" +msgstr "Ados" #. LANG_OC_FR -#: po/tmp/xap_String_Id.h.h:535 +#: po/tmp/xap_String_Id.h.h:562 msgid "Occitan" msgstr "Okzitaniera" #. DLG_FOSA_OpenTitle -#: po/tmp/xap_String_Id.h.h:537 +#: po/tmp/xap_String_Id.h.h:564 msgid "Open File" msgstr "Fitxategia ireki" #. DLG_FOSA_FileOpenTypeLabel -#: po/tmp/xap_String_Id.h.h:539 +#: po/tmp/xap_String_Id.h.h:566 msgid "Open file as type:" -msgstr "Mota honetako fitxategia ireki:" +msgstr "Honela ireki fitxategia:" #. DLG_LISTDOCS_Title -#: po/tmp/xap_String_Id.h.h:541 +#: po/tmp/xap_String_Id.h.h:568 msgid "Opened Documents" -msgstr "" +msgstr "Dokumentu irekiak" #. TB_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:543 +#: po/tmp/xap_String_Id.h.h:570 msgid "Other..." msgstr "Beste batzuk..." #. DLG_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:547 +#: po/tmp/xap_String_Id.h.h:574 msgid "P&ercent:" -msgstr "Portzentaia:" +msgstr "&Portzentaia:" #. TB_Zoom_PageWidth -#: po/tmp/xap_String_Id.h.h:549 +#: po/tmp/xap_String_Id.h.h:576 msgid "Page Width" -msgstr "Doitu zabalerara" +msgstr "Orri-zabalera" #. DLG_UP_PageRanges -#: po/tmp/xap_String_Id.h.h:551 +#: po/tmp/xap_String_Id.h.h:578 msgid "Page ranges:" -msgstr "Orrialde barrutia:" +msgstr "Orri barrutia:" + +#. LANG_PS +#: po/tmp/xap_String_Id.h.h:580 +msgid "Pashto" +msgstr "Pashtoera" #. DLG_Password_Password -#: po/tmp/xap_String_Id.h.h:553 +#: po/tmp/xap_String_Id.h.h:582 msgid "Password:" msgstr "Pasahitza:" #. STYLE_PLAIN_TEXT -#: po/tmp/xap_String_Id.h.h:555 +#: po/tmp/xap_String_Id.h.h:584 msgid "Plain Text" msgstr "Testu arrunta" #. DLG_PLUGIN_MANAGER_DETAILS -#: po/tmp/xap_String_Id.h.h:557 +#: po/tmp/xap_String_Id.h.h:586 msgid "Plugin Details:" -msgstr "Plugin zehaztasunak" +msgstr "Pluginaren zehaztasunak:" #. DLG_PLUGIN_MANAGER_LIST -#: po/tmp/xap_String_Id.h.h:559 +#: po/tmp/xap_String_Id.h.h:588 msgid "Plugin List" msgstr "Plugin zerrenda" #. LANG_PL_PL -#: po/tmp/xap_String_Id.h.h:561 +#: po/tmp/xap_String_Id.h.h:590 msgid "Polish" msgstr "Poloniera" #. LANG_PT_BR -#: po/tmp/xap_String_Id.h.h:563 +#: po/tmp/xap_String_Id.h.h:592 msgid "Portuguese (Brazil)" msgstr "Portugesa (Brasil)" #. LANG_PT_PT -#: po/tmp/xap_String_Id.h.h:565 +#: po/tmp/xap_String_Id.h.h:594 msgid "Portuguese (Portugal)" msgstr "Portugesa (Portugal)" #. DLG_Image_PlaceColumn -#: po/tmp/xap_String_Id.h.h:567 +#: po/tmp/xap_String_Id.h.h:596 msgid "Position relative to its Column" -msgstr "" +msgstr "Bere zutabearekiko posizio erlatiboa" #. DLG_Image_PlacePage -#: po/tmp/xap_String_Id.h.h:569 +#: po/tmp/xap_String_Id.h.h:598 msgid "Position relative to its Page" -msgstr "" +msgstr "Bere orriarekiko posizio erlatiboa" #. DLG_Image_PlaceParagraph -#: po/tmp/xap_String_Id.h.h:571 +#: po/tmp/xap_String_Id.h.h:600 msgid "Position relative to nearest paragraph" -msgstr "" +msgstr "Paragrafo gertuenarekiko posizio erlatiboa" #. DLG_Image_Aspect -#: po/tmp/xap_String_Id.h.h:573 +#: po/tmp/xap_String_Id.h.h:602 msgid "Preserve aspect ratio" -msgstr "Proportzioa mantendu:" +msgstr "Proportzioa mantendu" #. DLG_IP_Activate_Label -#: po/tmp/xap_String_Id.h.h:577 +#: po/tmp/xap_String_Id.h.h:606 msgid "Preview Picture" -msgstr "Irudia Aurreikusi" +msgstr "Irudia aurreikusi" #. DLG_FOSA_PrintToFileTitle -#: po/tmp/xap_String_Id.h.h:582 +#: po/tmp/xap_String_Id.h.h:611 msgid "Print To File" msgstr "Fitxategira inprimatu" #. DLG_FOSA_FilePrintTypeLabel -#: po/tmp/xap_String_Id.h.h:584 +#: po/tmp/xap_String_Id.h.h:613 msgid "Print file as type:" -msgstr "Mota honetako fitxategia inprimatu:" +msgstr "Honela inprimatu fitxategia:" #. DLG_UP_PrintIn -#: po/tmp/xap_String_Id.h.h:586 +#: po/tmp/xap_String_Id.h.h:615 msgid "Print in: " -msgstr "Nola inprimatu: " +msgstr "Non inprimatu: " #. DLG_UP_PrintTo -#: po/tmp/xap_String_Id.h.h:588 +#: po/tmp/xap_String_Id.h.h:617 msgid "Print to: " -msgstr "Non inprimatu: " +msgstr "Nora inprimatu: " #. DLG_UP_Printer -#: po/tmp/xap_String_Id.h.h:590 +#: po/tmp/xap_String_Id.h.h:619 msgid "Printer" msgstr "Inprimagailua" #. DLG_UP_PrinterCommand -#: po/tmp/xap_String_Id.h.h:592 +#: po/tmp/xap_String_Id.h.h:621 msgid "Printer command: " -msgstr "Inprimatze komandoa: " +msgstr "Inprimatze-komandoa: " #. LANG_PA_IN -#: po/tmp/xap_String_Id.h.h:594 +#: po/tmp/xap_String_Id.h.h:623 msgid "Punjabi (Gurmukhi)" -msgstr "" +msgstr "Punjabera (Gurmukhi)" #. LANG_PA_PK -#: po/tmp/xap_String_Id.h.h:596 +#: po/tmp/xap_String_Id.h.h:625 msgid "Punjabi (Shahmukhi)" -msgstr "" +msgstr "Punjabera (Shahmukhi)" #. LANG_QU_BO -#: po/tmp/xap_String_Id.h.h:598 +#: po/tmp/xap_String_Id.h.h:627 msgid "Quechua" -msgstr "" +msgstr "Quechuera" + +#. LANG_QUH_BO +#: po/tmp/xap_String_Id.h.h:629 +msgid "Quechua (3 vowels)" +msgstr "Quechuera (3 bokal)" + +#. LANG_QUL_BO +#: po/tmp/xap_String_Id.h.h:631 +msgid "Quechua (5 vowels)" +msgstr "Quechuera (5 bokal)" + +#. DLG_FOSA_RecordToFileTitle +#: po/tmp/xap_String_Id.h.h:633 +msgid "Record Editing to File" +msgstr "Fitxategian gorde edizioa" #. DLG_UFS_StyleRegular -#: po/tmp/xap_String_Id.h.h:600 +#: po/tmp/xap_String_Id.h.h:635 msgid "Regular" msgstr "Arrunta" #. DLG_DocComparison_Relationship -#: po/tmp/xap_String_Id.h.h:602 +#: po/tmp/xap_String_Id.h.h:637 msgid "Relationship:" -msgstr "" +msgstr "Erlazioa:" + +#. DLG_FOSA_ReplayFromFileTitle +#: po/tmp/xap_String_Id.h.h:639 +msgid "Replay Editing from File" +msgstr "Fitxategitik erreproduzitu edizioa" #. DLG_Restore -#: po/tmp/xap_String_Id.h.h:604 +#: po/tmp/xap_String_Id.h.h:641 msgid "Restore" -msgstr "" +msgstr "Berreskuratu" #. DLG_HTMLOPT_ExpRestore -#: po/tmp/xap_String_Id.h.h:606 +#: po/tmp/xap_String_Id.h.h:643 msgid "Restore Settings" msgstr "Ezarpenak berreskuratu" #. DLG_DocComparison_Results -#: po/tmp/xap_String_Id.h.h:608 +#: po/tmp/xap_String_Id.h.h:645 msgid "Results" -msgstr "" +msgstr "Emaitzak" #. LANG_RO_RO -#: po/tmp/xap_String_Id.h.h:610 +#: po/tmp/xap_String_Id.h.h:647 msgid "Romanian" msgstr "Errumaniera" #. ENC_ROMA_MAC -#: po/tmp/xap_String_Id.h.h:612 +#: po/tmp/xap_String_Id.h.h:649 msgid "Romanian, Macintosh" msgstr "Errumaniera, Macintosh" #. LANG_RU_RU -#: po/tmp/xap_String_Id.h.h:614 +#: po/tmp/xap_String_Id.h.h:651 msgid "Russian (Russia)" msgstr "Errusiera (Errusia)" #. DLG_UFS_SampleFrameLabel -#: po/tmp/xap_String_Id.h.h:616 +#: po/tmp/xap_String_Id.h.h:653 msgid "Sample" msgstr "Adibidea" #. LANG_SC_IT -#: po/tmp/xap_String_Id.h.h:618 +#: po/tmp/xap_String_Id.h.h:655 msgid "Sardinian" msgstr "Sardiniera" #. DLG_FOSA_SaveAsTitle -#: po/tmp/xap_String_Id.h.h:620 +#: po/tmp/xap_String_Id.h.h:657 msgid "Save File As" -msgstr "Fitxategia honela gorde" +msgstr "Honela gorde fitxategia" #. DLG_HTMLOPT_ExpSave -#: po/tmp/xap_String_Id.h.h:622 +#: po/tmp/xap_String_Id.h.h:659 msgid "Save Settings" msgstr "Ezarpenak gorde" #. DLG_FOSA_FileSaveTypeLabel -#: po/tmp/xap_String_Id.h.h:624 +#: po/tmp/xap_String_Id.h.h:661 msgid "Save file as type:" -msgstr "Gorde fitxategia honela:" +msgstr "Mota honekin gorde fitxategia:" #. DLG_UFS_ScriptLabel -#: po/tmp/xap_String_Id.h.h:626 +#: po/tmp/xap_String_Id.h.h:663 msgid "Script:" msgstr "Script-a:" #. STYLE_SECTHEADING -#: po/tmp/xap_String_Id.h.h:628 +#: po/tmp/xap_String_Id.h.h:665 msgid "Section Heading" -msgstr "Atalaren titulua" +msgstr "Sekzioaren izenburua" #. DLG_UENC_EncLabel -#: po/tmp/xap_String_Id.h.h:632 +#: po/tmp/xap_String_Id.h.h:669 msgid "Select Encoding:" -msgstr "Kodifikazioa Aukeratu:" +msgstr "Kodifikazioa hautatu:" #. DLG_HTMLOPT_ExpLabel -#: po/tmp/xap_String_Id.h.h:634 +#: po/tmp/xap_String_Id.h.h:671 msgid "Select HTML export options:" -msgstr "Aukeratu HTML esportatzeko aukerak: " +msgstr "HTML esportatze-aukerak hautatu: " #. DLG_ULANG_LangLabel -#: po/tmp/xap_String_Id.h.h:636 +#: po/tmp/xap_String_Id.h.h:673 msgid "Select Language:" -msgstr "Hizkuntza Aukeratu:" +msgstr "Hizkuntza hautatu:" #. LANG_SR -#: po/tmp/xap_String_Id.h.h:640 +#: po/tmp/xap_String_Id.h.h:677 msgid "Serbian" msgstr "Serbiera" #. DLG_Image_ImageDesc -#: po/tmp/xap_String_Id.h.h:642 +#: po/tmp/xap_String_Id.h.h:679 msgid "Set Image Name" -msgstr "" +msgstr "Irudiaren izena ezarri" #. DLG_Image_ImageSize -#: po/tmp/xap_String_Id.h.h:644 +#: po/tmp/xap_String_Id.h.h:681 msgid "Set Image Size" -msgstr "" +msgstr "Irudiaren tamaina ezarri" #. DLG_ULANG_LangTitle -#: po/tmp/xap_String_Id.h.h:646 +#: po/tmp/xap_String_Id.h.h:683 msgid "Set Language" -msgstr "" +msgstr "Hizkuntza ezarri" #. DLG_UFS_TransparencyCheck -#: po/tmp/xap_String_Id.h.h:648 +#: po/tmp/xap_String_Id.h.h:685 msgid "Set no Highlight Color" -msgstr "Ez jarri nabaritzeko kolorea" +msgstr "Nabarmentze-kolorerik ez ezarri" #. DLG_UFS_SizeLabel -#: po/tmp/xap_String_Id.h.h:652 +#: po/tmp/xap_String_Id.h.h:689 msgid "Size:" msgstr "Tamaina:" #. LANG_SK_SK -#: po/tmp/xap_String_Id.h.h:654 +#: po/tmp/xap_String_Id.h.h:691 msgid "Slovak" -msgstr "Eslobakiera" +msgstr "Eslovakiera" #. LANG_SL_SI -#: po/tmp/xap_String_Id.h.h:656 +#: po/tmp/xap_String_Id.h.h:693 msgid "Slovenian" -msgstr "Eslobeniera" +msgstr "Esloveniera" #. LANG_ES_MX -#: po/tmp/xap_String_Id.h.h:658 +#: po/tmp/xap_String_Id.h.h:695 msgid "Spanish (Mexico)" msgstr "Gaztelera (Mexiko)" #. LANG_ES_ES -#: po/tmp/xap_String_Id.h.h:660 +#: po/tmp/xap_String_Id.h.h:697 msgid "Spanish (Spain)" msgstr "Gaztelera (Espania)" #. DLG_Image_SquareWrap -#: po/tmp/xap_String_Id.h.h:664 +#: po/tmp/xap_String_Id.h.h:701 msgid "Square text wrapping" -msgstr "" +msgstr "Testu-egokitze karratua" #. DLG_DocComparison_Styles -#: po/tmp/xap_String_Id.h.h:672 +#: po/tmp/xap_String_Id.h.h:709 msgid "Styles:" -msgstr "" +msgstr "Estiloak:" #. LANG_SW -#: po/tmp/xap_String_Id.h.h:678 +#: po/tmp/xap_String_Id.h.h:715 msgid "Swahili" -msgstr "" +msgstr "Swahili" #. LANG_SV_SE -#: po/tmp/xap_String_Id.h.h:680 +#: po/tmp/xap_String_Id.h.h:717 msgid "Swedish" msgstr "Suediera" #. TB_Font_Symbol -#: po/tmp/xap_String_Id.h.h:682 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:719 msgid "Symbols" -msgstr "&Sinboloa" +msgstr "Sinboloak" #. LANG_SYR -#: po/tmp/xap_String_Id.h.h:684 +#: po/tmp/xap_String_Id.h.h:721 msgid "Syriac" -msgstr "" +msgstr "Siriera" #. LANG_TL_PH -#: po/tmp/xap_String_Id.h.h:688 +#: po/tmp/xap_String_Id.h.h:725 msgid "Tagalog" -msgstr "" +msgstr "Tagalog" #. LANG_TA_IN -#: po/tmp/xap_String_Id.h.h:690 +#: po/tmp/xap_String_Id.h.h:727 msgid "Tamil" -msgstr "" +msgstr "Tamilera" #. LANG_TE_IN -#: po/tmp/xap_String_Id.h.h:692 +#: po/tmp/xap_String_Id.h.h:729 msgid "Telugu" -msgstr "" +msgstr "Teluguera" #. DLG_UFS_ColorTab -#: po/tmp/xap_String_Id.h.h:694 +#: po/tmp/xap_String_Id.h.h:731 msgid "Text Color" -msgstr "Testu kolorea" +msgstr "Testu-kolorea" #. DLG_Image_WrappedBoth -#: po/tmp/xap_String_Id.h.h:696 +#: po/tmp/xap_String_Id.h.h:733 msgid "Text wrapped on both sides of the Image" -msgstr "" +msgstr "Irudiaren bi aldeetara egokitu testua" #. DLG_Image_WrappedLeft -#: po/tmp/xap_String_Id.h.h:698 +#: po/tmp/xap_String_Id.h.h:735 msgid "Text wrapped to the Left of the Image" -msgstr "" +msgstr "Irudiaren ezkerraldera egokitu testua" #. DLG_Image_WrappedRight -#: po/tmp/xap_String_Id.h.h:700 +#: po/tmp/xap_String_Id.h.h:737 msgid "Text wrapped to the Right of the Image" -msgstr "" +msgstr "Irudiaren eskuinaldera egokitu testua" #. LANG_TH_TH -#: po/tmp/xap_String_Id.h.h:702 +#: po/tmp/xap_String_Id.h.h:739 msgid "Thai" -msgstr "Tailandiera" +msgstr "Thailandiera" #. ENC_THAI_MAC -#: po/tmp/xap_String_Id.h.h:704 +#: po/tmp/xap_String_Id.h.h:741 msgid "Thai, Macintosh" -msgstr "Tailandiera, Macintosh" +msgstr "Thailandiera, Macintosh" #. ENC_THAI_TIS -#: po/tmp/xap_String_Id.h.h:706 +#: po/tmp/xap_String_Id.h.h:743 msgid "Thai, TIS-620" -msgstr "Tailandiera, TIS-620" +msgstr "Thailandiera, TIS-620" #. ENC_THAI_WIN -#: po/tmp/xap_String_Id.h.h:708 +#: po/tmp/xap_String_Id.h.h:745 msgid "Thai, Windows Code Page 874" -msgstr "Tailandiera, Windows 874 Orri Kodea" +msgstr "Thailandiera, Windows 874 kode-orria" #. DLG_NoSaveFile_DirNotWriteable -#: po/tmp/xap_String_Id.h.h:710 +#: po/tmp/xap_String_Id.h.h:747 #, c-format msgid "The directory '%s' is write-protected." -msgstr "'%s'direktorioa idazketarako babestua dago." +msgstr "'%s' direktorioa idazketaren aurka babestua dago." + +#. DLG_FOSA_ExtensionDoesNotMatch +#: po/tmp/xap_String_Id.h.h:749 +msgid "The given file extension does not match the chosen file type. Do you want to use this name anyway?" +msgstr "Zehaztutako fitxategi-hedapena ez dator hautatutako fitxategi-motarekin bat. Halaere, izen hau erabili nahi al duzu?" #. MSG_HistoryPartRestore2 -#: po/tmp/xap_String_Id.h.h:712 +#: po/tmp/xap_String_Id.h.h:751 #, c-format -msgid "" -"The nearest version that can be restored fully is %d. Would you like to " -"restore this version instead? To partially restore version %d press No." -msgstr "" +msgid "The nearest version that can be restored fully is %d. Would you like to restore this version instead? To partially restore version %d press No." +msgstr "%d da erabat berreskuratu daitekeen bertsio gertukoena. Nahiago al duzu bertsio hau berreskuratzea? %d bertsioa partzialki berreskuratzeko, sakatu ezazu 'Ez'." #. DLG_UP_InvalidPrintString -#: po/tmp/xap_String_Id.h.h:714 +#: po/tmp/xap_String_Id.h.h:753 msgid "The print command string is not valid." -msgstr "Inprimatzeko komandoa ez da zuzena." +msgstr "Inprimatze-komandoa ez da zuzena." #. MSG_NoUndo -#: po/tmp/xap_String_Id.h.h:716 +#: po/tmp/xap_String_Id.h.h:755 msgid "This operation cannot be undone. Are you sure you want to proceed?" -msgstr "" +msgstr "Ekintza hau ezin da desegin. Ziur al zaude jarraitu nahi duzula?" #. DLG_Image_TightWrap -#: po/tmp/xap_String_Id.h.h:720 +#: po/tmp/xap_String_Id.h.h:759 msgid "Tight text wrapping" -msgstr "" +msgstr "Testu-egokitze estua" #. MSG_HistoryPartRestore3 -#: po/tmp/xap_String_Id.h.h:724 +#: po/tmp/xap_String_Id.h.h:763 msgid "To continue anyway, press OK." -msgstr "" +msgstr "Edonola ere jarraitzeko, sakatu ezazu Ados." #. MSG_HistoryPartRestore4 -#: po/tmp/xap_String_Id.h.h:726 +#: po/tmp/xap_String_Id.h.h:765 msgid "To quit the restoration attempt, press Cancel." -msgstr "" +msgstr "Berreskuratze-saioa bertan behera uzteko, sakatu ezazu Utzi." #. LANG_TR_TR -#: po/tmp/xap_String_Id.h.h:732 +#: po/tmp/xap_String_Id.h.h:771 msgid "Turkish" msgstr "Turkiera" #. ENC_TURK_ISO -#: po/tmp/xap_String_Id.h.h:734 +#: po/tmp/xap_String_Id.h.h:773 msgid "Turkish, ISO-8859-9" msgstr "Turkiera, ISO-8859-9" #. ENC_TURK_MAC -#: po/tmp/xap_String_Id.h.h:736 +#: po/tmp/xap_String_Id.h.h:775 msgid "Turkish, Macintosh" msgstr "Turkiera, Macintosh" #. ENC_TURK_WIN -#: po/tmp/xap_String_Id.h.h:738 +#: po/tmp/xap_String_Id.h.h:777 msgid "Turkish, Windows Code Page 1254" -msgstr "Turkiera, Windows 1254 Orri Kodea" +msgstr "Turkiera, Windows 1254 kode-orria" #. DLG_Image_WrapType -#: po/tmp/xap_String_Id.h.h:740 +#: po/tmp/xap_String_Id.h.h:779 msgid "Type of text wrapping" -msgstr "" +msgstr "Testu-egokitze mota" #. ENC_WEST_ASCII -#: po/tmp/xap_String_Id.h.h:742 +#: po/tmp/xap_String_Id.h.h:781 msgid "US-ASCII" msgstr "US-ASCII" #. LANG_UK_UA -#: po/tmp/xap_String_Id.h.h:744 +#: po/tmp/xap_String_Id.h.h:783 msgid "Ukrainian" msgstr "Ukraniera" #. ENC_UKRA_KOI -#: po/tmp/xap_String_Id.h.h:746 +#: po/tmp/xap_String_Id.h.h:785 msgid "Ukrainian, KOI8-U" msgstr "Ukrainiera, KOI8-U" #. ENC_UKRA_MAC -#: po/tmp/xap_String_Id.h.h:748 +#: po/tmp/xap_String_Id.h.h:787 msgid "Ukrainian, Macintosh" msgstr "Ukrainiera, Macintosh" #. ENC_UNIC_UCS2 -#: po/tmp/xap_String_Id.h.h:752 +#: po/tmp/xap_String_Id.h.h:791 msgid "Unicode UCS-2" msgstr "Unicode UCS-2" #. ENC_UNIC_UCS_2BE -#: po/tmp/xap_String_Id.h.h:754 +#: po/tmp/xap_String_Id.h.h:793 msgid "Unicode UCS-2 Big Endian" -msgstr "Unicode UCS-2 Handia Lehena" +msgstr "Unicode UCS-2 Big Endian" #. ENC_UNIC_UCS_2LE -#: po/tmp/xap_String_Id.h.h:756 +#: po/tmp/xap_String_Id.h.h:795 msgid "Unicode UCS-2 Little Endian" -msgstr "Unicode UCS-2 Txikia Lehena" +msgstr "Unicode UCS-2 Little Endian" #. ENC_UNIC_UCS4 -#: po/tmp/xap_String_Id.h.h:758 +#: po/tmp/xap_String_Id.h.h:797 msgid "Unicode UCS-4" msgstr "Unicode UCS-4" #. ENC_UNIC_UCS_4BE -#: po/tmp/xap_String_Id.h.h:760 +#: po/tmp/xap_String_Id.h.h:799 msgid "Unicode UCS-4 Big Endian" -msgstr "Unicode UCS-4 Handia Lehena" +msgstr "Unicode UCS-4 Big Endian" #. ENC_UNIC_UCS_4LE -#: po/tmp/xap_String_Id.h.h:762 +#: po/tmp/xap_String_Id.h.h:801 msgid "Unicode UCS-4 Little Endian" -msgstr "Unicode UCS-4 Txikia Lehena" +msgstr "Unicode UCS-4 Little Endian" #. ENC_UNIC_UTF_16 -#: po/tmp/xap_String_Id.h.h:764 +#: po/tmp/xap_String_Id.h.h:803 msgid "Unicode UTF-16" msgstr "Unicode UTF-16" #. ENC_UNIC_UTF_16BE -#: po/tmp/xap_String_Id.h.h:766 +#: po/tmp/xap_String_Id.h.h:805 msgid "Unicode UTF-16 Big Endian" -msgstr "Unicode UTF-16 Handia Lehena" +msgstr "Unicode UTF-16 Big Endian" #. ENC_UNIC_UTF_16LE -#: po/tmp/xap_String_Id.h.h:768 +#: po/tmp/xap_String_Id.h.h:807 msgid "Unicode UTF-16 Little Endian" -msgstr "Unicode UTF-16 Txikia Lehena" +msgstr "Unicode UTF-16 Little Endian" #. ENC_UNIC_UTF_32 -#: po/tmp/xap_String_Id.h.h:770 +#: po/tmp/xap_String_Id.h.h:809 msgid "Unicode UTF-32" msgstr "Unicode UTF-32" #. ENC_UNIC_UTF_32BE -#: po/tmp/xap_String_Id.h.h:772 +#: po/tmp/xap_String_Id.h.h:811 msgid "Unicode UTF-32 Big Endian" -msgstr "Unicode UTF-32 Handia Lehena" +msgstr "Unicode UTF-32 Big Endian" #. ENC_UNIC_UTF_32LE -#: po/tmp/xap_String_Id.h.h:774 +#: po/tmp/xap_String_Id.h.h:813 msgid "Unicode UTF-32 Little Endian" -msgstr "Unicode UTF-32 Txikia Lehena" +msgstr "Unicode UTF-32 Little Endian" #. ENC_UNIC_UTF_7 -#: po/tmp/xap_String_Id.h.h:776 +#: po/tmp/xap_String_Id.h.h:815 msgid "Unicode UTF-7" msgstr "Unicode UTF-7" #. ENC_UNIC_UTF_8 -#: po/tmp/xap_String_Id.h.h:778 +#: po/tmp/xap_String_Id.h.h:817 msgid "Unicode UTF-8" msgstr "Unicode UTF-8" #. UntitledDocument -#: po/tmp/xap_String_Id.h.h:780 +#: po/tmp/xap_String_Id.h.h:819 #, c-format msgid "Untitled%d" -msgstr "Izenik gabeko %d" +msgstr "Izengabe%d" #. DLG_Update -#: po/tmp/xap_String_Id.h.h:782 +#: po/tmp/xap_String_Id.h.h:821 msgid "Update" msgstr "Eguneratu" -#. LANG_UR_PK -#: po/tmp/xap_String_Id.h.h:788 +#. LANG_UR +#: po/tmp/xap_String_Id.h.h:827 msgid "Urdu" msgstr "Urdu" +#. LANG_UR_PK +#: po/tmp/xap_String_Id.h.h:829 +msgid "Urdu (Pakistan)" +msgstr "Urdu (Pakistan)" + #. LANG_UZ_UZ -#: po/tmp/xap_String_Id.h.h:790 +#: po/tmp/xap_String_Id.h.h:831 msgid "Uzbek" -msgstr "" +msgstr "Uzbekera" #. DLG_History_List_Title -#: po/tmp/xap_String_Id.h.h:794 +#: po/tmp/xap_String_Id.h.h:835 msgid "Version history" -msgstr "" +msgstr "Bertsio-historia" #. DLG_PLUGIN_MANAGER_VERSION #. DLG_History_Version -#: po/tmp/xap_String_Id.h.h:797 +#: po/tmp/xap_String_Id.h.h:838 msgid "Version:" -msgstr "" +msgstr "Bertsioa:" #. LANG_VI_VN -#: po/tmp/xap_String_Id.h.h:799 +#: po/tmp/xap_String_Id.h.h:840 msgid "Vietnamese" msgstr "Bietnamera" #. ENC_VIET_TCVN -#: po/tmp/xap_String_Id.h.h:801 +#: po/tmp/xap_String_Id.h.h:842 msgid "Vietnamese, TCVN" msgstr "Bietnamera, TCVN" #. ENC_VIET_VISCII -#: po/tmp/xap_String_Id.h.h:803 +#: po/tmp/xap_String_Id.h.h:844 msgid "Vietnamese, VISCII" msgstr "Bietnamera, VISCII" #. ENC_VIET_WIN -#: po/tmp/xap_String_Id.h.h:805 +#: po/tmp/xap_String_Id.h.h:846 msgid "Vietnamese, Windows Code Page 1258" -msgstr "Bietnamera, Windows 1258 Orri Kodea" +msgstr "Bietnamera, Windows 1258 kode-orria" #. DLG_MW_MoreWindows -#: po/tmp/xap_String_Id.h.h:807 +#: po/tmp/xap_String_Id.h.h:848 msgid "View Document" -msgstr "&Dokumentua ikusi" +msgstr "Dokumentua ikusi" #. DLG_MW_Activate -#: po/tmp/xap_String_Id.h.h:809 +#: po/tmp/xap_String_Id.h.h:850 msgid "View:" msgstr "Ikusi:" #. LANG_CY_GB -#: po/tmp/xap_String_Id.h.h:811 +#: po/tmp/xap_String_Id.h.h:852 msgid "Welsh" -msgstr "Galesa" +msgstr "Galesera" #. ENC_US_DOS -#: po/tmp/xap_String_Id.h.h:813 +#: po/tmp/xap_String_Id.h.h:854 msgid "Western European, DOS/Windows Code Page 437" -msgstr "" +msgstr "Mendebaldeko Europa, DOS/Windows 437 kode-orria" #. ENC_MLNG_DOS -#: po/tmp/xap_String_Id.h.h:815 +#: po/tmp/xap_String_Id.h.h:856 msgid "Western European, DOS/Windows Code Page 850" -msgstr "" +msgstr "Mendebaldeko Europa, DOS/Windows 850 kode-orria" #. ENC_WEST_HP -#: po/tmp/xap_String_Id.h.h:817 +#: po/tmp/xap_String_Id.h.h:858 msgid "Western European, HP" msgstr "Mendebaldeko Europa, HP" #. ENC_WEST_ISO -#: po/tmp/xap_String_Id.h.h:819 +#: po/tmp/xap_String_Id.h.h:860 msgid "Western European, ISO-8859-1" msgstr "Mendebaldeko Europa, ISO-8859-1" #. ENC_WEST_MAC -#: po/tmp/xap_String_Id.h.h:821 +#: po/tmp/xap_String_Id.h.h:862 msgid "Western European, Macintosh" msgstr "Mendebaldeko Europa, Macintosh" #. ENC_WEST_NXT -#: po/tmp/xap_String_Id.h.h:823 +#: po/tmp/xap_String_Id.h.h:864 msgid "Western European, NeXT" msgstr "Mendebaldeko Europa, NeXT" #. ENC_WEST_WIN -#: po/tmp/xap_String_Id.h.h:825 +#: po/tmp/xap_String_Id.h.h:866 msgid "Western European, Windows Code Page 1252" -msgstr "Mendebaldeko Europa, Windows 1252 Orri kodea" +msgstr "Mendebaldeko Europa, Windows 1252 kode-orria" #. TB_Zoom_WholePage -#: po/tmp/xap_String_Id.h.h:827 +#: po/tmp/xap_String_Id.h.h:868 msgid "Whole Page" -msgstr "Doitu Altuerara:" +msgstr "Orri osoa" #. DLG_Image_Width -#: po/tmp/xap_String_Id.h.h:829 +#: po/tmp/xap_String_Id.h.h:870 msgid "Width:" msgstr "Zabalera:" #. DLG_IP_Width_Label -#: po/tmp/xap_String_Id.h.h:831 +#: po/tmp/xap_String_Id.h.h:872 msgid "Width: " msgstr "Zabalera: " +#. LANG_WO_SN +#: po/tmp/xap_String_Id.h.h:874 +msgid "Wolof (Senegal)" +msgstr "Wolofera (Senegal)" + #. DLG_QNXMB_Yes -#: po/tmp/xap_String_Id.h.h:833 +#: po/tmp/xap_String_Id.h.h:876 msgid "Yes" msgstr "Bai" #. LANG_YI -#: po/tmp/xap_String_Id.h.h:835 +#: po/tmp/xap_String_Id.h.h:878 msgid "Yiddish" -msgstr "Jiddish" +msgstr "Yiddish" #. MSG_HistoryConfirmSave -#: po/tmp/xap_String_Id.h.h:837 +#: po/tmp/xap_String_Id.h.h:880 #, c-format msgid "You have to save changes to document %s before proceeding. Save now?" -msgstr "" +msgstr "%s dokumentuaren aldaketak gorde behar dituzu jarraitu aurretik. Orain gorde?" #. DLG_Zoom_RadioFrameCaption -#: po/tmp/xap_String_Id.h.h:841 +#: po/tmp/xap_String_Id.h.h:884 msgid "Zoom to" -msgstr "Egin Zoom" +msgstr "Zoom egin" #. DLG_UnixMB_No -#: po/tmp/xap_String_Id.h.h:843 +#: po/tmp/xap_String_Id.h.h:886 msgid "_No" msgstr "_Ez" #. DLG_UnixMB_Yes -#: po/tmp/xap_String_Id.h.h:845 +#: po/tmp/xap_String_Id.h.h:888 msgid "_Yes" msgstr "_Bai" #. DLG_Unit_cm -#: po/tmp/xap_String_Id.h.h:847 +#: po/tmp/xap_String_Id.h.h:890 msgid "cm" msgstr "zm" #. DLG_DocComparison_Different -#: po/tmp/xap_String_Id.h.h:849 +#: po/tmp/xap_String_Id.h.h:892 msgid "different" -msgstr "" +msgstr "ezberdin" #. DLG_DocComparison_DivergingPos -#: po/tmp/xap_String_Id.h.h:851 +#: po/tmp/xap_String_Id.h.h:894 #, c-format msgid "diverging after document position %d" -msgstr "" +msgstr "ezberdinak dokumentuaren %d posiziotik aurrera" #. DLG_DocComparison_Diverging -#: po/tmp/xap_String_Id.h.h:853 -#, c-format +#: po/tmp/xap_String_Id.h.h:896 +#, fuzzy, c-format msgid "diverging after version %d of %s" -msgstr "" +msgstr "ezberdinak %s-ren %d bertsiotik aurrera" #. DLG_DocComparison_Identical -#: po/tmp/xap_String_Id.h.h:855 +#: po/tmp/xap_String_Id.h.h:898 msgid "identical" -msgstr "" +msgstr "erabat berdinak" #. DLG_Unit_inch -#: po/tmp/xap_String_Id.h.h:857 +#: po/tmp/xap_String_Id.h.h:900 msgid "inch" msgstr "hatzbete" #. DLG_Unit_mm -#: po/tmp/xap_String_Id.h.h:859 +#: po/tmp/xap_String_Id.h.h:902 msgid "mm" msgstr "mm" #. DLG_Unit_pica -#: po/tmp/xap_String_Id.h.h:861 +#: po/tmp/xap_String_Id.h.h:904 msgid "pica" -msgstr "" +msgstr "pica" #. DLG_Unit_points -#: po/tmp/xap_String_Id.h.h:863 +#: po/tmp/xap_String_Id.h.h:906 msgid "points" msgstr "puntuak" #. DLG_DocComparison_Siblings -#: po/tmp/xap_String_Id.h.h:865 +#: po/tmp/xap_String_Id.h.h:908 msgid "siblings" -msgstr "" +msgstr "antzekoak" #. DLG_DocComparison_Unrelated -#: po/tmp/xap_String_Id.h.h:867 +#: po/tmp/xap_String_Id.h.h:910 msgid "unrelated" -msgstr "" +msgstr "zerikusirik ez" +#~ msgid "&From File" +#~ msgstr "&Fitxategitik" +#~ msgid "Insert a picture" +#~ msgstr "Irudia txertatu" +#~ msgid "Show the AbiWord splash screen on application startup" +#~ msgstr "Aplikazioaren hasieran AbiWord aurkezpen pantaila erakutsi" #~ msgid "&Autotext" #~ msgstr "&Autotestua" - #~ msgid "ATTN:" #~ msgstr "ATTN:" - #~ msgid "About &GNU Free Software" #~ msgstr "&GNU Free Software-ri buruz" - #~ msgid "About &Open Source" #~ msgstr "&Open Source-ri buruz" - #~ msgid "About the GNU project" #~ msgstr "GNU proiektuari buruz" - #~ msgid "Attention:" #~ msgstr "Adi:" - #~ msgid "BCC:" #~ msgstr "BIDALTZE BEREZIA" - #~ msgid "Best regards," #~ msgstr "Esker mila," - #~ msgid "Best wishes," #~ msgstr "Bihotz-bihotzez," - #~ msgid "CC:" #~ msgstr "Posta erregistratua" - #~ msgid "CERTIFIED MAIL" #~ msgstr "POSTA ZIURTAGIRITUA" - #~ msgid "CONFIDENTIAL" #~ msgstr "KONFIDENTZIALA" - #~ msgid "Check &Version" #~ msgstr "&Bertsioa egiaztatu" - #~ msgid "Closing:" #~ msgstr "Amaierako agurra:" - #~ msgid "Cordially," #~ msgstr "Adeitasunez" - #~ msgid "Dear Mom and Dad," #~ msgstr "Aita eta Ama Maiteak," - #~ msgid "Dear Sir or Madam:" #~ msgstr "Jaun-andere maiteak:" - #~ msgid "Display information about Open Source" #~ msgstr "Openn Source-ri buruzko informazioa erakutsi" - #~ msgid "Display program version number" #~ msgstr "Programaren bertsioaren zenbakia erakutsi" - #~ msgid "Email:" #~ msgstr "Email:" - #~ msgid "From:" #~ msgstr "Noren partez:" - #~ msgid "Fwd:" #~ msgstr "Fwd:" - #~ msgid "In reply to:" #~ msgstr "Nori erantzunez:" - #~ msgid "Ladies and Gentlemen:" #~ msgstr "Jaun-andereak:" - #~ msgid "Love," #~ msgstr "Maitasunez," - #~ msgid "Mail Instructions:" #~ msgstr "Bidaltzeko instrukzioak:" - #~ msgid "PERSONAL" #~ msgstr "PERTSONALA" - #~ msgid "RE:" #~ msgstr "RE:" - #~ msgid "REGISTERED MAIL" #~ msgstr "POSTA ERREGISTRATUA" - #~ msgid "Reference:" #~ msgstr "Erreferentzia:" - #~ msgid "Regards," #~ msgstr "Agurrak," - #~ msgid "Respectfully yours," #~ msgstr "Begirunez," - #~ msgid "Respectfully," #~ msgstr "Begirunez," - #~ msgid "SPECIAL DELIVERY" #~ msgstr "BIDALTZE BEREZIA" - #~ msgid "Salutation:" #~ msgstr "Sarrerako agurra:" - #~ msgid "Sincerely yours," #~ msgstr "Adeitasunez," - #~ msgid "Take care," #~ msgstr "Zaindu," - #~ msgid "Thank you," #~ msgstr "Esker mila," - #~ msgid "Thanks," #~ msgstr "Eskerrik asko," - #~ msgid "To Whom It May Concern:" #~ msgstr "Interesatzen zaionari: " - #~ msgid "To:" #~ msgstr "Nori:" - #~ msgid "VIA AIRMAIL" #~ msgstr "AIREZ" - #~ msgid "VIA FACSIMILE" #~ msgstr "FAXEZ" - #~ msgid "VIA OVERNIGHT MAIL" #~ msgstr "GAUEKO POSTA BIDEZ" - #~ msgid "Yours truly," #~ msgstr "Adeitasunez," - #~ msgid "\tFont " #~ msgstr "Letra mota " + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/po/pt-BR.po /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/po/pt-BR.po --- abiword-2.6.2/abiword/po/pt-BR.po 2008-04-06 17:00:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword/po/pt-BR.po 2009-07-15 16:56:23.000000000 +0100 @@ -1,5 +1,4 @@ -# translation of pt-BR.po to Portugus do Brasil -# Translation of Abiword to Brazilian Portuguese +# Translation of Abiword to Brazilian Portuguese. # Copyright (C) 2003, 2004 Free Software Foundation, Inc. # Nelson Ferraz , 2004. # @@ -7,7 +6,7 @@ msgstr "" "Project-Id-Version: pt-BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-28 05:15+0200\n" +"POT-Creation-Date: 2008-08-25 05:26+0200\n" "PO-Revision-Date: 2004-01-09 16:03-0200\n" "Last-Translator: Nelson Ferraz \n" "Language-Team: Portugus do Brasil \n" @@ -39,7 +38,7 @@ #. MENU_STATUSLINE_HELP #: po/tmp/ap_String_Id.h.h:23 msgid " " -msgstr "Fechar documento" +msgstr " " #. DLG_Styles_ErrNotTitle2 #: po/tmp/ap_String_Id.h.h:25 @@ -47,7 +46,7 @@ " - Reserved. \n" " You cannot use this name. Choose Another \n" msgstr "" -"Reservado. \n" +" - Reservado. \n" " No pode usar este nome. Escolha outro \n" #. DLG_WordCount_Auto_Update @@ -57,7 +56,6 @@ #. DLG_PageSetup_Percent #: po/tmp/ap_String_Id.h.h:29 -#, c-format msgid "% of normal size" msgstr "% do tamanho normal" @@ -286,7 +284,7 @@ #. DLG_Spell_Change #: po/tmp/ap_String_Id.h.h:122 msgid "&Change" -msgstr "Mudar todas" +msgstr "Mudar" #. MENU_LABEL_INSERT_CLIPART #: po/tmp/ap_String_Id.h.h:124 @@ -327,7 +325,7 @@ #. MENU_LABEL_FMT_STYLE_DEFINE #: po/tmp/ap_String_Id.h.h:139 msgid "&Create and Modify Styles" -msgstr "&Criar e Modificar" +msgstr "&Criar e Modificar Estilos" #. DLG_Options_Label_PrefsCurrentScheme #: po/tmp/ap_String_Id.h.h:141 @@ -450,85 +448,80 @@ msgid "&Format Table" msgstr "&Formatar Tabela" -#. MENU_LABEL_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:190 -msgid "&From File" -msgstr "Do &Arquivo" - #. MENU_LABEL_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:192 +#: po/tmp/ap_String_Id.h.h:190 msgid "&Go To" msgstr "&Ir para" #. DLG_FormatTOC_HasHeading -#: po/tmp/ap_String_Id.h.h:194 +#: po/tmp/ap_String_Id.h.h:192 msgid "&Has Heading" msgstr "&Possui cabealho" #. MENU_LABEL_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:196 +#: po/tmp/ap_String_Id.h.h:194 msgid "&Header and Footer" msgstr "&Cabealhos e Rodaps" #. DLG_PageSetup_Header -#: po/tmp/ap_String_Id.h.h:198 +#: po/tmp/ap_String_Id.h.h:196 msgid "&Header:" msgstr "Primeira" #. DLG_PageSetup_Height -#: po/tmp/ap_String_Id.h.h:200 +#: po/tmp/ap_String_Id.h.h:198 msgid "&Height:" msgstr "Altura:" #. DLG_HelpButton #. MENU_LABEL_HELP -#: po/tmp/ap_String_Id.h.h:203 +#: po/tmp/ap_String_Id.h.h:201 msgid "&Help" msgstr "&Ajuda" #. DLG_Options_Label_ViewHiddenText -#: po/tmp/ap_String_Id.h.h:205 +#: po/tmp/ap_String_Id.h.h:203 msgid "&Hidden Text" msgstr "texto escondido" #. DLG_Options_Label_SpellHighlightMisspelledWords -#: po/tmp/ap_String_Id.h.h:207 +#: po/tmp/ap_String_Id.h.h:205 msgid "&Highlight misspelled words" msgstr "&Mostrar palavras com ortografia errada" #. MENU_LABEL_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:209 +#: po/tmp/ap_String_Id.h.h:207 msgid "&Hyperlink" msgstr "&Hiperligao" #. DLG_Spell_Ignore -#: po/tmp/ap_String_Id.h.h:211 +#: po/tmp/ap_String_Id.h.h:209 msgid "&Ignore" -msgstr "Ignora todas" +msgstr "Ignorar" #. MENU_LABEL_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:213 +#: po/tmp/ap_String_Id.h.h:211 msgid "&Ignore All" msgstr "&Ignorar tudo" #. MENU_LABEL_FMT_IMAGE #. MENU_LABEL_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:216 +#: po/tmp/ap_String_Id.h.h:214 msgid "&Image" msgstr "F&ormatar" #. MENU_LABEL_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:218 +#: po/tmp/ap_String_Id.h.h:216 msgid "&Import Styles" msgstr "&Importar Estilos" #. MENU_LABEL_WEB_WEBPREVIEW -#: po/tmp/ap_String_Id.h.h:220 +#: po/tmp/ap_String_Id.h.h:218 msgid "&In web browser" msgstr "Ver antes como &Web" #. DLG_FormatTOC_InheritLabel -#: po/tmp/ap_String_Id.h.h:222 +#: po/tmp/ap_String_Id.h.h:220 msgid "&Inherit label" msgstr "&Herdar rtulo" @@ -536,571 +529,573 @@ #. MENU_LABEL_INSERT #. MENU_LABEL_TABLE_INSERT #. DLG_Insert -#: po/tmp/ap_String_Id.h.h:226 po/tmp/xap_String_Id.h.h:15 +#: po/tmp/ap_String_Id.h.h:224 po/tmp/xap_String_Id.h.h:15 msgid "&Insert" msgstr "&Inserir" #. DLG_Options_Label_AutoSaveInterval -#: po/tmp/ap_String_Id.h.h:228 +#: po/tmp/ap_String_Id.h.h:226 msgid "&Interval:" msgstr "&Intervalo:" #. MENU_LABEL_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:230 +#: po/tmp/ap_String_Id.h.h:228 msgid "&Italic" msgstr "&Itlico" #. MENU_LABEL_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:232 +#: po/tmp/ap_String_Id.h.h:230 msgid "&Jump to hyperlink" msgstr "&Saltar para hiperlink" #. MENU_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:234 +#: po/tmp/ap_String_Id.h.h:232 msgid "&Justify" msgstr "&Justificar" #. DLG_Para_PushKeepLinesTogether -#: po/tmp/ap_String_Id.h.h:236 +#: po/tmp/ap_String_Id.h.h:234 msgid "&Keep lines together" msgstr "Manter linhas juntas" #. MENU_LABEL_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:238 +#: po/tmp/ap_String_Id.h.h:236 msgid "&LRM" msgstr "M&ED" #. DLG_PageSetup_Landscape -#: po/tmp/ap_String_Id.h.h:240 +#: po/tmp/ap_String_Id.h.h:238 msgid "&Landscape" msgstr "&Horizontal" #. MENU_LABEL_TOOLS_LANGUAGE -#: po/tmp/ap_String_Id.h.h:242 +#: po/tmp/ap_String_Id.h.h:240 msgid "&Language" msgstr "&Idioma" #. MENU_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:244 +#: po/tmp/ap_String_Id.h.h:242 msgid "&Left" msgstr " &Esquerda" #. MENU_LABEL_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:246 +#: po/tmp/ap_String_Id.h.h:244 msgid "&Left-to-right text" msgstr "Texto no sentido &esquerda para a direita" #. DLG_Para_LabelLeft #. DLG_PageSetup_Left -#: po/tmp/ap_String_Id.h.h:249 +#: po/tmp/ap_String_Id.h.h:247 msgid "&Left:" msgstr " Esquerda" #. MENU_LABEL_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:251 +#: po/tmp/ap_String_Id.h.h:249 msgid "&Lock layout" msgstr "Travar &layout" #. MENU_LABEL_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:253 +#: po/tmp/ap_String_Id.h.h:251 msgid "&Mail Merge" msgstr "&Mala Direta" #. MENU_LABEL_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:255 +#: po/tmp/ap_String_Id.h.h:253 msgid "&Mail Merge Field" msgstr "&Mala Direta" #. MENU_LABEL_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:257 +#: po/tmp/ap_String_Id.h.h:255 msgid "&Maintain Full History" msgstr "&Manter Histrico Completo" #. MENU_LABEL_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:259 +#: po/tmp/ap_String_Id.h.h:257 msgid "&Mark revisions while typing" msgstr "&Marcar revises enquanto se escreve" #. DLG_FR_MatchCase -#: po/tmp/ap_String_Id.h.h:261 +#: po/tmp/ap_String_Id.h.h:259 msgid "&Match case" msgstr "&Diferenciar maisculas/minsculas" #. MENU_LABEL_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:263 +#: po/tmp/ap_String_Id.h.h:261 msgid "&Merge Cells" msgstr "&Mesclar Clulas" #. MENU_LABEL_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:265 +#: po/tmp/ap_String_Id.h.h:263 msgid "&More Documents" msgstr "&Mais janelas" #. DLG_Goto_Label_Name -#: po/tmp/ap_String_Id.h.h:267 +#: po/tmp/ap_String_Id.h.h:265 msgid "&Name:" msgstr "Nome:" #. MENU_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:269 +#: po/tmp/ap_String_Id.h.h:267 msgid "&New" msgstr "&Novo" #. MENU_LABEL_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:271 +#: po/tmp/ap_String_Id.h.h:269 msgid "&New Window" msgstr "&Nova" #. MENU_LABEL_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:273 +#: po/tmp/ap_String_Id.h.h:271 msgid "&New using Template" msgstr "&Novo partir de Modelo" #. DLG_Break_NextPage -#: po/tmp/ap_String_Id.h.h:275 +#: po/tmp/ap_String_Id.h.h:273 msgid "&Next page" msgstr "Pgina &seguinte" #. MENU_LABEL_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:277 +#: po/tmp/ap_String_Id.h.h:275 msgid "&Normal Layout" msgstr "Esquema Normal" #. DLG_Goto_Label_Number -#: po/tmp/ap_String_Id.h.h:279 +#: po/tmp/ap_String_Id.h.h:277 msgid "&Number:" msgstr "Nmero:" #. DLG_FormatTOC_NumberingType -#: po/tmp/ap_String_Id.h.h:281 +#: po/tmp/ap_String_Id.h.h:279 msgid "&Numbering type:" msgstr "&Tipo de numerao:" #. DLG_Break_OddPage -#: po/tmp/ap_String_Id.h.h:283 +#: po/tmp/ap_String_Id.h.h:281 msgid "&Odd page" msgstr "Pgina &mpar" #. MENU_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:285 +#: po/tmp/ap_String_Id.h.h:283 msgid "&Open" msgstr "&Abrir" #. DLG_MailMerge_OpenFile -#: po/tmp/ap_String_Id.h.h:287 +#: po/tmp/ap_String_Id.h.h:285 msgid "&Open File" msgstr "Abrir &Arquivo" #. MENU_LABEL_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:289 +#: po/tmp/ap_String_Id.h.h:287 msgid "&Overline" msgstr "Sobrelin&hado" #. MENU_LABEL_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:291 +#: po/tmp/ap_String_Id.h.h:289 msgid "&Page Width" msgstr "Zoom para &Largura de Pgina" #. DLG_Break_PageBreak -#: po/tmp/ap_String_Id.h.h:293 +#: po/tmp/ap_String_Id.h.h:291 msgid "&Page break" msgstr "Quebra de &pgina" #. DLG_FormatTOC_PageNumbering -#: po/tmp/ap_String_Id.h.h:295 +#: po/tmp/ap_String_Id.h.h:293 msgid "&Page numbering:" msgstr "Numerao de pgina:" #. MENU_LABEL_FMT_PARAGRAPH -#: po/tmp/ap_String_Id.h.h:297 +#: po/tmp/ap_String_Id.h.h:295 msgid "&Paragraph" msgstr "&Pargrafo" #. MENU_LABEL_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:299 +#: po/tmp/ap_String_Id.h.h:297 msgid "&Paste" msgstr "Co&lar" -#. MENU_LABEL_INSERT_PICTURE -#: po/tmp/ap_String_Id.h.h:301 +#. MENU_LABEL_INSERT_GRAPHIC +#: po/tmp/ap_String_Id.h.h:299 msgid "&Picture" msgstr "&Imagem" #. MENU_LABEL_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:303 +#: po/tmp/ap_String_Id.h.h:301 msgid "&Plugins" msgstr "P&lugins" #. DLG_PageSetup_Portrait -#: po/tmp/ap_String_Id.h.h:305 +#: po/tmp/ap_String_Id.h.h:303 msgid "&Portrait" msgstr "&Vertical" #. MENU_LABEL_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:307 +#: po/tmp/ap_String_Id.h.h:305 msgid "&Print" msgstr "&Imprimir" #. MENU_LABEL_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:309 +#: po/tmp/ap_String_Id.h.h:307 msgid "&Print Layout" msgstr "Layout de &Impresso" #. MENU_LABEL_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:311 +#: po/tmp/ap_String_Id.h.h:309 msgid "&Purge History" msgstr "A&pagar Histrico" #. MENU_LABEL_FILE_EXIT -#: po/tmp/ap_String_Id.h.h:313 +#: po/tmp/ap_String_Id.h.h:311 msgid "&Quit" msgstr "&Sair" #. MENU_LABEL_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:315 +#: po/tmp/ap_String_Id.h.h:313 msgid "&RLM" msgstr "M&DE" #. MENU_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:317 +#: po/tmp/ap_String_Id.h.h:315 msgid "&Redo" msgstr "&Refazer" #. MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:319 +#: po/tmp/ap_String_Id.h.h:317 msgid "&Reject revision" msgstr "&Rejeitar reviso" #. DLG_FR_ReplaceButton -#: po/tmp/ap_String_Id.h.h:321 +#: po/tmp/ap_String_Id.h.h:319 msgid "&Replace" msgstr "S&ubstituir" #. DLG_Options_Btn_IgnoreReset -#: po/tmp/ap_String_Id.h.h:323 +#: po/tmp/ap_String_Id.h.h:321 msgid "&Reset" msgstr "&Cancelar" #. MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:325 +#: po/tmp/ap_String_Id.h.h:323 msgid "&Reset to default layout" msgstr "&Voltar ao layout padro" #. MENU_LABEL_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:327 +#: po/tmp/ap_String_Id.h.h:325 msgid "&Revisions" msgstr "&Revises" #. MENU_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:329 +#: po/tmp/ap_String_Id.h.h:327 msgid "&Right" msgstr " &Direita" #. MENU_LABEL_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:331 +#: po/tmp/ap_String_Id.h.h:329 msgid "&Right-to-left text" msgstr "Texto no sentido &direita para esquerda" #. DLG_Para_LabelRight #. DLG_PageSetup_Right -#: po/tmp/ap_String_Id.h.h:334 +#: po/tmp/ap_String_Id.h.h:332 msgid "&Right:" msgstr " Direita" #. MENU_LABEL_TABLE_DELETE_ROWS #. MENU_LABEL_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:337 +#: po/tmp/ap_String_Id.h.h:335 msgid "&Row" msgstr "Apagar &Linhas" #. DLG_Options_Label_ViewRuler -#: po/tmp/ap_String_Id.h.h:339 +#: po/tmp/ap_String_Id.h.h:337 msgid "&Ruler" msgstr "rgua" #. MENU_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:341 +#: po/tmp/ap_String_Id.h.h:339 msgid "&Save" msgstr "&Salvar" #. MENU_LABEL_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:343 +#: po/tmp/ap_String_Id.h.h:341 msgid "&Save Image As" msgstr "&Salvar Imagem Como" #. MENU_LABEL_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:345 +#: po/tmp/ap_String_Id.h.h:343 msgid "&Save web page" msgstr "Salvar como &Web" #. MENU_LABEL_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:347 +#: po/tmp/ap_String_Id.h.h:345 msgid "&Search for Help" msgstr "&Pesquisar na Ajuda" #. MENU_LABEL_TABLE_SELECT -#: po/tmp/ap_String_Id.h.h:349 +#: po/tmp/ap_String_Id.h.h:347 msgid "&Select" msgstr "&Selecionar" #. MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL -#: po/tmp/ap_String_Id.h.h:351 +#: po/tmp/ap_String_Id.h.h:349 msgid "&Select revision" msgstr "&Selecionar reviso" #. MENU_LABEL_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:353 +#: po/tmp/ap_String_Id.h.h:351 msgid "&Show History" msgstr "&Mostrar Histrico" #. MENU_LABEL_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:355 +#: po/tmp/ap_String_Id.h.h:353 msgid "&Show Status Bar" msgstr "Barra de &mensagens" #. DLG_Para_LabelSpecial -#: po/tmp/ap_String_Id.h.h:357 +#: po/tmp/ap_String_Id.h.h:355 msgid "&Special:" msgstr "Especial:" #. MENU_LABEL_TOOLS_SPELLING -#: po/tmp/ap_String_Id.h.h:359 +#: po/tmp/ap_String_Id.h.h:357 msgid "&Spelling" msgstr "&Ortografia" #. DLG_FormatTOC_StartAt -#: po/tmp/ap_String_Id.h.h:361 +#: po/tmp/ap_String_Id.h.h:359 msgid "&Start at:" msgstr "&Comea em:" #. DLG_Options_Label_ViewStatusBar -#: po/tmp/ap_String_Id.h.h:363 +#: po/tmp/ap_String_Id.h.h:361 msgid "&Status bar" msgstr "barra de mensagens" #. MENU_LABEL_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:365 +#: po/tmp/ap_String_Id.h.h:363 msgid "&Subscript" msgstr "n&dice" #. DLG_Para_PushSuppressLineNumbers -#: po/tmp/ap_String_Id.h.h:367 +#: po/tmp/ap_String_Id.h.h:365 msgid "&Suppress line numbers" msgstr "Esconder numerao de linhas" #. DLG_FormatTOC_TabLeader -#: po/tmp/ap_String_Id.h.h:369 +#: po/tmp/ap_String_Id.h.h:367 msgid "&Tab leader:" msgstr "Formato de &tabulao:" #. MENU_LABEL_TABLE_INSERT_TABLE #. MENU_LABEL_TABLE_DELETE_TABLE #. MENU_LABEL_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:373 +#: po/tmp/ap_String_Id.h.h:371 msgid "&Table" msgstr "Inserir &Tabela" #. MENU_LABEL_FMT_TABS -#: po/tmp/ap_String_Id.h.h:375 +#: po/tmp/ap_String_Id.h.h:373 msgid "&Tabs" msgstr "Ta&bulao" #. DLG_Para_ButtonTabs -#: po/tmp/ap_String_Id.h.h:377 +#: po/tmp/ap_String_Id.h.h:375 msgid "&Tabs..." msgstr "&Tabulao" #. MENU_LABEL_VIEW_TOOLBARS -#: po/tmp/ap_String_Id.h.h:379 +#: po/tmp/ap_String_Id.h.h:377 msgid "&Toolbars" msgstr "&Barras de utilitrios" #. MENU_LABEL_TOOLS -#: po/tmp/ap_String_Id.h.h:381 +#: po/tmp/ap_String_Id.h.h:379 msgid "&Tools" msgstr "Fe&rramentas" #. DLG_PageSetup_Top -#: po/tmp/ap_String_Id.h.h:383 +#: po/tmp/ap_String_Id.h.h:381 msgid "&Top:" msgstr "&Tipo..." #. DLG_Field_Types_No_Colon -#: po/tmp/ap_String_Id.h.h:385 +#: po/tmp/ap_String_Id.h.h:383 msgid "&Types" msgstr "&Tipos" #. DLG_Field_Types -#: po/tmp/ap_String_Id.h.h:387 +#: po/tmp/ap_String_Id.h.h:385 msgid "&Types:" msgstr "&Tipo..." #. MENU_LABEL_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:389 +#: po/tmp/ap_String_Id.h.h:387 msgid "&Underline" msgstr "S&ublinhado" #. MENU_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:391 +#: po/tmp/ap_String_Id.h.h:389 msgid "&Undo" msgstr "&Desfazer" #. DLG_Options_Label_ViewUnits #. DLG_PageSetup_Units -#: po/tmp/ap_String_Id.h.h:394 +#: po/tmp/ap_String_Id.h.h:392 msgid "&Units:" msgstr "Unidades" #. MENU_LABEL_VIEW #. DLG_MW_ViewButton -#: po/tmp/ap_String_Id.h.h:396 po/tmp/xap_String_Id.h.h:21 +#: po/tmp/ap_String_Id.h.h:394 po/tmp/xap_String_Id.h.h:21 msgid "&View" msgstr "&Ver" #. MENU_LABEL_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:398 +#: po/tmp/ap_String_Id.h.h:396 msgid "&Web Layout" msgstr "Esquema &Web" #. MENU_LABEL_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:400 +#: po/tmp/ap_String_Id.h.h:398 msgid "&Whole Page" msgstr "Zoom para &Toda Pgina" #. DLG_FR_WholeWord -#: po/tmp/ap_String_Id.h.h:402 +#: po/tmp/ap_String_Id.h.h:400 msgid "&Whole word" msgstr "&Palavra Inteira" #. DLG_Para_PushWidowOrphanControl -#: po/tmp/ap_String_Id.h.h:404 +#: po/tmp/ap_String_Id.h.h:402 msgid "&Widow/Orphan control" msgstr "Controlo Viva/Orf" #. DLG_PageSetup_Width -#: po/tmp/ap_String_Id.h.h:406 +#: po/tmp/ap_String_Id.h.h:404 msgid "&Width:" msgstr "Comprimento" #. MENU_LABEL_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:408 +#: po/tmp/ap_String_Id.h.h:406 msgid "&Word Count" msgstr "&Contar palavras" #. MENU_LABEL_VIEW_ZOOM_MENU #. MENU_LABEL_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:411 +#: po/tmp/ap_String_Id.h.h:409 msgid "&Zoom" msgstr "&Zoom" #. DLG_ListRevisions_LevelZero -#: po/tmp/ap_String_Id.h.h:413 +#: po/tmp/ap_String_Id.h.h:411 msgid "(All revisions visible)" msgstr "(Todas as revises visveis)" #. DLG_Spell_NoSuggestions -#: po/tmp/ap_String_Id.h.h:415 +#: po/tmp/ap_String_Id.h.h:413 msgid "(no spelling suggestions)" msgstr "Nenhuma sugesto" #. DLG_Para_SpecialNone -#: po/tmp/ap_String_Id.h.h:417 +#: po/tmp/ap_String_Id.h.h:415 msgid "(none)" msgstr "(nenhum)" #. TOOLBAR_LABEL_1COLUMN #. TOOLBAR_STATUSLINE_1COLUMN #. TOOLBAR_TOOLTIP_1COLUMN -#: po/tmp/ap_String_Id.h.h:421 +#: po/tmp/ap_String_Id.h.h:419 msgid "1 Column" msgstr "1 Coluna" #. TOOLBAR_LABEL_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:423 +#: po/tmp/ap_String_Id.h.h:421 msgid "1.5 Spacing" msgstr "Espaamento 1,5" #. DLG_Para_SpacingHalf -#: po/tmp/ap_String_Id.h.h:425 +#: po/tmp/ap_String_Id.h.h:423 msgid "1.5 lines" msgstr "1,5 linha" #. TOOLBAR_STATUSLINE_MIDDLE_SPACE #. TOOLBAR_TOOLTIP_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:428 +#: po/tmp/ap_String_Id.h.h:426 msgid "1.5 spacing" msgstr "Espaamento 1,5" #. TOOLBAR_LABEL_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:430 +#: po/tmp/ap_String_Id.h.h:428 msgid "12 pt before" msgstr "12 pt antes" #. TOOLBAR_LABEL_2COLUMN #. TOOLBAR_STATUSLINE_2COLUMN #. TOOLBAR_TOOLTIP_2COLUMN -#: po/tmp/ap_String_Id.h.h:434 +#: po/tmp/ap_String_Id.h.h:432 msgid "2 Columns" msgstr "2 Colunas" #. TOOLBAR_LABEL_3COLUMN #. TOOLBAR_STATUSLINE_3COLUMN #. TOOLBAR_TOOLTIP_3COLUMN -#: po/tmp/ap_String_Id.h.h:438 +#: po/tmp/ap_String_Id.h.h:436 msgid "3 Columns" msgstr "3 Colunas" #. DLG_Goto_Btn_Prev -#: po/tmp/ap_String_Id.h.h:440 +#: po/tmp/ap_String_Id.h.h:438 msgid "<< Prev" msgstr "Pgina Anterior" #. MSG_Exception -#: po/tmp/ap_String_Id.h.h:442 +#: po/tmp/ap_String_Id.h.h:440 +#, fuzzy msgid "" -"A fatal error has just occurred. Abiword is going to shutdown.\n" +"A fatal error has just occurred. AbiWord is going to shutdown.\n" "The current document has been saved to disc with a \".saved\" extension." msgstr "" "Um erro fatal acabou de ocorrer. Abiword vai ser terminado.\n" "O documento corrente foi salvo no disco com a extenso \".saved\"." #. DLG_Options_Label_SpellSuggest -#: po/tmp/ap_String_Id.h.h:444 +#: po/tmp/ap_String_Id.h.h:442 msgid "A&lways suggest corrections" msgstr "Sugerir sempre uma alternativa" #. FIELD_DateTime_AMPM -#: po/tmp/ap_String_Id.h.h:446 +#: po/tmp/ap_String_Id.h.h:444 msgid "AM/PM" msgstr "AM/PM" #. MSG_IE_BogusDocument -#: po/tmp/ap_String_Id.h.h:448 +#: po/tmp/ap_String_Id.h.h:446 #, c-format msgid "AbiWord cannot open %s. It appears to be an invalid document" msgstr "%s um arquivo danificado" #. MSG_SpellSelectionDone -#: po/tmp/ap_String_Id.h.h:450 +#: po/tmp/ap_String_Id.h.h:448 msgid "AbiWord finished checking the selection." -msgstr "AbiWord terminou de verificar a seleo." -"Fim da correo ortogrfica da seleo.\n" +msgstr "" +"AbiWord terminou de verificar a seleo.Fim da correo ortogrfica da " +"seleo.\n" "Quer continuar a verificar o resto do documento?" #. DLG_FR_FinishedReplace -#: po/tmp/ap_String_Id.h.h:452 +#: po/tmp/ap_String_Id.h.h:450 #, c-format msgid "" "AbiWord has finished its search of the document and has made %d replacements." msgstr "Terminou a pesquisa no documento e foram feitas %d substituies." #. DLG_FR_FinishedFind -#: po/tmp/ap_String_Id.h.h:454 +#: po/tmp/ap_String_Id.h.h:452 msgid "AbiWord has finished searching the document." msgstr "Terminou a pesquisa no documento." #. WINDOWS_COMCTL_WARNING -#: po/tmp/ap_String_Id.h.h:456 +#: po/tmp/ap_String_Id.h.h:454 msgid "" "AbiWord is designed for a newer version of the system file COMCTL32.DLL\n" "than the one currently on your system. (COMCTL32.DLL version 4.72 or newer)\n" @@ -1113,16 +1108,16 @@ msgstr "" "AbiWord foi projetado para uma verso do arquivo de sistema COMCTL32.DLL\n" "mais nova do que a que est instalada em seu sistema.\n" -"(COMCTL verso 4.72 ou mais novo). Uma soluo para este problema descrita\n" +"(COMCTL verso 4.72 ou mais novo). Uma soluo para este problema " +"descrita\n" "no FAQ no site AbiSource:\n" "\n" "\thttp://www.abisource.com\n" "\n" "Voc pode usar o programa, mas a barra de tarefas pode no aparecer." - #. WINDOWS_NEED_UNICOWS -#: po/tmp/ap_String_Id.h.h:458 +#: po/tmp/ap_String_Id.h.h:456 #, c-format msgid "" "AbiWord needs the file %s.dll\n" @@ -1130,108 +1125,114 @@ "platformsdk/sdkupdate/psdkredist.htm" msgstr "" "O AbiWord precisa do arquivo %s.dll\n" -"Por favor baixe o arquivo e o instale a partir de " -"http://www.microsoft.com/msdonload/platformsdk/sdkupdate/psdkredist.htm" +"Por favor baixe o arquivo e o instale a partir de http://www.microsoft.com/" +"msdonload/platformsdk/sdkupdate/psdkredist.htm" #. MENU_LABEL_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:460 +#: po/tmp/ap_String_Id.h.h:458 msgid "About G&NOME Office" msgstr "Sobre o G&NOME Office" #. MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:462 +#: po/tmp/ap_String_Id.h.h:460 msgid "About the GNOME Office project" msgstr "Saiba mais sobre o projecto GNOME Office" #. MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION -#: po/tmp/ap_String_Id.h.h:464 +#: po/tmp/ap_String_Id.h.h:462 msgid "Accept the suggested change" msgstr "Aceitar a alterao sugerida" #. TOOLBAR_STATUSLINE_ADD_COLUMN #. TOOLBAR_TOOLTIP_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:467 +#: po/tmp/ap_String_Id.h.h:465 msgid "Add a column to this table after the current column" msgstr "Adicionar uma coluna a esta tabela aps a coluna atual" #. TOOLBAR_STATUSLINE_ADD_ROW #. TOOLBAR_TOOLTIP_ADD_ROW -#: po/tmp/ap_String_Id.h.h:470 +#: po/tmp/ap_String_Id.h.h:468 msgid "Add a row to this table after the current row" msgstr "Adicionar uma linha a esta tabela aps a linha atual" #. MENU_STATUSLINE_FMT_BORDERS -#: po/tmp/ap_String_Id.h.h:472 +#: po/tmp/ap_String_Id.h.h:470 msgid "Add borders and shading to the selection" msgstr "ajustar bordas e sombreados" #. TOOLBAR_LABEL_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:474 +#: po/tmp/ap_String_Id.h.h:472 msgid "Add column after" msgstr "Adicionar uma coluna aps a coluna atual" #. MENU_STATUSLINE_FMT_BULLETS -#: po/tmp/ap_String_Id.h.h:476 +#: po/tmp/ap_String_Id.h.h:474 msgid "Add or modify bullets and numbering for selected paragraphs" msgstr "Formatar listas (no) numeradas" #. TOOLBAR_LABEL_ADD_ROW -#: po/tmp/ap_String_Id.h.h:478 +#: po/tmp/ap_String_Id.h.h:476 msgid "Add row after" msgstr "Adicionar uma linha aps a linha atual" #. MENU_STATUSLINE_SPELL_ADD -#: po/tmp/ap_String_Id.h.h:480 +#: po/tmp/ap_String_Id.h.h:478 msgid "Add this word to the custom dictionary" msgstr "Adicionar esta palavra ao dicionrio custumizvel" #. DLG_Styles_ModifyTemplate -#: po/tmp/ap_String_Id.h.h:482 +#: po/tmp/ap_String_Id.h.h:480 msgid "Add to template" msgstr "Adicionar ao modelo" #. DLG_Para_LabelAfter -#: po/tmp/ap_String_Id.h.h:484 +#: po/tmp/ap_String_Id.h.h:482 msgid "Aft&er:" msgstr "Depois:" #. DLG_Para_LabelAlignment -#: po/tmp/ap_String_Id.h.h:486 +#: po/tmp/ap_String_Id.h.h:484 msgid "Ali&gnment:" msgstr "Alinhamento:" #. DLG_Tab_Label_Alignment #. DLG_PageNumbers_Alignment_No_Colon -#: po/tmp/ap_String_Id.h.h:489 +#: po/tmp/ap_String_Id.h.h:487 msgid "Alignment" msgstr "Alinhamento" #. DLG_PageNumbers_Alignment -#: po/tmp/ap_String_Id.h.h:491 +#: po/tmp/ap_String_Id.h.h:489 msgid "Alignment:" msgstr "Alinhamento:" #. DLG_Styles_LBL_All #. DLG_UP_All -#: po/tmp/ap_String_Id.h.h:493 po/tmp/xap_String_Id.h.h:51 +#: po/tmp/ap_String_Id.h.h:491 po/tmp/xap_String_Id.h.h:51 msgid "All" msgstr "Todos" #. DLG_Options_Label_CheckAllowCustomToolbars -#: po/tmp/ap_String_Id.h.h:495 +#: po/tmp/ap_String_Id.h.h:493 msgid "Allow Custom Toolbars" msgstr "Permitir barras de utilitrios personalizveis" #. MENU_STATUSLINE_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:497 +#: po/tmp/ap_String_Id.h.h:495 msgid "Allow formatting using styles only" msgstr "Permitir formataao usando apenas os estilos" #. DLG_Options_Label_CheckWhiteForTransparent -#: po/tmp/ap_String_Id.h.h:499 +#: po/tmp/ap_String_Id.h.h:497 msgid "Allow screen colors other than white" msgstr "Definir uma outra cor para as pginas" +#. MENU_LABEL_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:499 +#, fuzzy +msgid "Annotation" +msgstr "Identao" + #. FIELD_Application #: po/tmp/ap_String_Id.h.h:501 msgid "Application" @@ -1276,7 +1277,8 @@ "proceed, you will not be able to restore earlier versions of this document." msgstr "" "Voc tem certeza de que no quer manter o registro completo do histrico? Se " -"voc proceder, poder no ser possver restaurar verses anteriores deste documento." +"voc proceder, poder no ser possver restaurar verses anteriores deste " +"documento." #. DLG_Para_SpacingAtLeast #: po/tmp/ap_String_Id.h.h:518 @@ -1290,7 +1292,7 @@ #. DLG_MetaData_Author_LBL #. DLG_PLUGIN_MANAGER_AUTHOR -#: po/tmp/ap_String_Id.h.h:522 po/tmp/xap_String_Id.h.h:83 +#: po/tmp/ap_String_Id.h.h:522 po/tmp/xap_String_Id.h.h:85 msgid "Author:" msgstr "Autor:" @@ -1415,7 +1417,7 @@ #. TOOLBAR_STATUSLINE_FMT_BOLD #. TOOLBAR_TOOLTIP_FMT_BOLD #. DLG_UFS_StyleBold -#: po/tmp/ap_String_Id.h.h:574 po/tmp/xap_String_Id.h.h:111 +#: po/tmp/ap_String_Id.h.h:574 po/tmp/xap_String_Id.h.h:119 msgid "Bold" msgstr "Negrito" @@ -1463,13 +1465,13 @@ #. TOOLBAR_STATUSLINE_FMT_BOTTOMLINE #. TOOLBAR_TOOLTIP_FMT_BOTTOMLINE #. DLG_UFS_BottomlineCheck -#: po/tmp/ap_String_Id.h.h:595 po/tmp/xap_String_Id.h.h:115 +#: po/tmp/ap_String_Id.h.h:595 po/tmp/xap_String_Id.h.h:123 msgid "Bottomline" msgstr "Linha &Inferior" #. DLG_Lists_Box_List #. STYLE_BOXLIST -#: po/tmp/ap_String_Id.h.h:597 po/tmp/xap_String_Id.h.h:117 +#: po/tmp/ap_String_Id.h.h:597 po/tmp/xap_String_Id.h.h:125 msgid "Box List" msgstr "Lista com Caixas" @@ -1495,7 +1497,7 @@ #. DLG_Lists_Bullet_List #. STYLE_BULLETLIST -#: po/tmp/ap_String_Id.h.h:607 po/tmp/xap_String_Id.h.h:125 +#: po/tmp/ap_String_Id.h.h:607 po/tmp/xap_String_Id.h.h:133 msgid "Bullet List" msgstr "Lista de pontos" @@ -1844,7 +1846,7 @@ #. DLG_FormatFrame_Color #. DLG_FormatTable_Color #. DLG_UFS_ColorLabel -#: po/tmp/ap_String_Id.h.h:751 po/tmp/xap_String_Id.h.h:177 +#: po/tmp/ap_String_Id.h.h:751 po/tmp/xap_String_Id.h.h:191 msgid "Color:" msgstr "Cor:" @@ -1910,587 +1912,597 @@ msgid "Con&tinuous" msgstr "Con&tnuo" -#. DLG_MarkRevisions_Check1Label +#. TOC_TocHeading #: po/tmp/ap_String_Id.h.h:777 +#, fuzzy +msgid "Contents" +msgstr "Cotedo 1" + +#. DLG_MarkRevisions_Check1Label +#: po/tmp/ap_String_Id.h.h:779 #, c-format msgid "Continue previous revision (number %d)" msgstr "Continuar reviso anterior (nmero %d)" #. FIELD_Document_Contributor -#: po/tmp/ap_String_Id.h.h:779 +#: po/tmp/ap_String_Id.h.h:781 msgid "Contributor" msgstr "Co-autor" #. DLG_MetaData_CoAuthor_LBL -#: po/tmp/ap_String_Id.h.h:781 +#: po/tmp/ap_String_Id.h.h:783 msgid "Contributor(s):" msgstr "Co-autores:" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:783 +#: po/tmp/ap_String_Id.h.h:785 msgid "Convert Selected Text to a Table" msgstr "Converter Texto Selectionado em Tabela" #. MENU_LABEL_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:785 +#: po/tmp/ap_String_Id.h.h:787 msgid "Convert Table to Text" msgstr "Converter Tabela em Texto" #. MENU_LABEL_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:787 +#: po/tmp/ap_String_Id.h.h:789 msgid "Convert Text to Table" msgstr "Converter Texto em Tabela" #. MENU_STATUSLINE_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:789 +#: po/tmp/ap_String_Id.h.h:791 msgid "Convert from a Table to Text" msgstr "Converter Tabela em Texto" #. TOOLBAR_LABEL_EDIT_COPY #. TOOLBAR_STATUSLINE_EDIT_COPY #. TOOLBAR_TOOLTIP_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:793 +#: po/tmp/ap_String_Id.h.h:795 msgid "Copy" msgstr "Copiar" #. MENU_STATUSLINE_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:795 +#: po/tmp/ap_String_Id.h.h:797 msgid "Copy Embedded Object" msgstr "Copiar Objeto Embutido" #. MENU_LABEL_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:797 +#: po/tmp/ap_String_Id.h.h:799 msgid "Copy Image" msgstr "Copiar Imagem" #. MENU_LABEL_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:799 +#: po/tmp/ap_String_Id.h.h:801 msgid "Copy Object" msgstr "Copiar Objeto" #. MENU_LABEL_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:801 +#: po/tmp/ap_String_Id.h.h:803 msgid "Copy Text Box" msgstr "Copiar Caixa de Texto" #. MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION -#: po/tmp/ap_String_Id.h.h:803 +#: po/tmp/ap_String_Id.h.h:805 msgid "Copy hyperlink location" msgstr "Copiar localizao de hiperlink" #. MENU_STATUSLINE_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:805 +#: po/tmp/ap_String_Id.h.h:807 msgid "Copy the Text Box to the clipboard" msgstr "Copiar a Caixa de Texto para rea de Transferncia" #. MENU_STATUSLINE_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:807 +#: po/tmp/ap_String_Id.h.h:809 msgid "Copy the Text Box to the clipboard then remove it" msgstr "Copiar a Caixa de Texto para a rea de Transferncia e ento remov-la" #. MENU_STATUSLINE_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:809 +#: po/tmp/ap_String_Id.h.h:811 msgid "Copy the selection and put it on the Clipboard" msgstr "Copiar seleo" #. MSG_IE_CouldNotOpen -#: po/tmp/ap_String_Id.h.h:811 +#: po/tmp/ap_String_Id.h.h:813 #, c-format msgid "Could not open file %s for writing" msgstr "No foi possvel abrir %s para gravao" #. MSG_OpenFailed -#: po/tmp/ap_String_Id.h.h:813 +#: po/tmp/ap_String_Id.h.h:815 #, c-format msgid "Could not open file %s." msgstr "Impossvel salvar o arquivo %s." #. MSG_IE_CouldNotWrite -#: po/tmp/ap_String_Id.h.h:815 +#: po/tmp/ap_String_Id.h.h:817 #, c-format msgid "Could not write to file %s" msgstr "No foi possvel salvar no arquivo %s" #. MSG_SaveFailed -#: po/tmp/ap_String_Id.h.h:817 +#: po/tmp/ap_String_Id.h.h:819 #, c-format msgid "Could not write to the file %s." msgstr "Impossvel salvar o arquivo %s." #. MENU_STATUSLINE_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:819 +#: po/tmp/ap_String_Id.h.h:821 msgid "Count the number of words in the document" msgstr "Contar palavras no documento" #. FIELD_Document_Coverage -#: po/tmp/ap_String_Id.h.h:821 +#: po/tmp/ap_String_Id.h.h:823 msgid "Coverage" msgstr "Cobertura" #. DLG_MetaData_Coverage_LBL -#: po/tmp/ap_String_Id.h.h:823 +#: po/tmp/ap_String_Id.h.h:825 msgid "Coverage:" msgstr "Cobertura:" #. DLG_NEW_Tab1_FAX1 -#: po/tmp/ap_String_Id.h.h:825 +#: po/tmp/ap_String_Id.h.h:827 msgid "Create a fax" msgstr "Criar um Fax" #. DLG_NEW_Tab1_WP1 -#: po/tmp/ap_String_Id.h.h:827 +#: po/tmp/ap_String_Id.h.h:829 msgid "Create a new blank document" msgstr "Criar um documento em branco" #. MENU_STATUSLINE_FILE_NEW #. TOOLBAR_STATUSLINE_FILE_NEW #. TOOLBAR_TOOLTIP_FILE_NEW -#: po/tmp/ap_String_Id.h.h:831 +#: po/tmp/ap_String_Id.h.h:833 msgid "Create a new document" msgstr "Criar novo documento" #. DLG_NEW_Create -#: po/tmp/ap_String_Id.h.h:833 +#: po/tmp/ap_String_Id.h.h:835 msgid "Create a new document from a template" msgstr "Criar documento com base num modelo" #. MENU_STATUSLINE_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:835 +#: po/tmp/ap_String_Id.h.h:837 msgid "Create a new document using a template" msgstr "Criar um novo documento a partir de um modelo" #. DLG_NEW_StartEmpty -#: po/tmp/ap_String_Id.h.h:837 +#: po/tmp/ap_String_Id.h.h:839 msgid "Create an empty document" msgstr "Criar novo documento" #. FIELD_Document_Creator -#: po/tmp/ap_String_Id.h.h:839 +#: po/tmp/ap_String_Id.h.h:841 msgid "Creator" msgstr "Autor" #. MENU_LABEL_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:841 +#: po/tmp/ap_String_Id.h.h:843 msgid "Cu&t" msgstr "Co&rtar" #. FIELD_Datetime_CurrentDate -#: po/tmp/ap_String_Id.h.h:843 +#: po/tmp/ap_String_Id.h.h:845 msgid "Current Date" msgstr "Data atual" #. DLG_Lists_Current_Font -#: po/tmp/ap_String_Id.h.h:845 +#: po/tmp/ap_String_Id.h.h:847 msgid "Current Font" msgstr "Escolher tipo de letra" #. DLG_Lists_Current_List_Label -#: po/tmp/ap_String_Id.h.h:847 +#: po/tmp/ap_String_Id.h.h:849 msgid "Current List Label" msgstr "Etiqueta atual" #. DLG_Lists_Current_List_Type -#: po/tmp/ap_String_Id.h.h:849 +#: po/tmp/ap_String_Id.h.h:851 msgid "Current List Type" msgstr "Tipo atual da lista" #. MSG_EmptySelection -#: po/tmp/ap_String_Id.h.h:851 +#: po/tmp/ap_String_Id.h.h:853 msgid "Current Selection is Empty" msgstr "No tem nada seleccionado" #. DLG_Styles_DefCurrent -#: po/tmp/ap_String_Id.h.h:853 +#: po/tmp/ap_String_Id.h.h:855 msgid "Current Settings" msgstr "Este estilo" #. FIELD_Datetime_CurrentTime -#: po/tmp/ap_String_Id.h.h:855 +#: po/tmp/ap_String_Id.h.h:857 msgid "Current Time" msgstr "Hora atual" #. DLG_Options_Label_ViewCursorBlink -#: po/tmp/ap_String_Id.h.h:857 +#: po/tmp/ap_String_Id.h.h:859 msgid "Cursor &blink" msgstr "o piscar do cursor" #. DLG_Options_Label_SpellCustomDict -#: po/tmp/ap_String_Id.h.h:859 +#: po/tmp/ap_String_Id.h.h:861 msgid "Custom Dictionary:" msgstr "Dicionrio pessoal:" #. FIELD_DateTime_Custom -#: po/tmp/ap_String_Id.h.h:861 +#: po/tmp/ap_String_Id.h.h:863 msgid "Customizable date/time" msgstr "Data e hora personalizvel" #. DLG_Lists_Customize -#: po/tmp/ap_String_Id.h.h:863 +#: po/tmp/ap_String_Id.h.h:865 msgid "Customized List" msgstr "Configurar" #. TOOLBAR_LABEL_EDIT_CUT #. TOOLBAR_STATUSLINE_EDIT_CUT #. TOOLBAR_TOOLTIP_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:867 +#: po/tmp/ap_String_Id.h.h:869 msgid "Cut" msgstr "Corta" #. MENU_STATUSLINE_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:869 +#: po/tmp/ap_String_Id.h.h:871 msgid "Cut Embedded Object" msgstr "Remover Objeto Embutido" #. MENU_LABEL_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:871 +#: po/tmp/ap_String_Id.h.h:873 msgid "Cut Image" msgstr "Remover Imagem" #. MENU_LABEL_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:873 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:875 msgid "Cut Object" -msgstr "Definir" +msgstr "Remover Objeto" #. MENU_LABEL_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:875 +#: po/tmp/ap_String_Id.h.h:877 msgid "Cut Text Box" msgstr "Remover Caixa de Texto" #. MENU_STATUSLINE_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:877 +#: po/tmp/ap_String_Id.h.h:879 msgid "Cut the selection and put it on the Clipboard" msgstr "Cortar seleo" #. MENU_LABEL_FMT_DIRECTION -#: po/tmp/ap_String_Id.h.h:879 +#: po/tmp/ap_String_Id.h.h:881 msgid "D&irectional" msgstr "Dir&eo Texto" #. DLG_Lists_Dashed_List #. STYLE_DASHEDLIST -#: po/tmp/ap_String_Id.h.h:881 po/tmp/xap_String_Id.h.h:225 +#: po/tmp/ap_String_Id.h.h:883 po/tmp/xap_String_Id.h.h:241 msgid "Dashed List" msgstr "Lista com Traos" #. FIELD_Document_Date #. DLG_ListRevisions_Column2Label -#: po/tmp/ap_String_Id.h.h:884 +#: po/tmp/ap_String_Id.h.h:886 msgid "Date" msgstr "Data" #. MENU_LABEL_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:886 +#: po/tmp/ap_String_Id.h.h:888 msgid "Date and &Time" msgstr "Data e &Hora" #. FIELD_Type_Datetime -#: po/tmp/ap_String_Id.h.h:888 +#: po/tmp/ap_String_Id.h.h:890 msgid "Date and Time" msgstr "Data e Hora" #. FIELD_DateTime_DOY -#: po/tmp/ap_String_Id.h.h:890 +#: po/tmp/ap_String_Id.h.h:892 msgid "Day # in the year" msgstr "Dia do ano" #. DLG_Options_Btn_Default -#: po/tmp/ap_String_Id.h.h:892 +#: po/tmp/ap_String_Id.h.h:894 msgid "De&faults" msgstr "&Original" #. DLG_Tab_Radio_Decimal -#: po/tmp/ap_String_Id.h.h:894 +#: po/tmp/ap_String_Id.h.h:896 msgid "Decimal" msgstr "Deci&mal" #. TabToggleDecimalTab -#: po/tmp/ap_String_Id.h.h:896 +#: po/tmp/ap_String_Id.h.h:898 msgid "Decimal Tab" msgstr "Tabulao Decimal" #. TOOLBAR_LABEL_UNINDENT #. TOOLBAR_STATUSLINE_UNINDENT #. TOOLBAR_TOOLTIP_UNINDENT -#: po/tmp/ap_String_Id.h.h:900 +#: po/tmp/ap_String_Id.h.h:902 msgid "Decrease indent" msgstr "Remover identao" #. FIELD_DateTime_DefaultDateNoTime -#: po/tmp/ap_String_Id.h.h:902 +#: po/tmp/ap_String_Id.h.h:904 msgid "Default date (w/o time)" msgstr "Representao usual da data (sem hora)" #. FIELD_DateTime_DefaultDate -#: po/tmp/ap_String_Id.h.h:904 +#: po/tmp/ap_String_Id.h.h:906 msgid "Default date representation" msgstr "Representao usual da data (sem hora)" #. DLG_Options_Label_DefaultPageSize -#: po/tmp/ap_String_Id.h.h:906 +#: po/tmp/ap_String_Id.h.h:908 msgid "Default page size" msgstr "Tamanho de pgina normal" #. DLG_Tab_Label_DefaultTS -#: po/tmp/ap_String_Id.h.h:908 +#: po/tmp/ap_String_Id.h.h:910 msgid "Default tab stops:" msgstr "Fim de tab (por omisso): " #. DLG_Options_Label_DirectionRtl -#: po/tmp/ap_String_Id.h.h:910 +#: po/tmp/ap_String_Id.h.h:912 msgid "Default to right-to-left direction of text" msgstr "Usar direita para a esquerda como orientao normal do texto" #. DLG_FormatTOC_LevelDefs -#: po/tmp/ap_String_Id.h.h:912 +#: po/tmp/ap_String_Id.h.h:914 msgid "Define Main Properties" msgstr "Definir Propriedades Principais" #. MENU_STATUSLINE_FMT_STYLE #. MENU_STATUSLINE_FMT_STYLE_DEFINE -#: po/tmp/ap_String_Id.h.h:915 +#: po/tmp/ap_String_Id.h.h:917 msgid "Define or apply style for the selection" msgstr "Definir ou aplicar estilos" #. DLG_Styles_Delete #. MENU_STATUSLINE_TABLE_DELETE #. DLG_Delete -#: po/tmp/ap_String_Id.h.h:918 po/tmp/xap_String_Id.h.h:239 +#: po/tmp/ap_String_Id.h.h:920 po/tmp/xap_String_Id.h.h:255 msgid "Delete" msgstr "Apagar" #. MENU_STATUSLINE_TABLE_DELETE_CELLS -#: po/tmp/ap_String_Id.h.h:920 +#: po/tmp/ap_String_Id.h.h:922 msgid "Delete Cells" msgstr "Remover Clulas" #. MENU_LABEL_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:922 +#: po/tmp/ap_String_Id.h.h:924 msgid "Delete Co&lumn" msgstr "Apagar Co&luna" #. MENU_STATUSLINE_TABLE_DELETE_COLUMNS #. MENU_STATUSLINE_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:925 +#: po/tmp/ap_String_Id.h.h:927 msgid "Delete Column" msgstr "Remover Coluna" #. MENU_STATUSLINE_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:927 +#: po/tmp/ap_String_Id.h.h:929 msgid "Delete Embedded Object" msgstr "Remover Objeto Embutido" #. MENU_LABEL_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:929 +#: po/tmp/ap_String_Id.h.h:931 msgid "Delete Image" msgstr "Remover Imagem" #. MENU_LABEL_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:931 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:933 msgid "Delete Object" -msgstr "Apagar &Tabela" +msgstr "Apagar Objeto" #. MENU_LABEL_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:933 +#: po/tmp/ap_String_Id.h.h:935 msgid "Delete Ro&w" msgstr "Apagar &Linha" #. MENU_STATUSLINE_TABLE_DELETE_ROWS #. MENU_STATUSLINE_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:936 +#: po/tmp/ap_String_Id.h.h:938 msgid "Delete Row" msgstr "Remover Linha" #. MENU_LABEL_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:938 +#: po/tmp/ap_String_Id.h.h:940 msgid "Delete Tabl&e" msgstr "Apagar &Tabela" #. MENU_STATUSLINE_TABLE_DELETE_TABLE #. MENU_STATUSLINE_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:941 +#: po/tmp/ap_String_Id.h.h:943 msgid "Delete Table" msgstr "Remover Tabela" #. MENU_LABEL_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:943 +#: po/tmp/ap_String_Id.h.h:945 msgid "Delete Text Box" msgstr "Remover Caixa de Texto" #. TOOLBAR_LABEL_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:945 +#: po/tmp/ap_String_Id.h.h:947 msgid "Delete column" msgstr "Apagar coluna" #. MENU_STATUSLINE_INSERT_DELETE_HYPERLINK -#: po/tmp/ap_String_Id.h.h:947 +#: po/tmp/ap_String_Id.h.h:949 msgid "Delete hyperlink" msgstr "Inserir hiperligao" #. TOOLBAR_LABEL_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:949 +#: po/tmp/ap_String_Id.h.h:951 msgid "Delete row" msgstr "Apagar linha" #. MENU_STATUSLINE_EDIT_CLEAR -#: po/tmp/ap_String_Id.h.h:951 +#: po/tmp/ap_String_Id.h.h:953 msgid "Delete the selection" msgstr "Apagar seleo" #. TOOLBAR_STATUSLINE_DELETE_COLUMN #. TOOLBAR_TOOLTIP_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:954 +#: po/tmp/ap_String_Id.h.h:956 msgid "Delete this column from its table" msgstr "Apagar esta coluna da tabela" #. TOOLBAR_STATUSLINE_DELETE_ROW #. TOOLBAR_TOOLTIP_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:957 +#: po/tmp/ap_String_Id.h.h:959 msgid "Delete this row from its table" msgstr "Apagar esta linha da tabela" #. DLG_Styles_Description #. DLG_Styles_ModifyDescription #. FIELD_Document_Description -#: po/tmp/ap_String_Id.h.h:961 +#: po/tmp/ap_String_Id.h.h:963 msgid "Description" msgstr "Paginao" #. DLG_MetaData_Description_LBL #. DLG_PLUGIN_MANAGER_DESC #. DLG_Image_LblDescription -#: po/tmp/ap_String_Id.h.h:963 po/tmp/xap_String_Id.h.h:242 +#: po/tmp/ap_String_Id.h.h:965 po/tmp/xap_String_Id.h.h:258 msgid "Description:" msgstr "Descrio:" #. DLG_Lists_Diamond_List #. STYLE_DIAMONLIST -#: po/tmp/ap_String_Id.h.h:965 po/tmp/xap_String_Id.h.h:244 +#: po/tmp/ap_String_Id.h.h:967 po/tmp/xap_String_Id.h.h:260 msgid "Diamond List" msgstr "Lista com Diamantes" #. DLG_Options_Label_SpellDictionaries -#: po/tmp/ap_String_Id.h.h:967 +#: po/tmp/ap_String_Id.h.h:969 msgid "Dictionaries" msgstr "Remover dicionrios" #. DLG_HdrFtr_FooterEven -#: po/tmp/ap_String_Id.h.h:969 +#: po/tmp/ap_String_Id.h.h:971 msgid "Different footer on facing pages" msgstr "Rodaps diferentes em pginas contguas" #. DLG_HdrFtr_FooterFirst -#: po/tmp/ap_String_Id.h.h:971 +#: po/tmp/ap_String_Id.h.h:973 msgid "Different footer on first page" msgstr "Rodap diferente na Primeira pgina" #. DLG_HdrFtr_FooterLast -#: po/tmp/ap_String_Id.h.h:973 +#: po/tmp/ap_String_Id.h.h:975 msgid "Different footer on last page" msgstr "Rodap diferente na ltima pgina" #. DLG_HdrFtr_HeaderEven -#: po/tmp/ap_String_Id.h.h:975 +#: po/tmp/ap_String_Id.h.h:977 msgid "Different header on facing pages" msgstr "Cabealhos diferentes em pginas contguas" #. DLG_HdrFtr_HeaderFirst -#: po/tmp/ap_String_Id.h.h:977 +#: po/tmp/ap_String_Id.h.h:979 msgid "Different header on first page" msgstr "Cabealho diferente na Primeira pgina" #. DLG_HdrFtr_HeaderLast -#: po/tmp/ap_String_Id.h.h:979 +#: po/tmp/ap_String_Id.h.h:981 msgid "Different header on last page" msgstr "Cabealho diferente na ltima pgina" #. DLG_Styles_StylesLocked -#: po/tmp/ap_String_Id.h.h:981 +#: po/tmp/ap_String_Id.h.h:983 msgid "Disable all formatting commands, except styles" msgstr "Bloquear comandos de formatao que no estejam nos estilos" #. MENU_STATUSLINE_HELP_CREDITS -#: po/tmp/ap_String_Id.h.h:983 +#: po/tmp/ap_String_Id.h.h:985 msgid "Display Credits" msgstr "Mostrar crditos" #. MENU_STATUSLINE_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:985 +#: po/tmp/ap_String_Id.h.h:987 msgid "Display Help Contents" msgstr "Mostrar tpicos de ajuda" #. MENU_STATUSLINE_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:987 +#: po/tmp/ap_String_Id.h.h:989 msgid "Display Help Index" msgstr "Mostrar o Index da ajuda" #. MENU_STATUSLINE_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:989 +#: po/tmp/ap_String_Id.h.h:991 msgid "Display non-printing characters" msgstr "Ver/Omitir Caracteres No Imprimveis" #. MENU_STATUSLINE_HELP_ABOUT -#: po/tmp/ap_String_Id.h.h:991 +#: po/tmp/ap_String_Id.h.h:993 msgid "Display program information, version number, and copyright" msgstr "Ver informaes sobre o programa, nmero de verso e copyrights" #. DLG_FormatTOC_DispStyle -#: po/tmp/ap_String_Id.h.h:993 +#: po/tmp/ap_String_Id.h.h:995 msgid "Display style:" msgstr "Estilo de tela:" #. DLG_Options_Prompt_IgnoreResetAll -#: po/tmp/ap_String_Id.h.h:995 +#: po/tmp/ap_String_Id.h.h:997 msgid "Do you want to reset ignored words in all the documents?" msgstr "Deseja cancelar a lista de palavras ignoradas em todos os documentos?" #. DLG_Options_Prompt_IgnoreResetCurrent -#: po/tmp/ap_String_Id.h.h:997 +#: po/tmp/ap_String_Id.h.h:999 msgid "Do you want to reset ignored words in the current document?" msgstr "Deseja cancelar a lista de palavras ignoradas neste documento?" #. FIELD_Type_Document -#: po/tmp/ap_String_Id.h.h:999 +#: po/tmp/ap_String_Id.h.h:1001 msgid "Document" msgstr "Documento" #. DLG_MetaData_Title -#: po/tmp/ap_String_Id.h.h:1001 +#: po/tmp/ap_String_Id.h.h:1003 msgid "Document Properties" msgstr "Propriedades do Documento" #. DLG_Options_Label_Documents -#: po/tmp/ap_String_Id.h.h:1003 +#: po/tmp/ap_String_Id.h.h:1005 msgid "Documents" msgstr "Documentos" #. DLG_FormatFootnotes_FootRestartNone -#: po/tmp/ap_String_Id.h.h:1005 +#: po/tmp/ap_String_Id.h.h:1007 msgid "Don't restart" msgstr "No recomear" #. DLG_Para_SpacingDouble -#: po/tmp/ap_String_Id.h.h:1007 +#: po/tmp/ap_String_Id.h.h:1009 msgid "Double" msgstr "Dupla" #. TOOLBAR_LABEL_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1009 +#: po/tmp/ap_String_Id.h.h:1011 msgid "Double Spacing" msgstr "Espaamento duplo" #. TOOLBAR_STATUSLINE_DOUBLE_SPACE #. TOOLBAR_TOOLTIP_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1012 +#: po/tmp/ap_String_Id.h.h:1014 msgid "Double spacing" msgstr "Espaamento duplo" +#. MENU_LABEL_EDIT_LATEXEQUATION +#: po/tmp/ap_String_Id.h.h:1016 +#, fuzzy +msgid "Edit Equation" +msgstr "Equao" + #. MENU_LABEL_EDIT_EDITFOOTER #. TOOLBAR_LABEL_EDIT_FOOTER #. TOOLBAR_STATUSLINE_EDIT_FOOTER #. TOOLBAR_TOOLTIP_EDIT_FOOTER -#: po/tmp/ap_String_Id.h.h:1017 +#: po/tmp/ap_String_Id.h.h:1021 msgid "Edit Footer" msgstr "Editar &Rodap" @@ -2498,273 +2510,285 @@ #. TOOLBAR_LABEL_EDIT_HEADER #. TOOLBAR_STATUSLINE_EDIT_HEADER #. TOOLBAR_TOOLTIP_EDIT_HEADER -#: po/tmp/ap_String_Id.h.h:1022 +#: po/tmp/ap_String_Id.h.h:1026 msgid "Edit Header" msgstr "Editar &Cabealho" +#. MENU_STATUSLINE_EDIT_LATEXEQUATION +#: po/tmp/ap_String_Id.h.h:1028 +#, fuzzy +msgid "Edit Latex Equation" +msgstr "Equao LaTeX" + #. MENU_STATUSLINE_INSERT_EDIT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1024 +#: po/tmp/ap_String_Id.h.h:1030 msgid "Edit hyperlink" msgstr "Editar hiperlink" #. MENU_STATUSLINE_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:1026 +#: po/tmp/ap_String_Id.h.h:1032 msgid "Edit text at the top or bottom of every page" msgstr "Editar os cabealhos e rodaps" #. MENU_STATUSLINE_EDIT_EDITFOOTER -#: po/tmp/ap_String_Id.h.h:1028 +#: po/tmp/ap_String_Id.h.h:1034 msgid "Edit the Footer on the current page" msgstr "Editar rodap" #. MENU_STATUSLINE_EDIT_EDITHEADER -#: po/tmp/ap_String_Id.h.h:1030 +#: po/tmp/ap_String_Id.h.h:1036 msgid "Edit the Header on the current page" msgstr "Editar cabealho" +#. TB_Embedded +#: po/tmp/ap_String_Id.h.h:1038 +#, fuzzy +msgid "Embedded" +msgstr "Numerada" + #. MENU_LABEL_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:1032 +#: po/tmp/ap_String_Id.h.h:1040 msgid "Enable F&ormatting Tools" msgstr "Ativar Ferramentas de F&ormatao" #. DLG_Options_Label_CheckEnableSmoothScrolling -#: po/tmp/ap_String_Id.h.h:1034 +#: po/tmp/ap_String_Id.h.h:1042 msgid "Enable Smooth Scrolling" msgstr "Ativar suavidade nos elevadores" #. FIELD_Numbers_EndnoteAnchor -#: po/tmp/ap_String_Id.h.h:1036 +#: po/tmp/ap_String_Id.h.h:1044 msgid "Endnote anchor" msgstr "Ligao para nota final" #. FIELD_Numbers_EndnoteReference -#: po/tmp/ap_String_Id.h.h:1038 +#: po/tmp/ap_String_Id.h.h:1046 msgid "Endnote reference" msgstr "Referncia para nota final" #. DLG_FormatFootnotes_EndStyle -#: po/tmp/ap_String_Id.h.h:1040 +#: po/tmp/ap_String_Id.h.h:1048 msgid "Endnote style" msgstr "Estilo da nota final" #. MENU_LABEL_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1042 +#: po/tmp/ap_String_Id.h.h:1050 msgid "Equation" msgstr "Equao" #. FIELD_Error -#: po/tmp/ap_String_Id.h.h:1044 +#: po/tmp/ap_String_Id.h.h:1052 msgid "Error calculating value!" msgstr "Erro ao calcular o valor!" #. SCRIPT_CANTRUN -#: po/tmp/ap_String_Id.h.h:1046 +#: po/tmp/ap_String_Id.h.h:1054 #, c-format msgid "Error executing script %s" msgstr "Erro de importao do arquivo %s." #. MSG_ImportError -#: po/tmp/ap_String_Id.h.h:1048 +#: po/tmp/ap_String_Id.h.h:1056 #, c-format msgid "Error importing file %s." msgstr "Erro de importao do arquivo %s." #. MSG_SaveFailedExport -#: po/tmp/ap_String_Id.h.h:1050 +#: po/tmp/ap_String_Id.h.h:1058 #, c-format msgid "Error while attempting to save %s: could not construct exporter" msgstr "Impossvel salvar o arquivo %s." #. MSG_SaveFailedName -#: po/tmp/ap_String_Id.h.h:1052 +#: po/tmp/ap_String_Id.h.h:1060 #, c-format msgid "Error while attempting to save %s: invalid name" msgstr "Impossvel salvar o arquivo %s." #. TOOLBAR_LABEL_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1054 +#: po/tmp/ap_String_Id.h.h:1062 msgid "Ex. script" msgstr "Executar Script" #. DLG_Para_SpacingExactly -#: po/tmp/ap_String_Id.h.h:1056 +#: po/tmp/ap_String_Id.h.h:1064 msgid "Exactly" msgstr "Exatamente" #. DLG_Latex_Example -#: po/tmp/ap_String_Id.h.h:1058 +#: po/tmp/ap_String_Id.h.h:1066 #, fuzzy msgid "Example:" msgstr "Amostra" #. MENU_STATUSLINE_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1060 +#: po/tmp/ap_String_Id.h.h:1068 msgid "Execute helper scripts" msgstr "Executar scripts" #. TOOLBAR_STATUSLINE_SCRIPT_PLAY #. TOOLBAR_TOOLTIP_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1063 +#: po/tmp/ap_String_Id.h.h:1071 msgid "Execute script" msgstr "Executar script" #. DLG_ListRevisions_Label1 -#: po/tmp/ap_String_Id.h.h:1065 +#: po/tmp/ap_String_Id.h.h:1073 msgid "Existing revisions:" msgstr "Revises existentes:" #. TB_Extra -#: po/tmp/ap_String_Id.h.h:1067 +#: po/tmp/ap_String_Id.h.h:1075 msgid "Extra" msgstr "Extra" #. DLG_Field_Parameters_Capital -#: po/tmp/ap_String_Id.h.h:1069 +#: po/tmp/ap_String_Id.h.h:1077 msgid "Extra Parameters" msgstr "Parmetros Extra" #. DLG_Options_Label_ViewExtraTB -#: po/tmp/ap_String_Id.h.h:1071 +#: po/tmp/ap_String_Id.h.h:1079 msgid "Extra Toolbar" msgstr "Extras" #. DLG_Field_Parameters -#: po/tmp/ap_String_Id.h.h:1073 +#: po/tmp/ap_String_Id.h.h:1081 msgid "Extra parameters:" msgstr "Parmetros extra" #. MENU_LABEL_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1075 +#: po/tmp/ap_String_Id.h.h:1083 msgid "F&ile" msgstr "&Inserir Documento" #. MENU_LABEL_FORMAT -#: po/tmp/ap_String_Id.h.h:1077 +#: po/tmp/ap_String_Id.h.h:1085 msgid "F&ormat" msgstr "F&ormatar" #. MENU_LABEL_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:1079 +#: po/tmp/ap_String_Id.h.h:1087 msgid "F&ull Screen" msgstr "&S a Pgina" #. DLG_FR_FindLabel -#: po/tmp/ap_String_Id.h.h:1081 +#: po/tmp/ap_String_Id.h.h:1089 msgid "Fi&nd what:" msgstr "P&rocurar..." #. DLG_MailMerge_Insert_No_Colon -#: po/tmp/ap_String_Id.h.h:1083 +#: po/tmp/ap_String_Id.h.h:1091 msgid "Field Name" msgstr "Nome do Campo" #. DLG_MailMerge_Insert -#: po/tmp/ap_String_Id.h.h:1085 +#: po/tmp/ap_String_Id.h.h:1093 msgid "Field Name:" msgstr "Nome do Campo:" #. MSG_IE_UnsupportedType -#: po/tmp/ap_String_Id.h.h:1087 +#: po/tmp/ap_String_Id.h.h:1095 #, c-format msgid "File %s is not of a currently supported file type" msgstr "O arquivo %s de um tipo ainda no suportado" #. MSG_IE_FakeType -#: po/tmp/ap_String_Id.h.h:1089 +#: po/tmp/ap_String_Id.h.h:1097 #, c-format msgid "File %s is not of the type it claims to be" msgstr "%s no do formato que alega ser" #. MSG_IE_UnknownType -#: po/tmp/ap_String_Id.h.h:1091 +#: po/tmp/ap_String_Id.h.h:1099 #, c-format msgid "File %s is of unknown type" msgstr "%s de um formato desconhecido" #. MSG_IE_FileNotFound -#: po/tmp/ap_String_Id.h.h:1093 +#: po/tmp/ap_String_Id.h.h:1101 #, c-format msgid "File %s not found" msgstr "Arquivo %s no encontrado" #. FIELD_Application_Filename -#: po/tmp/ap_String_Id.h.h:1095 +#: po/tmp/ap_String_Id.h.h:1103 msgid "File Name" msgstr "Nome do arquivo" #. DLG_FormatTOC_FillStyle -#: po/tmp/ap_String_Id.h.h:1097 +#: po/tmp/ap_String_Id.h.h:1105 msgid "Fill style:" msgstr "Estilo de preenchimento:" #. DLG_FR_FindTitle -#: po/tmp/ap_String_Id.h.h:1099 +#: po/tmp/ap_String_Id.h.h:1107 msgid "Find" msgstr "Procurar" #. MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1101 +#: po/tmp/ap_String_Id.h.h:1109 msgid "Find &next revision" msgstr "Procurar &prxima reviso" #. MENU_LABEL_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1103 +#: po/tmp/ap_String_Id.h.h:1111 msgid "Find &previous revision" msgstr "Procurar reviso pr&via" #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1105 +#: po/tmp/ap_String_Id.h.h:1113 msgid "Find next visible revision in the document" msgstr "Procurar prxima reviso visvel neste documento" #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1107 +#: po/tmp/ap_String_Id.h.h:1115 msgid "Find previous visible revision in the document" msgstr "Procurar reviso visvel anterior neste documento" #. MENU_STATUSLINE_EDIT_FIND -#: po/tmp/ap_String_Id.h.h:1109 +#: po/tmp/ap_String_Id.h.h:1117 msgid "Find the specified text" msgstr "Procurar no documento" #. FirstLineIndentStatus -#: po/tmp/ap_String_Id.h.h:1111 +#: po/tmp/ap_String_Id.h.h:1119 #, c-format msgid "First Line Indent [%s]" msgstr "Identao da Primeira Linha [%s]" #. DLG_Para_SpecialFirstLine -#: po/tmp/ap_String_Id.h.h:1113 +#: po/tmp/ap_String_Id.h.h:1121 msgid "First line" msgstr "1 linha" #. DLG_InsertTable_FixedColSize -#: po/tmp/ap_String_Id.h.h:1115 +#: po/tmp/ap_String_Id.h.h:1123 msgid "Fixed column size:" msgstr "Tamanho de coluna fixo:" #. DLG_Lists_FoldingLevel1 -#: po/tmp/ap_String_Id.h.h:1117 +#: po/tmp/ap_String_Id.h.h:1125 msgid "Fold below level 1" msgstr "Dobrar abaixo do nvel 1" #. DLG_Lists_FoldingLevel2 -#: po/tmp/ap_String_Id.h.h:1119 +#: po/tmp/ap_String_Id.h.h:1127 msgid "Fold below level 2" msgstr "Dobrar abaixo do nvel 2" #. DLG_Lists_FoldingLevel3 -#: po/tmp/ap_String_Id.h.h:1121 +#: po/tmp/ap_String_Id.h.h:1129 msgid "Fold below level 3" msgstr "Dobrar abaix do nvel 3" #. DLG_Lists_FoldingLevel4 -#: po/tmp/ap_String_Id.h.h:1123 +#: po/tmp/ap_String_Id.h.h:1131 msgid "Fold below level 4" msgstr "Dobrar abaixo do nvel 4" #. DLG_Para_PreviewFollowParagraph -#: po/tmp/ap_String_Id.h.h:1125 +#: po/tmp/ap_String_Id.h.h:1133 msgid "" "Following Paragraph Following Paragraph Following Paragraph Following " "Paragraph Following Paragraph Following Paragraph Following Paragraph" @@ -2778,12 +2802,12 @@ #. TOOLBAR_TOOLTIP_FMT_FONT #. DLG_UFS_FontTitle #. DLG_UFS_FontTab -#: po/tmp/ap_String_Id.h.h:1130 po/tmp/xap_String_Id.h.h:315 +#: po/tmp/ap_String_Id.h.h:1138 po/tmp/xap_String_Id.h.h:335 msgid "Font" msgstr "Tipo de letra" #. TOOLBAR_STATUSLINE_FMT_CHOOSE -#: po/tmp/ap_String_Id.h.h:1132 +#: po/tmp/ap_String_Id.h.h:1140 #, fuzzy msgid "Font Choose" msgstr "Escolher" @@ -2791,12 +2815,12 @@ #. TOOLBAR_LABEL_FMT_SIZE #. TOOLBAR_STATUSLINE_FMT_SIZE #. TOOLBAR_TOOLTIP_FMT_SIZE -#: po/tmp/ap_String_Id.h.h:1136 +#: po/tmp/ap_String_Id.h.h:1144 msgid "Font Size" msgstr "Tamanho" #. TOOLBAR_LABEL_FMT_CHOOSE -#: po/tmp/ap_String_Id.h.h:1138 +#: po/tmp/ap_String_Id.h.h:1146 #, fuzzy msgid "Font choose" msgstr "Cor" @@ -2804,252 +2828,259 @@ #. TOOLBAR_LABEL_COLOR_FORE #. TOOLBAR_STATUSLINE_COLOR_FORE #. TOOLBAR_TOOLTIP_COLOR_FORE -#: po/tmp/ap_String_Id.h.h:1142 +#: po/tmp/ap_String_Id.h.h:1150 msgid "Font color" msgstr "Cor" #. DLG_Lists_ButtonFont -#: po/tmp/ap_String_Id.h.h:1144 +#: po/tmp/ap_String_Id.h.h:1152 msgid "Font..." msgstr "Tipo..." #. DLG_Lists_Font #. DLG_UFS_FontLabel -#: po/tmp/ap_String_Id.h.h:1146 po/tmp/xap_String_Id.h.h:317 +#: po/tmp/ap_String_Id.h.h:1154 po/tmp/xap_String_Id.h.h:337 msgid "Font:" msgstr "Tipo de letra:" #. MENU_LABEL_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1148 +#: po/tmp/ap_String_Id.h.h:1156 msgid "Foot¬e" msgstr "Inserir &Nota de Rodap" #. DLG_PageNumbers_Footer #. MENU_LABEL_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1151 +#: po/tmp/ap_String_Id.h.h:1159 msgid "Footer" msgstr "Rodap" #. DLG_HdrFtr_FooterFrame -#: po/tmp/ap_String_Id.h.h:1153 +#: po/tmp/ap_String_Id.h.h:1161 msgid "Footer Properties" msgstr "Propriedades do Rodap" #. FooterStatus -#: po/tmp/ap_String_Id.h.h:1155 +#: po/tmp/ap_String_Id.h.h:1163 #, c-format msgid "Footer [%s]" msgstr "Rodap [%s]" #. FIELD_Numbers_FootnoteAnchor -#: po/tmp/ap_String_Id.h.h:1157 +#: po/tmp/ap_String_Id.h.h:1165 msgid "Footnote anchor" msgstr "ncora de Nota de Rodap" #. FIELD_Numbers_FootnoteReference -#: po/tmp/ap_String_Id.h.h:1159 +#: po/tmp/ap_String_Id.h.h:1167 msgid "Footnote reference" msgstr "Referncia de Nota de Rodap" #. DLG_FormatFootnotes_FootStyle -#: po/tmp/ap_String_Id.h.h:1161 +#: po/tmp/ap_String_Id.h.h:1169 msgid "Footnote style" msgstr "Estilo da nota de rodap" #. MENU_LABEL_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:1163 +#: po/tmp/ap_String_Id.h.h:1171 msgid "Footnotes and Endnotes" msgstr "Formatar Notas de Rodap e do Final" #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1166 +#: po/tmp/ap_String_Id.h.h:1174 msgid "Force LTR direction of text" msgstr "Forar orientao da Esquerda para a Direita" #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_RTL #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1169 +#: po/tmp/ap_String_Id.h.h:1177 msgid "Force RTL direction of text" msgstr "Forar orientao da Direita para a Esquerda" #. MENU_STATUSLINE_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:1171 +#: po/tmp/ap_String_Id.h.h:1179 msgid "Force left-to-right direction of text" msgstr "Forar direo do texto da esquerda para a direita" #. MENU_STATUSLINE_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:1173 +#: po/tmp/ap_String_Id.h.h:1181 msgid "Force right-to-left direction of text" msgstr "Forar direo do texto da direita para a esquerda" #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1175 +#: po/tmp/ap_String_Id.h.h:1183 msgid "Force text LTR" msgstr "Esquerda para a Direita" #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1177 +#: po/tmp/ap_String_Id.h.h:1185 msgid "Force text RTL" msgstr "Direita para a Esquerda" #. DLG_Styles_ModifyFormat #. TB_Format -#: po/tmp/ap_String_Id.h.h:1180 +#: po/tmp/ap_String_Id.h.h:1188 msgid "Format" msgstr "Formato" #. MENU_STATUSLINE_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1182 +#: po/tmp/ap_String_Id.h.h:1190 msgid "Format Embedded Object" msgstr "Formatar Objeto Embutido" #. DLG_FormatFootnotes_Endnotes -#: po/tmp/ap_String_Id.h.h:1184 +#: po/tmp/ap_String_Id.h.h:1192 msgid "Format Endnotes" msgstr "Formatar Notas Finais" #. DLG_FormatFootnotes_Footnotes -#: po/tmp/ap_String_Id.h.h:1186 +#: po/tmp/ap_String_Id.h.h:1194 msgid "Format Footnotes" msgstr "Formatar Notas de Rodap" #. DLG_FormatFootnotes_Title -#: po/tmp/ap_String_Id.h.h:1188 +#: po/tmp/ap_String_Id.h.h:1196 msgid "Format Footnotes and Endnotes" msgstr "Formatar Notas de Rodap e do Final" #. DLG_HdrFtr_Title -#: po/tmp/ap_String_Id.h.h:1190 +#: po/tmp/ap_String_Id.h.h:1198 msgid "Format Header/Footers" msgstr "Formatar Cabealho/Rodap" #. MENU_LABEL_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1192 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1200 msgid "Format Object" -msgstr "Formatar Tabela" +msgstr "Formatar Objeto" #. TOOLBAR_LABEL_FMTPAINTER -#: po/tmp/ap_String_Id.h.h:1194 +#: po/tmp/ap_String_Id.h.h:1202 msgid "Format Painter" msgstr "Aplicador de formatao" #. DLG_FormatTableTitle #. MENU_STATUSLINE_TABLE_FORMAT -#: po/tmp/ap_String_Id.h.h:1197 +#: po/tmp/ap_String_Id.h.h:1205 msgid "Format Table" msgstr "Formatar Tabela" #. DLG_FormatTOC_Title -#: po/tmp/ap_String_Id.h.h:1199 +#: po/tmp/ap_String_Id.h.h:1207 msgid "Format Table of Contents" msgstr "Formatar ndice" #. DLG_FormatFrameTitle -#: po/tmp/ap_String_Id.h.h:1201 +#: po/tmp/ap_String_Id.h.h:1209 msgid "Format Text Box" msgstr "Formatar Caixa de Texto" #. DLG_Options_Label_ViewFormatTB -#: po/tmp/ap_String_Id.h.h:1203 +#: po/tmp/ap_String_Id.h.h:1211 msgid "Format Toolbar" msgstr "Formatao" #. MENU_STATUSLINE_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:1205 +#: po/tmp/ap_String_Id.h.h:1213 msgid "Format this image" msgstr "Formatar esta imagem" #. MENU_STATUSLINE_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:1207 +#: po/tmp/ap_String_Id.h.h:1215 msgid "Format your document using styles" msgstr "Formatar o seu documento usando estilos" #. DLG_Lists_Format #. DLG_DocComparison_Fmt -#: po/tmp/ap_String_Id.h.h:1209 po/tmp/xap_String_Id.h.h:323 +#: po/tmp/ap_String_Id.h.h:1217 po/tmp/xap_String_Id.h.h:343 msgid "Format:" msgstr "Formato:" #. MENU_LABEL_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1211 +#: po/tmp/ap_String_Id.h.h:1219 msgid "From File" msgstr "A partir do arquivo" #. MENU_LABEL_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1213 +#: po/tmp/ap_String_Id.h.h:1221 #, fuzzy msgid "From LaTeX" msgstr "De: " +#. TOOLBAR_LABEL_VIEW_FULL_SCREEN +#. TOOLBAR_STATUSLINE_VIEW_FULL_SCREEN +#. TOOLBAR_TOOLTIP_VIEW_FULL_SCREEN +#: po/tmp/ap_String_Id.h.h:1225 +#, fuzzy +msgid "Full Screen" +msgstr "&S a Pgina" + #. DLG_FormatTOC_General #. DLG_Options_Label_General #. DLG_MetaData_TAB_General -#: po/tmp/ap_String_Id.h.h:1217 +#: po/tmp/ap_String_Id.h.h:1229 msgid "General" msgstr "Geral" #. DLG_Goto_Btn_Goto -#: po/tmp/ap_String_Id.h.h:1219 +#: po/tmp/ap_String_Id.h.h:1231 msgid "Go To" msgstr "Ir para" #. DLG_Goto_Label_What -#: po/tmp/ap_String_Id.h.h:1221 +#: po/tmp/ap_String_Id.h.h:1233 msgid "Go To &What:" msgstr "Ir para a..." #. DLG_Goto_Title -#: po/tmp/ap_String_Id.h.h:1223 +#: po/tmp/ap_String_Id.h.h:1235 msgid "Go to..." msgstr "Ir para..." #. DLG_FormatTOC_HasLabel -#: po/tmp/ap_String_Id.h.h:1225 +#: po/tmp/ap_String_Id.h.h:1237 msgid "H&as label" msgstr "P&ossui rtulo" #. DLG_FormatTOC_HeadingText -#: po/tmp/ap_String_Id.h.h:1227 +#: po/tmp/ap_String_Id.h.h:1239 msgid "H&eading text:" msgstr "Texto de cabealho:" #. DLG_Lists_Hand_List #. STYLE_HANDLIST -#: po/tmp/ap_String_Id.h.h:1229 po/tmp/xap_String_Id.h.h:363 +#: po/tmp/ap_String_Id.h.h:1241 po/tmp/xap_String_Id.h.h:383 msgid "Hand List" msgstr "Lista com Mos" #. DLG_Para_SpecialHanging -#: po/tmp/ap_String_Id.h.h:1231 +#: po/tmp/ap_String_Id.h.h:1243 msgid "Hanging" msgstr "Pendurado" #. DLG_PageNumbers_Header #. MENU_LABEL_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1234 +#: po/tmp/ap_String_Id.h.h:1246 msgid "Header" msgstr "Cabealho" #. DLG_HdrFtr_HeaderFrame -#: po/tmp/ap_String_Id.h.h:1236 +#: po/tmp/ap_String_Id.h.h:1248 msgid "Header Properties" msgstr "Propriedades do Cabealho" #. HeaderStatus -#: po/tmp/ap_String_Id.h.h:1238 +#: po/tmp/ap_String_Id.h.h:1250 #, c-format msgid "Header [%s]" msgstr "Cabealho [%s]" #. MENU_LABEL_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:1240 +#: po/tmp/ap_String_Id.h.h:1252 msgid "Header/Footers" msgstr "&Cabealhos e Rodaps" #. MSG_CHECK_PRINT_MODE -#: po/tmp/ap_String_Id.h.h:1242 +#: po/tmp/ap_String_Id.h.h:1254 msgid "" "Headers and Footers can only be created and edited while in Print View " "Mode. \n" @@ -3062,444 +3093,445 @@ " Deseja mudar para o Layout de Impresso agora?" #. DLG_Stylist_HeadingStyles -#: po/tmp/ap_String_Id.h.h:1244 +#: po/tmp/ap_String_Id.h.h:1256 msgid "Heading Styles" msgstr "Estilos de Cabealho" #. DLG_FormatTOC_HeadingStyle -#: po/tmp/ap_String_Id.h.h:1246 +#: po/tmp/ap_String_Id.h.h:1258 msgid "Heading style:" msgstr "Estilo de Cabecalho:" #. DLG_Lists_Heart_List #. STYLE_HEARTLIST -#: po/tmp/ap_String_Id.h.h:1248 po/tmp/xap_String_Id.h.h:379 +#: po/tmp/ap_String_Id.h.h:1260 po/tmp/xap_String_Id.h.h:399 msgid "Heart List" msgstr "Lista com Coraes" #. DLG_Lists_Hebrew_List -#: po/tmp/ap_String_Id.h.h:1250 +#: po/tmp/ap_String_Id.h.h:1262 msgid "Hebrew List" msgstr "Lista Hebraica" #. TOOLBAR_LABEL_HELP #. TOOLBAR_STATUSLINE_HELP #. TOOLBAR_TOOLTIP_HELP -#: po/tmp/ap_String_Id.h.h:1254 +#: po/tmp/ap_String_Id.h.h:1266 msgid "Help" msgstr "Ajuda" #. MENU_LABEL_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:1256 +#: po/tmp/ap_String_Id.h.h:1268 msgid "Help &Contents" msgstr "&Tpicos de Ajuda" #. MENU_LABEL_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:1258 +#: po/tmp/ap_String_Id.h.h:1270 msgid "Help &Introduction" msgstr "&ndice da Ajuda" #. DLG_Options_Label_Hide -#: po/tmp/ap_String_Id.h.h:1260 +#: po/tmp/ap_String_Id.h.h:1272 msgid "Hide" msgstr "Esconder" #. DLG_Options_Label_SpellHideErrors -#: po/tmp/ap_String_Id.h.h:1262 +#: po/tmp/ap_String_Id.h.h:1274 msgid "Hide &spelling errors in the document" msgstr "Esconder erros ortogrficos no documento" #. DLG_Lists_FoldingLevelexp -#: po/tmp/ap_String_Id.h.h:1264 +#: po/tmp/ap_String_Id.h.h:1276 msgid "Hide text below List Levels" msgstr "Esconder texto embaixo dos nveis de listas" #. TOOLBAR_LABEL_COLOR_BACK #. TOOLBAR_STATUSLINE_COLOR_BACK #. TOOLBAR_TOOLTIP_COLOR_BACK -#: po/tmp/ap_String_Id.h.h:1268 +#: po/tmp/ap_String_Id.h.h:1280 msgid "Highlight" msgstr "Cor de fundo" #. DLG_Spell_IgnoreAll -#: po/tmp/ap_String_Id.h.h:1270 +#: po/tmp/ap_String_Id.h.h:1282 msgid "I&gnore All" msgstr "Ignora todas" #. DLG_FormatTOC_Indent -#: po/tmp/ap_String_Id.h.h:1272 +#: po/tmp/ap_String_Id.h.h:1284 msgid "I&ndent:" msgstr "I&ndentar:" #. InsertModeFieldINS -#: po/tmp/ap_String_Id.h.h:1274 +#: po/tmp/ap_String_Id.h.h:1286 msgid "INS" msgstr "INS" #. DLG_Options_Label_Icons -#: po/tmp/ap_String_Id.h.h:1276 +#: po/tmp/ap_String_Id.h.h:1288 msgid "Icons" msgstr "cones" #. DLG_Options_Label_Ignore -#: po/tmp/ap_String_Id.h.h:1278 +#: po/tmp/ap_String_Id.h.h:1290 msgid "Ignore" msgstr "Ignorar" #. DLG_Options_Label_SpellIgnoreWords -#: po/tmp/ap_String_Id.h.h:1280 +#: po/tmp/ap_String_Id.h.h:1292 msgid "Ignore Words" msgstr "Ignorar Palavras" #. MENU_STATUSLINE_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:1282 +#: po/tmp/ap_String_Id.h.h:1294 msgid "Ignore all occurrences of this word in the document" msgstr "Ignorar todas as ocorrncias desta palavra no documento" #. DLG_Options_Label_SpellIgnoredWord -#: po/tmp/ap_String_Id.h.h:1284 +#: po/tmp/ap_String_Id.h.h:1296 msgid "Ignored words:" msgstr "Palavras ignoradas:" #. DLG_FormatFrame_SetImageBackground #. DLG_FormatTable_SetImageBackground -#: po/tmp/ap_String_Id.h.h:1287 +#: po/tmp/ap_String_Id.h.h:1299 msgid "Image For Background" msgstr "Imagem para o pano de fundo" #. DLG_Lists_Implies_List #. STYLE_IMPLIES_LIST -#: po/tmp/ap_String_Id.h.h:1289 po/tmp/xap_String_Id.h.h:413 +#: po/tmp/ap_String_Id.h.h:1301 po/tmp/xap_String_Id.h.h:433 msgid "Implies List" msgstr "Lista de Implicaes" #. MENU_STATUSLINE_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:1291 +#: po/tmp/ap_String_Id.h.h:1303 msgid "Import style definitions from a document" msgstr "Importar definies de estilo de outro documento" #. DLG_Styles_LBL_InUse -#: po/tmp/ap_String_Id.h.h:1293 +#: po/tmp/ap_String_Id.h.h:1305 msgid "In Use" msgstr "Em uso" #. WORD_PassInvalid -#: po/tmp/ap_String_Id.h.h:1295 +#: po/tmp/ap_String_Id.h.h:1307 msgid "Incorrect Password" msgstr "Password Incorecta" #. TOOLBAR_LABEL_INDENT #. TOOLBAR_STATUSLINE_INDENT #. TOOLBAR_TOOLTIP_INDENT -#: po/tmp/ap_String_Id.h.h:1299 +#: po/tmp/ap_String_Id.h.h:1311 msgid "Increase indent" msgstr "Indentar" #. DLG_Para_LabelIndentation -#: po/tmp/ap_String_Id.h.h:1301 +#: po/tmp/ap_String_Id.h.h:1313 msgid "Indentation" msgstr "Identao" #. DLG_Para_TabLabelIndentsAndSpacing -#: po/tmp/ap_String_Id.h.h:1303 +#: po/tmp/ap_String_Id.h.h:1315 msgid "Indents and Spacing" msgstr "&Identao e Espaamento" #. DLG_ToggleCase_FirstUpperCase -#: po/tmp/ap_String_Id.h.h:1305 +#: po/tmp/ap_String_Id.h.h:1317 msgid "Initial Caps" msgstr "Maisculas/Minsculas" #. DLG_FormatFootnotes_EndInitialVal -#: po/tmp/ap_String_Id.h.h:1307 +#: po/tmp/ap_String_Id.h.h:1319 msgid "Initial Endnote value" msgstr "Valor inicial da Nota Final" #. DLG_FormatFootnotes_FootInitialVal -#: po/tmp/ap_String_Id.h.h:1309 +#: po/tmp/ap_String_Id.h.h:1321 msgid "Initial Footnote value" msgstr "Valor inicial da Nota de Rodap" #. DLG_Break_Insert #. MENU_STATUSLINE_TABLE_INSERT #. DLG_IP_Button_Label -#: po/tmp/ap_String_Id.h.h:1312 po/tmp/xap_String_Id.h.h:423 +#: po/tmp/ap_String_Id.h.h:1324 po/tmp/xap_String_Id.h.h:443 msgid "Insert" msgstr "Inserir" #. MENU_LABEL_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1314 +#: po/tmp/ap_String_Id.h.h:1326 msgid "Insert &Columns" msgstr "Inserir &Colunas" #. MENU_LABEL_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1316 +#: po/tmp/ap_String_Id.h.h:1328 msgid "Insert &Rows" msgstr "Inserir &Linhas" #. MENU_LABEL_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1318 +#: po/tmp/ap_String_Id.h.h:1330 msgid "Insert &Table" msgstr "Inserir &Tabela" #. DLG_InsertBookmark_Title #. TOOLBAR_LABEL_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1321 +#: po/tmp/ap_String_Id.h.h:1333 msgid "Insert Bookmark" msgstr "Inserir Bookmark" #. DLG_Break_BreakTitle_Capital -#: po/tmp/ap_String_Id.h.h:1323 +#: po/tmp/ap_String_Id.h.h:1335 msgid "Insert Break" msgstr "Inserir Quebra" #. MENU_STATUSLINE_TABLE_INSERT_CELLS -#: po/tmp/ap_String_Id.h.h:1325 +#: po/tmp/ap_String_Id.h.h:1337 msgid "Insert Cells" msgstr "Inserir Clulas" #. MENU_STATUSLINE_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1327 +#: po/tmp/ap_String_Id.h.h:1339 msgid "Insert Clipboard contents" msgstr "Colar seleo" #. DLG_DateTime_DateTimeTitle -#: po/tmp/ap_String_Id.h.h:1329 +#: po/tmp/ap_String_Id.h.h:1341 msgid "Insert Date and Time" msgstr "Data e Hora" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1331 +#: po/tmp/ap_String_Id.h.h:1343 msgid "Insert Equation" msgstr "Inserir Equao" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1333 +#: po/tmp/ap_String_Id.h.h:1345 msgid "Insert Equation from a LaTeX expression" msgstr "Inserir Equao de uma expresso LaTeX" #. DLG_Field_FieldTitle_Capital -#: po/tmp/ap_String_Id.h.h:1335 +#: po/tmp/ap_String_Id.h.h:1347 msgid "Insert Field" msgstr "Inserir Campo" #. DLG_InsertHyperlink_Title #. TOOLBAR_LABEL_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1338 +#: po/tmp/ap_String_Id.h.h:1350 msgid "Insert Hyperlink" msgstr "Inserir hiperligao" #. TOOLBAR_LABEL_IMG -#: po/tmp/ap_String_Id.h.h:1340 +#: po/tmp/ap_String_Id.h.h:1352 msgid "Insert Image" msgstr "Inserir Imagem" #. DLG_MailMerge_MailMergeTitle -#: po/tmp/ap_String_Id.h.h:1342 +#: po/tmp/ap_String_Id.h.h:1354 msgid "Insert Mail Merge Field" msgstr "Inserir Campo de Mala Direta" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1344 +#: po/tmp/ap_String_Id.h.h:1356 msgid "Insert MathML from a file" msgstr "Inserir MathML de arquivo" #. DLG_InsertTable_TableTitle #. MENU_STATUSLINE_TABLE_INSERT_TABLE #. MENU_STATUSLINE_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1348 +#: po/tmp/ap_String_Id.h.h:1360 msgid "Insert Table" msgstr "Inserir Tabela" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER -#: po/tmp/ap_String_Id.h.h:1350 +#: po/tmp/ap_String_Id.h.h:1362 msgid "Insert Unicode direction marker into the document" msgstr "Inserir marcador de direo Unicode no documento" #. MENU_STATUSLINE_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1352 +#: po/tmp/ap_String_Id.h.h:1364 msgid "Insert a Footer" msgstr "Inserir um Rodap" #. MENU_STATUSLINE_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1354 +#: po/tmp/ap_String_Id.h.h:1366 msgid "Insert a Header" msgstr "Inserir um Cabealho" #. MENU_STATUSLINE_INSERT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:1356 +#: po/tmp/ap_String_Id.h.h:1368 msgid "Insert a Table of Contents based on Headings" msgstr "Inserir um ndice baseado nos Cabealhos" #. MENU_STATUSLINE_INSERT_TEXTBOX -#: po/tmp/ap_String_Id.h.h:1358 +#: po/tmp/ap_String_Id.h.h:1370 msgid "Insert a Text Box" msgstr "Inserir uma Caixa de Texto" #. TOOLBAR_STATUSLINE_FMT_BOOKMARK #. TOOLBAR_TOOLTIP_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1361 +#: po/tmp/ap_String_Id.h.h:1373 msgid "Insert a bookmark into the document" msgstr "Inserir uma ncora no documento" #. MENU_STATUSLINE_INSERT_FIELD -#: po/tmp/ap_String_Id.h.h:1363 +#: po/tmp/ap_String_Id.h.h:1375 msgid "Insert a calculated field" msgstr "Inserir campo calculado" #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_BEFORE -#: po/tmp/ap_String_Id.h.h:1365 +#: po/tmp/ap_String_Id.h.h:1377 msgid "Insert a column to the left" msgstr "Inserir a coluna esquerda" #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_AFTER #. MENU_STATUSLINE_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1368 +#: po/tmp/ap_String_Id.h.h:1380 msgid "Insert a column to the right" msgstr "Inserir a coluna direita" #. MENU_STATUSLINE_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1370 +#: po/tmp/ap_String_Id.h.h:1382 msgid "Insert a footnote" msgstr "Inserir um rodap" #. TOOLBAR_STATUSLINE_FMT_HYPERLINK #. TOOLBAR_TOOLTIP_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1373 +#: po/tmp/ap_String_Id.h.h:1385 msgid "Insert a hyperlink into the document" msgstr "Inserir uma hiperligao no documento" #. MENU_STATUSLINE_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1375 +#: po/tmp/ap_String_Id.h.h:1387 msgid "Insert a mail merge field" msgstr "Inserir um campo de reconciliao de correio" #. TOOLBAR_STATUSLINE_INSERT_TABLE #. TOOLBAR_TOOLTIP_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1378 +#: po/tmp/ap_String_Id.h.h:1390 msgid "Insert a new table into your document" msgstr "Inserir uma nova tabela no documento" #. MENU_STATUSLINE_INSERT_BREAK -#: po/tmp/ap_String_Id.h.h:1380 +#: po/tmp/ap_String_Id.h.h:1392 msgid "Insert a page, column, or section break" msgstr "Inserir quebras de pgina, seo..." -#. MENU_STATUSLINE_INSERT_PICTURE -#: po/tmp/ap_String_Id.h.h:1382 -msgid "Insert a picture" -msgstr "Inserir imagem" - #. MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1384 +#: po/tmp/ap_String_Id.h.h:1394 msgid "Insert a row above" msgstr "Inserir uma linha acima" #. MENU_STATUSLINE_TABLE_INSERT_ROWS_AFTER #. MENU_STATUSLINE_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1387 +#: po/tmp/ap_String_Id.h.h:1397 msgid "Insert a row below" msgstr "Inserir uma linha abaixo" #. MENU_STATUSLINE_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1389 +#: po/tmp/ap_String_Id.h.h:1399 msgid "Insert a symbol or other special character" msgstr "Inserir caracteres especiais" +#. MENU_STATUSLINE_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:1401 +#, fuzzy +msgid "Insert an Annotation" +msgstr "Inserir nota final" + #. MENU_STATUSLINE_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1391 +#: po/tmp/ap_String_Id.h.h:1403 msgid "Insert an automatically-updated page number" msgstr "Inserir nmerao de pginas" #. MENU_STATUSLINE_INSERT_ENDNOTE -#: po/tmp/ap_String_Id.h.h:1393 +#: po/tmp/ap_String_Id.h.h:1405 msgid "Insert an endnote" msgstr "Inserir nota final" #. MENU_STATUSLINE_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:1395 +#: po/tmp/ap_String_Id.h.h:1407 msgid "Insert an existing picture from another file" msgstr "Inserir uma imagem a partir de um arquivo" #. TOOLBAR_STATUSLINE_IMG #. TOOLBAR_TOOLTIP_IMG -#: po/tmp/ap_String_Id.h.h:1398 +#: po/tmp/ap_String_Id.h.h:1410 msgid "Insert an image into the document" msgstr "Inserir imagem" #. MENU_STATUSLINE_INSERT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1400 +#: po/tmp/ap_String_Id.h.h:1412 msgid "Insert bookmark" msgstr "Inserir bookmark" #. DLG_Break_BreakTitle -#: po/tmp/ap_String_Id.h.h:1402 +#: po/tmp/ap_String_Id.h.h:1414 msgid "Insert break" msgstr "Quebra" #. MENU_STATUSLINE_INSERT_CLIPART -#: po/tmp/ap_String_Id.h.h:1404 +#: po/tmp/ap_String_Id.h.h:1416 msgid "Insert clipart" msgstr "Inserir grficos do portfolio" #. DLG_Field_FieldTitle -#: po/tmp/ap_String_Id.h.h:1406 +#: po/tmp/ap_String_Id.h.h:1418 msgid "Insert field" msgstr "Campo" #. MENU_STATUSLINE_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1408 +#: po/tmp/ap_String_Id.h.h:1420 msgid "Insert hyperlink" msgstr "Inserir hiperligao" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:1410 +#: po/tmp/ap_String_Id.h.h:1422 msgid "Insert left-to-right direction marker (LRM)" msgstr "Inserir marcador de direao da esquerda para a direita (MED)" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:1412 +#: po/tmp/ap_String_Id.h.h:1424 msgid "Insert right-to-left direction marker (RLM)" msgstr "Inserir marcador de direo da direita para esquerda (MDE)" #. TOOLBAR_STATUSLINE_INSERT_SYMBOL #. TOOLBAR_TOOLTIP_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1415 +#: po/tmp/ap_String_Id.h.h:1427 msgid "Insert symbol" msgstr "Inserir smbolo" #. TOOLBAR_LABEL_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1417 +#: po/tmp/ap_String_Id.h.h:1429 msgid "Insert table" msgstr "Inserir tabela" #. MENU_STATUSLINE_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:1419 +#: po/tmp/ap_String_Id.h.h:1431 msgid "Insert the Sum of a Table Column" msgstr "Inserir a Soma de uma Coluna da Tabela" #. MENU_STATUSLINE_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:1421 +#: po/tmp/ap_String_Id.h.h:1433 msgid "Insert the Sum of a Table Row" msgstr "Inserir a Soma de uma Linha da Tabela" #. MENU_STATUSLINE_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1423 +#: po/tmp/ap_String_Id.h.h:1435 msgid "Insert the contents of another file" msgstr "Inserir o contedo de um outro documento" #. MENU_STATUSLINE_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:1425 +#: po/tmp/ap_String_Id.h.h:1437 msgid "Insert the date and/or time" msgstr "Inserir data e hora" #. MENU_STATUSLINE_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1427 +#: po/tmp/ap_String_Id.h.h:1439 msgid "Insert unformatted clipboard contents" msgstr "Colar objeto no formatado" #. DLG_Options_Label_ViewUnprintable -#: po/tmp/ap_String_Id.h.h:1429 +#: po/tmp/ap_String_Id.h.h:1441 msgid "Invisible &Layout Marks" msgstr "smbolos no imprimveis" @@ -3507,101 +3539,101 @@ #. TOOLBAR_STATUSLINE_FMT_ITALIC #. TOOLBAR_TOOLTIP_FMT_ITALIC #. DLG_UFS_StyleItalic -#: po/tmp/ap_String_Id.h.h:1433 po/tmp/xap_String_Id.h.h:453 +#: po/tmp/ap_String_Id.h.h:1445 po/tmp/xap_String_Id.h.h:473 msgid "Italic" msgstr "Itlico" #. MENU_STATUSLINE_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1435 +#: po/tmp/ap_String_Id.h.h:1447 msgid "Jump to hyperlink" msgstr "Saltar para o hiperlink" #. DLG_Para_AlignJustified -#: po/tmp/ap_String_Id.h.h:1437 +#: po/tmp/ap_String_Id.h.h:1449 msgid "Justified" msgstr "Justificado" #. TOOLBAR_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1439 +#: po/tmp/ap_String_Id.h.h:1451 msgid "Justify" msgstr "Justificar" #. TOOLBAR_STATUSLINE_ALIGN_JUSTIFY #. TOOLBAR_TOOLTIP_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1442 +#: po/tmp/ap_String_Id.h.h:1454 msgid "Justify paragraph" msgstr "Justificar pargrafo" #. MENU_STATUSLINE_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1444 +#: po/tmp/ap_String_Id.h.h:1456 msgid "Justify the paragraph" msgstr "Justificar texto" #. DLG_Para_PushKeepWithNext -#: po/tmp/ap_String_Id.h.h:1446 +#: po/tmp/ap_String_Id.h.h:1458 msgid "Keep with ne&xt" msgstr "Manter junto do seguinte" #. FIELD_PieceTable_Test -#: po/tmp/ap_String_Id.h.h:1448 +#: po/tmp/ap_String_Id.h.h:1460 msgid "Kevins Test" msgstr "Teste de Pedao de Tabela do Kevin" #. FIELD_Document_Keywords -#: po/tmp/ap_String_Id.h.h:1450 +#: po/tmp/ap_String_Id.h.h:1462 msgid "Keywords" msgstr "Palavras-chave" #. DLG_MetaData_Keywords_LBL -#: po/tmp/ap_String_Id.h.h:1452 +#: po/tmp/ap_String_Id.h.h:1464 msgid "Keywords:" msgstr "Referncias:" #. DLG_Latex_LatexTitle #. DLG_Latex_LatexEquation -#: po/tmp/ap_String_Id.h.h:1455 +#: po/tmp/ap_String_Id.h.h:1467 msgid "LaTeX Equation" msgstr "Equao LaTeX" #. DLG_Lists_Indent -#: po/tmp/ap_String_Id.h.h:1457 +#: po/tmp/ap_String_Id.h.h:1469 msgid "Label Align:" msgstr "Alinhamento da identao" #. DLG_FormatTOC_DetailsTop -#: po/tmp/ap_String_Id.h.h:1459 +#: po/tmp/ap_String_Id.h.h:1471 msgid "Label Definitions" msgstr "Definioes de Rtulos" #. DLG_Styles_ModifyLanguage #. DLG_Options_Label_Language #. FIELD_Document_Language -#: po/tmp/ap_String_Id.h.h:1463 +#: po/tmp/ap_String_Id.h.h:1475 msgid "Language" msgstr "idioma" #. DLG_Options_Label_LangSettings -#: po/tmp/ap_String_Id.h.h:1465 +#: po/tmp/ap_String_Id.h.h:1477 msgid "Language settings" msgstr "Preferncias de idioma" #. DLG_MetaData_Languages_LBL -#: po/tmp/ap_String_Id.h.h:1467 +#: po/tmp/ap_String_Id.h.h:1479 msgid "Language(s):" msgstr "Idioma(s):" #. DLG_Options_Label_Layout -#: po/tmp/ap_String_Id.h.h:1469 +#: po/tmp/ap_String_Id.h.h:1481 msgid "Layout" msgstr "Disposio" #. DLG_FormatTOC_LayoutDetails -#: po/tmp/ap_String_Id.h.h:1471 +#: po/tmp/ap_String_Id.h.h:1483 msgid "Layout Details" msgstr "Detalhes do Layout" #. DLG_Tab_Label_Leader -#: po/tmp/ap_String_Id.h.h:1473 +#: po/tmp/ap_String_Id.h.h:1485 msgid "Leader" msgstr "Primeira" @@ -3609,406 +3641,409 @@ #. DLG_Tab_Radio_Left #. DLG_PageNumbers_Left #. TOOLBAR_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1478 +#: po/tmp/ap_String_Id.h.h:1490 msgid "Left" msgstr " Esquerda" #. LeftIndentStatus -#: po/tmp/ap_String_Id.h.h:1480 +#: po/tmp/ap_String_Id.h.h:1492 #, c-format msgid "Left Indent [%s]" msgstr "Identao Esquerda [%s]" #. LeftIndentTextIndentStatus -#: po/tmp/ap_String_Id.h.h:1482 +#: po/tmp/ap_String_Id.h.h:1494 #, c-format msgid "Left Indent [%s] First Line Indent [%s]" msgstr "Identao Esquerda [%s] Primeira Linha [%s]" #. LeftMarginStatus -#: po/tmp/ap_String_Id.h.h:1484 +#: po/tmp/ap_String_Id.h.h:1496 #, c-format msgid "Left Margin [%s]" msgstr "Margem Esquerda [%s]" #. TabToggleLeftTab -#: po/tmp/ap_String_Id.h.h:1486 +#: po/tmp/ap_String_Id.h.h:1498 msgid "Left Tab" msgstr " &Esquerda" #. TOOLBAR_STATUSLINE_ALIGN_LEFT #. TOOLBAR_TOOLTIP_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1489 +#: po/tmp/ap_String_Id.h.h:1501 msgid "Left alignment" msgstr "Alinhar esquerda" #. MENU_STATUSLINE_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1491 +#: po/tmp/ap_String_Id.h.h:1503 msgid "Left-align the paragraph" msgstr "Alinhar esquerda" #. DLG_FormatTOC_Level1 -#: po/tmp/ap_String_Id.h.h:1493 +#: po/tmp/ap_String_Id.h.h:1505 msgid "Level 1" msgstr "Nvel 1" #. DLG_FormatTOC_Level2 -#: po/tmp/ap_String_Id.h.h:1495 +#: po/tmp/ap_String_Id.h.h:1507 msgid "Level 2" msgstr "Nvel 2" #. DLG_FormatTOC_Level3 -#: po/tmp/ap_String_Id.h.h:1497 +#: po/tmp/ap_String_Id.h.h:1509 msgid "Level 3" msgstr "Nvel 3" #. DLG_FormatTOC_Level4 -#: po/tmp/ap_String_Id.h.h:1499 +#: po/tmp/ap_String_Id.h.h:1511 msgid "Level 4" msgstr "Nvel 4" #. DLG_Lists_DelimiterString -#: po/tmp/ap_String_Id.h.h:1501 +#: po/tmp/ap_String_Id.h.h:1513 msgid "Level Delimiter:" msgstr "Delimitador de profundidade:" #. DLG_Lists_Level -#: po/tmp/ap_String_Id.h.h:1503 +#: po/tmp/ap_String_Id.h.h:1515 msgid "Level:" msgstr "Nvel" #. DLG_Para_LabelLineSpacing -#: po/tmp/ap_String_Id.h.h:1505 +#: po/tmp/ap_String_Id.h.h:1517 msgid "Li&ne spacing:" msgstr "Altura da linha:" #. DLG_Goto_Target_Line -#: po/tmp/ap_String_Id.h.h:1507 +#: po/tmp/ap_String_Id.h.h:1519 msgid "Line" msgstr "Linha" #. FIELD_Numbers_LineCount -#: po/tmp/ap_String_Id.h.h:1509 +#: po/tmp/ap_String_Id.h.h:1521 msgid "Line Count" msgstr "Contagem de Linhas" #. MENU_STATUSLINE_FMT_TOPLINE -#: po/tmp/ap_String_Id.h.h:1511 +#: po/tmp/ap_String_Id.h.h:1523 msgid "Line above the selection (toggle)" msgstr "Colocar/Remover linha acima da seleo" #. DLG_Para_TabLabelLineAndPageBreaks -#: po/tmp/ap_String_Id.h.h:1513 +#: po/tmp/ap_String_Id.h.h:1525 msgid "Line and Page Breaks" msgstr "&Quebras de Linha e Pgina" #. MENU_STATUSLINE_FMT_BOTTOMLINE -#: po/tmp/ap_String_Id.h.h:1515 +#: po/tmp/ap_String_Id.h.h:1527 msgid "Line below the selection (toggle)" msgstr "Colocar/Remover linha abaixo da seleo" #. DLG_Column_Line_Between -#: po/tmp/ap_String_Id.h.h:1517 +#: po/tmp/ap_String_Id.h.h:1529 msgid "Line between" msgstr "Linha intermdia" #. DLG_WordCount_Lines -#: po/tmp/ap_String_Id.h.h:1519 +#: po/tmp/ap_String_Id.h.h:1531 msgid "Lines:" msgstr "Linhas" #. DLG_Styles_List -#: po/tmp/ap_String_Id.h.h:1521 +#: po/tmp/ap_String_Id.h.h:1533 msgid "List" msgstr "Tipos de Estilos" #. FIELD_Numbers_ListLabel -#: po/tmp/ap_String_Id.h.h:1523 +#: po/tmp/ap_String_Id.h.h:1535 msgid "List Label" msgstr "Etiqueta da lista" #. DLG_Lists_PageProperties -#: po/tmp/ap_String_Id.h.h:1525 +#: po/tmp/ap_String_Id.h.h:1537 msgid "List Properties" msgstr "Propriedades da Lista" #. DLG_Stylist_ListStyles -#: po/tmp/ap_String_Id.h.h:1527 +#: po/tmp/ap_String_Id.h.h:1539 msgid "List Styles" msgstr "Estilos de Listas" #. DLG_Lists_Title -#: po/tmp/ap_String_Id.h.h:1529 +#: po/tmp/ap_String_Id.h.h:1541 msgid "Lists for " msgstr "Listas para " #. MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1531 +#: po/tmp/ap_String_Id.h.h:1543 msgid "Lock the layout of the current toolbars" msgstr "Travar o layout das barras de ferramentas atuais" #. DLG_Lists_Lower_Case_List #. STYLE_LOWERCASELIST -#: po/tmp/ap_String_Id.h.h:1533 po/tmp/xap_String_Id.h.h:489 +#: po/tmp/ap_String_Id.h.h:1545 po/tmp/xap_String_Id.h.h:512 msgid "Lower Case List" msgstr "Lista com minsculas" #. DLG_Lists_Lower_Roman_List #. STYLE_LOWERROMANLIST -#: po/tmp/ap_String_Id.h.h:1535 po/tmp/xap_String_Id.h.h:491 +#: po/tmp/ap_String_Id.h.h:1547 po/tmp/xap_String_Id.h.h:514 msgid "Lower Roman List" msgstr "Lista romnica com minsculas" -#. MENU_LABEL_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1537 -msgid "M&erge documents" -msgstr "R&econciliar documentos" - #. FIELD_Application_MailMerge #. MENU_STATUSLINE_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1540 +#: po/tmp/ap_String_Id.h.h:1550 msgid "Mail Merge" msgstr "Mala Direta" #. MENU_STATUSLINE_FMT_BOLD -#: po/tmp/ap_String_Id.h.h:1542 +#: po/tmp/ap_String_Id.h.h:1552 msgid "Make the selection bold (toggle)" msgstr "Engrossar texto" #. MENU_STATUSLINE_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:1544 +#: po/tmp/ap_String_Id.h.h:1554 msgid "Make the selection italic (toggle)" msgstr "Inclinar texto" #. MENU_STATUSLINE_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:1546 +#: po/tmp/ap_String_Id.h.h:1556 msgid "Make the selection subscript (toggle)" msgstr "Indiciar texto" #. MENU_STATUSLINE_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:1548 +#: po/tmp/ap_String_Id.h.h:1558 msgid "Make the selection superscript (toggle)" msgstr "Elevar texto" #. MENU_STATUSLINE_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:1550 +#: po/tmp/ap_String_Id.h.h:1560 msgid "Manage changes in document" msgstr "Gerenciar alteraes no documento" #. MENU_STATUSLINE_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:1552 +#: po/tmp/ap_String_Id.h.h:1562 msgid "Manage plugins" msgstr "Gerir plugins" #. DLG_PageSetup_Margin -#: po/tmp/ap_String_Id.h.h:1554 +#: po/tmp/ap_String_Id.h.h:1564 msgid "Margin" msgstr "&Margem" #. DLG_MarkRevisions_Title -#: po/tmp/ap_String_Id.h.h:1556 +#: po/tmp/ap_String_Id.h.h:1566 msgid "Mark Revisions" msgstr "Marcar Revises" #. MENU_STATUSLINE_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:1558 +#: po/tmp/ap_String_Id.h.h:1568 msgid "Mark changes as you type" msgstr "Mostrar alteraes enquanto voc digita" #. FIELD_PieceTable_MartinTest -#: po/tmp/ap_String_Id.h.h:1560 +#: po/tmp/ap_String_Id.h.h:1570 msgid "Martins Test" msgstr "Teste do Martin" #. DLG_Column_Size -#: po/tmp/ap_String_Id.h.h:1562 +#: po/tmp/ap_String_Id.h.h:1572 msgid "Max Column size" msgstr "Largura mxima da coluna " +#. TOOLBAR_LABEL_MENU +#. TOOLBAR_STATUSLINE_MENU +#. TOOLBAR_TOOLTIP_MENU +#: po/tmp/ap_String_Id.h.h:1576 +msgid "Menu" +msgstr "" + #. DLG_MergeCells_Above -#: po/tmp/ap_String_Id.h.h:1564 +#: po/tmp/ap_String_Id.h.h:1578 msgid "Merge Above" msgstr "Mesclar acima" #. DLG_MergeCells_Below -#: po/tmp/ap_String_Id.h.h:1566 +#: po/tmp/ap_String_Id.h.h:1580 msgid "Merge Below" msgstr "Mesclar abaixo" #. DLG_MergeCellsTitle #. DLG_MergeCells_Frame #. MENU_STATUSLINE_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1570 +#: po/tmp/ap_String_Id.h.h:1584 msgid "Merge Cells" msgstr "Mesclar Clulas" #. DLG_MergeCells_Left -#: po/tmp/ap_String_Id.h.h:1572 +#: po/tmp/ap_String_Id.h.h:1586 msgid "Merge Left" msgstr "Mesclar esquerda" #. DLG_MergeCells_Right -#: po/tmp/ap_String_Id.h.h:1574 +#: po/tmp/ap_String_Id.h.h:1588 msgid "Merge Right" msgstr "Mesclar direita" #. TOOLBAR_LABEL_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1576 +#: po/tmp/ap_String_Id.h.h:1590 msgid "Merge above" msgstr "Juntar acima" #. MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1578 +#: po/tmp/ap_String_Id.h.h:1592 msgid "Merge another document into the active document using revision marks" -msgstr "Reconciliar outro documento com o documento corrente usando marcas de reviso" +msgstr "" +"Reconciliar outro documento com o documento corrente usando marcas de reviso" #. TOOLBAR_LABEL_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1580 +#: po/tmp/ap_String_Id.h.h:1594 msgid "Merge below" msgstr "Juntar abaixo" #. TOOLBAR_LABEL_MERGE_CELLS #. TOOLBAR_STATUSLINE_MERGE_CELLS #. TOOLBAR_TOOLTIP_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1584 +#: po/tmp/ap_String_Id.h.h:1598 msgid "Merge cells" msgstr "Juntar clulas" #. TOOLBAR_LABEL_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1586 +#: po/tmp/ap_String_Id.h.h:1600 msgid "Merge left" msgstr "Juntar esquerda" #. TOOLBAR_LABEL_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1588 +#: po/tmp/ap_String_Id.h.h:1602 msgid "Merge right" msgstr "Juntar direita" #. TOOLBAR_STATUSLINE_MERGEABOVE #. TOOLBAR_TOOLTIP_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1591 +#: po/tmp/ap_String_Id.h.h:1605 msgid "Merge with cell above" msgstr "Juntar com a clula acima da atual" #. TOOLBAR_STATUSLINE_MERGEBELOW #. TOOLBAR_TOOLTIP_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1594 +#: po/tmp/ap_String_Id.h.h:1608 msgid "Merge with cell below" msgstr "Juntar com a clula abaixo da atual" #. TOOLBAR_STATUSLINE_MERGELEFT #. TOOLBAR_TOOLTIP_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1597 +#: po/tmp/ap_String_Id.h.h:1611 msgid "Merge with left cell" msgstr "Juntar com a clula esquerda da atual" #. TOOLBAR_STATUSLINE_MERGERIGHT #. TOOLBAR_TOOLTIP_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1600 +#: po/tmp/ap_String_Id.h.h:1614 msgid "Merge with right cell" msgstr "Juntar com a clula direita da atual" #. FIELD_DateTime_MilTime -#: po/tmp/ap_String_Id.h.h:1602 +#: po/tmp/ap_String_Id.h.h:1616 msgid "Military Time" msgstr "Data Militar" #. DLG_Options_TabLabel_Misc -#: po/tmp/ap_String_Id.h.h:1604 +#: po/tmp/ap_String_Id.h.h:1618 msgid "Misc." msgstr "Outras..." #. DLG_Stylist_MiscStyles -#: po/tmp/ap_String_Id.h.h:1606 +#: po/tmp/ap_String_Id.h.h:1620 msgid "Miscellaneous Styles" msgstr "Estilos Variados" #. DLG_Styles_ModifyTitle -#: po/tmp/ap_String_Id.h.h:1608 +#: po/tmp/ap_String_Id.h.h:1622 msgid "Modify Styles" msgstr "Modificar Estilos" #. DLG_Styles_Modify -#: po/tmp/ap_String_Id.h.h:1610 +#: po/tmp/ap_String_Id.h.h:1624 msgid "Modify..." msgstr "Atualizao automtica" #. FIELD_DateTime_MonthDayYear -#: po/tmp/ap_String_Id.h.h:1612 +#: po/tmp/ap_String_Id.h.h:1626 msgid "Month Day, Year" msgstr "Ms Dia, Ano" #. MENU_STATUSLINE_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:1614 +#: po/tmp/ap_String_Id.h.h:1628 msgid "Move the insertion point to a specific location" msgstr "Deslocar o cursor para" #. FIELD_DateTime_MthDayYear -#: po/tmp/ap_String_Id.h.h:1616 +#: po/tmp/ap_String_Id.h.h:1630 msgid "Mth. Day, Year" msgstr "Ms (abrev) Dia, Ano" #. DLG_Para_SpacingMultiple -#: po/tmp/ap_String_Id.h.h:1618 +#: po/tmp/ap_String_Id.h.h:1632 msgid "Multiple" msgstr "Multiplo" #. TOOLBAR_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:1620 +#: po/tmp/ap_String_Id.h.h:1634 msgid "New" msgstr "Novo" #. DLG_NEW_Title -#: po/tmp/ap_String_Id.h.h:1622 +#: po/tmp/ap_String_Id.h.h:1636 msgid "New Document" msgstr "Escolha um modelo" #. DLG_Lists_New_List_Label -#: po/tmp/ap_String_Id.h.h:1624 +#: po/tmp/ap_String_Id.h.h:1638 msgid "New List Label" msgstr "Nova etiqueta" #. DLG_Lists_New_List_Type -#: po/tmp/ap_String_Id.h.h:1626 +#: po/tmp/ap_String_Id.h.h:1640 msgid "" "New List \n" "Type" msgstr "Novo tipo de lista" #. DLG_Lists_Starting_Value -#: po/tmp/ap_String_Id.h.h:1628 +#: po/tmp/ap_String_Id.h.h:1642 msgid "" "New Starting \n" "Value" msgstr "Valor inicial" #. DLG_Styles_NewTitle -#: po/tmp/ap_String_Id.h.h:1630 +#: po/tmp/ap_String_Id.h.h:1644 msgid "New Style" msgstr "Novo Estilo" #. DLG_Styles_New -#: po/tmp/ap_String_Id.h.h:1632 +#: po/tmp/ap_String_Id.h.h:1646 msgid "New..." msgstr "Novo..." #. DLG_Goto_Btn_Next -#: po/tmp/ap_String_Id.h.h:1634 +#: po/tmp/ap_String_Id.h.h:1648 msgid "Next >>" msgstr "Pgina Seguinte" #. DLG_NEW_NoFile -#: po/tmp/ap_String_Id.h.h:1636 +#: po/tmp/ap_String_Id.h.h:1650 msgid "No File" msgstr "Nenhum Arquivo" #. DLG_Lists_FoldingLevel0 -#: po/tmp/ap_String_Id.h.h:1638 +#: po/tmp/ap_String_Id.h.h:1652 msgid "No Folding" msgstr "Sem Dobras" #. DLG_Styles_ErrNoStyle -#: po/tmp/ap_String_Id.h.h:1640 +#: po/tmp/ap_String_Id.h.h:1654 msgid "" "No Style selected \n" " so it cannot be modified" @@ -4017,7 +4052,7 @@ " tem de o selecionar primeiro" #. SCRIPT_NOSCRIPTS -#: po/tmp/ap_String_Id.h.h:1642 +#: po/tmp/ap_String_Id.h.h:1656 msgid "No scripts found" msgstr "No foram encontrados scripts" @@ -4025,63 +4060,63 @@ #. DLG_Styles_DefNone #. DLG_Tab_Radio_NoAlign #. DLG_Lists_Type_none -#: po/tmp/ap_String_Id.h.h:1647 +#: po/tmp/ap_String_Id.h.h:1661 msgid "None" msgstr "Nenhum" #. TOOLBAR_LABEL_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:1649 +#: po/tmp/ap_String_Id.h.h:1663 msgid "None before" msgstr "Nada antes" #. MENU_STATUSLINE_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:1651 +#: po/tmp/ap_String_Id.h.h:1665 msgid "Normal View" msgstr "Esquema Normal" #. DLG_Spell_UnknownWord -#: po/tmp/ap_String_Id.h.h:1653 +#: po/tmp/ap_String_Id.h.h:1667 msgid "Not in dictionary&:" msgstr "Palavra desconhecida:" #. DLG_Stylist_FootnoteStyles -#: po/tmp/ap_String_Id.h.h:1655 +#: po/tmp/ap_String_Id.h.h:1669 msgid "Note Styles" msgstr "Estilos de Anotaes" #. DLG_Column_Number_Cols -#: po/tmp/ap_String_Id.h.h:1657 +#: po/tmp/ap_String_Id.h.h:1671 msgid "Number of Columns" msgstr "Nmero de colunas " #. FIELD_Numbers_PagesCount -#: po/tmp/ap_String_Id.h.h:1659 +#: po/tmp/ap_String_Id.h.h:1673 msgid "Number of Pages" msgstr "Nmero de pginas" #. DLG_Column_Number -#: po/tmp/ap_String_Id.h.h:1661 +#: po/tmp/ap_String_Id.h.h:1675 msgid "Number of columns" msgstr "Nmero de colunas " #. DLG_InsertTable_NumCols -#: po/tmp/ap_String_Id.h.h:1663 +#: po/tmp/ap_String_Id.h.h:1677 msgid "Number of columns:" msgstr "Nmero de colunas:" #. DLG_InsertTable_NumRows -#: po/tmp/ap_String_Id.h.h:1665 +#: po/tmp/ap_String_Id.h.h:1679 msgid "Number of rows:" msgstr "Nmero de linhas:" #. DLG_Lists_Type_numbered -#: po/tmp/ap_String_Id.h.h:1667 +#: po/tmp/ap_String_Id.h.h:1681 msgid "Numbered" msgstr "Numerada" #. DLG_Lists_Numbered_List #. STYLE_NUMBER_LIST -#: po/tmp/ap_String_Id.h.h:1669 po/tmp/xap_String_Id.h.h:531 +#: po/tmp/ap_String_Id.h.h:1683 po/tmp/xap_String_Id.h.h:558 msgid "Numbered List" msgstr "Lista numerada" @@ -4090,47 +4125,47 @@ #. TOOLBAR_LABEL_LISTS_NUMBERS #. TOOLBAR_STATUSLINE_LISTS_NUMBERS #. TOOLBAR_TOOLTIP_LISTS_NUMBERS -#: po/tmp/ap_String_Id.h.h:1675 +#: po/tmp/ap_String_Id.h.h:1689 msgid "Numbering" msgstr "Numerao" #. FIELD_Type_Numbers -#: po/tmp/ap_String_Id.h.h:1677 +#: po/tmp/ap_String_Id.h.h:1691 msgid "Numbers" msgstr "Nmeros" #. InsertModeFieldOVR -#: po/tmp/ap_String_Id.h.h:1679 +#: po/tmp/ap_String_Id.h.h:1693 msgid "OVR" msgstr "SUBS" #. DLG_Column_One -#: po/tmp/ap_String_Id.h.h:1681 +#: po/tmp/ap_String_Id.h.h:1695 msgid "One" msgstr "Uma" #. MENU_LABEL_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1683 +#: po/tmp/ap_String_Id.h.h:1697 msgid "Op&en Copy" msgstr "&Importar" #. TOOLBAR_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1685 +#: po/tmp/ap_String_Id.h.h:1699 msgid "Open" msgstr "Abrir" #. MENU_LABEL_OPEN_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1687 +#: po/tmp/ap_String_Id.h.h:1701 msgid "Open Template" msgstr "Abrir" #. MENU_STATUSLINE_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1689 +#: po/tmp/ap_String_Id.h.h:1703 msgid "Open a document by making a copy" msgstr "Importar documento para a posio atual do cursor" #. MENU_STATUSLINE_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1691 +#: po/tmp/ap_String_Id.h.h:1705 msgid "Open a recently used document" msgstr "ltimo documento utilizado" @@ -4138,12 +4173,12 @@ #. MENU_STATUSLINE_FILE_OPEN #. TOOLBAR_STATUSLINE_FILE_OPEN #. TOOLBAR_TOOLTIP_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1696 +#: po/tmp/ap_String_Id.h.h:1710 msgid "Open an existing document" msgstr "Abrir um documento" #. MENU_STATUSLINE_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:1698 +#: po/tmp/ap_String_Id.h.h:1712 msgid "Open another window for the document" msgstr "Abrir outra janela para este documento" @@ -4156,22 +4191,22 @@ #. MENU_STATUSLINE_FILE_RECENT_7 #. MENU_STATUSLINE_FILE_RECENT_8 #. MENU_STATUSLINE_FILE_RECENT_9 -#: po/tmp/ap_String_Id.h.h:1708 +#: po/tmp/ap_String_Id.h.h:1722 msgid "Open this document" msgstr "ltimo documento utilizado" #. DLG_PageSetup_Orient -#: po/tmp/ap_String_Id.h.h:1710 +#: po/tmp/ap_String_Id.h.h:1724 msgid "Orientation..." msgstr "Orientao" #. DLG_Options_TabLabel_Other -#: po/tmp/ap_String_Id.h.h:1712 +#: po/tmp/ap_String_Id.h.h:1726 msgid "Other" msgstr "Outros" #. MSG_IE_NoMemory -#: po/tmp/ap_String_Id.h.h:1714 +#: po/tmp/ap_String_Id.h.h:1728 #, c-format msgid "Out of memory attempting to open %s" msgstr "No h memria suficiente para abrir %s" @@ -4180,230 +4215,230 @@ #. TOOLBAR_STATUSLINE_FMT_OVERLINE #. TOOLBAR_TOOLTIP_FMT_OVERLINE #. DLG_UFS_OverlineCheck -#: po/tmp/ap_String_Id.h.h:1718 po/tmp/xap_String_Id.h.h:545 +#: po/tmp/ap_String_Id.h.h:1732 po/tmp/xap_String_Id.h.h:572 msgid "Overline" msgstr "Sobrelinhado" #. MENU_STATUSLINE_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:1720 +#: po/tmp/ap_String_Id.h.h:1734 msgid "Overline the selection (toggle)" msgstr "Sobrelinhar texto" #. MENU_LABEL_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:1722 +#: po/tmp/ap_String_Id.h.h:1736 msgid "P&roperties" msgstr "P&ropriedades" #. MENU_LABEL_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1724 +#: po/tmp/ap_String_Id.h.h:1738 #, fuzzy msgid "P&urge revisions" msgstr "&Revises" #. MENU_LABEL_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1726 +#: po/tmp/ap_String_Id.h.h:1740 msgid "Pa&ste Unformatted" msgstr "Colar &Especial" #. DLG_Goto_Target_Page #. DLG_PageSetup_Page -#: po/tmp/ap_String_Id.h.h:1729 +#: po/tmp/ap_String_Id.h.h:1743 msgid "Page" msgstr "Pgina" #. DLG_Para_PushPageBreakBefore -#: po/tmp/ap_String_Id.h.h:1731 +#: po/tmp/ap_String_Id.h.h:1745 msgid "Page &break before" msgstr "Quebrar pgina antes" #. MENU_LABEL_FMT_BACKGROUND -#: po/tmp/ap_String_Id.h.h:1733 +#: po/tmp/ap_String_Id.h.h:1747 msgid "Page Background" msgstr "&Cor de Fundo" #. MENU_LABEL_FMT_BACKGROUND_PAGE_COLOR -#: po/tmp/ap_String_Id.h.h:1735 +#: po/tmp/ap_String_Id.h.h:1749 msgid "Page C&olor" msgstr "C&or de Pgina" #. MENU_LABEL_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:1737 +#: po/tmp/ap_String_Id.h.h:1751 msgid "Page Image" msgstr "Imagem da Pgina" #. MENU_LABEL_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1739 +#: po/tmp/ap_String_Id.h.h:1753 msgid "Page N&umbers" msgstr "&Nmerao" #. FIELD_Numbers_PageNumber -#: po/tmp/ap_String_Id.h.h:1741 +#: po/tmp/ap_String_Id.h.h:1755 msgid "Page Number" msgstr "Nmero da pgina" #. DLG_HdrFtr_PageNumberProperties -#: po/tmp/ap_String_Id.h.h:1743 +#: po/tmp/ap_String_Id.h.h:1757 msgid "Page Number Properties" msgstr "Propriedades da Numerao das Pginas" #. DLG_PageNumbers_Title -#: po/tmp/ap_String_Id.h.h:1745 +#: po/tmp/ap_String_Id.h.h:1759 msgid "Page Numbers" msgstr "Nmero da pgina" #. FIELD_Numbers_PageReference -#: po/tmp/ap_String_Id.h.h:1747 +#: po/tmp/ap_String_Id.h.h:1761 msgid "Page Reference" msgstr "Referncia da pgina" #. MENU_LABEL_FILE_PAGESETUP -#: po/tmp/ap_String_Id.h.h:1749 +#: po/tmp/ap_String_Id.h.h:1763 msgid "Page Set&up" msgstr "&Paginao" #. DLG_PageSetup_Title -#: po/tmp/ap_String_Id.h.h:1751 +#: po/tmp/ap_String_Id.h.h:1765 msgid "Page Setup" msgstr "Definio de Pgina" #. PageInfoField -#: po/tmp/ap_String_Id.h.h:1753 +#: po/tmp/ap_String_Id.h.h:1767 #, c-format msgid "Page: %d/%d" msgstr "Pgina: %d/%d" #. DLG_WordCount_Pages -#: po/tmp/ap_String_Id.h.h:1755 +#: po/tmp/ap_String_Id.h.h:1769 msgid "Pages:" msgstr "Pginas" #. DLG_Para_LabelPagination -#: po/tmp/ap_String_Id.h.h:1757 +#: po/tmp/ap_String_Id.h.h:1771 msgid "Pagination" msgstr "Paginao" #. DLG_PageSetup_Paper_Size -#: po/tmp/ap_String_Id.h.h:1759 +#: po/tmp/ap_String_Id.h.h:1773 msgid "Paper Si&ze:" msgstr "&Tamanho:" #. DLG_PageSetup_Paper -#: po/tmp/ap_String_Id.h.h:1761 +#: po/tmp/ap_String_Id.h.h:1775 msgid "Paper..." msgstr "Papel..." #. DLG_Styles_ModifyParagraph #. DLG_Para_ParaTitle -#: po/tmp/ap_String_Id.h.h:1764 +#: po/tmp/ap_String_Id.h.h:1778 msgid "Paragraph" msgstr "Pargrafo" #. FIELD_Numbers_ParaCount -#: po/tmp/ap_String_Id.h.h:1766 +#: po/tmp/ap_String_Id.h.h:1780 msgid "Paragraph Count" msgstr "Contagem de Pargrafos" #. TOOLBAR_LABEL_FMT_DOM_DIRECTION -#: po/tmp/ap_String_Id.h.h:1768 +#: po/tmp/ap_String_Id.h.h:1782 msgid "Paragraph Direction" msgstr "Orientao do pargrafo" #. DLG_Styles_ParaPrev -#: po/tmp/ap_String_Id.h.h:1770 +#: po/tmp/ap_String_Id.h.h:1784 msgid "Paragraph Preview" msgstr "Pargrafo" #. DLG_WordCount_Paragraphs -#: po/tmp/ap_String_Id.h.h:1772 +#: po/tmp/ap_String_Id.h.h:1786 msgid "Paragraphs:" msgstr "Pargrafos" #. WORD_PassRequired -#: po/tmp/ap_String_Id.h.h:1774 +#: po/tmp/ap_String_Id.h.h:1788 msgid "Password required, this is an encrypted document" msgstr "Este documento est protegido, por isso exige uma password" #. TOOLBAR_LABEL_EDIT_PASTE #. TOOLBAR_STATUSLINE_EDIT_PASTE #. TOOLBAR_TOOLTIP_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1778 +#: po/tmp/ap_String_Id.h.h:1792 msgid "Paste" msgstr "Colar" #. DLG_MetaData_TAB_Permission -#: po/tmp/ap_String_Id.h.h:1780 +#: po/tmp/ap_String_Id.h.h:1794 msgid "Permissions" msgstr "Permisses" #. DLG_Goto_Target_Picture -#: po/tmp/ap_String_Id.h.h:1782 +#: po/tmp/ap_String_Id.h.h:1796 msgid "Picture" msgstr "Figura" #. FIELD_Type_PieceTable -#: po/tmp/ap_String_Id.h.h:1784 +#: po/tmp/ap_String_Id.h.h:1798 msgid "Piece Table" msgstr "Parte de Tabela" #. DLG_FormatFootnotes_EndPlaceEndDoc -#: po/tmp/ap_String_Id.h.h:1786 +#: po/tmp/ap_String_Id.h.h:1800 msgid "Place at end of document" msgstr "Colocar no fim do documento" #. DLG_FormatFootnotes_EndPlaceEndSec -#: po/tmp/ap_String_Id.h.h:1788 +#: po/tmp/ap_String_Id.h.h:1802 msgid "Place at end of section" msgstr "Colocar no fim da seo" #. DLG_FormatFootnotes_EndPlacement -#: po/tmp/ap_String_Id.h.h:1790 +#: po/tmp/ap_String_Id.h.h:1804 msgid "Placement" msgstr "Posicionamento" #. DLG_Tab_Label_Position #. DLG_PageNumbers_Position_No_Colon -#: po/tmp/ap_String_Id.h.h:1793 +#: po/tmp/ap_String_Id.h.h:1807 msgid "Position" msgstr "Posio" #. DLG_FormatFrame_PositionTo -#: po/tmp/ap_String_Id.h.h:1795 +#: po/tmp/ap_String_Id.h.h:1809 msgid "Position Text Box" msgstr "Posicionar Caixa de Texto" #. DLG_FormatFrame_SetToColumn -#: po/tmp/ap_String_Id.h.h:1797 +#: po/tmp/ap_String_Id.h.h:1811 msgid "Position to Column" msgstr "Posicionar na Coluna " #. DLG_FormatFrame_SetToPage -#: po/tmp/ap_String_Id.h.h:1799 +#: po/tmp/ap_String_Id.h.h:1813 msgid "Position to Page" msgstr "Posicionar na Pgina" #. DLG_FormatFrame_SetToParagraph -#: po/tmp/ap_String_Id.h.h:1801 +#: po/tmp/ap_String_Id.h.h:1815 msgid "Position to Paragraph" msgstr "Posicionar no Pargrafo" #. DLG_PageNumbers_Position -#: po/tmp/ap_String_Id.h.h:1803 +#: po/tmp/ap_String_Id.h.h:1817 msgid "Position:" msgstr "Posio" #. MENU_LABEL_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:1805 +#: po/tmp/ap_String_Id.h.h:1819 msgid "Pr&eferences" msgstr "&Opes" #. DLG_Options_TabLabel_Preferences #. DLG_Options_Label_Schemes -#: po/tmp/ap_String_Id.h.h:1808 +#: po/tmp/ap_String_Id.h.h:1822 msgid "Preference Schemes" msgstr "Esquema de Preferncias..." #. DLG_Options_OptionsTitle -#: po/tmp/ap_String_Id.h.h:1810 +#: po/tmp/ap_String_Id.h.h:1824 msgid "Preferences" msgstr "Opes" @@ -4415,25 +4450,25 @@ #. DLG_Lists_Preview #. DLG_PageNumbers_Preview #. DLG_Zoom_PreviewFrame -#: po/tmp/ap_String_Id.h.h:1818 po/tmp/xap_String_Id.h.h:575 +#: po/tmp/ap_String_Id.h.h:1832 po/tmp/xap_String_Id.h.h:604 msgid "Preview" msgstr "Prvisualizar" #. MENU_STATUSLINE_WEB_WEBPREVIEW #. MENU_STATUSLINE_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:1821 +#: po/tmp/ap_String_Id.h.h:1835 msgid "Preview the document as a web page" msgstr "Ver o documento (antes de imprimir) como uma pgina de WWW" #. MENU_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1825 +#: po/tmp/ap_String_Id.h.h:1839 msgid "Preview the document before printing" msgstr "Ver documento antes de imprimir" #. DLG_Para_PreviewPrevParagraph -#: po/tmp/ap_String_Id.h.h:1827 +#: po/tmp/ap_String_Id.h.h:1841 msgid "" "Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph " "Previous Paragraph Previous Paragraph Previous Paragraph" @@ -4444,126 +4479,138 @@ #. TOOLBAR_LABEL_FILE_PRINT #. DLG_UP_PrintTitle #. DLG_UP_PrintButton -#: po/tmp/ap_String_Id.h.h:1829 po/tmp/xap_String_Id.h.h:580 +#: po/tmp/ap_String_Id.h.h:1843 po/tmp/xap_String_Id.h.h:609 msgid "Print" msgstr "Imprimir" #. MENU_LABEL_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1831 +#: po/tmp/ap_String_Id.h.h:1845 msgid "Print &directly" msgstr "Imprimir &Directamente" #. MENU_STATUSLINE_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:1833 +#: po/tmp/ap_String_Id.h.h:1847 msgid "Print Layout" msgstr "Ver documento como se impresso" #. MENU_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1835 +#: po/tmp/ap_String_Id.h.h:1849 msgid "Print P&review" msgstr "Visualizar Impresso" #. TOOLBAR_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1837 +#: po/tmp/ap_String_Id.h.h:1851 msgid "Print Preview" msgstr "Ver Antes" #. MENU_STATUSLINE_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1839 +#: po/tmp/ap_String_Id.h.h:1853 msgid "Print all or part of the document" msgstr "Imprimir" #. TOOLBAR_STATUSLINE_FILE_PRINT #. TOOLBAR_TOOLTIP_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1842 +#: po/tmp/ap_String_Id.h.h:1856 msgid "Print the document" msgstr "Imprimir" #. MENU_STATUSLINE_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1844 +#: po/tmp/ap_String_Id.h.h:1858 msgid "Print using the internal PS driver" msgstr "Imprimir com o driver interno de PostScript" #. MSG_PrintingDoc -#: po/tmp/ap_String_Id.h.h:1846 +#: po/tmp/ap_String_Id.h.h:1860 msgid "Printing Document.." msgstr "Imprimindo Documento..." #. MSG_PrintStatus -#: po/tmp/ap_String_Id.h.h:1848 +#: po/tmp/ap_String_Id.h.h:1862 #, c-format msgid "Printing page %d of %d" msgstr "Imprimindo pgina %d de %d" #. FIELD_Document_Publisher -#: po/tmp/ap_String_Id.h.h:1850 +#: po/tmp/ap_String_Id.h.h:1864 msgid "Publisher" msgstr "Publicador" #. DLG_MetaData_Publisher_LBL -#: po/tmp/ap_String_Id.h.h:1852 +#: po/tmp/ap_String_Id.h.h:1866 msgid "Publisher:" msgstr "Publicado por:" #. MENU_LABEL_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1854 +#: po/tmp/ap_String_Id.h.h:1868 msgid "R&eplace" msgstr "&Substituir" +#. MENU_LABEL_FMT_DIRECTION_DOCD_RTL +#: po/tmp/ap_String_Id.h.h:1870 +#, fuzzy +msgid "RTL &Document" +msgstr "&Documento" + #. MENU_LABEL_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:1856 +#: po/tmp/ap_String_Id.h.h:1872 msgid "RTL &Paragraph" msgstr "&Pargrafo da Direita para a Esquerda" +#. MENU_LABEL_FMT_DIRECTION_SD_RTL +#: po/tmp/ap_String_Id.h.h:1874 +#, fuzzy +msgid "RTL &Section" +msgstr "Seleo" + #. DLG_FR_ReplaceWithLabel -#: po/tmp/ap_String_Id.h.h:1858 +#: po/tmp/ap_String_Id.h.h:1876 msgid "Re&place with:" msgstr "...e sub&stituir por..." #. DLG_FR_ReverseFind -#: po/tmp/ap_String_Id.h.h:1860 +#: po/tmp/ap_String_Id.h.h:1878 msgid "Re&verse find" msgstr "Pesquisa em re&verso" #. MENU_LABEL_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1862 +#: po/tmp/ap_String_Id.h.h:1880 msgid "Re&vert" msgstr "&Reverter" #. MENU_LABEL_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1864 +#: po/tmp/ap_String_Id.h.h:1882 msgid "Recent &Files" msgstr "&Arquivos Recentes" #. TOOLBAR_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1866 +#: po/tmp/ap_String_Id.h.h:1884 msgid "Redo" msgstr "Refazer" #. TOOLBAR_STATUSLINE_EDIT_REDO #. TOOLBAR_TOOLTIP_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1869 +#: po/tmp/ap_String_Id.h.h:1887 msgid "Redo editing" msgstr "Refazer ltima ao cancelada" #. MENU_STATUSLINE_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1871 +#: po/tmp/ap_String_Id.h.h:1889 msgid "Redo previously undone editing" msgstr "Refazer ltima ao cancelada" #. MENU_STATUSLINE_VIEW_ZOOM_MENU #. MENU_STATUSLINE_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:1874 +#: po/tmp/ap_String_Id.h.h:1892 msgid "Reduce or enlarge the document display" msgstr "Aproximar ou afastar do texto" #. DLG_MetaData_Relation_LBL -#: po/tmp/ap_String_Id.h.h:1876 +#: po/tmp/ap_String_Id.h.h:1894 msgid "Relation:" msgstr "Relacionado:" #. DLG_Styles_RemoveButton -#: po/tmp/ap_String_Id.h.h:1878 +#: po/tmp/ap_String_Id.h.h:1896 msgid "Remove" msgstr "Remover" @@ -4571,7 +4618,7 @@ #. TOOLBAR_LABEL_EDIT_REMOVEFOOTER #. TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER #. TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1883 +#: po/tmp/ap_String_Id.h.h:1901 msgid "Remove Footer" msgstr "Remover Rodap" @@ -4579,164 +4626,164 @@ #. TOOLBAR_LABEL_EDIT_REMOVEHEADER #. TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER #. TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1888 +#: po/tmp/ap_String_Id.h.h:1906 msgid "Remove Header" msgstr "Remover Cabealho" #. DLG_Styles_RemoveLab -#: po/tmp/ap_String_Id.h.h:1890 +#: po/tmp/ap_String_Id.h.h:1908 msgid "Remove Property from Style" msgstr "Remover Propriedade ao Estilo" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1892 +#: po/tmp/ap_String_Id.h.h:1910 #, fuzzy msgid "Remove Row as Heading" msgstr "Repetir Linha como &Cabealho" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1894 +#: po/tmp/ap_String_Id.h.h:1912 #, fuzzy msgid "Remove Row as the page Heading" msgstr "Repetir Linha como &Cabealho" #. MENU_STATUSLINE_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1896 +#: po/tmp/ap_String_Id.h.h:1914 #, fuzzy msgid "Remove all revision information from the document" msgstr "Remover cabealho" #. MENU_STATUSLINE_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:1898 +#: po/tmp/ap_String_Id.h.h:1916 #, fuzzy msgid "Remove full document history from the document" msgstr "Remover cabealho" #. MENU_STATUSLINE_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1900 +#: po/tmp/ap_String_Id.h.h:1918 msgid "Remove the Footer on this page from the Document" msgstr "Remover rodap" #. MENU_STATUSLINE_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1902 +#: po/tmp/ap_String_Id.h.h:1920 msgid "Remove the Header on this page from the Document" msgstr "Remover cabealho" #. MENU_STATUSLINE_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:1904 +#: po/tmp/ap_String_Id.h.h:1922 msgid "Remove the Image and save a copy on the clipboard" msgstr "Remover a Imagem e salvar uma cpia na rea de Transferncia" #. MENU_STATUSLINE_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:1906 +#: po/tmp/ap_String_Id.h.h:1924 msgid "Remove the Image from the Document" msgstr "Remover a Imagem do Documento" #. MENU_STATUSLINE_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:1908 +#: po/tmp/ap_String_Id.h.h:1926 msgid "Remove the Text Box from the Document" msgstr "Remover a Caixa de Texto do Documento" #. MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:1910 +#: po/tmp/ap_String_Id.h.h:1928 msgid "Remove the suggested change" msgstr "Remover a alterao sugerida" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1912 +#: po/tmp/ap_String_Id.h.h:1930 msgid "Repeat Row as Heading" msgstr "Repetir Linha como &Cabealho" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1914 +#: po/tmp/ap_String_Id.h.h:1932 #, fuzzy msgid "Repeat Row as Heading on each new page" msgstr "Repetir Linha como &Cabealho" #. DLG_FR_ReplaceTitle -#: po/tmp/ap_String_Id.h.h:1916 +#: po/tmp/ap_String_Id.h.h:1934 msgid "Replace" msgstr "Substituir" #. DLG_FR_ReplaceAllButton -#: po/tmp/ap_String_Id.h.h:1918 +#: po/tmp/ap_String_Id.h.h:1936 msgid "Replace &All" msgstr "Substituir t&udo" #. MENU_STATUSLINE_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1920 +#: po/tmp/ap_String_Id.h.h:1938 msgid "Replace the specified text with different text" msgstr "Substituir no documento" #. MENU_LABEL_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1922 +#: po/tmp/ap_String_Id.h.h:1940 msgid "Report a &Bug" msgstr "Informe &Bugs" #. MENU_STATUSLINE_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1924 +#: po/tmp/ap_String_Id.h.h:1942 msgid "Report a bug and help AbiWord become a better product" msgstr "Relatar um erro e ajudar o AbiWord a se tornar um produto melhor" #. MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1926 +#: po/tmp/ap_String_Id.h.h:1944 msgid "Reset the current toolbar layout to its defaults" msgstr "Voltar o layout das barra de ferramenta atual para o padro" #. MENU_STATUSLINE_FMT_IMAGE -#: po/tmp/ap_String_Id.h.h:1928 +#: po/tmp/ap_String_Id.h.h:1946 msgid "Resize this image" msgstr "Mudar o tamanho desta imagem" #. DLG_HdrFtr_RestartNumbers -#: po/tmp/ap_String_Id.h.h:1930 +#: po/tmp/ap_String_Id.h.h:1948 msgid "Restart numbering at:" msgstr "... a partir de:" #. DLG_FormatFootnotes_FootRestartPage -#: po/tmp/ap_String_Id.h.h:1932 +#: po/tmp/ap_String_Id.h.h:1950 msgid "Restart on each page" msgstr "Recomear em cada pgina" #. DLG_FormatFootnotes_FootRestartSec #. DLG_FormatFootnotes_EndRestartSec -#: po/tmp/ap_String_Id.h.h:1935 +#: po/tmp/ap_String_Id.h.h:1953 msgid "Restart on each section" msgstr "Recomear em cada seo" #. DLG_HdrFtr_RestartCheck -#: po/tmp/ap_String_Id.h.h:1937 +#: po/tmp/ap_String_Id.h.h:1955 msgid "Restart page numbers on new sections" msgstr "Recomear numerao de pgina nas novas sees..." #. DLG_Lists_Resume_Previous_List -#: po/tmp/ap_String_Id.h.h:1939 +#: po/tmp/ap_String_Id.h.h:1957 msgid "Resume Previous List" msgstr "Continuar Lista An&terior" #. MENU_STATUSLINE_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:1941 +#: po/tmp/ap_String_Id.h.h:1959 msgid "Retain all document changes" msgstr "Reter todas as alteraes do documento" #. MSG_RevertFile -#: po/tmp/ap_String_Id.h.h:1943 +#: po/tmp/ap_String_Id.h.h:1961 msgid "Revert file to last saved state?" msgstr "Reverter o documento para o ltimo estado em que foi gravado" #. MENU_STATUSLINE_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1945 +#: po/tmp/ap_String_Id.h.h:1963 msgid "Revert the document to the last saved state" msgstr "Reverter o documento para o ltimo estado em que foi gravado" #. MSG_RevertBuffer -#: po/tmp/ap_String_Id.h.h:1947 +#: po/tmp/ap_String_Id.h.h:1965 #, c-format msgid "Revert to saved copy of %s?" msgstr "Reabrir '%s' com a ltima verso salva?" #. DLG_ListRevisions_Column1Label -#: po/tmp/ap_String_Id.h.h:1949 +#: po/tmp/ap_String_Id.h.h:1967 msgid "Revision ID" msgstr "Identificador de Reviso" @@ -4744,472 +4791,486 @@ #. DLG_Tab_Radio_Right #. DLG_PageNumbers_Right #. TOOLBAR_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1954 +#: po/tmp/ap_String_Id.h.h:1972 msgid "Right" msgstr " Direita" #. RightIndentStatus -#: po/tmp/ap_String_Id.h.h:1956 +#: po/tmp/ap_String_Id.h.h:1974 #, c-format msgid "Right Indent [%s]" msgstr "Identao Direita [%s]" #. RightMarginStatus -#: po/tmp/ap_String_Id.h.h:1958 +#: po/tmp/ap_String_Id.h.h:1976 #, c-format msgid "Right Margin [%s]" msgstr "Margem Direita [%s]" #. TabToggleRightTab -#: po/tmp/ap_String_Id.h.h:1960 +#: po/tmp/ap_String_Id.h.h:1978 msgid "Right Tab" msgstr " &Direita" #. TOOLBAR_STATUSLINE_ALIGN_RIGHT #. TOOLBAR_TOOLTIP_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1963 +#: po/tmp/ap_String_Id.h.h:1981 msgid "Right alignment" msgstr "Alinhar direita" #. MENU_STATUSLINE_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1965 +#: po/tmp/ap_String_Id.h.h:1983 msgid "Right-align the paragraph" msgstr "Alinhar direita" #. DLG_Para_DomDirection -#: po/tmp/ap_String_Id.h.h:1967 +#: po/tmp/ap_String_Id.h.h:1985 msgid "Right-to-left &dominant" msgstr "Principalmente &Esquerda para a Direita" #. FIELD_Document_Rights -#: po/tmp/ap_String_Id.h.h:1969 +#: po/tmp/ap_String_Id.h.h:1987 msgid "Rights" msgstr "Direitos" #. DLG_MetaData_Rights_LBL -#: po/tmp/ap_String_Id.h.h:1971 +#: po/tmp/ap_String_Id.h.h:1989 msgid "Rights:" msgstr "Direitos:" #. DLG_FormatTable_Apply_To_Row -#: po/tmp/ap_String_Id.h.h:1973 +#: po/tmp/ap_String_Id.h.h:1991 msgid "Row" msgstr "Linha" #. MENU_LABEL_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1975 +#: po/tmp/ap_String_Id.h.h:1993 msgid "Rows &Above" msgstr "Inserir &Linhas Antes" #. MENU_LABEL_TABLE_INSERT_ROWS_AFTER -#: po/tmp/ap_String_Id.h.h:1977 +#: po/tmp/ap_String_Id.h.h:1995 msgid "Rows &Below" msgstr "Inserir &Linhas Aps" #. MENU_LABEL_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1979 +#: po/tmp/ap_String_Id.h.h:1997 msgid "S&cripts" msgstr "S&cripts" #. MENU_LABEL_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:1981 +#: po/tmp/ap_String_Id.h.h:1999 msgid "S&how revisions" msgstr "M&ostrar revises" #. MENU_LABEL_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:1983 +#: po/tmp/ap_String_Id.h.h:2001 msgid "S&plit Cells" msgstr "Se¶r Clulas" #. DLG_Options_Btn_Save -#: po/tmp/ap_String_Id.h.h:1985 +#: po/tmp/ap_String_Id.h.h:2003 msgid "Sa&ve" msgstr "&Salvar" #. MENU_LABEL_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:1987 +#: po/tmp/ap_String_Id.h.h:2005 msgid "Sav&e Copy" msgstr "&Exportar" #. TOOLBAR_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:1989 +#: po/tmp/ap_String_Id.h.h:2007 msgid "Save" msgstr "Salvar" #. MENU_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:1991 +#: po/tmp/ap_String_Id.h.h:2009 msgid "Save &As" msgstr "Sal&var como" #. MENU_LABEL_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1993 +#: po/tmp/ap_String_Id.h.h:2011 msgid "Save &Template" msgstr "Salvar &Modelo" #. TOOLBAR_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:1995 +#: po/tmp/ap_String_Id.h.h:2013 msgid "Save As" msgstr "Salvar como" #. MENU_STATUSLINE_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:1997 +#: po/tmp/ap_String_Id.h.h:2015 msgid "Save a copy of the image on the clipboard" msgstr "Salvar uma cpia desta imagem na rea de transferncia" #. MSG_ConfirmSave -#: po/tmp/ap_String_Id.h.h:1999 +#: po/tmp/ap_String_Id.h.h:2017 #, c-format msgid "Save changes to document %s before closing?" msgstr "Salvar alteraes em %s?" #. MENU_STATUSLINE_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:2001 +#: po/tmp/ap_String_Id.h.h:2019 msgid "Save the Embedded Object" msgstr "Salvar o Objeto Embutido" #. MENU_STATUSLINE_FILE_SAVE #. TOOLBAR_STATUSLINE_FILE_SAVE #. TOOLBAR_TOOLTIP_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:2005 +#: po/tmp/ap_String_Id.h.h:2023 msgid "Save the document" msgstr "Salvar" #. MENU_STATUSLINE_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:2007 +#: po/tmp/ap_String_Id.h.h:2025 msgid "Save the document as a template" msgstr "Salvar o documento como modelo" #. MENU_STATUSLINE_FILE_SAVEAS #. TOOLBAR_STATUSLINE_FILE_SAVEAS #. TOOLBAR_TOOLTIP_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:2011 +#: po/tmp/ap_String_Id.h.h:2029 msgid "Save the document under a different name" msgstr "Salvar como" #. MENU_STATUSLINE_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:2013 +#: po/tmp/ap_String_Id.h.h:2031 msgid "Save the document without changing the current name" msgstr "Salvar como" #. MENU_STATUSLINE_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:2015 +#: po/tmp/ap_String_Id.h.h:2033 msgid "Save the selected image to a file" msgstr "Salvar a imagem selecionadas para um arquivo" #. MENU_LABEL_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:2017 +#: po/tmp/ap_String_Id.h.h:2035 #, fuzzy msgid "Save to file" msgstr "Salvar como" #. DLG_PageSetup_Scale -#: po/tmp/ap_String_Id.h.h:2019 +#: po/tmp/ap_String_Id.h.h:2037 msgid "Scale..." msgstr "Escala..." #. MENU_STATUSLINE_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:2021 +#: po/tmp/ap_String_Id.h.h:2039 msgid "Search for help about..." msgstr "Pesquisar ajuda sobre..." #. DLG_WordCount_Update_Rate -#: po/tmp/ap_String_Id.h.h:2023 +#: po/tmp/ap_String_Id.h.h:2041 msgid "Seconds between updates" msgstr "Perodo da atualizao" #. FIELD_DateTime_Epoch -#: po/tmp/ap_String_Id.h.h:2025 +#: po/tmp/ap_String_Id.h.h:2043 msgid "Seconds since the epoch" msgstr "Segundos desde epoch" #. DLG_Break_SectionBreaks_Capital -#: po/tmp/ap_String_Id.h.h:2027 +#: po/tmp/ap_String_Id.h.h:2045 msgid "Section Breaks" msgstr "Quebras de seo" #. DLG_Break_SectionBreaks -#: po/tmp/ap_String_Id.h.h:2029 +#: po/tmp/ap_String_Id.h.h:2047 msgid "Section breaks" msgstr "Quebra de seo" #. MENU_STATUSLINE_TOOLS_HISTORY -#: po/tmp/ap_String_Id.h.h:2031 +#: po/tmp/ap_String_Id.h.h:2049 msgid "See history of the current document" msgstr "Ver histrico do documento corrente" #. MENU_STATUSLINE_TABLE_SELECT #. DLG_Select -#: po/tmp/ap_String_Id.h.h:2033 po/tmp/xap_String_Id.h.h:630 +#: po/tmp/ap_String_Id.h.h:2051 po/tmp/xap_String_Id.h.h:667 msgid "Select" msgstr "Selecionar" #. MENU_LABEL_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2035 +#: po/tmp/ap_String_Id.h.h:2053 msgid "Select A&ll" msgstr "Selecionar &tudo" #. MENU_STATUSLINE_TABLE_SELECT_CELL -#: po/tmp/ap_String_Id.h.h:2037 +#: po/tmp/ap_String_Id.h.h:2055 msgid "Select Cell" msgstr "Selecionar Clula" #. MENU_STATUSLINE_TABLE_SELECT_COLUMN -#: po/tmp/ap_String_Id.h.h:2039 +#: po/tmp/ap_String_Id.h.h:2057 msgid "Select Column" msgstr "Selecionar Coluna" #. TOOLBAR_TOOLTIP_FMT_CHOOSE -#: po/tmp/ap_String_Id.h.h:2041 +#: po/tmp/ap_String_Id.h.h:2059 #, fuzzy msgid "Select Font" msgstr "Seleo" #. DLG_ListRevisions_Title -#: po/tmp/ap_String_Id.h.h:2043 +#: po/tmp/ap_String_Id.h.h:2061 msgid "Select Revision" msgstr "Selecionar Reviso" #. MENU_STATUSLINE_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:2045 +#: po/tmp/ap_String_Id.h.h:2063 msgid "Select Row" msgstr "Selecionar Linha" #. MENU_STATUSLINE_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:2047 +#: po/tmp/ap_String_Id.h.h:2065 msgid "Select Table" msgstr "Selecionar Tabela" #. MENU_LABEL_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2049 +#: po/tmp/ap_String_Id.h.h:2067 msgid "Select Text Box" msgstr "Selecionar Caixa de Texto" #. DLG_InsertHyperlink_Msg -#: po/tmp/ap_String_Id.h.h:2051 +#: po/tmp/ap_String_Id.h.h:2069 msgid "Select a target bookmark from the list." msgstr "Selecionar um marcador alvo a partir da lista" #. DLG_FormatFrame_SelectImage #. DLG_FormatTable_SelectImage -#: po/tmp/ap_String_Id.h.h:2054 +#: po/tmp/ap_String_Id.h.h:2072 msgid "Select image from File" msgstr "Selecionar imagem do Arquivo" #. MENU_STATUSLINE_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2056 +#: po/tmp/ap_String_Id.h.h:2074 msgid "Select the Text Box" msgstr "Selecionar a Caixa de Texto" #. MENU_STATUSLINE_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2058 +#: po/tmp/ap_String_Id.h.h:2076 msgid "Select the entire document" msgstr "Selecionar todo o documento" #. DLG_FormatTable_Apply_To_Selection #. DLG_UP_Selection -#: po/tmp/ap_String_Id.h.h:2060 po/tmp/xap_String_Id.h.h:638 +#: po/tmp/ap_String_Id.h.h:2078 po/tmp/xap_String_Id.h.h:675 msgid "Selection" msgstr "Seleo" #. DLG_ToggleCase_SentenceCase -#: po/tmp/ap_String_Id.h.h:2062 +#: po/tmp/ap_String_Id.h.h:2080 msgid "Sentence case" msgstr "Capitalizao da frase" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2064 +#: po/tmp/ap_String_Id.h.h:2082 msgid "Separate table items with commas" msgstr "Separar tens da tabela com vrgulas" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2066 +#: po/tmp/ap_String_Id.h.h:2084 msgid "Separate table items with commas and tabs" msgstr "Separar tens da tabela com vrgulas e tabulaes" #. MENU_STATUSLINE_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2068 +#: po/tmp/ap_String_Id.h.h:2086 msgid "Separate table items with tabs" msgstr "Separar tens da tabela com tabulaes" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2070 +#: po/tmp/ap_String_Id.h.h:2088 msgid "Separate with commas" msgstr "Separar com vrgulas" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2072 +#: po/tmp/ap_String_Id.h.h:2090 msgid "Separate with commas and tabs" msgstr "Separar com vrgulas e tabulaes" #. MENU_LABEL_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2074 +#: po/tmp/ap_String_Id.h.h:2092 #, fuzzy msgid "Separate with tabs" msgstr "Caracteres (contando espaos)" #. DLG_Tab_Button_Set -#: po/tmp/ap_String_Id.h.h:2076 +#: po/tmp/ap_String_Id.h.h:2094 msgid "Set" msgstr "C&riar" #. MENU_LABEL_FMT_LANGUAGE -#: po/tmp/ap_String_Id.h.h:2078 +#: po/tmp/ap_String_Id.h.h:2096 msgid "Set &Language" msgstr "&Idioma" #. DLG_Lists_SetDefault -#: po/tmp/ap_String_Id.h.h:2080 +#: po/tmp/ap_String_Id.h.h:2098 msgid "Set Default Values" msgstr "Usar valores por omisso" #. DLG_FormatFrame_SetImage #. DLG_FormatTable_SetImage -#: po/tmp/ap_String_Id.h.h:2083 +#: po/tmp/ap_String_Id.h.h:2101 msgid "Set Image" msgstr "Colocar Imagem" #. MENU_LABEL_FMT_SETPOSIMAGE -#: po/tmp/ap_String_Id.h.h:2085 +#: po/tmp/ap_String_Id.h.h:2103 msgid "Set Positioned Image" msgstr "Colocar Imagem Posicionada" #. DLG_FormatFrame_SetTextWrapping -#: po/tmp/ap_String_Id.h.h:2087 +#: po/tmp/ap_String_Id.h.h:2105 msgid "Set Text Wrapping" msgstr "Colocar Contorno de Texto" #. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:2089 +#: po/tmp/ap_String_Id.h.h:2107 msgid "Set an image as a background for your page" msgstr "Colocar uma imagem como fundo para sua pgina" +#. MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL +#: po/tmp/ap_String_Id.h.h:2109 +#, fuzzy +msgid "Set dominant direction of document to RTL" +msgstr "Mudar a direo dominante do pargrafo para DPE" + #. MENU_STATUSLINE_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:2091 +#: po/tmp/ap_String_Id.h.h:2111 msgid "Set dominant direction of paragraph to RTL" msgstr "Mudar a direo dominante do pargrafo para DPE" +#. MENU_STATUSLINE_FMT_DIRECTION_SD_RTL +#: po/tmp/ap_String_Id.h.h:2113 +#, fuzzy +msgid "Set dominant direction of section to RTL" +msgstr "Mudar a direo dominante do pargrafo para DPE" + #. MENU_STATUSLINE_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:2093 +#: po/tmp/ap_String_Id.h.h:2115 msgid "Set meta-data properties" msgstr "Mudar propriedades de meta-data" #. DLG_Tab_Label_New -#: po/tmp/ap_String_Id.h.h:2095 +#: po/tmp/ap_String_Id.h.h:2117 #, fuzzy msgid "Set new Tab" msgstr "&Centralizar" #. DLG_FormatFrame_NoImageBackground #. DLG_FormatTable_NoImageBackground -#: po/tmp/ap_String_Id.h.h:2098 +#: po/tmp/ap_String_Id.h.h:2120 msgid "Set no image" msgstr "No colocar imagem" #. MENU_STATUSLINE_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:2100 +#: po/tmp/ap_String_Id.h.h:2122 msgid "Set preferences" msgstr "Configurar as opes" #. MENU_STATUSLINE_FMT_TABS -#: po/tmp/ap_String_Id.h.h:2102 +#: po/tmp/ap_String_Id.h.h:2124 msgid "Set tab stops" msgstr "Definir tabulao" #. MENU_STATUSLINE_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2104 +#: po/tmp/ap_String_Id.h.h:2126 msgid "Set the type and styles of the Table of Contents" msgstr "Configurar a fonte e os estilos do ndice" #. MENU_STATUSLINE_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:2106 +#: po/tmp/ap_String_Id.h.h:2128 msgid "Set the types of Footnotes and Endnotes" msgstr "Configurar as fontes dos Rodaps e Notas de Pgina" #. MENU_STATUSLINE_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:2108 +#: po/tmp/ap_String_Id.h.h:2130 msgid "Set the types of Headers and Footers" msgstr "Definir os tipos de Cabealhos e Rodaps" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2110 +#: po/tmp/ap_String_Id.h.h:2132 #, fuzzy msgid "Set this Row as Heading" msgstr "Repetir Linha como &Cabealho" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2112 +#: po/tmp/ap_String_Id.h.h:2134 msgid "Set this Row as the Heading on each page" msgstr "Fazer esta linha ser o cabealho em cada pgina" #. MENU_STATUSLINE_FMT_SETPOSIMAGE -#: po/tmp/ap_String_Id.h.h:2114 +#: po/tmp/ap_String_Id.h.h:2136 msgid "Set this image to be positioned" msgstr "Fazer esta imagem ser posicionada" #. MENU_STATUSLINE_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2116 +#: po/tmp/ap_String_Id.h.h:2138 msgid "Set your spelling preferences" msgstr "Definir opes de ortografia" #. MENU_STATUSLINE_FMT_DOCUMENT -#: po/tmp/ap_String_Id.h.h:2118 +#: po/tmp/ap_String_Id.h.h:2140 msgid "Setup your document's page properties such as page size and margins" -msgstr "Configurar as propriedades do seu documento, como tamanho de pgina e margens" -"Formatar propriedades do documento, tais como tamanho do papel e margens" +msgstr "" +"Configurar as propriedades do seu documento, como tamanho de pgina e " +"margensFormatar propriedades do documento, tais como tamanho do papel e " +"margens" #. DLG_Styles_ModifyShortCut -#: po/tmp/ap_String_Id.h.h:2120 +#: po/tmp/ap_String_Id.h.h:2142 msgid "Shortcut Key" msgstr "Comando de teclado" #. DLG_Options_Label_Show #. DLG_Show -#: po/tmp/ap_String_Id.h.h:2122 po/tmp/xap_String_Id.h.h:650 +#: po/tmp/ap_String_Id.h.h:2144 po/tmp/xap_String_Id.h.h:687 msgid "Show" msgstr "Mostrar" #. MENU_LABEL_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2124 +#: po/tmp/ap_String_Id.h.h:2146 msgid "Show &Ruler" msgstr "&Rguas" #. TOOLBAR_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2126 +#: po/tmp/ap_String_Id.h.h:2148 msgid "Show All" msgstr "Ver Pargrafos" #. MENU_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2128 +#: po/tmp/ap_String_Id.h.h:2150 msgid "Show For&matting Marks" msgstr "M&ostrar " #. MENU_LABEL_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2130 +#: po/tmp/ap_String_Id.h.h:2152 msgid "Show document &before revisions" msgstr "Mostrar documento &antes das revises" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2132 +#: po/tmp/ap_String_Id.h.h:2154 msgid "Show document a&fter revisions" msgstr "Mostrar o documento a&ps as revises" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2134 +#: po/tmp/ap_String_Id.h.h:2156 msgid "Show document after &previous revisions" msgstr "Mostrar o documento antes das revises &prvias" #. MENU_STATUSLINE_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:2136 +#: po/tmp/ap_String_Id.h.h:2158 msgid "Show full list of documents" msgstr "Mostrar lista completa de janelas" #. MENU_STATUSLINE_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2138 +#: po/tmp/ap_String_Id.h.h:2160 msgid "Show or hide the rulers" msgstr "Ver/Omitir Rguas" #. MENU_STATUSLINE_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:2140 +#: po/tmp/ap_String_Id.h.h:2162 msgid "Show or hide the status bar" msgstr "Ver/Omitir Barra de Mensagens" @@ -5217,323 +5278,318 @@ #. MENU_STATUSLINE_VIEW_TB_2 #. MENU_STATUSLINE_VIEW_TB_3 #. MENU_STATUSLINE_VIEW_TB_4 -#: po/tmp/ap_String_Id.h.h:2145 +#: po/tmp/ap_String_Id.h.h:2167 msgid "Show or hide the toolbar" msgstr "Mostrar ou esconder a barra de ferramentas" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:2147 +#: po/tmp/ap_String_Id.h.h:2169 msgid "Show revisions that are present in document" msgstr "Mostrar revises presentes no documento" -#. DLG_Options_Label_ShowSplash -#: po/tmp/ap_String_Id.h.h:2149 -msgid "Show the AbiWord splash screen on application startup" -msgstr "Exibir logotipo de inicializao" - #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2151 +#: po/tmp/ap_String_Id.h.h:2171 msgid "Show what the document looks like after previous revisions" msgstr "Mostar como o documento era aps revises anteriores" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2153 +#: po/tmp/ap_String_Id.h.h:2173 msgid "Show what the document looks like after revisions" msgstr "Mostrar como o documento ser aps revises" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2155 +#: po/tmp/ap_String_Id.h.h:2175 msgid "Show what the document looks like before revisions" msgstr "Mostrar como o documento antes das revises" #. DLG_Options_Label_ViewShowHide -#: po/tmp/ap_String_Id.h.h:2157 +#: po/tmp/ap_String_Id.h.h:2177 msgid "Show..." msgstr "Ver..." #. TOOLBAR_STATUSLINE_VIEW_SHOWPARA #. TOOLBAR_TOOLTIP_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2160 +#: po/tmp/ap_String_Id.h.h:2180 msgid "Show/hide formatting marks" msgstr "Ver/Esconder " #. TB_Simple -#: po/tmp/ap_String_Id.h.h:2162 +#: po/tmp/ap_String_Id.h.h:2182 #, fuzzy msgid "Simple" msgstr "Amostra" #. DLG_Options_Label_ViewSimpleTB -#: po/tmp/ap_String_Id.h.h:2164 +#: po/tmp/ap_String_Id.h.h:2184 #, fuzzy msgid "Simple Toolbar" msgstr "Formatao" #. DLG_Para_SpacingSingle -#: po/tmp/ap_String_Id.h.h:2166 +#: po/tmp/ap_String_Id.h.h:2186 msgid "Single" msgstr "Simples" #. TOOLBAR_LABEL_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2168 +#: po/tmp/ap_String_Id.h.h:2188 msgid "Single Spacing" msgstr "Espaamento simples" #. TOOLBAR_STATUSLINE_SINGLE_SPACE #. TOOLBAR_TOOLTIP_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2171 +#: po/tmp/ap_String_Id.h.h:2191 msgid "Single spacing" msgstr "Espaamento simples" #. MENU_LABEL_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2173 +#: po/tmp/ap_String_Id.h.h:2193 msgid "So&rt Table" msgstr "&Ordenar Tabela" #. MENU_LABEL_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2175 +#: po/tmp/ap_String_Id.h.h:2195 msgid "Sort Columns in Ascending Order" msgstr "Ordenar Colunas em ordem ascendente" #. MENU_STATUSLINE_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2177 +#: po/tmp/ap_String_Id.h.h:2197 msgid "Sort Columns in Ascending Order based on Selected Row" msgstr "Order" #. MENU_LABEL_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2179 +#: po/tmp/ap_String_Id.h.h:2199 msgid "Sort Columns in Descending Order" msgstr "Ordenar colunas em orden descendente" #. MENU_STATUSLINE_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2181 +#: po/tmp/ap_String_Id.h.h:2201 msgid "Sort Columns in Descending Order based on Selected Row" msgstr "Ordenar colunas em ordem descendente baseado na linha selecionada" #. MENU_LABEL_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2183 +#: po/tmp/ap_String_Id.h.h:2203 msgid "Sort Rows in Ascending Order" msgstr "Odenar linhas em ordem ascendente" #. MENU_STATUSLINE_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2185 +#: po/tmp/ap_String_Id.h.h:2205 msgid "Sort Rows in Ascending Order based on selected Column" msgstr "Ordenar linhas em ordem ascendente baseado na coluna selecionada" #. MENU_LABEL_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2187 +#: po/tmp/ap_String_Id.h.h:2207 msgid "Sort Rows in Descending Order" msgstr "Ordenar linhas em ordem descendente" #. MENU_STATUSLINE_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2189 +#: po/tmp/ap_String_Id.h.h:2209 msgid "Sort Rows in Descending Order based on Selected Column" msgstr "Ordenar linhas em ordem descendente baseado na coluna selecionada" #. MENU_STATUSLINE_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2191 +#: po/tmp/ap_String_Id.h.h:2211 msgid "Sort Table" msgstr "Ordenar Tabela" #. DLG_MetaData_Source_LBL -#: po/tmp/ap_String_Id.h.h:2193 +#: po/tmp/ap_String_Id.h.h:2213 msgid "Source:" msgstr "Fonte:" #. DLG_Column_Space_After -#: po/tmp/ap_String_Id.h.h:2195 +#: po/tmp/ap_String_Id.h.h:2215 msgid "Space after Column" msgstr "Espao aps coluna " #. TOOLBAR_STATUSLINE_PARA_12BEFORE #. TOOLBAR_TOOLTIP_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:2198 +#: po/tmp/ap_String_Id.h.h:2218 msgid "Space before: 12 pt" msgstr "Espaamento anterior: 12 pt" #. TOOLBAR_STATUSLINE_PARA_0BEFORE #. TOOLBAR_TOOLTIP_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:2201 +#: po/tmp/ap_String_Id.h.h:2221 msgid "Space before: None" msgstr "Espaamento anterior: nenhum" #. DLG_Para_LabelSpacing -#: po/tmp/ap_String_Id.h.h:2203 +#: po/tmp/ap_String_Id.h.h:2223 msgid "Spacing" msgstr "Espaamento" #. DLG_Options_SpellCheckingTitle -#: po/tmp/ap_String_Id.h.h:2205 +#: po/tmp/ap_String_Id.h.h:2225 msgid "Spell Checking" msgstr "Verificao Ortogrfica" #. TOOLBAR_LABEL_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2207 +#: po/tmp/ap_String_Id.h.h:2227 msgid "Spellcheck" msgstr "Ortografia" #. TOOLBAR_STATUSLINE_SPELLCHECK #. TOOLBAR_TOOLTIP_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2210 +#: po/tmp/ap_String_Id.h.h:2230 msgid "Spellcheck the document" msgstr "Verificar ortografia" #. DLG_Spell_SpellTitle #. DLG_Options_TabLabel_Spelling -#: po/tmp/ap_String_Id.h.h:2213 +#: po/tmp/ap_String_Id.h.h:2233 msgid "Spelling" msgstr "Ortografia" #. MENU_LABEL_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2215 +#: po/tmp/ap_String_Id.h.h:2235 msgid "Spelling &Options" msgstr "&Opes de Ortografia" #. MENU_LABEL_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2217 +#: po/tmp/ap_String_Id.h.h:2237 msgid "Spli&t Table" msgstr "Se¶r Tabela" #. DLG_SplitCellsTitle #. DLG_SplitCells_Frame #. MENU_STATUSLINE_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2221 +#: po/tmp/ap_String_Id.h.h:2241 msgid "Split Cells" msgstr "Dividir Clulas" #. MENU_STATUSLINE_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2223 +#: po/tmp/ap_String_Id.h.h:2243 msgid "Split Table" msgstr "Dividir Tabela" #. TOOLBAR_LABEL_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2225 +#: po/tmp/ap_String_Id.h.h:2245 msgid "Split cells" msgstr "Separar clulas" #. DLG_SplitCells_HoriMid #. DLG_SplitCells_VertMid -#: po/tmp/ap_String_Id.h.h:2228 +#: po/tmp/ap_String_Id.h.h:2248 msgid "Split in Middle" msgstr "Dividir ao Meio" #. DLG_SplitCells_Below -#: po/tmp/ap_String_Id.h.h:2230 +#: po/tmp/ap_String_Id.h.h:2250 msgid "Split on Bottom Side" msgstr "Dividir pelo Lado de Baixo" #. DLG_SplitCells_Left -#: po/tmp/ap_String_Id.h.h:2232 +#: po/tmp/ap_String_Id.h.h:2252 msgid "Split on Left Side" msgstr "Dividir pelo Lado Esquerdo" #. DLG_SplitCells_Right -#: po/tmp/ap_String_Id.h.h:2234 +#: po/tmp/ap_String_Id.h.h:2254 msgid "Split on Right Side" msgstr "Dividir pelo Lado Direito" #. DLG_SplitCells_Above -#: po/tmp/ap_String_Id.h.h:2236 +#: po/tmp/ap_String_Id.h.h:2256 msgid "Split on Top Side" msgstr "Dividir pelo Lado de Cima" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2238 +#: po/tmp/ap_String_Id.h.h:2258 msgid "Split on all delimiters except spaces" msgstr "Dividir em todos os delimitadores com exceo dos espaos" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2240 +#: po/tmp/ap_String_Id.h.h:2260 msgid "Split on all word delimiters including spaces" msgstr "Dividir em todos os delimitadores de palavras, incluindo espaos" #. MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2242 +#: po/tmp/ap_String_Id.h.h:2262 msgid "Split text at commas or tabs" msgstr "Dividir texto em vrgulas ou tabulaes" #. MENU_LABEL_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2244 +#: po/tmp/ap_String_Id.h.h:2264 msgid "Split text at spaces, commas, or tabs" msgstr "Dividir texto em espaos, vrgulas ou tabulaes" #. TOOLBAR_STATUSLINE_SPLIT_CELLS #. TOOLBAR_TOOLTIP_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2247 +#: po/tmp/ap_String_Id.h.h:2267 msgid "Split this cell" msgstr "Separar clulas" #. DLG_Lists_Square_List #. STYLE_SQUARELIST -#: po/tmp/ap_String_Id.h.h:2249 po/tmp/xap_String_Id.h.h:662 +#: po/tmp/ap_String_Id.h.h:2269 po/tmp/xap_String_Id.h.h:699 msgid "Square List" msgstr "Lista com Quadrados" #. MENU_LABEL_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2251 +#: po/tmp/ap_String_Id.h.h:2271 msgid "St&yle" msgstr "&Estilo" #. TB_Standard -#: po/tmp/ap_String_Id.h.h:2253 +#: po/tmp/ap_String_Id.h.h:2273 msgid "Standard" msgstr "Padro" #. DLG_Options_Label_ViewStandardTB -#: po/tmp/ap_String_Id.h.h:2255 +#: po/tmp/ap_String_Id.h.h:2275 msgid "Standard Toolbar" msgstr "Barra de ferramentas padro" #. DLG_Lists_Star_List #. STYLE_STARLIST -#: po/tmp/ap_String_Id.h.h:2257 po/tmp/xap_String_Id.h.h:666 +#: po/tmp/ap_String_Id.h.h:2277 po/tmp/xap_String_Id.h.h:703 msgid "Star List" msgstr "Lista com Estrelas" #. DLG_Lists_Start -#: po/tmp/ap_String_Id.h.h:2259 +#: po/tmp/ap_String_Id.h.h:2279 msgid "Start At:" msgstr "Comear em:" #. DLG_Lists_Start_New_List #. DLG_Lists_Start_New -#: po/tmp/ap_String_Id.h.h:2262 +#: po/tmp/ap_String_Id.h.h:2282 msgid "Start New List" msgstr "Comear nova lista" #. DLG_Lists_Start_Sub -#: po/tmp/ap_String_Id.h.h:2264 +#: po/tmp/ap_String_Id.h.h:2284 msgid "Start Sublist" msgstr "Comear sublista" #. DLG_MarkRevisions_Check2Label -#: po/tmp/ap_String_Id.h.h:2266 +#: po/tmp/ap_String_Id.h.h:2286 msgid "Start a new revision" msgstr "Comear nova reviso" #. MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2268 +#: po/tmp/ap_String_Id.h.h:2288 #, fuzzy msgid "Start ne&w revision" msgstr "Comear nova reviso" #. MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2270 +#: po/tmp/ap_String_Id.h.h:2290 msgid "Start revision distinct from the current one" msgstr "Iniciar uma reviso distinta da reviso corrente" #. DLG_WordCount_Statistics -#: po/tmp/ap_String_Id.h.h:2272 +#: po/tmp/ap_String_Id.h.h:2292 msgid "Statistics:" msgstr "Estatsticas" #. DLG_Lists_Stop_Current_List -#: po/tmp/ap_String_Id.h.h:2274 +#: po/tmp/ap_String_Id.h.h:2294 msgid "Stop Current List" msgstr "Terminar lista" #. MENU_LABEL_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2276 +#: po/tmp/ap_String_Id.h.h:2296 msgid "Stri&ke" msgstr "&Riscar" @@ -5541,76 +5597,76 @@ #. TOOLBAR_STATUSLINE_FMT_STRIKE #. TOOLBAR_TOOLTIP_FMT_STRIKE #. DLG_UFS_StrikeoutCheck -#: po/tmp/ap_String_Id.h.h:2280 po/tmp/xap_String_Id.h.h:668 +#: po/tmp/ap_String_Id.h.h:2300 po/tmp/xap_String_Id.h.h:705 msgid "Strike" msgstr "Riscado" #. MENU_STATUSLINE_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2282 +#: po/tmp/ap_String_Id.h.h:2302 msgid "Strikeout the selection (toggle)" msgstr "Riscar texto" #. MENU_LABEL_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:2284 +#: po/tmp/ap_String_Id.h.h:2304 msgid "Sty&list" msgstr "" #. TOOLBAR_LABEL_FMT_STYLE #. TOOLBAR_STATUSLINE_FMT_STYLE #. TOOLBAR_TOOLTIP_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2288 +#: po/tmp/ap_String_Id.h.h:2308 msgid "Style" msgstr "Estilo" #. DLG_Styles_ErrNotTitle1 -#: po/tmp/ap_String_Id.h.h:2290 +#: po/tmp/ap_String_Id.h.h:2310 msgid "Style Name - " msgstr "Nome do Estilo - " #. DLG_Styles_ModifyName -#: po/tmp/ap_String_Id.h.h:2292 +#: po/tmp/ap_String_Id.h.h:2312 msgid "Style Name:" msgstr "Nome do estilo:" #. DLG_Styles_ModifyType -#: po/tmp/ap_String_Id.h.h:2294 +#: po/tmp/ap_String_Id.h.h:2314 msgid "Style Type" msgstr "Tipo do Estilo" #. DLG_Styles_ModifyFollowing -#: po/tmp/ap_String_Id.h.h:2296 +#: po/tmp/ap_String_Id.h.h:2316 msgid "Style for following paragraph" msgstr "Estilo do pargrafo seguinte" #. DLG_Styles_ErrBlankName -#: po/tmp/ap_String_Id.h.h:2298 +#: po/tmp/ap_String_Id.h.h:2318 msgid "Style name cannot be left blank" msgstr "O nome do estilo no pode ficar em branco" #. DLG_Lists_Style #. DLG_UFS_StyleLabel -#: po/tmp/ap_String_Id.h.h:2300 po/tmp/xap_String_Id.h.h:670 +#: po/tmp/ap_String_Id.h.h:2320 po/tmp/xap_String_Id.h.h:707 msgid "Style:" msgstr "Estilo:" #. DLG_Styles_StylesTitle #. DLG_Stylist_Styles -#: po/tmp/ap_String_Id.h.h:2303 +#: po/tmp/ap_String_Id.h.h:2323 msgid "Styles" msgstr "Estilos" #. DLG_Stylist_Title -#: po/tmp/ap_String_Id.h.h:2305 +#: po/tmp/ap_String_Id.h.h:2325 msgid "Stylist" msgstr "" #. FIELD_Document_Subject -#: po/tmp/ap_String_Id.h.h:2307 +#: po/tmp/ap_String_Id.h.h:2327 msgid "Subject" msgstr "Definir" #. DLG_MetaData_Subject_LBL -#: po/tmp/ap_String_Id.h.h:2309 +#: po/tmp/ap_String_Id.h.h:2329 msgid "Subject:" msgstr "Assunto:" @@ -5618,47 +5674,47 @@ #. TOOLBAR_STATUSLINE_FMT_SUBSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUBSCRIPT #. DLG_UFS_SubScript -#: po/tmp/ap_String_Id.h.h:2313 po/tmp/xap_String_Id.h.h:674 +#: po/tmp/ap_String_Id.h.h:2333 po/tmp/xap_String_Id.h.h:711 msgid "Subscript" msgstr "ndice" #. DLG_Spell_Suggestions -#: po/tmp/ap_String_Id.h.h:2315 +#: po/tmp/ap_String_Id.h.h:2335 msgid "Sugg&estions:" msgstr "Sugestes:" #. DLG_Options_Label_SpellMainOnly -#: po/tmp/ap_String_Id.h.h:2317 +#: po/tmp/ap_String_Id.h.h:2337 msgid "Suggest from &main dictionary only" msgstr "Sugerir apenas do dicionrio principal" #. MENU_LABEL_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:2319 +#: po/tmp/ap_String_Id.h.h:2339 msgid "Sum a Column" msgstr "Somar uma coluna" #. MENU_LABEL_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:2321 +#: po/tmp/ap_String_Id.h.h:2341 msgid "Sum a Row" msgstr "Somar uma Linha" #. FIELD_Numbers_TableSumRows -#: po/tmp/ap_String_Id.h.h:2323 +#: po/tmp/ap_String_Id.h.h:2343 msgid "Sum a Table Column" msgstr "Somar uma coluna da tabela" #. FIELD_Numbers_TableSumCols -#: po/tmp/ap_String_Id.h.h:2325 +#: po/tmp/ap_String_Id.h.h:2345 msgid "Sum a Table Row" msgstr "Somar uma linha da tabela" #. DLG_MetaData_TAB_Summary -#: po/tmp/ap_String_Id.h.h:2327 +#: po/tmp/ap_String_Id.h.h:2347 msgid "Summary" msgstr "Resumo" #. MENU_LABEL_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:2329 +#: po/tmp/ap_String_Id.h.h:2349 msgid "Supe&rscript" msgstr "&Expoente" @@ -5666,153 +5722,143 @@ #. TOOLBAR_STATUSLINE_FMT_SUPERSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUPERSCRIPT #. DLG_UFS_SuperScript -#: po/tmp/ap_String_Id.h.h:2333 po/tmp/xap_String_Id.h.h:676 +#: po/tmp/ap_String_Id.h.h:2353 po/tmp/xap_String_Id.h.h:713 msgid "Superscript" msgstr "Expoente" #. MENU_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2335 +#: po/tmp/ap_String_Id.h.h:2355 msgid "Sy&mbol" msgstr "&Smbolo" #. TOOLBAR_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2337 +#: po/tmp/ap_String_Id.h.h:2357 msgid "Symbol" msgstr "Smbolo" #. MENU_LABEL_TABLE -#: po/tmp/ap_String_Id.h.h:2339 +#: po/tmp/ap_String_Id.h.h:2359 msgid "T&able" msgstr "&Tabelas" #. TabStopStatus -#: po/tmp/ap_String_Id.h.h:2341 +#: po/tmp/ap_String_Id.h.h:2361 #, c-format msgid "Tab Stop [%s]" msgstr "Fim de Tabulao [%s]" #. DLG_Tab_Label_TabPosition -#: po/tmp/ap_String_Id.h.h:2343 +#: po/tmp/ap_String_Id.h.h:2363 msgid "Tab stop position:" msgstr "Fim da tabulao" #. DLG_Tab_Label_TabToClear -#: po/tmp/ap_String_Id.h.h:2345 +#: po/tmp/ap_String_Id.h.h:2365 msgid "Tab stops to be cleared:" msgstr "Tabulaes a eliminar" #. DLG_FormatTable_Apply_To_Table #. MENU_STATUSLINE_TABLE #. TB_Table -#: po/tmp/ap_String_Id.h.h:2349 po/tmp/xap_String_Id.h.h:686 +#: po/tmp/ap_String_Id.h.h:2369 po/tmp/xap_String_Id.h.h:723 msgid "Table" msgstr "Tabela" #. DLG_InsertTable_TableSize_Capital -#: po/tmp/ap_String_Id.h.h:2351 +#: po/tmp/ap_String_Id.h.h:2371 msgid "Table Size" msgstr "Tamanho da tabela" #. DLG_Options_Label_ViewTableTB -#: po/tmp/ap_String_Id.h.h:2353 +#: po/tmp/ap_String_Id.h.h:2373 msgid "Table Toolbar" msgstr "Barra de Ferramentas de Tabelas" -#. TOC_TocHeading #. MENU_LABEL_INSERT_TABLEOFCONTENTS #. MENU_LABEL_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2357 +#: po/tmp/ap_String_Id.h.h:2376 msgid "Table of Contents" msgstr "ndice" #. FIELD_Numbers_TOCListLabel -#: po/tmp/ap_String_Id.h.h:2359 +#: po/tmp/ap_String_Id.h.h:2378 msgid "Table of Contents List Label" msgstr "Rtulo de Lista do ndice" #. FIELD_Numbers_TOCPageNumber -#: po/tmp/ap_String_Id.h.h:2361 +#: po/tmp/ap_String_Id.h.h:2380 msgid "Table of Contents Page" msgstr "Pgina do ndice" #. DLG_InsertTable_TableSize -#: po/tmp/ap_String_Id.h.h:2363 +#: po/tmp/ap_String_Id.h.h:2382 msgid "Table size" msgstr "Tamanho da tabela" #. DLG_Styles_ModifyTabs #. DLG_Tab_TabTitle -#: po/tmp/ap_String_Id.h.h:2366 +#: po/tmp/ap_String_Id.h.h:2385 msgid "Tabs" msgstr "Tabulao" #. DLG_FormatTOC_DetailsTabPage -#: po/tmp/ap_String_Id.h.h:2368 +#: po/tmp/ap_String_Id.h.h:2387 msgid "Tabs and Page Numbering" msgstr "Tabulaes e numerao de pginas" #. MENU_LABEL_FMT -#: po/tmp/ap_String_Id.h.h:2370 +#: po/tmp/ap_String_Id.h.h:2389 msgid "Te&xt Formatting" msgstr "Formatao do Te&xto" #. DLG_Options_Label_Text -#: po/tmp/ap_String_Id.h.h:2372 +#: po/tmp/ap_String_Id.h.h:2391 msgid "Text" msgstr "Texto" #. DLG_FormatTOC_TextAfter -#: po/tmp/ap_String_Id.h.h:2374 +#: po/tmp/ap_String_Id.h.h:2393 msgid "Text &after:" msgstr "Texto &aps:" #. DLG_FormatTOC_TextBefore -#: po/tmp/ap_String_Id.h.h:2376 +#: po/tmp/ap_String_Id.h.h:2395 msgid "Text &before:" msgstr "Texto a&ntes:" #. DLG_Lists_Align -#: po/tmp/ap_String_Id.h.h:2378 +#: po/tmp/ap_String_Id.h.h:2397 msgid "Text Align:" msgstr "Alinhamento da lista" #. MENU_LABEL_INSERT_TEXTBOX #. MENU_LABEL_FMT_FRAME -#: po/tmp/ap_String_Id.h.h:2381 +#: po/tmp/ap_String_Id.h.h:2400 msgid "Text Box" msgstr "Caixa de Texto" #. DLG_Lists_PageFolding -#: po/tmp/ap_String_Id.h.h:2383 +#: po/tmp/ap_String_Id.h.h:2402 msgid "Text Folding" msgstr "Dobra de Texto" #. DLG_FormatFrame_TextWrapping -#: po/tmp/ap_String_Id.h.h:2385 +#: po/tmp/ap_String_Id.h.h:2404 msgid "Text Wrapping" msgstr "Contorno de Texto" #. DLG_Options_Label_Both -#: po/tmp/ap_String_Id.h.h:2387 +#: po/tmp/ap_String_Id.h.h:2406 msgid "Text and Icon" msgstr "Texto e cone" -#. MSG_MergeDocsNotRelated -#: po/tmp/ap_String_Id.h.h:2389 -msgid "" -"The documents you are trying to merge are unrelated. AbiWord will attempt to " -"merge them, but the result might be meaningless." -msgstr "" -"Estes documentos que voc est tentando reconciliar no so relacionados. " -"O AbiWord tentar reconcili-los, mas o resultado pode no fazer sentido." - #. DLG_PageSetup_ErrBigMargins -#: po/tmp/ap_String_Id.h.h:2391 +#: po/tmp/ap_String_Id.h.h:2408 msgid "The margins selected are too large to fit on the page." msgstr "As margens escolhidas so demasiado grandes para caber na pgina." #. DLG_Options_Prompt_YouMustRestart -#: po/tmp/ap_String_Id.h.h:2393 +#: po/tmp/ap_String_Id.h.h:2410 msgid "" "The new user interface language will take effect the next time that you " "start the application" @@ -5821,12 +5867,12 @@ "vez em que voc iniciar a aplicao." #. MSG_SpellDone -#: po/tmp/ap_String_Id.h.h:2395 +#: po/tmp/ap_String_Id.h.h:2412 msgid "The spelling check is complete." msgstr "Correo ortogrfica terminada." #. MSG_HyperlinkCrossesBoundaries -#: po/tmp/ap_String_Id.h.h:2397 +#: po/tmp/ap_String_Id.h.h:2414 msgid "" "The text to which the hyperlink is to be attached must be within a single " "paragraph." @@ -5835,36 +5881,36 @@ "pargrafo." #. FIELD_DateTime_Wkday -#: po/tmp/ap_String_Id.h.h:2399 +#: po/tmp/ap_String_Id.h.h:2416 msgid "The weekday" msgstr "O dia da semana" #. DLG_FormatTable_Thickness -#: po/tmp/ap_String_Id.h.h:2401 +#: po/tmp/ap_String_Id.h.h:2418 msgid "Thickness:" msgstr "Expessura:" #. MSG_AfterRestartNew -#: po/tmp/ap_String_Id.h.h:2403 +#: po/tmp/ap_String_Id.h.h:2420 msgid "" "This change will only take effect when you restart AbiWord or create a new " "document." msgstr "" -"Estas alteraes tomaro efeito quando recomear o AbiWord ou quando criar um " -"novo documento." +"Estas alteraes tomaro efeito quando recomear o AbiWord ou quando criar " +"um novo documento." #. MSG_HiddenRevisions -#: po/tmp/ap_String_Id.h.h:2405 +#: po/tmp/ap_String_Id.h.h:2422 msgid "" "This document contains revisions which are currently hidden from view. " "Please see AbiWord documentation for information on working with revisions." msgstr "" -"Este documento contm revises que esto presentemente escondidas. " -"Por favor veja a documentao do AbiWord para informao sobre como trabalhar" -" com revises." +"Este documento contm revises que esto presentemente escondidas. Por favor " +"veja a documentao do AbiWord para informao sobre como trabalhar com " +"revises." #. DLG_Para_PreviewSampleFallback -#: po/tmp/ap_String_Id.h.h:2407 +#: po/tmp/ap_String_Id.h.h:2424 msgid "" "This paragraph represents words as they might appear in your document. To " "see text from your document used in this preview, position your cursor in a " @@ -5875,7 +5921,7 @@ "este dilogo." #. DLG_Styles_ErrStyleNot -#: po/tmp/ap_String_Id.h.h:2409 +#: po/tmp/ap_String_Id.h.h:2426 msgid "" "This style does not exist \n" " so it cannot be modified" @@ -5884,44 +5930,44 @@ " e por isso no pode ser modificado" #. DLG_Column_Three -#: po/tmp/ap_String_Id.h.h:2411 +#: po/tmp/ap_String_Id.h.h:2428 msgid "Three" msgstr "Trs" #. DLG_Lists_Tick_List #. STYLE_TICKLIST -#: po/tmp/ap_String_Id.h.h:2413 po/tmp/xap_String_Id.h.h:718 +#: po/tmp/ap_String_Id.h.h:2430 po/tmp/xap_String_Id.h.h:757 msgid "Tick List" msgstr "Lista de Verificaes" #. FIELD_DateTime_TimeZone -#: po/tmp/ap_String_Id.h.h:2415 +#: po/tmp/ap_String_Id.h.h:2432 msgid "Time Zone" msgstr "Fuso Horrio" #. FIELD_Document_Title -#: po/tmp/ap_String_Id.h.h:2417 +#: po/tmp/ap_String_Id.h.h:2434 msgid "Title" msgstr "Ttulo" #. DLG_ToggleCase_TitleCase -#: po/tmp/ap_String_Id.h.h:2419 +#: po/tmp/ap_String_Id.h.h:2436 msgid "Title Case" msgstr "Primeira letra maiscula" #. DLG_MetaData_Title_LBL #. DLG_Image_LblTitle -#: po/tmp/ap_String_Id.h.h:2421 po/tmp/xap_String_Id.h.h:722 +#: po/tmp/ap_String_Id.h.h:2438 po/tmp/xap_String_Id.h.h:761 msgid "Title:" msgstr "Ttulo:" #. DLG_Options_Label_Toolbars -#: po/tmp/ap_String_Id.h.h:2423 +#: po/tmp/ap_String_Id.h.h:2440 msgid "Toolbars" msgstr "Barras de Ferramentas" #. TopMarginStatus -#: po/tmp/ap_String_Id.h.h:2425 +#: po/tmp/ap_String_Id.h.h:2442 #, c-format msgid "Top Margin [%s]" msgstr "Margem Superior [%s]" @@ -5931,38 +5977,38 @@ #. TOOLBAR_STATUSLINE_FMT_TOPLINE #. TOOLBAR_TOOLTIP_FMT_TOPLINE #. DLG_UFS_ToplineCheck -#: po/tmp/ap_String_Id.h.h:2430 po/tmp/xap_String_Id.h.h:728 +#: po/tmp/ap_String_Id.h.h:2447 po/tmp/xap_String_Id.h.h:767 msgid "Topline" msgstr "Linha &Superior" #. DLG_Lists_Triangle_List #. STYLE_TRIANGLELIST -#: po/tmp/ap_String_Id.h.h:2432 po/tmp/xap_String_Id.h.h:730 +#: po/tmp/ap_String_Id.h.h:2449 po/tmp/xap_String_Id.h.h:769 msgid "Triangle List" msgstr "Listas com Tringulos" #. DLG_Column_Two -#: po/tmp/ap_String_Id.h.h:2434 +#: po/tmp/ap_String_Id.h.h:2451 msgid "Two" msgstr "Duas" #. FIELD_Document_Type -#: po/tmp/ap_String_Id.h.h:2436 +#: po/tmp/ap_String_Id.h.h:2453 msgid "Type" msgstr "Tipo" #. DLG_InsertBookmark_Msg -#: po/tmp/ap_String_Id.h.h:2438 +#: po/tmp/ap_String_Id.h.h:2455 msgid "Type a name for the bookmark, or select an existing from the list." msgstr "Escreva um nome para o bookmark, ou selecione um a partir da lista." #. DLG_Lists_Type -#: po/tmp/ap_String_Id.h.h:2440 +#: po/tmp/ap_String_Id.h.h:2457 msgid "Type:" msgstr "Pontuada" #. DLG_ToggleCase_UpperCase -#: po/tmp/ap_String_Id.h.h:2442 +#: po/tmp/ap_String_Id.h.h:2459 msgid "UPPERCASE" msgstr "MAISCULAS" @@ -5970,93 +6016,93 @@ #. TOOLBAR_STATUSLINE_FMT_UNDERLINE #. TOOLBAR_TOOLTIP_FMT_UNDERLINE #. DLG_UFS_UnderlineCheck -#: po/tmp/ap_String_Id.h.h:2446 po/tmp/xap_String_Id.h.h:750 +#: po/tmp/ap_String_Id.h.h:2463 po/tmp/xap_String_Id.h.h:789 msgid "Underline" msgstr "Sublinhado" #. MENU_STATUSLINE_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:2448 +#: po/tmp/ap_String_Id.h.h:2465 msgid "Underline the selection (toggle)" msgstr "Sublinhar texto" #. TOOLBAR_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2450 +#: po/tmp/ap_String_Id.h.h:2467 msgid "Undo" msgstr "Desfazer" #. MENU_STATUSLINE_EDIT_UNDO #. TOOLBAR_STATUSLINE_EDIT_UNDO #. TOOLBAR_TOOLTIP_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2454 +#: po/tmp/ap_String_Id.h.h:2471 msgid "Undo editing" msgstr "Cancelar ltima ao" #. DLG_Lists_Upper_Case_List #. STYLE_UPPERCASTELIST -#: po/tmp/ap_String_Id.h.h:2456 po/tmp/xap_String_Id.h.h:784 +#: po/tmp/ap_String_Id.h.h:2473 po/tmp/xap_String_Id.h.h:823 msgid "Upper Case List" msgstr "Lista com maisculas" #. DLG_Lists_Upper_Roman_List #. STYLE_UPPERROMANLIST -#: po/tmp/ap_String_Id.h.h:2458 po/tmp/xap_String_Id.h.h:786 +#: po/tmp/ap_String_Id.h.h:2475 po/tmp/xap_String_Id.h.h:825 msgid "Upper Roman List" msgstr "Lista romnica com maisculas" #. DLG_Column_RtlOrder -#: po/tmp/ap_String_Id.h.h:2460 +#: po/tmp/ap_String_Id.h.h:2477 msgid "Use RTL Order" msgstr "Usar ordem Direita para a Esquerda" #. DLG_Options_Label_HebrewContextGlyphs -#: po/tmp/ap_String_Id.h.h:2462 +#: po/tmp/ap_String_Id.h.h:2479 msgid "Use glyph shaping for Hebrew" msgstr "Usar smbolos para Hebraico" #. DLG_Options_Label_UI -#: po/tmp/ap_String_Id.h.h:2464 +#: po/tmp/ap_String_Id.h.h:2481 msgid "User Interface" msgstr "idioma do Interface" #. DLG_Options_Label_UILang -#: po/tmp/ap_String_Id.h.h:2466 +#: po/tmp/ap_String_Id.h.h:2483 msgid "User Interface Language" msgstr "idioma do Interface" #. DLG_Stylist_UserStyles -#: po/tmp/ap_String_Id.h.h:2468 +#: po/tmp/ap_String_Id.h.h:2485 msgid "User defined Styles" msgstr "Estilos definidos pelo usurio" #. DLG_Tab_Label_Existing -#: po/tmp/ap_String_Id.h.h:2470 +#: po/tmp/ap_String_Id.h.h:2487 #, fuzzy msgid "User-defined Tabs" msgstr "Estilos personalizados" #. DLG_Styles_LBL_UserDefined -#: po/tmp/ap_String_Id.h.h:2472 +#: po/tmp/ap_String_Id.h.h:2489 msgid "User-defined styles" msgstr "Estilos personalizados" #. FIELD_Application_Version #. DLG_History_Version_Version -#: po/tmp/ap_String_Id.h.h:2474 po/tmp/xap_String_Id.h.h:792 +#: po/tmp/ap_String_Id.h.h:2491 po/tmp/xap_String_Id.h.h:833 msgid "Version" msgstr "Verso" #. DLG_Options_TabLabel_View -#: po/tmp/ap_String_Id.h.h:2476 +#: po/tmp/ap_String_Id.h.h:2493 msgid "View" msgstr "Ver" #. MENU_STATUSLINE_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:2478 +#: po/tmp/ap_String_Id.h.h:2495 msgid "View document history" msgstr "Ver histrico do documento" #. MENU_STATUSLINE_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:2480 +#: po/tmp/ap_String_Id.h.h:2497 msgid "View the document in full screen mode" msgstr "Mostrar somente as pginas" @@ -6069,106 +6115,107 @@ #. MENU_STATUSLINE_WINDOW_7 #. MENU_STATUSLINE_WINDOW_8 #. MENU_STATUSLINE_WINDOW_9 -#: po/tmp/ap_String_Id.h.h:2490 +#: po/tmp/ap_String_Id.h.h:2507 msgid "View this document" msgstr "Mudar para a primeira janela" #. DLG_Options_Label_ViewTooltips -#: po/tmp/ap_String_Id.h.h:2492 +#: po/tmp/ap_String_Id.h.h:2509 msgid "View tooltips" msgstr "Ver legendas" #. DLG_Options_Label_ViewViewFrame -#: po/tmp/ap_String_Id.h.h:2494 +#: po/tmp/ap_String_Id.h.h:2511 msgid "View..." msgstr "Mostrar..." #. DLG_Options_Label_Visible -#: po/tmp/ap_String_Id.h.h:2496 +#: po/tmp/ap_String_Id.h.h:2513 msgid "Visible" msgstr "Visvel" #. MSG_HyperlinkNoBookmark -#: po/tmp/ap_String_Id.h.h:2498 +#: po/tmp/ap_String_Id.h.h:2515 #, c-format msgid "Warning: the bookmark you provided [%s] does not exist." msgstr "Ateno: o bookmark providenciado [%s] no existe." #. MENU_STATUSLINE_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:2500 +#: po/tmp/ap_String_Id.h.h:2517 msgid "Web Layout" msgstr "Ver documento como pgina WWW" #. DLG_Styles_LBL_TxtMsg -#: po/tmp/ap_String_Id.h.h:2502 +#: po/tmp/ap_String_Id.h.h:2519 msgid "What Hath God Wrought" msgstr "Texto do pargrafo" #. DLG_Options_Label_WithExtension -#: po/tmp/ap_String_Id.h.h:2504 +#: po/tmp/ap_String_Id.h.h:2521 msgid "With extension:" msgstr "...com extenso" #. DLG_WordCount_WordCountTitle #. FIELD_Numbers_WordCount -#: po/tmp/ap_String_Id.h.h:2507 +#: po/tmp/ap_String_Id.h.h:2524 msgid "Word Count" msgstr "Contagem de Palavras" #. DLG_NEW_Tab1 -#: po/tmp/ap_String_Id.h.h:2509 +#: po/tmp/ap_String_Id.h.h:2526 msgid "Wordprocessing" msgstr "Criar um Fax" #. DLG_WordCount_Words_No_Notes -#: po/tmp/ap_String_Id.h.h:2511 +#: po/tmp/ap_String_Id.h.h:2528 msgid "Words (no footnotes/endnotes):" msgstr "Palavras (sem rodaps/notas de rodap)" #. DLG_Options_Label_SpellUppercase -#: po/tmp/ap_String_Id.h.h:2513 +#: po/tmp/ap_String_Id.h.h:2530 msgid "Words in &UPPERCASE" msgstr "Ignorar MAISCULAS" #. DLG_Options_Label_SpellNumbers -#: po/tmp/ap_String_Id.h.h:2515 +#: po/tmp/ap_String_Id.h.h:2532 msgid "Words with num&bers" msgstr "Ignorar palavras com nmeros" #. DLG_WordCount_Words -#: po/tmp/ap_String_Id.h.h:2517 +#: po/tmp/ap_String_Id.h.h:2534 msgid "Words:" msgstr "Palavras" #. MSG_SaveFailedWrite -#: po/tmp/ap_String_Id.h.h:2519 +#: po/tmp/ap_String_Id.h.h:2536 #, c-format msgid "Writing error when attempting to save %s" msgstr "Impossvel salvar o arquivo %s." #. MSG_DefaultDirectionChg -#: po/tmp/ap_String_Id.h.h:2521 +#: po/tmp/ap_String_Id.h.h:2538 msgid "You have changed the default direction." msgstr "Mudou a direco por omisso da escrita." #. MSG_DirectionModeChg -#: po/tmp/ap_String_Id.h.h:2523 +#: po/tmp/ap_String_Id.h.h:2540 msgid "You have changed the direction mode." msgstr "Mudou o modo da direco da escrita." #. MSG_HyperlinkNoSelection -#: po/tmp/ap_String_Id.h.h:2525 +#: po/tmp/ap_String_Id.h.h:2542 msgid "You must select a portion of the document before inserting a hyperlink." msgstr "" -"Voc tem de selecionar uma poro do documento antes de inserir uma hiperligao." +"Voc tem de selecionar uma poro do documento antes de inserir uma " +"hiperligao." #. DLG_Options_Label_InvalidRangeForAutoSave -#: po/tmp/ap_String_Id.h.h:2527 +#: po/tmp/ap_String_Id.h.h:2544 msgid "You should choose a range from 1 to 120 for the auto save frequency" msgstr "A frequncia da gravao automtica deve ser um valor entre 1 e 120" #. MSG_ConfirmSaveSecondary -#: po/tmp/ap_String_Id.h.h:2529 +#: po/tmp/ap_String_Id.h.h:2546 msgid "Your changes will be lost if you don't save them." msgstr "As suas alteraes sero perdidas se fechar sem salvar!" @@ -6176,87 +6223,87 @@ #. TOOLBAR_STATUSLINE_ZOOM #. TOOLBAR_TOOLTIP_ZOOM #. DLG_Zoom_ZoomTitle -#: po/tmp/ap_String_Id.h.h:2533 po/tmp/xap_String_Id.h.h:839 +#: po/tmp/ap_String_Id.h.h:2550 po/tmp/xap_String_Id.h.h:882 msgid "Zoom" msgstr "Zoom" #. MENU_LABEL_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2535 +#: po/tmp/ap_String_Id.h.h:2552 msgid "Zoom to &100%" msgstr "Zoom para &100%" #. MENU_LABEL_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2537 +#: po/tmp/ap_String_Id.h.h:2554 msgid "Zoom to &200%" msgstr "Zoom para &200%" #. MENU_LABEL_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2539 +#: po/tmp/ap_String_Id.h.h:2556 msgid "Zoom to &50%" msgstr "Zoom para &50%" #. MENU_LABEL_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2541 +#: po/tmp/ap_String_Id.h.h:2558 msgid "Zoom to &75%" msgstr "Zoom para &75%" #. MENU_STATUSLINE_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2543 +#: po/tmp/ap_String_Id.h.h:2560 msgid "Zoom to 100%" msgstr "Zoom a 100%" #. MENU_STATUSLINE_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2545 +#: po/tmp/ap_String_Id.h.h:2562 msgid "Zoom to 200%" msgstr "Zoom a 200%" #. MENU_STATUSLINE_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2547 +#: po/tmp/ap_String_Id.h.h:2564 msgid "Zoom to 50%" msgstr "Zoom a 50%" #. MENU_STATUSLINE_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2549 +#: po/tmp/ap_String_Id.h.h:2566 msgid "Zoom to 75%" msgstr "Zoom a 75%" #. MENU_STATUSLINE_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:2551 +#: po/tmp/ap_String_Id.h.h:2568 msgid "Zoom to page width" msgstr "Zoom largura da pgina" #. MENU_STATUSLINE_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:2553 +#: po/tmp/ap_String_Id.h.h:2570 msgid "Zoom to whole page" msgstr "Zoom pgina inteira" #. DLG_Options_Label_CustomDict -#: po/tmp/ap_String_Id.h.h:2555 +#: po/tmp/ap_String_Id.h.h:2572 msgid "custom.dic" msgstr "custom.dic" #. FIELD_DateTime_DDMMYY -#: po/tmp/ap_String_Id.h.h:2557 +#: po/tmp/ap_String_Id.h.h:2574 msgid "dd/mm/yy" msgstr "dd/mm/yy" #. DLG_ToggleCase_LowerCase -#: po/tmp/ap_String_Id.h.h:2559 +#: po/tmp/ap_String_Id.h.h:2576 msgid "lowercase" msgstr "minsculas" #. DLG_Options_Label_Minutes -#: po/tmp/ap_String_Id.h.h:2561 +#: po/tmp/ap_String_Id.h.h:2578 msgid "minutes" msgstr "minutos..." #. FIELD_DateTime_MMDDYY -#: po/tmp/ap_String_Id.h.h:2563 +#: po/tmp/ap_String_Id.h.h:2580 msgid "mm/dd/yy" msgstr "mm/dd/yy" #. DLG_ToggleCase_ToggleCase -#: po/tmp/ap_String_Id.h.h:2565 +#: po/tmp/ap_String_Id.h.h:2582 msgid "tOGGLE cASE" msgstr "iNVERTER mAISCULAS/MINSCULAS" @@ -6336,8 +6383,8 @@ "AbiWord cannot fully restore version %d of the document because the version " "information is incomplete." msgstr "" -"O AbiWord no pode restaurar completamente a verso %d do documento porque " -"a informao da reviso est incompleta." +"O AbiWord no pode restaurar completamente a verso %d do documento porque a " +"informao da reviso est incompleta." #. MSG_HistoryNoRestore #: po/tmp/xap_String_Id.h.h:37 @@ -6346,8 +6393,8 @@ "AbiWord cannot restore version %d of the document because the version " "information is missing." msgstr "" -"O AbiWord no pode restaurar a verso %d do documento porque a informao"\ -" da reviso est ausente." +"O AbiWord no pode restaurar a verso %d do documento porque a informao da " +"reviso est ausente." #. DLG_UP_PrintPreviewTitle #: po/tmp/xap_String_Id.h.h:39 @@ -6406,1454 +6453,1562 @@ msgid "Amharic (Ethiopia)" msgstr "Amrico (Etipia)" -#. LANG_AR_EG +#. LANG_AR #: po/tmp/xap_String_Id.h.h:65 +#, fuzzy +msgid "Arabic" +msgstr "Lista rabe" + +#. LANG_AR_EG +#: po/tmp/xap_String_Id.h.h:67 msgid "Arabic (Egypt)" msgstr "rabe (Egipto)" #. LANG_AR_SA -#: po/tmp/xap_String_Id.h.h:67 +#: po/tmp/xap_String_Id.h.h:69 msgid "Arabic (Saudi Arabia)" msgstr "rabe (Arbia Saudita)" #. ENC_ARAB_ISO -#: po/tmp/xap_String_Id.h.h:69 +#: po/tmp/xap_String_Id.h.h:71 msgid "Arabic, ISO-8859-6" msgstr "rabe, ISO-8859-6" #. ENC_ARAB_MAC -#: po/tmp/xap_String_Id.h.h:71 +#: po/tmp/xap_String_Id.h.h:73 msgid "Arabic, Macintosh" msgstr "rabe, Macintosh" #. ENC_ARAB_WIN -#: po/tmp/xap_String_Id.h.h:73 +#: po/tmp/xap_String_Id.h.h:75 msgid "Arabic, Windows Code Page 1256" msgstr "rabe, Pgina de Cdigos 1256 do Windows" #. LANG_HY_AM -#: po/tmp/xap_String_Id.h.h:75 +#: po/tmp/xap_String_Id.h.h:77 msgid "Armenian" msgstr "Armnio" #. ENC_ARME_ARMSCII -#: po/tmp/xap_String_Id.h.h:77 +#: po/tmp/xap_String_Id.h.h:79 msgid "Armenian, ARMSCII-8" msgstr "Armnio, ARMSCII-8" #. LANG_AS_IN -#: po/tmp/xap_String_Id.h.h:79 +#: po/tmp/xap_String_Id.h.h:81 msgid "Assamese" msgstr "Asams (ndia)" #. LANG_AST_ES -#: po/tmp/xap_String_Id.h.h:81 +#: po/tmp/xap_String_Id.h.h:83 msgid "Asturian (Spain)" msgstr "" #. DLG_Options_Label_DirMarkerAfterClosingParenthesis -#: po/tmp/xap_String_Id.h.h:85 +#: po/tmp/xap_String_Id.h.h:87 msgid "Auto-insert direction markers" msgstr "Inserir marcadores de direo automaticamente" #. DLG_History_Version_AutoRevisioned -#: po/tmp/xap_String_Id.h.h:87 +#: po/tmp/xap_String_Id.h.h:89 msgid "Auto-revision" msgstr "Reviso automtica" #. DLG_FOSA_FileTypeAutoDetect -#: po/tmp/xap_String_Id.h.h:89 +#: po/tmp/xap_String_Id.h.h:91 msgid "Automatically Detected" msgstr "Automtico" #. MSG_AutoRevision -#: po/tmp/xap_String_Id.h.h:91 +#: po/tmp/xap_String_Id.h.h:93 msgid "Autorevision" msgstr "Reviso automtica" #. DLG_MW_AvailableDocuments -#: po/tmp/xap_String_Id.h.h:93 +#: po/tmp/xap_String_Id.h.h:95 msgid "Available Documents" msgstr "Documentos disponveis" #. DLG_ULANG_AvailableLanguages -#: po/tmp/xap_String_Id.h.h:95 +#: po/tmp/xap_String_Id.h.h:97 msgid "Available Languages" msgstr "Idiomas Disponveis" +#. LANG_AYM_BO +#: po/tmp/xap_String_Id.h.h:99 +msgid "Aymara (La Paz)" +msgstr "" + +#. LANG_AYC_BO +#: po/tmp/xap_String_Id.h.h:101 +msgid "Aymara (Oruro)" +msgstr "" + #. ENC_BALT_ISO -#: po/tmp/xap_String_Id.h.h:97 +#: po/tmp/xap_String_Id.h.h:103 msgid "Baltic, ISO-8859-4" msgstr "Bltico, ISO-8859-4" #. ENC_BALT_WIN -#: po/tmp/xap_String_Id.h.h:99 +#: po/tmp/xap_String_Id.h.h:105 msgid "Baltic, Windows Code Page 1257" msgstr "Bltico, Pgina de Cdigos 1257 do Windows" #. LANG_EU_ES -#: po/tmp/xap_String_Id.h.h:101 +#: po/tmp/xap_String_Id.h.h:107 msgid "Basque" msgstr "Basco" #. LANG_BE_BY -#: po/tmp/xap_String_Id.h.h:103 +#: po/tmp/xap_String_Id.h.h:109 msgid "Belarusian" msgstr "Bielorusso" +#. LANG_BE_LATIN +#: po/tmp/xap_String_Id.h.h:111 +#, fuzzy +msgid "Belarusian, Latin" +msgstr "Bielorusso" + #. LANG_BN_IN -#: po/tmp/xap_String_Id.h.h:105 +#: po/tmp/xap_String_Id.h.h:113 msgid "Bengali" msgstr "" #. DLG_UP_BlackWhite -#: po/tmp/xap_String_Id.h.h:107 +#: po/tmp/xap_String_Id.h.h:115 msgid "Black & White" msgstr "Preto e branco" #. STYLE_BLOCKTEXT -#: po/tmp/xap_String_Id.h.h:109 +#: po/tmp/xap_String_Id.h.h:117 msgid "Block Text" msgstr "Texto de Bloco" #. DLG_UFS_StyleBoldItalic -#: po/tmp/xap_String_Id.h.h:113 +#: po/tmp/xap_String_Id.h.h:121 msgid "Bold Italic" msgstr "Negrito itlico" #. LANG_BR_FR -#: po/tmp/xap_String_Id.h.h:119 +#: po/tmp/xap_String_Id.h.h:127 msgid "Breton" msgstr "Breto" #. MSG_BuildingDoc -#: po/tmp/xap_String_Id.h.h:121 +#: po/tmp/xap_String_Id.h.h:129 msgid "Building Document:" msgstr "Construindo Documento:" #. LANG_BG_BG -#: po/tmp/xap_String_Id.h.h:123 +#: po/tmp/xap_String_Id.h.h:131 msgid "Bulgarian" msgstr "Blgaro" #. DLG_Cancel -#: po/tmp/xap_String_Id.h.h:127 +#: po/tmp/xap_String_Id.h.h:135 msgid "Cancel" msgstr "Cancela" #. LANG_CA_ES -#: po/tmp/xap_String_Id.h.h:129 +#: po/tmp/xap_String_Id.h.h:137 msgid "Catalan" msgstr "Catalo" +#. LANG_AYR +#: po/tmp/xap_String_Id.h.h:139 +msgid "Central Aymara" +msgstr "" + #. ENC_CENT_ISO -#: po/tmp/xap_String_Id.h.h:131 +#: po/tmp/xap_String_Id.h.h:141 msgid "Central European, ISO-8859-2" msgstr "Europeu Central, ISO-8859-2" #. ENC_CENT_MAC -#: po/tmp/xap_String_Id.h.h:133 +#: po/tmp/xap_String_Id.h.h:143 msgid "Central European, Macintosh" msgstr "Europeu Central, Macintosh" #. ENC_CENT_WIN -#: po/tmp/xap_String_Id.h.h:135 +#: po/tmp/xap_String_Id.h.h:145 msgid "Central European, Windows Code Page 1250" msgstr "Europeu Central, Pgina de Cdigos 1250 do Windows" #. DLG_Options_Label_LangWithKeyboard -#: po/tmp/xap_String_Id.h.h:137 +#: po/tmp/xap_String_Id.h.h:147 msgid "Change Language when changing keyboard" msgstr "Mudar a linguagem quando mudar o teclado" #. STYLE_CHAPHEADING -#: po/tmp/xap_String_Id.h.h:139 +#: po/tmp/xap_String_Id.h.h:149 msgid "Chapter Heading" msgstr "Cabealho de Captulo" #. LANG_ZH_HK -#: po/tmp/xap_String_Id.h.h:141 +#: po/tmp/xap_String_Id.h.h:151 msgid "Chinese (Hong Kong)" msgstr "Chins (Hong Kong)" #. LANG_ZH_CN -#: po/tmp/xap_String_Id.h.h:143 +#: po/tmp/xap_String_Id.h.h:153 msgid "Chinese (PRC)" msgstr "Chins (PRC)" #. LANG_ZH_SG -#: po/tmp/xap_String_Id.h.h:145 +#: po/tmp/xap_String_Id.h.h:155 msgid "Chinese (Singapore)" msgstr "Chins (Singapura)" #. LANG_ZH_TW -#: po/tmp/xap_String_Id.h.h:147 +#: po/tmp/xap_String_Id.h.h:157 msgid "Chinese (Taiwan)" msgstr "Chins (Taiwan)" #. ENC_CHSI_EUC -#: po/tmp/xap_String_Id.h.h:149 +#: po/tmp/xap_String_Id.h.h:159 msgid "Chinese Simplified, EUC-CN (GB2312)" msgstr "Chins Simplificado, EUC-CN" #. ENC_CHSI_GB -#: po/tmp/xap_String_Id.h.h:151 +#: po/tmp/xap_String_Id.h.h:161 msgid "Chinese Simplified, GB_2312-80" msgstr "Chins Simplificado, GB_2312-80" #. ENC_CHSI_HZ -#: po/tmp/xap_String_Id.h.h:153 +#: po/tmp/xap_String_Id.h.h:163 msgid "Chinese Simplified, HZ" msgstr "Chins Simplificado, HZ" #. ENC_CHSI_WIN -#: po/tmp/xap_String_Id.h.h:155 +#: po/tmp/xap_String_Id.h.h:165 msgid "Chinese Simplified, Windows Code Page 936" msgstr "Chins Simplificado, Pgina de Cdigos 936 do Windows" #. ENC_CHTR_BIG5 -#: po/tmp/xap_String_Id.h.h:157 +#: po/tmp/xap_String_Id.h.h:167 msgid "Chinese Traditional, BIG5" msgstr "Chins Tradicional, BIG5" #. ENC_CHTR_BIG5HKSCS -#: po/tmp/xap_String_Id.h.h:159 +#: po/tmp/xap_String_Id.h.h:169 msgid "Chinese Traditional, BIG5-HKSCS" msgstr "Chins Tradicional, BIG5-HKSCS" #. ENC_CHTR_EUC -#: po/tmp/xap_String_Id.h.h:161 +#: po/tmp/xap_String_Id.h.h:171 msgid "Chinese Traditional, EUC-TW" msgstr "Chins Tradicional, EUC-TW" #. ENC_CHTR_WIN -#: po/tmp/xap_String_Id.h.h:163 +#: po/tmp/xap_String_Id.h.h:173 msgid "Chinese Traditional, Windows Code Page 950" msgstr "Chins Tradicional, Pgina de Cdigos 950 do Windows" #. DLG_LISTDOCS_Heading1 -#: po/tmp/xap_String_Id.h.h:165 +#: po/tmp/xap_String_Id.h.h:175 msgid "Choose document from the list:" msgstr "Escolher documento da lista:" +#. TB_ClearBackground +#: po/tmp/xap_String_Id.h.h:177 +#, fuzzy +msgid "Clear Background" +msgstr "Remover Cor de Fundo" + #. DLG_CLIPART_Title -#: po/tmp/xap_String_Id.h.h:167 +#: po/tmp/xap_String_Id.h.h:179 msgid "Clip Art" msgstr "Portfolio" +#. DLG_CLIPART_Error +#: po/tmp/xap_String_Id.h.h:181 +msgid "Clip Art could not be loaded" +msgstr "" + #. DLG_Close -#: po/tmp/xap_String_Id.h.h:169 +#: po/tmp/xap_String_Id.h.h:183 msgid "Close" msgstr "Fechar" #. DLG_Exit_CloseWithoutSaving -#: po/tmp/xap_String_Id.h.h:171 +#: po/tmp/xap_String_Id.h.h:185 msgid "Close &Without Saving" msgstr "Fechar S&em Salvar" #. DLG_UP_Collate -#: po/tmp/xap_String_Id.h.h:173 +#: po/tmp/xap_String_Id.h.h:187 msgid "Collate" msgstr "Cpias seguidas" #. DLG_UP_Color -#: po/tmp/xap_String_Id.h.h:175 +#: po/tmp/xap_String_Id.h.h:189 msgid "Color" msgstr "Cor" #. DLG_Compare -#: po/tmp/xap_String_Id.h.h:179 +#: po/tmp/xap_String_Id.h.h:193 msgid "Compare" msgstr "Comparar" #. DLG_DocComparison_Content -#: po/tmp/xap_String_Id.h.h:181 +#: po/tmp/xap_String_Id.h.h:195 msgid "Content:" msgstr "Contedo:" #. STYLE_TOCHEADING1 -#: po/tmp/xap_String_Id.h.h:183 +#: po/tmp/xap_String_Id.h.h:197 msgid "Contents 1" msgstr "Cotedo 1" #. STYLE_TOCHEADING2 -#: po/tmp/xap_String_Id.h.h:185 +#: po/tmp/xap_String_Id.h.h:199 msgid "Contents 2" msgstr "Contedo 2" #. STYLE_TOCHEADING3 -#: po/tmp/xap_String_Id.h.h:187 +#: po/tmp/xap_String_Id.h.h:201 msgid "Contents 3" msgstr "Contedo 3" #. STYLE_TOCHEADING4 -#: po/tmp/xap_String_Id.h.h:189 +#: po/tmp/xap_String_Id.h.h:203 msgid "Contents 4" msgstr "Contedo 4" #. STYLE_TOCHEADING -#: po/tmp/xap_String_Id.h.h:191 +#: po/tmp/xap_String_Id.h.h:205 msgid "Contents Header" msgstr "Cabealho do Contedo" #. DLG_UP_Copies -#: po/tmp/xap_String_Id.h.h:193 +#: po/tmp/xap_String_Id.h.h:207 msgid "Copies: " msgstr "Cpias: " +#. LANG_COP_EG +#: po/tmp/xap_String_Id.h.h:209 +#, fuzzy +msgid "Coptic" +msgstr "Copiar" + #. LANG_KW_GB -#: po/tmp/xap_String_Id.h.h:195 +#: po/tmp/xap_String_Id.h.h:211 msgid "Cornish" msgstr "Corns" #. LANG_CO_FR -#: po/tmp/xap_String_Id.h.h:197 +#: po/tmp/xap_String_Id.h.h:213 msgid "Corsican" msgstr "Corso" #. DLG_PLUGIN_MANAGER_COULDNT_LOAD -#: po/tmp/xap_String_Id.h.h:199 +#: po/tmp/xap_String_Id.h.h:215 msgid "Could not activate/load plugin" msgstr "No foi possivel ligar/carregar o plugin" #. DLG_PLUGIN_MANAGER_COULDNT_UNLOAD -#: po/tmp/xap_String_Id.h.h:201 +#: po/tmp/xap_String_Id.h.h:217 msgid "Could not deactivate plugin" msgstr "No foi possivel desligar/descarregar o plugin" #. SPELL_CANTLOAD_DICT -#: po/tmp/xap_String_Id.h.h:203 +#: po/tmp/xap_String_Id.h.h:219 #, c-format msgid "Could not load the dictionary for the %s language" msgstr "No foi possvel carregar o dicionrio para a Idioma %s" #. DLG_History_Version_Started -#: po/tmp/xap_String_Id.h.h:205 +#: po/tmp/xap_String_Id.h.h:221 msgid "Created" msgstr "Criado" #. DLG_History_Created -#: po/tmp/xap_String_Id.h.h:207 +#: po/tmp/xap_String_Id.h.h:223 msgid "Created:" msgstr "Criado:" -#. LANG_HR -#: po/tmp/xap_String_Id.h.h:209 +#. LANG_HR_HR +#: po/tmp/xap_String_Id.h.h:225 msgid "Croatian" msgstr "Croata" #. ENC_CROA_MAC -#: po/tmp/xap_String_Id.h.h:211 +#: po/tmp/xap_String_Id.h.h:227 msgid "Croatian, Macintosh" msgstr "Croata, Macintosh" #. ENC_CYRL_ISO -#: po/tmp/xap_String_Id.h.h:213 +#: po/tmp/xap_String_Id.h.h:229 msgid "Cyrillic, ISO-8859-5" msgstr "Cirlico, ISO-8859-5" #. ENC_CYRL_KOI -#: po/tmp/xap_String_Id.h.h:215 +#: po/tmp/xap_String_Id.h.h:231 msgid "Cyrillic, KOI8-R" msgstr "Cirlico, KOI8-R" #. ENC_CYRL_MAC -#: po/tmp/xap_String_Id.h.h:217 +#: po/tmp/xap_String_Id.h.h:233 msgid "Cyrillic, Macintosh" msgstr "Cirlico, Macintosh" #. ENC_CYRL_WIN -#: po/tmp/xap_String_Id.h.h:219 +#: po/tmp/xap_String_Id.h.h:235 msgid "Cyrillic, Windows Code Page 1251" msgstr "Cirlico, Pgina de Cdigos 1251 do Windows" #. LANG_CS_CZ -#: po/tmp/xap_String_Id.h.h:221 +#: po/tmp/xap_String_Id.h.h:237 msgid "Czech" msgstr "Checo" #. LANG_DA_DK -#: po/tmp/xap_String_Id.h.h:223 +#: po/tmp/xap_String_Id.h.h:239 msgid "Danish" msgstr "Dinamarqus" #. DLG_PLUGIN_MANAGER_DEACTIVATE_ALL -#: po/tmp/xap_String_Id.h.h:227 +#: po/tmp/xap_String_Id.h.h:243 msgid "Deactivate all plugins" msgstr "Desligar todos os plugins" #. DLG_PLUGIN_MANAGER_DEACTIVATE -#: po/tmp/xap_String_Id.h.h:229 +#: po/tmp/xap_String_Id.h.h:245 msgid "Deactivate plugin" msgstr "Desligar todos os plugins" #. DLG_HTMLOPT_ExpDeclareXML -#: po/tmp/xap_String_Id.h.h:231 +#: po/tmp/xap_String_Id.h.h:247 msgid "Declare as XML (version 1.0)" msgstr "Declarar como XML (verso 1.0)" #. DLG_ULANG_DefaultLangLabel -#: po/tmp/xap_String_Id.h.h:233 +#: po/tmp/xap_String_Id.h.h:249 msgid "Default language: " msgstr "Linguagem padro:" #. DLG_Image_Placement -#: po/tmp/xap_String_Id.h.h:235 +#: po/tmp/xap_String_Id.h.h:251 msgid "Define Image Placement" msgstr "Definir Posicionamento de Imagem" #. DLG_Image_TextWrapping -#: po/tmp/xap_String_Id.h.h:237 +#: po/tmp/xap_String_Id.h.h:253 msgid "Define Text Wrapping" msgstr "Definir Contorno de Texto" #. DLG_Remove_Icon -#: po/tmp/xap_String_Id.h.h:246 +#: po/tmp/xap_String_Id.h.h:262 msgid "Do you want to remove this icon from the toolbar?" msgstr "Deseja remover este cone da barra de utilitrios?" #. DLG_DocComparison_WindowLabel -#: po/tmp/xap_String_Id.h.h:248 +#: po/tmp/xap_String_Id.h.h:264 msgid "Document Comparison" msgstr "Comparao de Documentos" #. DLG_History_DocumentDetails -#: po/tmp/xap_String_Id.h.h:250 +#: po/tmp/xap_String_Id.h.h:266 msgid "Document Details" msgstr "Detalhes do Documento" #. DLG_History_WindowLabel -#: po/tmp/xap_String_Id.h.h:252 +#: po/tmp/xap_String_Id.h.h:268 msgid "Document History" msgstr "Histrico do Documento" #. DLG_History_Path -#: po/tmp/xap_String_Id.h.h:254 +#: po/tmp/xap_String_Id.h.h:270 msgid "Document name:" msgstr "Nome do Documento:" #. DLG_DocComparison_DocsCompared -#: po/tmp/xap_String_Id.h.h:256 +#: po/tmp/xap_String_Id.h.h:272 msgid "Documents compared" msgstr "Documentos comparados" #. LANG_NL_NL -#: po/tmp/xap_String_Id.h.h:258 +#: po/tmp/xap_String_Id.h.h:274 msgid "Dutch (Netherlands)" msgstr "Holands" #. DLG_History_EditTime -#: po/tmp/xap_String_Id.h.h:260 +#: po/tmp/xap_String_Id.h.h:276 msgid "Editing time:" msgstr "Tempo de edio:" #. DLG_UFS_EffectsFrameLabel -#: po/tmp/xap_String_Id.h.h:262 +#: po/tmp/xap_String_Id.h.h:278 msgid "Effects" msgstr "Efeitos" #. DLG_HTMLOPT_ExpEmbedCSS -#: po/tmp/xap_String_Id.h.h:264 +#: po/tmp/xap_String_Id.h.h:280 msgid "Embed (CSS) style sheet" msgstr "Embutir folha de estilo (CSS)" #. DLG_UP_EmbedFonts -#: po/tmp/xap_String_Id.h.h:266 +#: po/tmp/xap_String_Id.h.h:282 msgid "Embed Fonts" msgstr "Embutir Fontes" #. DLG_HTMLOPT_ExpEmbedImages -#: po/tmp/xap_String_Id.h.h:268 +#: po/tmp/xap_String_Id.h.h:284 msgid "Embed images in URLs (Base64-encoded)" msgstr "Embutir imagens em URLs (com codificao Base64)" #. DLG_UENC_EncTitle -#: po/tmp/xap_String_Id.h.h:270 +#: po/tmp/xap_String_Id.h.h:286 msgid "Encoding" msgstr "Codificao:" #. DLG_UFS_EncodingLabel -#: po/tmp/xap_String_Id.h.h:272 +#: po/tmp/xap_String_Id.h.h:288 msgid "Encoding:" msgstr "Codificao:" #. STYLE_ENDREFERENCE -#: po/tmp/xap_String_Id.h.h:274 +#: po/tmp/xap_String_Id.h.h:290 msgid "Endnote Reference" msgstr "Referncia de nota de rodap" #. STYLE_ENDTEXT -#: po/tmp/xap_String_Id.h.h:276 +#: po/tmp/xap_String_Id.h.h:292 msgid "Endnote Text" msgstr "Texto de Nota de Rodap" #. LANG_EN_AU -#: po/tmp/xap_String_Id.h.h:278 +#: po/tmp/xap_String_Id.h.h:294 msgid "English (Australia)" msgstr "Ingls (AU)" #. LANG_EN_CA -#: po/tmp/xap_String_Id.h.h:280 +#: po/tmp/xap_String_Id.h.h:296 msgid "English (Canada)" msgstr "Ingls (Canad)" #. LANG_EN_IE -#: po/tmp/xap_String_Id.h.h:282 +#: po/tmp/xap_String_Id.h.h:298 msgid "English (Ireland)" msgstr "Ingls (Irlanda)" #. LANG_EN_NZ -#: po/tmp/xap_String_Id.h.h:284 +#: po/tmp/xap_String_Id.h.h:300 msgid "English (New Zealand)" msgstr "Ingls (NZ)" #. LANG_EN_ZA -#: po/tmp/xap_String_Id.h.h:286 +#: po/tmp/xap_String_Id.h.h:302 msgid "English (South Africa)" msgstr "Ingls (frica do Sul)" #. LANG_EN_GB -#: po/tmp/xap_String_Id.h.h:288 +#: po/tmp/xap_String_Id.h.h:304 msgid "English (UK)" msgstr "Ingls (GB)" #. LANG_EN_US -#: po/tmp/xap_String_Id.h.h:290 +#: po/tmp/xap_String_Id.h.h:306 msgid "English (US)" msgstr "Ingls (EUA)" #. DLG_Password_Title -#: po/tmp/xap_String_Id.h.h:292 +#: po/tmp/xap_String_Id.h.h:308 msgid "Enter Password" msgstr "Digite a senha" #. LANG_EO -#: po/tmp/xap_String_Id.h.h:294 +#: po/tmp/xap_String_Id.h.h:310 msgid "Esperanto" msgstr "Esperanto" #. LANG_ET -#: po/tmp/xap_String_Id.h.h:296 +#: po/tmp/xap_String_Id.h.h:312 msgid "Estonian" msgstr "Estnio" #. DLG_FOSA_ExportTitle -#: po/tmp/xap_String_Id.h.h:298 +#: po/tmp/xap_String_Id.h.h:314 msgid "Export File" msgstr "Exportar Documento" #. DLG_HTMLOPT_ExpIs4 -#: po/tmp/xap_String_Id.h.h:300 +#: po/tmp/xap_String_Id.h.h:316 msgid "Export as HTML 4.01" msgstr "Exportar como HTML 4.01" #. DLG_HTMLOPT_ExpAbiWebDoc -#: po/tmp/xap_String_Id.h.h:302 +#: po/tmp/xap_String_Id.h.h:318 msgid "Export with PHP instructions" msgstr "Exportar com instrues PHP" #. LANG_FA_IR -#: po/tmp/xap_String_Id.h.h:304 +#: po/tmp/xap_String_Id.h.h:320 msgid "Farsi" msgstr "Farsi" #. DLG_UP_File -#: po/tmp/xap_String_Id.h.h:306 +#: po/tmp/xap_String_Id.h.h:322 msgid "File" msgstr "Arquivo" #. DLG_OverwriteFile -#: po/tmp/xap_String_Id.h.h:308 +#: po/tmp/xap_String_Id.h.h:324 #, c-format msgid "File already exists. Overwrite file '%s'?" msgstr "O arquivo '%s' j existe. Deseja substituir?" +#. DLG_FOSA_RecordToFileLabel +#: po/tmp/xap_String_Id.h.h:326 +msgid "File to record editing:" +msgstr "" + +#. DLG_FOSA_ReplayFromFileLabel +#: po/tmp/xap_String_Id.h.h:328 +msgid "File to replay editing:" +msgstr "" + #. LANG_FI_FI -#: po/tmp/xap_String_Id.h.h:310 +#: po/tmp/xap_String_Id.h.h:330 msgid "Finnish" msgstr "Finlands" #. LANG_NL_BE -#: po/tmp/xap_String_Id.h.h:312 +#: po/tmp/xap_String_Id.h.h:332 msgid "Flemish (Belgium)" msgstr "Holands (Blgica)" #. STYLE_FOOTREFERENCE -#: po/tmp/xap_String_Id.h.h:319 +#: po/tmp/xap_String_Id.h.h:339 msgid "Footnote Reference" msgstr "Referncia de Rodap" #. STYLE_FOOTTEXT -#: po/tmp/xap_String_Id.h.h:321 +#: po/tmp/xap_String_Id.h.h:341 msgid "Footnote Text" msgstr "Texto de Rodap" #. LANG_FR_BE -#: po/tmp/xap_String_Id.h.h:325 +#: po/tmp/xap_String_Id.h.h:345 msgid "French (Belgium)" msgstr "Francs (Blgica)" #. LANG_FR_CA -#: po/tmp/xap_String_Id.h.h:327 +#: po/tmp/xap_String_Id.h.h:347 msgid "French (Canada)" msgstr "Francs (Canad)" #. LANG_FR_FR -#: po/tmp/xap_String_Id.h.h:329 +#: po/tmp/xap_String_Id.h.h:349 msgid "French (France)" msgstr "Francs (Frana)" #. LANG_FR_CH -#: po/tmp/xap_String_Id.h.h:331 +#: po/tmp/xap_String_Id.h.h:351 msgid "French (Switzerland)" msgstr "Francs (Suia)" #. LANG_FY_NL -#: po/tmp/xap_String_Id.h.h:333 +#: po/tmp/xap_String_Id.h.h:353 msgid "Frisian" msgstr "Frsio" #. DLG_UP_From -#: po/tmp/xap_String_Id.h.h:335 +#: po/tmp/xap_String_Id.h.h:355 msgid "From: " msgstr "De: " -#. LANG_GL_ES -#: po/tmp/xap_String_Id.h.h:337 -msgid "Galician" +#. LANG_GL +#: po/tmp/xap_String_Id.h.h:357 +#, fuzzy +msgid "Galician (Galego)" msgstr "Galego" #. LANG_KA_GE -#: po/tmp/xap_String_Id.h.h:339 +#: po/tmp/xap_String_Id.h.h:359 msgid "Georgian" msgstr "Georgiano" #. ENC_GEOR_ACADEMY -#: po/tmp/xap_String_Id.h.h:341 +#: po/tmp/xap_String_Id.h.h:361 msgid "Georgian, Academy" msgstr "Georgiano, Acadmico" #. ENC_GEOR_PS -#: po/tmp/xap_String_Id.h.h:343 +#: po/tmp/xap_String_Id.h.h:363 msgid "Georgian, PS" msgstr "Georgiano, PS" #. LANG_DE_AT -#: po/tmp/xap_String_Id.h.h:345 +#: po/tmp/xap_String_Id.h.h:365 msgid "German (Austria)" msgstr "Alemo (ustria)" #. LANG_DE_DE -#: po/tmp/xap_String_Id.h.h:347 +#: po/tmp/xap_String_Id.h.h:367 msgid "German (Germany)" msgstr "Alemo (Alemanha)" #. LANG_DE_CH -#: po/tmp/xap_String_Id.h.h:349 +#: po/tmp/xap_String_Id.h.h:369 msgid "German (Switzerland)" msgstr "Alemo (Suia)" #. DLG_UP_Grayscale -#: po/tmp/xap_String_Id.h.h:351 +#: po/tmp/xap_String_Id.h.h:371 msgid "Grayscale" msgstr "Tons de cinza" #. LANG_EL_GR -#: po/tmp/xap_String_Id.h.h:353 +#: po/tmp/xap_String_Id.h.h:373 msgid "Greek" msgstr "Grego" #. ENC_GREE_ISO -#: po/tmp/xap_String_Id.h.h:355 +#: po/tmp/xap_String_Id.h.h:375 msgid "Greek, ISO-8859-7" msgstr "Grego, ISO-8859-7" #. ENC_GREE_MAC -#: po/tmp/xap_String_Id.h.h:357 +#: po/tmp/xap_String_Id.h.h:377 msgid "Greek, Macintosh" msgstr "Grego, Macintosh" #. ENC_GREE_WIN -#: po/tmp/xap_String_Id.h.h:359 +#: po/tmp/xap_String_Id.h.h:379 msgid "Greek, Windows Code Page 1253" msgstr "Grego, Pgina de Cdigos 1253 do Windows" #. DLG_HTMLOPT_ExpTitle -#: po/tmp/xap_String_Id.h.h:361 +#: po/tmp/xap_String_Id.h.h:381 msgid "HTML Export Options" msgstr "Opoes de Exportao HTML" #. LANG_HA_NE -#: po/tmp/xap_String_Id.h.h:365 +#: po/tmp/xap_String_Id.h.h:385 msgid "Hausa (Niger)" msgstr "Hausa (Nigria)" #. LANG_HA_NG -#: po/tmp/xap_String_Id.h.h:367 +#: po/tmp/xap_String_Id.h.h:387 msgid "Hausa (Nigeria)" msgstr "Hausa (Nigria)" #. LANG_HAW_US -#: po/tmp/xap_String_Id.h.h:369 +#: po/tmp/xap_String_Id.h.h:389 msgid "Hawaiian" msgstr "" #. STYLE_HEADING1 -#: po/tmp/xap_String_Id.h.h:371 +#: po/tmp/xap_String_Id.h.h:391 msgid "Heading 1" msgstr "Cabealho 1" #. STYLE_HEADING2 -#: po/tmp/xap_String_Id.h.h:373 +#: po/tmp/xap_String_Id.h.h:393 msgid "Heading 2" msgstr "Cabealho 2" #. STYLE_HEADING3 -#: po/tmp/xap_String_Id.h.h:375 +#: po/tmp/xap_String_Id.h.h:395 msgid "Heading 3" msgstr "Cabealho 3" #. STYLE_HEADING4 -#: po/tmp/xap_String_Id.h.h:377 +#: po/tmp/xap_String_Id.h.h:397 msgid "Heading 4" msgstr "Cabealho 4" #. LANG_HE_IL -#: po/tmp/xap_String_Id.h.h:381 +#: po/tmp/xap_String_Id.h.h:401 msgid "Hebrew" msgstr "Hebreu" #. ENC_HEBR_ISO -#: po/tmp/xap_String_Id.h.h:383 +#: po/tmp/xap_String_Id.h.h:403 msgid "Hebrew, ISO-8859-8" msgstr "Hebraico, ISO-8859-8" #. ENC_HEBR_MAC -#: po/tmp/xap_String_Id.h.h:385 +#: po/tmp/xap_String_Id.h.h:405 msgid "Hebrew, Macintosh" msgstr "Hebraico, Macintosh" #. ENC_HEBR_WIN -#: po/tmp/xap_String_Id.h.h:387 +#: po/tmp/xap_String_Id.h.h:407 msgid "Hebrew, Windows Code Page 1255" msgstr "Hebraico, Pgina de Cdigos 1255 do Windows" #. DLG_Image_Height -#: po/tmp/xap_String_Id.h.h:389 +#: po/tmp/xap_String_Id.h.h:409 msgid "Height:" msgstr "Altura:" #. DLG_IP_Height_Label -#: po/tmp/xap_String_Id.h.h:391 +#: po/tmp/xap_String_Id.h.h:411 msgid "Height: " msgstr "Altura:" #. DLG_UFS_HiddenCheck -#: po/tmp/xap_String_Id.h.h:393 +#: po/tmp/xap_String_Id.h.h:413 msgid "Hidden" msgstr "Escondido" #. DLG_UFS_BGColorTab -#: po/tmp/xap_String_Id.h.h:395 +#: po/tmp/xap_String_Id.h.h:415 msgid "HighLight Color" msgstr " Cor de fundo " #. LANG_HI_IN -#: po/tmp/xap_String_Id.h.h:397 +#: po/tmp/xap_String_Id.h.h:417 msgid "Hindi" msgstr "Hindu" #. LANG_HU_HU -#: po/tmp/xap_String_Id.h.h:399 +#: po/tmp/xap_String_Id.h.h:419 msgid "Hungarian" msgstr "Hngaro" #. LANG_IS_IS -#: po/tmp/xap_String_Id.h.h:401 +#: po/tmp/xap_String_Id.h.h:421 msgid "Icelandic" msgstr "Islands" #. ENC_ICEL_MAC -#: po/tmp/xap_String_Id.h.h:403 +#: po/tmp/xap_String_Id.h.h:423 msgid "Icelandic, Macintosh" msgstr "Islands, Macintosh" #. DLG_History_Id -#: po/tmp/xap_String_Id.h.h:405 +#: po/tmp/xap_String_Id.h.h:425 msgid "Identifier:" msgstr "Identificador:" #. DLG_Image_Title -#: po/tmp/xap_String_Id.h.h:407 +#: po/tmp/xap_String_Id.h.h:427 msgid "Image Properties" msgstr "Propriedades da Imagem" #. DLG_Image_WrappedNone -#: po/tmp/xap_String_Id.h.h:409 +#: po/tmp/xap_String_Id.h.h:429 msgid "Image floats above text" msgstr "Imagens flutuam sobre o texto" #. DLG_Image_InLine -#: po/tmp/xap_String_Id.h.h:411 +#: po/tmp/xap_String_Id.h.h:431 msgid "Image placed in-line (no text wrapping)" msgstr "Imagem posicionadas junto com texto (sem contorno de texto)" #. DLG_FOSA_ImportTitle -#: po/tmp/xap_String_Id.h.h:415 +#: po/tmp/xap_String_Id.h.h:435 msgid "Import File" msgstr "Importar Documento" #. MSG_ImportingDoc -#: po/tmp/xap_String_Id.h.h:417 -msgid "Importing Document.." +#: po/tmp/xap_String_Id.h.h:437 +#, fuzzy +msgid "Importing Document..." msgstr "Importando Documento..." #. LANG_ID_ID -#: po/tmp/xap_String_Id.h.h:419 +#: po/tmp/xap_String_Id.h.h:439 msgid "Indonesian" msgstr "Indonsio" #. XIM_Methods -#: po/tmp/xap_String_Id.h.h:421 +#: po/tmp/xap_String_Id.h.h:441 msgid "Input Methods" msgstr "Mtodos de Entrada" #. DLG_FOSA_InsertObject -#: po/tmp/xap_String_Id.h.h:425 +#: po/tmp/xap_String_Id.h.h:445 #, fuzzy msgid "Insert Embeddable Object" msgstr "Inserir tabela" #. DLG_FOSA_FileInsertObject -#: po/tmp/xap_String_Id.h.h:427 +#: po/tmp/xap_String_Id.h.h:447 msgid "Insert Embeddable Object file:" msgstr "Inserir arquivo com Objeto Embutido:" #. DLG_FOSA_InsertTitle -#: po/tmp/xap_String_Id.h.h:429 +#: po/tmp/xap_String_Id.h.h:449 msgid "Insert File" msgstr "&Inserir Documento" #. DLG_FOSA_InsertMath -#: po/tmp/xap_String_Id.h.h:431 +#: po/tmp/xap_String_Id.h.h:451 msgid "Insert Math File" msgstr "Inserir arquivo Matemtico" #. DLG_FOSA_FileInsertMath -#: po/tmp/xap_String_Id.h.h:433 +#: po/tmp/xap_String_Id.h.h:453 msgid "Insert MathML file:" msgstr "Inserir arquivo MathML:" #. TB_InsertNewTable -#: po/tmp/xap_String_Id.h.h:435 +#: po/tmp/xap_String_Id.h.h:455 msgid "Insert New Table" msgstr "Inserir Nova Tabela" #. DLG_IP_Title -#: po/tmp/xap_String_Id.h.h:437 +#: po/tmp/xap_String_Id.h.h:457 msgid "Insert Picture" msgstr "Inserir Figura" #. DLG_Insert_SymbolTitle -#: po/tmp/xap_String_Id.h.h:439 +#: po/tmp/xap_String_Id.h.h:459 msgid "Insert Symbol" msgstr "Inserir Smbolo" #. DLG_PLUGIN_MANAGER_INSTALL -#: po/tmp/xap_String_Id.h.h:441 +#: po/tmp/xap_String_Id.h.h:461 msgid "Install new plugin" msgstr "Instalar plugin novo" #. LANG_IA -#: po/tmp/xap_String_Id.h.h:443 +#: po/tmp/xap_String_Id.h.h:463 msgid "Interlingua" msgstr "Interlngua" #. LANG_IU_CA -#: po/tmp/xap_String_Id.h.h:445 +#: po/tmp/xap_String_Id.h.h:465 msgid "Inuktitut" msgstr "" #. DLG_InvalidPathname -#: po/tmp/xap_String_Id.h.h:447 +#: po/tmp/xap_String_Id.h.h:467 msgid "Invalid pathname." msgstr "O nome do arquivo ou diretrio no est correto" #. LANG_GA_IE -#: po/tmp/xap_String_Id.h.h:449 +#: po/tmp/xap_String_Id.h.h:469 msgid "Irish" msgstr "Gals (Eire)" #. LANG_IT_IT -#: po/tmp/xap_String_Id.h.h:451 +#: po/tmp/xap_String_Id.h.h:471 msgid "Italian (Italy)" msgstr "Italiano (Itlia)" #. LANG_JA_JP -#: po/tmp/xap_String_Id.h.h:455 +#: po/tmp/xap_String_Id.h.h:475 msgid "Japanese" msgstr "Japons" #. ENC_JAPN_EUC -#: po/tmp/xap_String_Id.h.h:457 +#: po/tmp/xap_String_Id.h.h:477 msgid "Japanese, EUC-JP" msgstr "Japons, EUC-JP" #. ENC_JAPN_ISO -#: po/tmp/xap_String_Id.h.h:459 +#: po/tmp/xap_String_Id.h.h:479 msgid "Japanese, ISO-2022-JP" msgstr "Japons, ISO-2022-JP" #. ENC_JAPN_SJIS -#: po/tmp/xap_String_Id.h.h:461 +#: po/tmp/xap_String_Id.h.h:481 msgid "Japanese, Shift-JIS" msgstr "Japons, Shift-JIS" #. ENC_JAPN_WIN -#: po/tmp/xap_String_Id.h.h:463 +#: po/tmp/xap_String_Id.h.h:483 msgid "Japanese, Windows Code Page 932" msgstr "Japons, Pgina de Cdigos 932 do Windows" #. LANG_KN_IN -#: po/tmp/xap_String_Id.h.h:465 +#: po/tmp/xap_String_Id.h.h:485 msgid "Kannada" msgstr "" #. LANG_KO_KR -#: po/tmp/xap_String_Id.h.h:467 +#. LANG_KO +#: po/tmp/xap_String_Id.h.h:488 msgid "Korean" msgstr "Coreano" #. ENC_KORE_EUC -#: po/tmp/xap_String_Id.h.h:469 +#: po/tmp/xap_String_Id.h.h:490 msgid "Korean, EUC-KR" msgstr "Coreano, EUC-KR" #. ENC_KORE_JOHAB -#: po/tmp/xap_String_Id.h.h:471 +#: po/tmp/xap_String_Id.h.h:492 msgid "Korean, Johab" msgstr "Coreano, Johab" #. ENC_KORE_KSC -#: po/tmp/xap_String_Id.h.h:473 +#: po/tmp/xap_String_Id.h.h:494 msgid "Korean, KSC_5601" msgstr "Coreano, KSC_5601" #. ENC_KORE_WIN -#: po/tmp/xap_String_Id.h.h:475 +#: po/tmp/xap_String_Id.h.h:496 msgid "Korean, Windows Code Page 949" msgstr "Coreano, Pgina de Cdigos 949 do Windows" #. LANG_KU -#: po/tmp/xap_String_Id.h.h:477 +#: po/tmp/xap_String_Id.h.h:498 #, fuzzy msgid "Kurdish" msgstr "Turco" #. LANG_LO_LA -#: po/tmp/xap_String_Id.h.h:479 +#: po/tmp/xap_String_Id.h.h:500 msgid "Lao" msgstr "" #. DLG_History_LastSaved -#: po/tmp/xap_String_Id.h.h:481 +#: po/tmp/xap_String_Id.h.h:502 msgid "Last saved:" msgstr "Salvo pela ltima vez em:" #. LANG_LA_IT -#: po/tmp/xap_String_Id.h.h:483 +#: po/tmp/xap_String_Id.h.h:504 msgid "Latin (Renaissance)" msgstr "Latim (Renascentista)" #. LANG_LV_LV -#: po/tmp/xap_String_Id.h.h:485 +#: po/tmp/xap_String_Id.h.h:506 msgid "Latvian" msgstr "Latvrio" #. LANG_LT_LT -#: po/tmp/xap_String_Id.h.h:487 +#: po/tmp/xap_String_Id.h.h:508 msgid "Lithuanian" msgstr "Litunio" +#. DLG_CLIPART_Loading +#: po/tmp/xap_String_Id.h.h:510 +#, fuzzy +msgid "Loading Clip Art" +msgstr "Portfolio" + #. LANG_MK -#: po/tmp/xap_String_Id.h.h:493 +#: po/tmp/xap_String_Id.h.h:516 msgid "Macedonian" msgstr "Macednio" #. DLG_ULANG_DefaultLangChkbox -#: po/tmp/xap_String_Id.h.h:495 +#: po/tmp/xap_String_Id.h.h:518 msgid "Make default for document" msgstr "Tornar padro para o documento" +#. LANG_MS_MY +#: po/tmp/xap_String_Id.h.h:520 +msgid "Malay" +msgstr "" + #. LANG_MI_NZ -#: po/tmp/xap_String_Id.h.h:497 +#: po/tmp/xap_String_Id.h.h:522 msgid "Maori" msgstr "" #. LANG_MR_IN -#: po/tmp/xap_String_Id.h.h:499 +#: po/tmp/xap_String_Id.h.h:524 msgid "Marathi" msgstr "" #. LANG_MH_MH -#: po/tmp/xap_String_Id.h.h:501 +#: po/tmp/xap_String_Id.h.h:526 msgid "Marshallese (Marshall Islands)" msgstr "Marshalhs (Ilhas Marshall)" #. LANG_MH_NR -#: po/tmp/xap_String_Id.h.h:503 +#: po/tmp/xap_String_Id.h.h:528 msgid "Marshallese (Nauru)" msgstr "Marshalhs (Nauru)" #. DLG_Merge -#: po/tmp/xap_String_Id.h.h:505 +#: po/tmp/xap_String_Id.h.h:530 msgid "Merge" msgstr "Reconciliar" #. LANG_MN_MN -#: po/tmp/xap_String_Id.h.h:507 +#: po/tmp/xap_String_Id.h.h:532 msgid "Mongolian" msgstr "" #. DLG_PLUGIN_MANAGER_NAME -#: po/tmp/xap_String_Id.h.h:509 +#: po/tmp/xap_String_Id.h.h:534 msgid "Name:" msgstr "Nome" +#. LANG_NE_NP +#: po/tmp/xap_String_Id.h.h:536 +msgid "Nepali (Nepal)" +msgstr "" + #. DLG_QNXMB_No -#: po/tmp/xap_String_Id.h.h:511 +#: po/tmp/xap_String_Id.h.h:538 msgid "No" msgstr "No" #. DLG_IP_No_Picture_Label -#: po/tmp/xap_String_Id.h.h:513 +#: po/tmp/xap_String_Id.h.h:540 msgid "No Picture" msgstr "Nenhuma imagem" #. DLG_PLUGIN_MANAGER_NONE_SELECTED -#: po/tmp/xap_String_Id.h.h:515 +#: po/tmp/xap_String_Id.h.h:542 msgid "No plugin selected" msgstr "Nenhum plugin selecionado" #. STYLE_NORMAL -#: po/tmp/xap_String_Id.h.h:517 +#: po/tmp/xap_String_Id.h.h:544 msgid "Normal" msgstr "Normal" #. LANG_NB_NO -#: po/tmp/xap_String_Id.h.h:519 +#: po/tmp/xap_String_Id.h.h:546 msgid "Norwegian Bokmal" msgstr "Noruegus Bokmal" #. LANG_NN_NO -#: po/tmp/xap_String_Id.h.h:521 +#: po/tmp/xap_String_Id.h.h:548 msgid "Norwegian Nynorsk" msgstr "Noruegus Nyorsk" #. DLG_PLUGIN_MANAGER_NOT_AVAILABLE -#: po/tmp/xap_String_Id.h.h:523 +#: po/tmp/xap_String_Id.h.h:550 msgid "Not available" msgstr "No disponvel" #. STYLE_NUMHEAD1 -#: po/tmp/xap_String_Id.h.h:525 +#: po/tmp/xap_String_Id.h.h:552 msgid "Numbered Heading 1" msgstr "Cabealho Numerado 1" #. STYLE_NUMHEAD2 -#: po/tmp/xap_String_Id.h.h:527 +#: po/tmp/xap_String_Id.h.h:554 msgid "Numbered Heading 2" msgstr "Cabealho Numerado 2" #. STYLE_NUMHEAD3 -#: po/tmp/xap_String_Id.h.h:529 +#: po/tmp/xap_String_Id.h.h:556 msgid "Numbered Heading 3" msgstr "Cabealho Numerado 3" #. DLG_OK -#: po/tmp/xap_String_Id.h.h:533 +#: po/tmp/xap_String_Id.h.h:560 msgid "OK" msgstr "OK" #. LANG_OC_FR -#: po/tmp/xap_String_Id.h.h:535 +#: po/tmp/xap_String_Id.h.h:562 msgid "Occitan" msgstr "Occitan" #. DLG_FOSA_OpenTitle -#: po/tmp/xap_String_Id.h.h:537 +#: po/tmp/xap_String_Id.h.h:564 msgid "Open File" msgstr "Abrir" #. DLG_FOSA_FileOpenTypeLabel -#: po/tmp/xap_String_Id.h.h:539 +#: po/tmp/xap_String_Id.h.h:566 msgid "Open file as type:" msgstr "Abrir um arquivo do tipo:" #. DLG_LISTDOCS_Title -#: po/tmp/xap_String_Id.h.h:541 +#: po/tmp/xap_String_Id.h.h:568 msgid "Opened Documents" msgstr "Documentos Abertos" #. TB_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:543 +#: po/tmp/xap_String_Id.h.h:570 msgid "Other..." msgstr "Outros..." #. DLG_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:547 +#: po/tmp/xap_String_Id.h.h:574 msgid "P&ercent:" msgstr "Percentagem:" #. TB_Zoom_PageWidth -#: po/tmp/xap_String_Id.h.h:549 +#: po/tmp/xap_String_Id.h.h:576 msgid "Page Width" msgstr "Largura de Pgina" #. DLG_UP_PageRanges -#: po/tmp/xap_String_Id.h.h:551 +#: po/tmp/xap_String_Id.h.h:578 msgid "Page ranges:" msgstr "Pginas nmero ...:" +#. LANG_PS +#: po/tmp/xap_String_Id.h.h:580 +#, fuzzy +msgid "Pashto" +msgstr "Colar" + #. DLG_Password_Password -#: po/tmp/xap_String_Id.h.h:553 +#: po/tmp/xap_String_Id.h.h:582 msgid "Password:" msgstr "Senha:" #. STYLE_PLAIN_TEXT -#: po/tmp/xap_String_Id.h.h:555 +#: po/tmp/xap_String_Id.h.h:584 msgid "Plain Text" msgstr "Texto simples" #. DLG_PLUGIN_MANAGER_DETAILS -#: po/tmp/xap_String_Id.h.h:557 +#: po/tmp/xap_String_Id.h.h:586 msgid "Plugin Details:" msgstr "Detalhes do plugin" #. DLG_PLUGIN_MANAGER_LIST -#: po/tmp/xap_String_Id.h.h:559 +#: po/tmp/xap_String_Id.h.h:588 msgid "Plugin List" msgstr "Lista de Plugins" #. LANG_PL_PL -#: po/tmp/xap_String_Id.h.h:561 +#: po/tmp/xap_String_Id.h.h:590 msgid "Polish" msgstr "Polaco" #. LANG_PT_BR -#: po/tmp/xap_String_Id.h.h:563 +#: po/tmp/xap_String_Id.h.h:592 msgid "Portuguese (Brazil)" msgstr "Portugus (Brasil)" #. LANG_PT_PT -#: po/tmp/xap_String_Id.h.h:565 +#: po/tmp/xap_String_Id.h.h:594 msgid "Portuguese (Portugal)" msgstr "Portugus (Portugal)" #. DLG_Image_PlaceColumn -#: po/tmp/xap_String_Id.h.h:567 +#: po/tmp/xap_String_Id.h.h:596 msgid "Position relative to its Column" msgstr "Posio relativa coluna" #. DLG_Image_PlacePage -#: po/tmp/xap_String_Id.h.h:569 +#: po/tmp/xap_String_Id.h.h:598 msgid "Position relative to its Page" msgstr "Posio relativa pgina" #. DLG_Image_PlaceParagraph -#: po/tmp/xap_String_Id.h.h:571 +#: po/tmp/xap_String_Id.h.h:600 msgid "Position relative to nearest paragraph" msgstr "Posio relativa ao pargrafo mais prximo" #. DLG_Image_Aspect -#: po/tmp/xap_String_Id.h.h:573 +#: po/tmp/xap_String_Id.h.h:602 msgid "Preserve aspect ratio" msgstr "Preservar a razo das dimenses:" #. DLG_IP_Activate_Label -#: po/tmp/xap_String_Id.h.h:577 +#: po/tmp/xap_String_Id.h.h:606 msgid "Preview Picture" msgstr "Ver antes" #. DLG_FOSA_PrintToFileTitle -#: po/tmp/xap_String_Id.h.h:582 +#: po/tmp/xap_String_Id.h.h:611 msgid "Print To File" msgstr "Imprimir para arquivo" #. DLG_FOSA_FilePrintTypeLabel -#: po/tmp/xap_String_Id.h.h:584 +#: po/tmp/xap_String_Id.h.h:613 msgid "Print file as type:" msgstr "Imprimir para arquivo do tipo:" #. DLG_UP_PrintIn -#: po/tmp/xap_String_Id.h.h:586 +#: po/tmp/xap_String_Id.h.h:615 msgid "Print in: " msgstr "Imprimir em: " #. DLG_UP_PrintTo -#: po/tmp/xap_String_Id.h.h:588 +#: po/tmp/xap_String_Id.h.h:617 msgid "Print to: " msgstr "Imprimir em: " #. DLG_UP_Printer -#: po/tmp/xap_String_Id.h.h:590 +#: po/tmp/xap_String_Id.h.h:619 msgid "Printer" msgstr "Impressora" #. DLG_UP_PrinterCommand -#: po/tmp/xap_String_Id.h.h:592 +#: po/tmp/xap_String_Id.h.h:621 msgid "Printer command: " msgstr "Comando de impresso: " #. LANG_PA_IN -#: po/tmp/xap_String_Id.h.h:594 +#: po/tmp/xap_String_Id.h.h:623 msgid "Punjabi (Gurmukhi)" msgstr "" #. LANG_PA_PK -#: po/tmp/xap_String_Id.h.h:596 +#: po/tmp/xap_String_Id.h.h:625 msgid "Punjabi (Shahmukhi)" msgstr "" #. LANG_QU_BO -#: po/tmp/xap_String_Id.h.h:598 +#: po/tmp/xap_String_Id.h.h:627 msgid "Quechua" msgstr "" +#. LANG_QUH_BO +#: po/tmp/xap_String_Id.h.h:629 +msgid "Quechua (3 vowels)" +msgstr "" + +#. LANG_QUL_BO +#: po/tmp/xap_String_Id.h.h:631 +msgid "Quechua (5 vowels)" +msgstr "" + +#. DLG_FOSA_RecordToFileTitle +#: po/tmp/xap_String_Id.h.h:633 +#, fuzzy +msgid "Record Editing to File" +msgstr "Tempo de edio:" + #. DLG_UFS_StyleRegular -#: po/tmp/xap_String_Id.h.h:600 +#: po/tmp/xap_String_Id.h.h:635 msgid "Regular" msgstr "Normal" #. DLG_DocComparison_Relationship -#: po/tmp/xap_String_Id.h.h:602 +#: po/tmp/xap_String_Id.h.h:637 msgid "Relationship:" msgstr "Relacionamento:" +#. DLG_FOSA_ReplayFromFileTitle +#: po/tmp/xap_String_Id.h.h:639 +#, fuzzy +msgid "Replay Editing from File" +msgstr "Selecionar imagem do Arquivo" + #. DLG_Restore -#: po/tmp/xap_String_Id.h.h:604 +#: po/tmp/xap_String_Id.h.h:641 msgid "Restore" msgstr "Restaurar" #. DLG_HTMLOPT_ExpRestore -#: po/tmp/xap_String_Id.h.h:606 +#: po/tmp/xap_String_Id.h.h:643 msgid "Restore Settings" msgstr "Restaurar Configuraes" #. DLG_DocComparison_Results -#: po/tmp/xap_String_Id.h.h:608 +#: po/tmp/xap_String_Id.h.h:645 msgid "Results" msgstr "Resultados" #. LANG_RO_RO -#: po/tmp/xap_String_Id.h.h:610 +#: po/tmp/xap_String_Id.h.h:647 msgid "Romanian" msgstr "Romeno" #. ENC_ROMA_MAC -#: po/tmp/xap_String_Id.h.h:612 +#: po/tmp/xap_String_Id.h.h:649 msgid "Romanian, Macintosh" msgstr "Romeno, Macintosh" #. LANG_RU_RU -#: po/tmp/xap_String_Id.h.h:614 +#: po/tmp/xap_String_Id.h.h:651 msgid "Russian (Russia)" msgstr "Russo (Rssia)" #. DLG_UFS_SampleFrameLabel -#: po/tmp/xap_String_Id.h.h:616 +#: po/tmp/xap_String_Id.h.h:653 msgid "Sample" msgstr "Amostra" #. LANG_SC_IT -#: po/tmp/xap_String_Id.h.h:618 +#: po/tmp/xap_String_Id.h.h:655 msgid "Sardinian" msgstr "Sardins" #. DLG_FOSA_SaveAsTitle -#: po/tmp/xap_String_Id.h.h:620 +#: po/tmp/xap_String_Id.h.h:657 msgid "Save File As" msgstr "Salvar como" #. DLG_HTMLOPT_ExpSave -#: po/tmp/xap_String_Id.h.h:622 +#: po/tmp/xap_String_Id.h.h:659 msgid "Save Settings" msgstr "Salvar Configuraes" #. DLG_FOSA_FileSaveTypeLabel -#: po/tmp/xap_String_Id.h.h:624 +#: po/tmp/xap_String_Id.h.h:661 msgid "Save file as type:" msgstr "Salvar o arquivo como o tipo:" #. DLG_UFS_ScriptLabel -#: po/tmp/xap_String_Id.h.h:626 +#: po/tmp/xap_String_Id.h.h:663 msgid "Script:" msgstr "Script:" #. STYLE_SECTHEADING -#: po/tmp/xap_String_Id.h.h:628 +#: po/tmp/xap_String_Id.h.h:665 msgid "Section Heading" msgstr "Cabealho de Seo" #. DLG_UENC_EncLabel -#: po/tmp/xap_String_Id.h.h:632 +#: po/tmp/xap_String_Id.h.h:669 msgid "Select Encoding:" msgstr "Escolha a Codificao:" #. DLG_HTMLOPT_ExpLabel -#: po/tmp/xap_String_Id.h.h:634 +#: po/tmp/xap_String_Id.h.h:671 msgid "Select HTML export options:" msgstr "Selecionar opes de exportao de HTML" #. DLG_ULANG_LangLabel -#: po/tmp/xap_String_Id.h.h:636 +#: po/tmp/xap_String_Id.h.h:673 msgid "Select Language:" msgstr "Escolha o Idioma" #. LANG_SR -#: po/tmp/xap_String_Id.h.h:640 +#: po/tmp/xap_String_Id.h.h:677 msgid "Serbian" msgstr "Srvio" #. DLG_Image_ImageDesc -#: po/tmp/xap_String_Id.h.h:642 +#: po/tmp/xap_String_Id.h.h:679 msgid "Set Image Name" msgstr "Configurar Nome de Imagem" #. DLG_Image_ImageSize -#: po/tmp/xap_String_Id.h.h:644 +#: po/tmp/xap_String_Id.h.h:681 msgid "Set Image Size" msgstr "Configurar Tamanho da Imagem" #. DLG_ULANG_LangTitle -#: po/tmp/xap_String_Id.h.h:646 +#: po/tmp/xap_String_Id.h.h:683 msgid "Set Language" msgstr "Idioma" #. DLG_UFS_TransparencyCheck -#: po/tmp/xap_String_Id.h.h:648 +#: po/tmp/xap_String_Id.h.h:685 msgid "Set no Highlight Color" msgstr "Desligar cor de realce" #. DLG_UFS_SizeLabel -#: po/tmp/xap_String_Id.h.h:652 +#: po/tmp/xap_String_Id.h.h:689 msgid "Size:" msgstr "Tamanho:" #. LANG_SK_SK -#: po/tmp/xap_String_Id.h.h:654 +#: po/tmp/xap_String_Id.h.h:691 msgid "Slovak" msgstr "Eslovaco" #. LANG_SL_SI -#: po/tmp/xap_String_Id.h.h:656 +#: po/tmp/xap_String_Id.h.h:693 msgid "Slovenian" msgstr "Eslovnio" #. LANG_ES_MX -#: po/tmp/xap_String_Id.h.h:658 +#: po/tmp/xap_String_Id.h.h:695 msgid "Spanish (Mexico)" msgstr "Espanhol (Mxico)" #. LANG_ES_ES -#: po/tmp/xap_String_Id.h.h:660 +#: po/tmp/xap_String_Id.h.h:697 msgid "Spanish (Spain)" msgstr "Espanhol (Espanha)" #. DLG_Image_SquareWrap -#: po/tmp/xap_String_Id.h.h:664 +#: po/tmp/xap_String_Id.h.h:701 msgid "Square text wrapping" msgstr "Contorno de texto quadrado" #. DLG_DocComparison_Styles -#: po/tmp/xap_String_Id.h.h:672 +#: po/tmp/xap_String_Id.h.h:709 msgid "Styles:" msgstr "Estilos:" #. LANG_SW -#: po/tmp/xap_String_Id.h.h:678 +#: po/tmp/xap_String_Id.h.h:715 msgid "Swahili" msgstr "" #. LANG_SV_SE -#: po/tmp/xap_String_Id.h.h:680 +#: po/tmp/xap_String_Id.h.h:717 msgid "Swedish" msgstr "Sueco" #. TB_Font_Symbol -#: po/tmp/xap_String_Id.h.h:682 +#: po/tmp/xap_String_Id.h.h:719 #, fuzzy msgid "Symbols" msgstr "Smbolos" #. LANG_SYR -#: po/tmp/xap_String_Id.h.h:684 +#: po/tmp/xap_String_Id.h.h:721 msgid "Syriac" msgstr "" #. LANG_TL_PH -#: po/tmp/xap_String_Id.h.h:688 +#: po/tmp/xap_String_Id.h.h:725 msgid "Tagalog" msgstr "" #. LANG_TA_IN -#: po/tmp/xap_String_Id.h.h:690 +#: po/tmp/xap_String_Id.h.h:727 msgid "Tamil" msgstr "" #. LANG_TE_IN -#: po/tmp/xap_String_Id.h.h:692 +#: po/tmp/xap_String_Id.h.h:729 msgid "Telugu" msgstr "" #. DLG_UFS_ColorTab -#: po/tmp/xap_String_Id.h.h:694 +#: po/tmp/xap_String_Id.h.h:731 msgid "Text Color" msgstr " Cor " #. DLG_Image_WrappedBoth -#: po/tmp/xap_String_Id.h.h:696 +#: po/tmp/xap_String_Id.h.h:733 msgid "Text wrapped on both sides of the Image" msgstr "Contorno de texto nos dois lados da imagem" #. DLG_Image_WrappedLeft -#: po/tmp/xap_String_Id.h.h:698 +#: po/tmp/xap_String_Id.h.h:735 msgid "Text wrapped to the Left of the Image" msgstr "Texto contornando o lado esquerdo da imagem" #. DLG_Image_WrappedRight -#: po/tmp/xap_String_Id.h.h:700 +#: po/tmp/xap_String_Id.h.h:737 msgid "Text wrapped to the Right of the Image" msgstr "Texto contornando o lado direito da imagem" #. LANG_TH_TH -#: po/tmp/xap_String_Id.h.h:702 +#: po/tmp/xap_String_Id.h.h:739 msgid "Thai" msgstr "Tailands" #. ENC_THAI_MAC -#: po/tmp/xap_String_Id.h.h:704 +#: po/tmp/xap_String_Id.h.h:741 msgid "Thai, Macintosh" msgstr "Tailands, Macintosh" #. ENC_THAI_TIS -#: po/tmp/xap_String_Id.h.h:706 +#: po/tmp/xap_String_Id.h.h:743 msgid "Thai, TIS-620" msgstr "Tailands, TIS-620" #. ENC_THAI_WIN -#: po/tmp/xap_String_Id.h.h:708 +#: po/tmp/xap_String_Id.h.h:745 msgid "Thai, Windows Code Page 874" msgstr "Tailands, Pgina de Cdigos 874 do Windows" #. DLG_NoSaveFile_DirNotWriteable -#: po/tmp/xap_String_Id.h.h:710 +#: po/tmp/xap_String_Id.h.h:747 #, c-format msgid "The directory '%s' is write-protected." msgstr "O diretrio '%s' est protegido contra gravao." +#. DLG_FOSA_ExtensionDoesNotMatch +#: po/tmp/xap_String_Id.h.h:749 +msgid "" +"The given file extension does not match the chosen file type. Do you want to " +"use this name anyway?" +msgstr "" + #. MSG_HistoryPartRestore2 -#: po/tmp/xap_String_Id.h.h:712 +#: po/tmp/xap_String_Id.h.h:751 #, c-format msgid "" "The nearest version that can be restored fully is %d. Would you like to " @@ -7864,352 +8019,383 @@ "aperte No." #. DLG_UP_InvalidPrintString -#: po/tmp/xap_String_Id.h.h:714 +#: po/tmp/xap_String_Id.h.h:753 msgid "The print command string is not valid." msgstr "O comando de impresso no valido." #. MSG_NoUndo -#: po/tmp/xap_String_Id.h.h:716 +#: po/tmp/xap_String_Id.h.h:755 msgid "This operation cannot be undone. Are you sure you want to proceed?" -msgstr "Esta operao no poder ser desfeita. Voc tem certeza que " -"deseja prosseguir?" +msgstr "" +"Esta operao no poder ser desfeita. Voc tem certeza que deseja " +"prosseguir?" #. DLG_Image_TightWrap -#: po/tmp/xap_String_Id.h.h:720 +#: po/tmp/xap_String_Id.h.h:759 msgid "Tight text wrapping" msgstr "Contorno de texto apertado" #. MSG_HistoryPartRestore3 -#: po/tmp/xap_String_Id.h.h:724 +#: po/tmp/xap_String_Id.h.h:763 msgid "To continue anyway, press OK." msgstr "Para continuar de qualquer maneira, aperte OK" #. MSG_HistoryPartRestore4 -#: po/tmp/xap_String_Id.h.h:726 +#: po/tmp/xap_String_Id.h.h:765 msgid "To quit the restoration attempt, press Cancel." msgstr "Para parar a tentativa de restaurao, aperte Cancela." #. LANG_TR_TR -#: po/tmp/xap_String_Id.h.h:732 +#: po/tmp/xap_String_Id.h.h:771 msgid "Turkish" msgstr "Turco" #. ENC_TURK_ISO -#: po/tmp/xap_String_Id.h.h:734 +#: po/tmp/xap_String_Id.h.h:773 msgid "Turkish, ISO-8859-9" msgstr "Turco, ISO-8859-9" #. ENC_TURK_MAC -#: po/tmp/xap_String_Id.h.h:736 +#: po/tmp/xap_String_Id.h.h:775 msgid "Turkish, Macintosh" msgstr "Turco, Macintosh" #. ENC_TURK_WIN -#: po/tmp/xap_String_Id.h.h:738 +#: po/tmp/xap_String_Id.h.h:777 msgid "Turkish, Windows Code Page 1254" msgstr "Turco, Pgina de Cdigos 1254 do Windows" #. DLG_Image_WrapType -#: po/tmp/xap_String_Id.h.h:740 +#: po/tmp/xap_String_Id.h.h:779 msgid "Type of text wrapping" msgstr "Tipo de Contorno de Texto" #. ENC_WEST_ASCII -#: po/tmp/xap_String_Id.h.h:742 +#: po/tmp/xap_String_Id.h.h:781 msgid "US-ASCII" msgstr "US-ASCII" #. LANG_UK_UA -#: po/tmp/xap_String_Id.h.h:744 +#: po/tmp/xap_String_Id.h.h:783 msgid "Ukrainian" msgstr "Ukraniano" #. ENC_UKRA_KOI -#: po/tmp/xap_String_Id.h.h:746 +#: po/tmp/xap_String_Id.h.h:785 msgid "Ukrainian, KOI8-U" msgstr "Ucraniano, KOI8-U" #. ENC_UKRA_MAC -#: po/tmp/xap_String_Id.h.h:748 +#: po/tmp/xap_String_Id.h.h:787 msgid "Ukrainian, Macintosh" msgstr "Ucraniano, Macintosh" #. ENC_UNIC_UCS2 -#: po/tmp/xap_String_Id.h.h:752 +#: po/tmp/xap_String_Id.h.h:791 msgid "Unicode UCS-2" msgstr "Unicode UCS-2" #. ENC_UNIC_UCS_2BE -#: po/tmp/xap_String_Id.h.h:754 +#: po/tmp/xap_String_Id.h.h:793 msgid "Unicode UCS-2 Big Endian" msgstr "Unicode UCS-2 Big Endian" #. ENC_UNIC_UCS_2LE -#: po/tmp/xap_String_Id.h.h:756 +#: po/tmp/xap_String_Id.h.h:795 msgid "Unicode UCS-2 Little Endian" msgstr "Unicode UCS-2 Little Endian" #. ENC_UNIC_UCS4 -#: po/tmp/xap_String_Id.h.h:758 +#: po/tmp/xap_String_Id.h.h:797 msgid "Unicode UCS-4" msgstr "Unicode UCS-4" #. ENC_UNIC_UCS_4BE -#: po/tmp/xap_String_Id.h.h:760 +#: po/tmp/xap_String_Id.h.h:799 msgid "Unicode UCS-4 Big Endian" msgstr "Unicode UCS-4 Big Endian" #. ENC_UNIC_UCS_4LE -#: po/tmp/xap_String_Id.h.h:762 +#: po/tmp/xap_String_Id.h.h:801 msgid "Unicode UCS-4 Little Endian" msgstr "Unicode UCS-4 Little Endian" #. ENC_UNIC_UTF_16 -#: po/tmp/xap_String_Id.h.h:764 +#: po/tmp/xap_String_Id.h.h:803 msgid "Unicode UTF-16" msgstr "Unicode UTF-16 Big Endian" #. ENC_UNIC_UTF_16BE -#: po/tmp/xap_String_Id.h.h:766 +#: po/tmp/xap_String_Id.h.h:805 msgid "Unicode UTF-16 Big Endian" msgstr "Unicode UTF-16 Big Endian" #. ENC_UNIC_UTF_16LE -#: po/tmp/xap_String_Id.h.h:768 +#: po/tmp/xap_String_Id.h.h:807 msgid "Unicode UTF-16 Little Endian" msgstr "Unicode UTF-16 Little Endian" #. ENC_UNIC_UTF_32 -#: po/tmp/xap_String_Id.h.h:770 +#: po/tmp/xap_String_Id.h.h:809 msgid "Unicode UTF-32" msgstr "Unicode UTF-32 Big Endian" #. ENC_UNIC_UTF_32BE -#: po/tmp/xap_String_Id.h.h:772 +#: po/tmp/xap_String_Id.h.h:811 msgid "Unicode UTF-32 Big Endian" msgstr "Unicode UTF-32 Big Endian" #. ENC_UNIC_UTF_32LE -#: po/tmp/xap_String_Id.h.h:774 +#: po/tmp/xap_String_Id.h.h:813 msgid "Unicode UTF-32 Little Endian" msgstr "Unicode UTF-32 Little Endian" #. ENC_UNIC_UTF_7 -#: po/tmp/xap_String_Id.h.h:776 +#: po/tmp/xap_String_Id.h.h:815 msgid "Unicode UTF-7" msgstr "Unicode UTF-7" #. ENC_UNIC_UTF_8 -#: po/tmp/xap_String_Id.h.h:778 +#: po/tmp/xap_String_Id.h.h:817 msgid "Unicode UTF-8" msgstr "Unicode UTF-8" #. UntitledDocument -#: po/tmp/xap_String_Id.h.h:780 +#: po/tmp/xap_String_Id.h.h:819 #, c-format msgid "Untitled%d" msgstr "Documento%d" #. DLG_Update -#: po/tmp/xap_String_Id.h.h:782 +#: po/tmp/xap_String_Id.h.h:821 msgid "Update" msgstr "Atualizar" -#. LANG_UR_PK -#: po/tmp/xap_String_Id.h.h:788 +#. LANG_UR +#: po/tmp/xap_String_Id.h.h:827 msgid "Urdu" msgstr "Urdo" +#. LANG_UR_PK +#: po/tmp/xap_String_Id.h.h:829 +msgid "Urdu (Pakistan)" +msgstr "" + #. LANG_UZ_UZ -#: po/tmp/xap_String_Id.h.h:790 +#: po/tmp/xap_String_Id.h.h:831 msgid "Uzbek" msgstr "" #. DLG_History_List_Title -#: po/tmp/xap_String_Id.h.h:794 +#: po/tmp/xap_String_Id.h.h:835 msgid "Version history" msgstr "Histrico de verses" #. DLG_PLUGIN_MANAGER_VERSION #. DLG_History_Version -#: po/tmp/xap_String_Id.h.h:797 +#: po/tmp/xap_String_Id.h.h:838 msgid "Version:" msgstr "Verso" #. LANG_VI_VN -#: po/tmp/xap_String_Id.h.h:799 +#: po/tmp/xap_String_Id.h.h:840 msgid "Vietnamese" msgstr "Vietnamita" #. ENC_VIET_TCVN -#: po/tmp/xap_String_Id.h.h:801 +#: po/tmp/xap_String_Id.h.h:842 msgid "Vietnamese, TCVN" msgstr "Vietnamita, TCVN" #. ENC_VIET_VISCII -#: po/tmp/xap_String_Id.h.h:803 +#: po/tmp/xap_String_Id.h.h:844 msgid "Vietnamese, VISCII" msgstr "Vietnamita, VISCII" #. ENC_VIET_WIN -#: po/tmp/xap_String_Id.h.h:805 +#: po/tmp/xap_String_Id.h.h:846 msgid "Vietnamese, Windows Code Page 1258" msgstr "Vietnamita, Pgina de Cdigos 1258 do Windows" #. DLG_MW_MoreWindows -#: po/tmp/xap_String_Id.h.h:807 +#: po/tmp/xap_String_Id.h.h:848 msgid "View Document" msgstr "Ativar janela" #. DLG_MW_Activate -#: po/tmp/xap_String_Id.h.h:809 +#: po/tmp/xap_String_Id.h.h:850 msgid "View:" msgstr "Ativar::" #. LANG_CY_GB -#: po/tmp/xap_String_Id.h.h:811 +#: po/tmp/xap_String_Id.h.h:852 msgid "Welsh" msgstr "Gals" #. ENC_US_DOS -#: po/tmp/xap_String_Id.h.h:813 +#: po/tmp/xap_String_Id.h.h:854 msgid "Western European, DOS/Windows Code Page 437" msgstr "Centro-Europeu, Pgina de Cdigo 437 do DOS/Windows" #. ENC_MLNG_DOS -#: po/tmp/xap_String_Id.h.h:815 +#: po/tmp/xap_String_Id.h.h:856 msgid "Western European, DOS/Windows Code Page 850" msgstr "Centro-Europeu, Pgina de Cdigo 850 do DOS/Windows" #. ENC_WEST_HP -#: po/tmp/xap_String_Id.h.h:817 +#: po/tmp/xap_String_Id.h.h:858 msgid "Western European, HP" msgstr "Europeu Ocidental, HP" #. ENC_WEST_ISO -#: po/tmp/xap_String_Id.h.h:819 +#: po/tmp/xap_String_Id.h.h:860 msgid "Western European, ISO-8859-1" msgstr "Europeu Ocidental, ISO-8859-1" #. ENC_WEST_MAC -#: po/tmp/xap_String_Id.h.h:821 +#: po/tmp/xap_String_Id.h.h:862 msgid "Western European, Macintosh" msgstr "Europeu Ocidental, Macintosh" #. ENC_WEST_NXT -#: po/tmp/xap_String_Id.h.h:823 +#: po/tmp/xap_String_Id.h.h:864 msgid "Western European, NeXT" msgstr "Europeu Ocidental, NeXT" #. ENC_WEST_WIN -#: po/tmp/xap_String_Id.h.h:825 +#: po/tmp/xap_String_Id.h.h:866 msgid "Western European, Windows Code Page 1252" msgstr "Europeu Ocidental, Pgina de Cdigos 1252 do Windows" #. TB_Zoom_WholePage -#: po/tmp/xap_String_Id.h.h:827 +#: po/tmp/xap_String_Id.h.h:868 msgid "Whole Page" msgstr "Pgina Toda" #. DLG_Image_Width -#: po/tmp/xap_String_Id.h.h:829 +#: po/tmp/xap_String_Id.h.h:870 msgid "Width:" msgstr "Comprimento:" #. DLG_IP_Width_Label -#: po/tmp/xap_String_Id.h.h:831 +#: po/tmp/xap_String_Id.h.h:872 msgid "Width: " msgstr "Comprimento:" +#. LANG_WO_SN +#: po/tmp/xap_String_Id.h.h:874 +msgid "Wolof (Senegal)" +msgstr "" + #. DLG_QNXMB_Yes -#: po/tmp/xap_String_Id.h.h:833 +#: po/tmp/xap_String_Id.h.h:876 msgid "Yes" msgstr "Sim" #. LANG_YI -#: po/tmp/xap_String_Id.h.h:835 +#: po/tmp/xap_String_Id.h.h:878 msgid "Yiddish" msgstr "Yeddish" #. MSG_HistoryConfirmSave -#: po/tmp/xap_String_Id.h.h:837 +#: po/tmp/xap_String_Id.h.h:880 #, c-format msgid "You have to save changes to document %s before proceeding. Save now?" -msgstr "Voc tem que salvar as alterao do documento %s antes de prosseguir. " -"Salvar agora?" +msgstr "" +"Voc tem que salvar as alterao do documento %s antes de prosseguir. Salvar " +"agora?" #. DLG_Zoom_RadioFrameCaption -#: po/tmp/xap_String_Id.h.h:841 +#: po/tmp/xap_String_Id.h.h:884 msgid "Zoom to" msgstr "Fator de zoom" #. DLG_UnixMB_No -#: po/tmp/xap_String_Id.h.h:843 +#: po/tmp/xap_String_Id.h.h:886 msgid "_No" msgstr "_No" #. DLG_UnixMB_Yes -#: po/tmp/xap_String_Id.h.h:845 +#: po/tmp/xap_String_Id.h.h:888 msgid "_Yes" msgstr "_Sim" #. DLG_Unit_cm -#: po/tmp/xap_String_Id.h.h:847 +#: po/tmp/xap_String_Id.h.h:890 msgid "cm" msgstr "centmetros" #. DLG_DocComparison_Different -#: po/tmp/xap_String_Id.h.h:849 +#: po/tmp/xap_String_Id.h.h:892 msgid "different" msgstr "diferentes" #. DLG_DocComparison_DivergingPos -#: po/tmp/xap_String_Id.h.h:851 +#: po/tmp/xap_String_Id.h.h:894 #, c-format msgid "diverging after document position %d" msgstr "divergindo a partir da posio %d do documento" #. DLG_DocComparison_Diverging -#: po/tmp/xap_String_Id.h.h:853 +#: po/tmp/xap_String_Id.h.h:896 #, c-format msgid "diverging after version %d of %s" msgstr "divergindo a partir da verso %d de %s" #. DLG_DocComparison_Identical -#: po/tmp/xap_String_Id.h.h:855 +#: po/tmp/xap_String_Id.h.h:898 msgid "identical" msgstr "idnticos" #. DLG_Unit_inch -#: po/tmp/xap_String_Id.h.h:857 +#: po/tmp/xap_String_Id.h.h:900 msgid "inch" msgstr "polegadas" #. DLG_Unit_mm -#: po/tmp/xap_String_Id.h.h:859 +#: po/tmp/xap_String_Id.h.h:902 msgid "mm" msgstr "milmetros" #. DLG_Unit_pica -#: po/tmp/xap_String_Id.h.h:861 +#: po/tmp/xap_String_Id.h.h:904 msgid "pica" msgstr "picas" #. DLG_Unit_points -#: po/tmp/xap_String_Id.h.h:863 +#: po/tmp/xap_String_Id.h.h:906 msgid "points" msgstr "pontos" #. DLG_DocComparison_Siblings -#: po/tmp/xap_String_Id.h.h:865 +#: po/tmp/xap_String_Id.h.h:908 msgid "siblings" msgstr "prximos" #. DLG_DocComparison_Unrelated -#: po/tmp/xap_String_Id.h.h:867 +#: po/tmp/xap_String_Id.h.h:910 msgid "unrelated" msgstr "no relacionados" +#~ msgid "&From File" +#~ msgstr "Do &Arquivo" + +#~ msgid "Insert a picture" +#~ msgstr "Inserir imagem" + +#~ msgid "M&erge documents" +#~ msgstr "R&econciliar documentos" + +#~ msgid "Show the AbiWord splash screen on application startup" +#~ msgstr "Exibir logotipo de inicializao" + +#~ msgid "" +#~ "The documents you are trying to merge are unrelated. AbiWord will attempt " +#~ "to merge them, but the result might be meaningless." +#~ msgstr "" +#~ "Estes documentos que voc est tentando reconciliar no so relacionados. " +#~ "O AbiWord tentar reconcili-los, mas o resultado pode no fazer sentido." + #~ msgid "&Autotext" #~ msgstr "&Texto Automtico" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/po/ro-RO.po /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/po/ro-RO.po --- abiword-2.6.2/abiword/po/ro-RO.po 2008-04-06 17:00:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword/po/ro-RO.po 2009-07-15 16:56:23.000000000 +0100 @@ -8,12 +8,12 @@ msgstr "" "Project-Id-Version: Abiword 2.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-14 20:12+0200\n" +"POT-Creation-Date: 2008-09-06 05:26+0200\n" "PO-Revision-Date: 2005-03-21 11:28/-0600\n" -"Last-Translator: unknown \n" +"Last-Translator: Lucian Constantin \n" "Language-Team: unknown \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. @@ -46,18 +46,18 @@ msgid "" " - Reserved. \n" " You cannot use this name. Choose Another \n" -msgstr "" +msgstr " - Rezervat. \n" +" Nu puteți folosi acest nume. Alegeți altul \n" #. DLG_WordCount_Auto_Update #: po/tmp/ap_String_Id.h.h:27 msgid " Auto Update" -msgstr "Actualizare automat" +msgstr "Actualizare automată" #. DLG_PageSetup_Percent #: po/tmp/ap_String_Id.h.h:29 -#, c-format msgid "% of normal size" -msgstr "% din dimensiunea normal" +msgstr "% din dimensiunea normală" #. MENU_LABEL_SPELL_SUGGEST_1 #. MENU_LABEL_SPELL_SUGGEST_2 @@ -85,11 +85,15 @@ "\tabiword-dev@abisource.com\n" "\n" "Otherwise, please be patient." -msgstr "" -"%s nu este nc implementat.x0a;x0a;Dac suntei un programator,putei scrie " -"codul chiar dumneavoastr.x0a; n fiierul %s, la linia %dx0a; i s ne " -"trimitei modificarea la:x0a;x0a;\tabiword-dev@abisource.comx0a;x0a;altfel " -"v mulumim pentru rbdarea dumneavoastr." +msgstr "%s nu este implementat încă.\n" +"\n" +"Dacă sunteți un programator, puteți adăuga codul chiar dumneavoastră\n" +"în fișierul %s, la linia %d\n" +"și să ne trimiteți modificarea la\n" +"\n" +"\tabiword-dev@abisource.com\n" +"\n" +"altfel vă mulțumim pentru răbdarea dumneavoastră." #. MENU_LABEL_FILE_RECENT_1 #. MENU_LABEL_VIEW_TB_1 @@ -187,23 +191,23 @@ #. MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION #: po/tmp/ap_String_Id.h.h:84 msgid "&Accept revision" -msgstr "&Accept corecii" +msgstr "&Acceptă corecții" #. DLG_Spell_AddToDict #. MENU_LABEL_SPELL_ADD #: po/tmp/ap_String_Id.h.h:87 msgid "&Add" -msgstr "Adaug la dicionar" +msgstr "Adaugă la dicționar" #. DLG_PageSetup_Adjust #: po/tmp/ap_String_Id.h.h:89 msgid "&Adjust to:" -msgstr "&Scaleaz la:" +msgstr "&Scalează la:" #. MENU_LABEL_ALIGN #: po/tmp/ap_String_Id.h.h:91 msgid "&Align" -msgstr "&Aliniaz" +msgstr "&Aliniază" #. DLG_Options_Label_ViewAll #: po/tmp/ap_String_Id.h.h:93 @@ -213,7 +217,7 @@ #. DLG_ApplyButton #: po/tmp/ap_String_Id.h.h:95 msgid "&Apply" -msgstr "" +msgstr "&Aplică" #. DLG_Para_LabelAt #: po/tmp/ap_String_Id.h.h:97 @@ -223,17 +227,17 @@ #. MENU_LABEL_TOOLS_AUTOSPELL #: po/tmp/ap_String_Id.h.h:99 msgid "&Auto Spellcheck" -msgstr "Control ortografic &automat" +msgstr "Corectare ortografică &automată" #. MENU_LABEL_TABLE_AUTOFIT #: po/tmp/ap_String_Id.h.h:101 msgid "&Autofit Table" -msgstr "&Dimensioneaz automat tabelul" +msgstr "&Dimensionează automat tabelul" #. DLG_Options_Label_PrefsAutoSave #: po/tmp/ap_String_Id.h.h:103 msgid "&Automatically save this Scheme" -msgstr "Salveaz &automat preferinele" +msgstr "Salvează &automat preferințele" #. DLG_DateTime_AvailableFormats #: po/tmp/ap_String_Id.h.h:105 @@ -243,33 +247,33 @@ #. DLG_Para_LabelBefore #: po/tmp/ap_String_Id.h.h:107 msgid "&Before:" -msgstr "&nainte:" +msgstr "&Înainte:" #. MENU_LABEL_FMT_BOLD #: po/tmp/ap_String_Id.h.h:109 msgid "&Bold" -msgstr "&Aldin" +msgstr "În&groșat" #. DLG_PageSetup_Bottom #: po/tmp/ap_String_Id.h.h:111 msgid "&Bottom:" -msgstr "&Inferioar:" +msgstr "&Inferioară:" #. MENU_LABEL_INSERT_BREAK #: po/tmp/ap_String_Id.h.h:113 msgid "&Break" -msgstr "&ntrerupere" +msgstr "În&trerupe" #. MENU_LABEL_TABLE_SELECT_CELL #: po/tmp/ap_String_Id.h.h:115 msgid "&Cell" -msgstr "Selecteaz &celul" +msgstr "C&elulă" #. MENU_LABEL_TABLE_INSERT_CELLS #. MENU_LABEL_TABLE_DELETE_CELLS #: po/tmp/ap_String_Id.h.h:118 msgid "&Cells" -msgstr "Insereaz &celule" +msgstr "&Celule" #. MENU_LABEL_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:120 @@ -279,73 +283,73 @@ #. DLG_Spell_Change #: po/tmp/ap_String_Id.h.h:122 msgid "&Change" -msgstr "nlocuiete cu:" +msgstr "Î&nlocuiește cu" #. MENU_LABEL_INSERT_CLIPART #: po/tmp/ap_String_Id.h.h:124 msgid "&Clip Art" -msgstr "&Clip Art" +msgstr "Clip &Art" #. DLG_CloseButton #. MENU_LABEL_FILE_CLOSE #: po/tmp/ap_String_Id.h.h:127 msgid "&Close" -msgstr "&nchide" +msgstr "În&chide" #. MENU_LABEL_TABLE_DELETE_COLUMNS #: po/tmp/ap_String_Id.h.h:129 msgid "&Column" -msgstr "terge co&loane" +msgstr "&Coloane" #. DLG_Break_ColumnBreak #: po/tmp/ap_String_Id.h.h:131 msgid "&Column break" -msgstr "&Coloan" +msgstr "&Coloană" #. MENU_LABEL_FMT_COLUMNS #: po/tmp/ap_String_Id.h.h:133 msgid "&Columns" -msgstr "Coloa&ne" +msgstr "&Coloane" #. MENU_LABEL_TOOLS_REVISIONS_COMPARE_DOCUMENTS #: po/tmp/ap_String_Id.h.h:135 msgid "&Compare documents" -msgstr "" +msgstr "&Compară documente" #. MENU_LABEL_EDIT_COPY #: po/tmp/ap_String_Id.h.h:137 msgid "&Copy" -msgstr "&Copiaz" +msgstr "&Copiază" #. MENU_LABEL_FMT_STYLE_DEFINE #: po/tmp/ap_String_Id.h.h:139 msgid "&Create and Modify Styles" -msgstr "" +msgstr "Crea&ză și modifică stilul" #. DLG_Options_Label_PrefsCurrentScheme #: po/tmp/ap_String_Id.h.h:141 msgid "&Current Preferences Scheme" -msgstr "Schema de preferine curent" +msgstr "Schema de preferințe curentă" #. MENU_LABEL_TABLE_DELETE #: po/tmp/ap_String_Id.h.h:143 msgid "&Delete" -msgstr "&terge" +msgstr "Șter&ge" #. MENU_LABEL_INSERT_DELETE_HYPERLINK #: po/tmp/ap_String_Id.h.h:145 msgid "&Delete hyperlink" -msgstr "&terge hiperlegtur" +msgstr "Ș&terge legătura web" #. DLG_Options_Btn_CustomDict #: po/tmp/ap_String_Id.h.h:147 msgid "&Dictionary..." -msgstr "&Dicionar..." +msgstr "&Dicționar..." #. MENU_LABEL_INSERT_DIRECTIONMARKER #: po/tmp/ap_String_Id.h.h:149 msgid "&Direction Marker" -msgstr "" +msgstr "Marker de &direcție" #. MENU_LABEL_FMT_DOCUMENT #: po/tmp/ap_String_Id.h.h:151 @@ -355,78 +359,78 @@ #. MENU_LABEL_TOOLS_HISTORY #: po/tmp/ap_String_Id.h.h:153 msgid "&Document History" -msgstr "" +msgstr "Istoria &documentului" #. MENU_LABEL_WINDOW #: po/tmp/ap_String_Id.h.h:155 msgid "&Documents" -msgstr "Fe&reastr" +msgstr "Fe&reastră" #. DLG_Para_PushNoHyphenate #: po/tmp/ap_String_Id.h.h:157 msgid "&Don't hyphenate" -msgstr "F&r desprire n silabe" +msgstr "Fă&ră despărțire în silabe" #. DLG_Options_Btn_IgnoreEdit #. MENU_LABEL_EDIT #: po/tmp/ap_String_Id.h.h:160 msgid "&Edit" -msgstr "&Modific" +msgstr "&Editare" #. MENU_LABEL_INSERT_EDIT_HYPERLINK #: po/tmp/ap_String_Id.h.h:162 msgid "&Edit hyperlink" -msgstr "" +msgstr "Editare legătură web" #. DLG_Options_Label_SmartQuotesEnable #: po/tmp/ap_String_Id.h.h:164 msgid "&Enable smart quotes" -msgstr "Activeaz smart quotes" +msgstr "Activează smart quotes" #. MENU_LABEL_INSERT_ENDNOTE #: po/tmp/ap_String_Id.h.h:166 msgid "&Endnote" -msgstr "&Not de final" +msgstr "Notă de s&fârșit" #. DLG_Break_EvenPage #: po/tmp/ap_String_Id.h.h:168 msgid "&Even page" -msgstr "Pagin &par" +msgstr "Pagină &pară" #. MENU_LABEL_INSERT_FIELD #: po/tmp/ap_String_Id.h.h:170 msgid "&Field" -msgstr "&Cmp" +msgstr "&Câmp" #. DLG_Field_Fields_No_Colon #: po/tmp/ap_String_Id.h.h:172 msgid "&Fields" -msgstr "" +msgstr "Câmpuri" #. DLG_Field_Fields #: po/tmp/ap_String_Id.h.h:174 msgid "&Fields:" -msgstr "&Cmpuri:" +msgstr "&Câmpuri:" #. MENU_LABEL_FILE #: po/tmp/ap_String_Id.h.h:176 msgid "&File" -msgstr "&Fiier" +msgstr "&Fișier" #. DLG_Options_Label_FileExtension #: po/tmp/ap_String_Id.h.h:178 msgid "&File extension:" -msgstr "" +msgstr "Extensia &fișierului" #. MENU_LABEL_EDIT_FIND #: po/tmp/ap_String_Id.h.h:180 msgid "&Find" -msgstr "&Caut" +msgstr "Ca&ută" #. DLG_FR_FindNextButton #: po/tmp/ap_String_Id.h.h:182 msgid "&Find Next" -msgstr "&Caut succesiv" +msgstr "&Caută succesiv" #. MENU_LABEL_FMT_FONT #: po/tmp/ap_String_Id.h.h:184 @@ -441,655 +445,651 @@ #. MENU_LABEL_TABLE_FORMAT #: po/tmp/ap_String_Id.h.h:188 msgid "&Format Table" -msgstr "&Formateaz tabel" - -#. MENU_LABEL_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:190 -msgid "&From File" -msgstr "&Din fiier" +msgstr "&Formatează tabel" #. MENU_LABEL_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:192 +#: po/tmp/ap_String_Id.h.h:190 msgid "&Go To" -msgstr "&Du-te la" +msgstr "Du-&te la" #. DLG_FormatTOC_HasHeading -#: po/tmp/ap_String_Id.h.h:194 +#: po/tmp/ap_String_Id.h.h:192 msgid "&Has Heading" -msgstr "" +msgstr "Are titlu" #. MENU_LABEL_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:196 +#: po/tmp/ap_String_Id.h.h:194 msgid "&Header and Footer" -msgstr "&Antet i subsol" +msgstr "&Antet și subsol" #. DLG_PageSetup_Header -#: po/tmp/ap_String_Id.h.h:198 +#: po/tmp/ap_String_Id.h.h:196 msgid "&Header:" msgstr "&Antet:" #. DLG_PageSetup_Height -#: po/tmp/ap_String_Id.h.h:200 +#: po/tmp/ap_String_Id.h.h:198 msgid "&Height:" -msgstr "&nlime:" +msgstr "&Înălțime:" #. DLG_HelpButton #. MENU_LABEL_HELP -#: po/tmp/ap_String_Id.h.h:203 +#: po/tmp/ap_String_Id.h.h:201 msgid "&Help" msgstr "&Ajutor" #. DLG_Options_Label_ViewHiddenText -#: po/tmp/ap_String_Id.h.h:205 +#: po/tmp/ap_String_Id.h.h:203 msgid "&Hidden Text" msgstr "Text &ascuns" #. DLG_Options_Label_SpellHighlightMisspelledWords -#: po/tmp/ap_String_Id.h.h:207 +#: po/tmp/ap_String_Id.h.h:205 msgid "&Highlight misspelled words" -msgstr "" +msgstr "&Evidențiază cuvintele greșite ortografic" #. MENU_LABEL_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:209 +#: po/tmp/ap_String_Id.h.h:207 msgid "&Hyperlink" -msgstr "&Hiperlegtur" +msgstr "&Legătură web" #. DLG_Spell_Ignore -#: po/tmp/ap_String_Id.h.h:211 +#: po/tmp/ap_String_Id.h.h:209 msgid "&Ignore" -msgstr "Ignor" +msgstr "I&gnoră" #. MENU_LABEL_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:213 +#: po/tmp/ap_String_Id.h.h:211 msgid "&Ignore All" -msgstr "&Ignor totul" +msgstr "Ignoră tot" #. MENU_LABEL_FMT_IMAGE #. MENU_LABEL_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:216 +#: po/tmp/ap_String_Id.h.h:214 msgid "&Image" msgstr "Formatul &imaginii" #. MENU_LABEL_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:218 +#: po/tmp/ap_String_Id.h.h:216 msgid "&Import Styles" -msgstr "" +msgstr "&Importă stiluri" #. MENU_LABEL_WEB_WEBPREVIEW -#: po/tmp/ap_String_Id.h.h:220 +#: po/tmp/ap_String_Id.h.h:218 msgid "&In web browser" -msgstr "&Previzualizeaz pagina web" +msgstr "În web br&owser" #. DLG_FormatTOC_InheritLabel -#: po/tmp/ap_String_Id.h.h:222 +#: po/tmp/ap_String_Id.h.h:220 msgid "&Inherit label" -msgstr "" +msgstr "Moștenește eticheta" #. DLG_InsertButton #. MENU_LABEL_INSERT #. MENU_LABEL_TABLE_INSERT #. DLG_Insert -#: po/tmp/ap_String_Id.h.h:226 po/tmp/xap_String_Id.h.h:15 +#: po/tmp/ap_String_Id.h.h:224 po/tmp/xap_String_Id.h.h:15 msgid "&Insert" msgstr "&Inserare" #. DLG_Options_Label_AutoSaveInterval -#: po/tmp/ap_String_Id.h.h:228 +#: po/tmp/ap_String_Id.h.h:226 msgid "&Interval:" -msgstr "" +msgstr "&Interval" #. MENU_LABEL_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:230 +#: po/tmp/ap_String_Id.h.h:228 msgid "&Italic" -msgstr "&Italic" +msgstr "În&clinat" #. MENU_LABEL_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:232 +#: po/tmp/ap_String_Id.h.h:230 msgid "&Jump to hyperlink" -msgstr "" +msgstr "Sari la legătura web" #. MENU_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:234 +#: po/tmp/ap_String_Id.h.h:232 msgid "&Justify" msgstr "&Aliniat la margini" #. DLG_Para_PushKeepLinesTogether -#: po/tmp/ap_String_Id.h.h:236 +#: po/tmp/ap_String_Id.h.h:234 msgid "&Keep lines together" -msgstr "&ine liniile mpreun" +msgstr "&Ține liniile împreună" #. MENU_LABEL_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:238 +#: po/tmp/ap_String_Id.h.h:236 msgid "&LRM" -msgstr "" +msgstr "Stânga la dreapta" #. DLG_PageSetup_Landscape -#: po/tmp/ap_String_Id.h.h:240 +#: po/tmp/ap_String_Id.h.h:238 msgid "&Landscape" -msgstr "&Orizontal" +msgstr "&Orizontală" #. MENU_LABEL_TOOLS_LANGUAGE -#: po/tmp/ap_String_Id.h.h:242 +#: po/tmp/ap_String_Id.h.h:240 msgid "&Language" -msgstr "Li&mb" +msgstr "Li&mbă" #. MENU_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:244 +#: po/tmp/ap_String_Id.h.h:242 msgid "&Left" -msgstr "La &stnga" +msgstr "La &stânga" #. MENU_LABEL_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:246 +#: po/tmp/ap_String_Id.h.h:244 msgid "&Left-to-right text" -msgstr "" +msgstr "&Text de la stânga la dreapta" #. DLG_Para_LabelLeft #. DLG_PageSetup_Left -#: po/tmp/ap_String_Id.h.h:249 +#: po/tmp/ap_String_Id.h.h:247 msgid "&Left:" -msgstr "La &stnga:" +msgstr "La &stânga:" #. MENU_LABEL_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:251 +#: po/tmp/ap_String_Id.h.h:249 msgid "&Lock layout" -msgstr "" +msgstr "Încuie aspectul" #. MENU_LABEL_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:253 +#: po/tmp/ap_String_Id.h.h:251 msgid "&Mail Merge" -msgstr "" +msgstr "Combină &mail" #. MENU_LABEL_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:255 +#: po/tmp/ap_String_Id.h.h:253 msgid "&Mail Merge Field" -msgstr "" +msgstr "Combină câmp de &mail" #. MENU_LABEL_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:257 +#: po/tmp/ap_String_Id.h.h:255 msgid "&Maintain Full History" -msgstr "" +msgstr "&Menține o istorie completă" #. MENU_LABEL_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:259 +#: po/tmp/ap_String_Id.h.h:257 msgid "&Mark revisions while typing" -msgstr "&Marcheaz coreciile n timpul editrii" +msgstr "&Marchează corecțiile în timpul editării" #. DLG_FR_MatchCase -#: po/tmp/ap_String_Id.h.h:261 +#: po/tmp/ap_String_Id.h.h:259 msgid "&Match case" -msgstr "&Difereniaz majuscule/minuscule" +msgstr "&Diferențiază majuscule/minuscule" #. MENU_LABEL_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:263 +#: po/tmp/ap_String_Id.h.h:261 msgid "&Merge Cells" -msgstr "&Combin celule" +msgstr "&Combină celule" #. MENU_LABEL_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:265 +#: po/tmp/ap_String_Id.h.h:263 msgid "&More Documents" msgstr "&Mai multe ferestre" #. DLG_Goto_Label_Name -#: po/tmp/ap_String_Id.h.h:267 +#: po/tmp/ap_String_Id.h.h:265 msgid "&Name:" msgstr "&Nume:" #. MENU_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:269 +#: po/tmp/ap_String_Id.h.h:267 msgid "&New" msgstr "&Nou" #. MENU_LABEL_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:271 +#: po/tmp/ap_String_Id.h.h:269 msgid "&New Window" -msgstr "&Fereastr nou" +msgstr "&Fereastră nouă" #. MENU_LABEL_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:273 +#: po/tmp/ap_String_Id.h.h:271 msgid "&New using Template" -msgstr "" +msgstr "N&ou folosind un șablon" #. DLG_Break_NextPage -#: po/tmp/ap_String_Id.h.h:275 +#: po/tmp/ap_String_Id.h.h:273 msgid "&Next page" -msgstr "U&rmtoarea pagin" +msgstr "U&rmătoarea pagină" #. MENU_LABEL_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:277 +#: po/tmp/ap_String_Id.h.h:275 msgid "&Normal Layout" -msgstr "&Normal" +msgstr "&Normală" #. DLG_Goto_Label_Number -#: po/tmp/ap_String_Id.h.h:279 +#: po/tmp/ap_String_Id.h.h:277 msgid "&Number:" -msgstr "&Numrul:" +msgstr "&Numărul:" #. DLG_FormatTOC_NumberingType -#: po/tmp/ap_String_Id.h.h:281 +#: po/tmp/ap_String_Id.h.h:279 msgid "&Numbering type:" -msgstr "" +msgstr "Tip de &numărare" #. DLG_Break_OddPage -#: po/tmp/ap_String_Id.h.h:283 +#: po/tmp/ap_String_Id.h.h:281 msgid "&Odd page" -msgstr "Pagin &impar" +msgstr "Pagină &impară" #. MENU_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:285 +#: po/tmp/ap_String_Id.h.h:283 msgid "&Open" msgstr "&Deschide" #. DLG_MailMerge_OpenFile -#: po/tmp/ap_String_Id.h.h:287 +#: po/tmp/ap_String_Id.h.h:285 msgid "&Open File" -msgstr "" +msgstr "Deschide fișier" #. MENU_LABEL_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:289 +#: po/tmp/ap_String_Id.h.h:287 msgid "&Overline" msgstr "&Barat" #. MENU_LABEL_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:291 +#: po/tmp/ap_String_Id.h.h:289 msgid "&Page Width" -msgstr "Zoom la &limea paginii " +msgstr "Zoom la &lățimea paginii " #. DLG_Break_PageBreak -#: po/tmp/ap_String_Id.h.h:293 +#: po/tmp/ap_String_Id.h.h:291 msgid "&Page break" -msgstr "&Pagin" +msgstr "&Pagină" #. DLG_FormatTOC_PageNumbering -#: po/tmp/ap_String_Id.h.h:295 +#: po/tmp/ap_String_Id.h.h:293 msgid "&Page numbering:" -msgstr "" +msgstr "Numărarea &paginilor:" #. MENU_LABEL_FMT_PARAGRAPH -#: po/tmp/ap_String_Id.h.h:297 +#: po/tmp/ap_String_Id.h.h:295 msgid "&Paragraph" msgstr "&Paragraf" #. MENU_LABEL_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:299 +#: po/tmp/ap_String_Id.h.h:297 msgid "&Paste" -msgstr "&Lipete" +msgstr "&Lipește" -#. MENU_LABEL_INSERT_PICTURE -#: po/tmp/ap_String_Id.h.h:301 +#. MENU_LABEL_INSERT_GRAPHIC +#: po/tmp/ap_String_Id.h.h:299 msgid "&Picture" -msgstr "&Imagine" +msgstr "Ima&gine" #. MENU_LABEL_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:303 +#: po/tmp/ap_String_Id.h.h:301 msgid "&Plugins" msgstr "&Module" #. DLG_PageSetup_Portrait -#: po/tmp/ap_String_Id.h.h:305 +#: po/tmp/ap_String_Id.h.h:303 msgid "&Portrait" -msgstr "&Vertical" +msgstr "&Verticală" #. MENU_LABEL_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:307 +#: po/tmp/ap_String_Id.h.h:305 msgid "&Print" -msgstr "&Printeaz" +msgstr "&Tipărește" #. MENU_LABEL_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:309 +#: po/tmp/ap_String_Id.h.h:307 msgid "&Print Layout" -msgstr "&Pagin" +msgstr "&Pagină" #. MENU_LABEL_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:311 +#: po/tmp/ap_String_Id.h.h:309 msgid "&Purge History" -msgstr "" +msgstr "Curăță istoria" #. MENU_LABEL_FILE_EXIT -#: po/tmp/ap_String_Id.h.h:313 +#: po/tmp/ap_String_Id.h.h:311 msgid "&Quit" -msgstr "&Ieire" +msgstr "I&eșire" #. MENU_LABEL_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:315 +#: po/tmp/ap_String_Id.h.h:313 msgid "&RLM" -msgstr "" +msgstr "&Drepta la stânga" #. MENU_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:317 +#: po/tmp/ap_String_Id.h.h:315 msgid "&Redo" -msgstr "&Ref" +msgstr "&Refă" #. MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:319 +#: po/tmp/ap_String_Id.h.h:317 msgid "&Reject revision" -msgstr "&Respinge corecia" +msgstr "&Respinge corecția" #. DLG_FR_ReplaceButton -#: po/tmp/ap_String_Id.h.h:321 +#: po/tmp/ap_String_Id.h.h:319 msgid "&Replace" -msgstr "&nlocuiete" +msgstr "Î&nlocuiește" #. DLG_Options_Btn_IgnoreReset -#: po/tmp/ap_String_Id.h.h:323 +#: po/tmp/ap_String_Id.h.h:321 msgid "&Reset" -msgstr "&Reseteaz" +msgstr "&Resetează" #. MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:325 +#: po/tmp/ap_String_Id.h.h:323 msgid "&Reset to default layout" -msgstr "" +msgstr "&Revino la aspectul implicit" #. MENU_LABEL_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:327 +#: po/tmp/ap_String_Id.h.h:325 msgid "&Revisions" -msgstr "&Corecii" +msgstr "&Corecții" #. MENU_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:329 +#: po/tmp/ap_String_Id.h.h:327 msgid "&Right" msgstr "La &dreapta" #. MENU_LABEL_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:331 +#: po/tmp/ap_String_Id.h.h:329 msgid "&Right-to-left text" -msgstr "" +msgstr "Te&xt de la drepta la stânga" #. DLG_Para_LabelRight #. DLG_PageSetup_Right -#: po/tmp/ap_String_Id.h.h:334 +#: po/tmp/ap_String_Id.h.h:332 msgid "&Right:" msgstr "La d&reapta:" #. MENU_LABEL_TABLE_DELETE_ROWS #. MENU_LABEL_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:337 +#: po/tmp/ap_String_Id.h.h:335 msgid "&Row" -msgstr "terge linii" +msgstr "&Linii" #. DLG_Options_Label_ViewRuler -#: po/tmp/ap_String_Id.h.h:339 +#: po/tmp/ap_String_Id.h.h:337 msgid "&Ruler" msgstr "&Rigla" #. MENU_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:341 +#: po/tmp/ap_String_Id.h.h:339 msgid "&Save" -msgstr "&Salveaz" +msgstr "&Salvează" #. MENU_LABEL_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:343 +#: po/tmp/ap_String_Id.h.h:341 msgid "&Save Image As" -msgstr "Salveaz &imagine ca" +msgstr "Salvează &imagine ca" #. MENU_LABEL_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:345 +#: po/tmp/ap_String_Id.h.h:343 msgid "&Save web page" -msgstr "Salveaz ca pagin &web" +msgstr "Salvează ca pagină &web" #. MENU_LABEL_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:347 +#: po/tmp/ap_String_Id.h.h:345 msgid "&Search for Help" -msgstr "&Caut ajutor" +msgstr "Caută aj&utor" #. MENU_LABEL_TABLE_SELECT -#: po/tmp/ap_String_Id.h.h:349 +#: po/tmp/ap_String_Id.h.h:347 msgid "&Select" -msgstr "&Selecteaz" +msgstr "&Selectează" #. MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL -#: po/tmp/ap_String_Id.h.h:351 +#: po/tmp/ap_String_Id.h.h:349 msgid "&Select revision" -msgstr "&Selecteaz corecia" +msgstr "&Selectează corecția" #. MENU_LABEL_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:353 +#: po/tmp/ap_String_Id.h.h:351 msgid "&Show History" -msgstr "" +msgstr "Arată istoria" #. MENU_LABEL_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:355 +#: po/tmp/ap_String_Id.h.h:353 msgid "&Show Status Bar" -msgstr "&Bar de status" +msgstr "Bară de &stare" #. DLG_Para_LabelSpecial -#: po/tmp/ap_String_Id.h.h:357 +#: po/tmp/ap_String_Id.h.h:355 msgid "&Special:" msgstr "&Special:" #. MENU_LABEL_TOOLS_SPELLING -#: po/tmp/ap_String_Id.h.h:359 +#: po/tmp/ap_String_Id.h.h:357 msgid "&Spelling" -msgstr "&Control ortografic" +msgstr "&Corectare ortografică" #. DLG_FormatTOC_StartAt -#: po/tmp/ap_String_Id.h.h:361 +#: po/tmp/ap_String_Id.h.h:359 msgid "&Start at:" -msgstr "" +msgstr "Începe la:" #. DLG_Options_Label_ViewStatusBar -#: po/tmp/ap_String_Id.h.h:363 +#: po/tmp/ap_String_Id.h.h:361 msgid "&Status bar" -msgstr "Bara de status" +msgstr "Bara de stare" #. MENU_LABEL_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:365 +#: po/tmp/ap_String_Id.h.h:363 msgid "&Subscript" msgstr "&Indice" #. DLG_Para_PushSuppressLineNumbers -#: po/tmp/ap_String_Id.h.h:367 +#: po/tmp/ap_String_Id.h.h:365 msgid "&Suppress line numbers" -msgstr "&Fr numerotarea liniilor" +msgstr "&Fără numerotarea liniilor" #. DLG_FormatTOC_TabLeader -#: po/tmp/ap_String_Id.h.h:369 +#: po/tmp/ap_String_Id.h.h:367 msgid "&Tab leader:" msgstr "" #. MENU_LABEL_TABLE_INSERT_TABLE #. MENU_LABEL_TABLE_DELETE_TABLE #. MENU_LABEL_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:373 +#: po/tmp/ap_String_Id.h.h:371 msgid "&Table" -msgstr "Insreaz &tabel" +msgstr "&Tabel" #. MENU_LABEL_FMT_TABS -#: po/tmp/ap_String_Id.h.h:375 +#: po/tmp/ap_String_Id.h.h:373 msgid "&Tabs" -msgstr "&Tabulri" +msgstr "&Tabulări" #. DLG_Para_ButtonTabs -#: po/tmp/ap_String_Id.h.h:377 +#: po/tmp/ap_String_Id.h.h:375 msgid "&Tabs..." -msgstr "&Tabulri" +msgstr "&Tabulări..." #. MENU_LABEL_VIEW_TOOLBARS -#: po/tmp/ap_String_Id.h.h:379 +#: po/tmp/ap_String_Id.h.h:377 msgid "&Toolbars" -msgstr "&Bar de instrumente" +msgstr "&Bară de unelte" #. MENU_LABEL_TOOLS -#: po/tmp/ap_String_Id.h.h:381 +#: po/tmp/ap_String_Id.h.h:379 msgid "&Tools" msgstr "&Unelte" #. DLG_PageSetup_Top -#: po/tmp/ap_String_Id.h.h:383 +#: po/tmp/ap_String_Id.h.h:381 msgid "&Top:" -msgstr "&Superioar:" +msgstr "&Superioară:" #. DLG_Field_Types_No_Colon -#: po/tmp/ap_String_Id.h.h:385 +#: po/tmp/ap_String_Id.h.h:383 msgid "&Types" -msgstr "" +msgstr "&Tipuri" #. DLG_Field_Types -#: po/tmp/ap_String_Id.h.h:387 +#: po/tmp/ap_String_Id.h.h:385 msgid "&Types:" msgstr "&Tipuri:" #. MENU_LABEL_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:389 +#: po/tmp/ap_String_Id.h.h:387 msgid "&Underline" -msgstr "Su&bliniat" +msgstr "&Subliniat" #. MENU_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:391 +#: po/tmp/ap_String_Id.h.h:389 msgid "&Undo" -msgstr "&Anuleaz" +msgstr "&Anulează" #. DLG_Options_Label_ViewUnits #. DLG_PageSetup_Units -#: po/tmp/ap_String_Id.h.h:394 +#: po/tmp/ap_String_Id.h.h:392 msgid "&Units:" -msgstr "&Msoar n:" +msgstr "&Măsoară în:" #. MENU_LABEL_VIEW #. DLG_MW_ViewButton -#: po/tmp/ap_String_Id.h.h:396 po/tmp/xap_String_Id.h.h:21 +#: po/tmp/ap_String_Id.h.h:394 po/tmp/xap_String_Id.h.h:21 msgid "&View" msgstr "&Vizualizare" #. MENU_LABEL_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:398 +#: po/tmp/ap_String_Id.h.h:396 msgid "&Web Layout" msgstr "&Web" #. MENU_LABEL_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:400 +#: po/tmp/ap_String_Id.h.h:398 msgid "&Whole Page" -msgstr "Zoom la ntreaga &pagin" +msgstr "Zoom la întreaga &pagină" #. DLG_FR_WholeWord -#: po/tmp/ap_String_Id.h.h:402 +#: po/tmp/ap_String_Id.h.h:400 msgid "&Whole word" -msgstr "" +msgstr "Cuvânt întreg" #. DLG_Para_PushWidowOrphanControl -#: po/tmp/ap_String_Id.h.h:404 +#: po/tmp/ap_String_Id.h.h:402 msgid "&Widow/Orphan control" -msgstr "&Controleaz liniile orfane/vduve" +msgstr "&Controlează liniile orfane/văduve" #. DLG_PageSetup_Width -#: po/tmp/ap_String_Id.h.h:406 +#: po/tmp/ap_String_Id.h.h:404 msgid "&Width:" -msgstr "&Lime:" +msgstr "&Lățime:" #. MENU_LABEL_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:408 +#: po/tmp/ap_String_Id.h.h:406 msgid "&Word Count" -msgstr "&Numr cuvintele" +msgstr "&Numără cuvintele" #. MENU_LABEL_VIEW_ZOOM_MENU #. MENU_LABEL_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:411 +#: po/tmp/ap_String_Id.h.h:409 msgid "&Zoom" msgstr "&Zoom" #. DLG_ListRevisions_LevelZero -#: po/tmp/ap_String_Id.h.h:413 +#: po/tmp/ap_String_Id.h.h:411 msgid "(All revisions visible)" -msgstr "" +msgstr "(Toate reviziile visibile)" #. DLG_Spell_NoSuggestions -#: po/tmp/ap_String_Id.h.h:415 +#: po/tmp/ap_String_Id.h.h:413 msgid "(no spelling suggestions)" msgstr "Nici o sugestie" #. DLG_Para_SpecialNone -#: po/tmp/ap_String_Id.h.h:417 +#: po/tmp/ap_String_Id.h.h:415 msgid "(none)" msgstr "(nici unul)" #. TOOLBAR_LABEL_1COLUMN #. TOOLBAR_STATUSLINE_1COLUMN #. TOOLBAR_TOOLTIP_1COLUMN -#: po/tmp/ap_String_Id.h.h:421 +#: po/tmp/ap_String_Id.h.h:419 msgid "1 Column" -msgstr "" +msgstr "O coloană" #. TOOLBAR_LABEL_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:423 +#: po/tmp/ap_String_Id.h.h:421 msgid "1.5 Spacing" -msgstr "" +msgstr "Spațiere 1,5" #. DLG_Para_SpacingHalf -#: po/tmp/ap_String_Id.h.h:425 +#: po/tmp/ap_String_Id.h.h:423 msgid "1.5 lines" msgstr "1,5 linii" #. TOOLBAR_STATUSLINE_MIDDLE_SPACE #. TOOLBAR_TOOLTIP_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:428 +#: po/tmp/ap_String_Id.h.h:426 msgid "1.5 spacing" -msgstr "" +msgstr "Spațiere 1,5" #. TOOLBAR_LABEL_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:430 +#: po/tmp/ap_String_Id.h.h:428 msgid "12 pt before" -msgstr "" +msgstr "12 pt înainte" #. TOOLBAR_LABEL_2COLUMN #. TOOLBAR_STATUSLINE_2COLUMN #. TOOLBAR_TOOLTIP_2COLUMN -#: po/tmp/ap_String_Id.h.h:434 +#: po/tmp/ap_String_Id.h.h:432 msgid "2 Columns" -msgstr "" +msgstr "Două coloane" #. TOOLBAR_LABEL_3COLUMN #. TOOLBAR_STATUSLINE_3COLUMN #. TOOLBAR_TOOLTIP_3COLUMN -#: po/tmp/ap_String_Id.h.h:438 +#: po/tmp/ap_String_Id.h.h:436 msgid "3 Columns" -msgstr "" +msgstr "Trei coloane" #. DLG_Goto_Btn_Prev -#: po/tmp/ap_String_Id.h.h:440 +#: po/tmp/ap_String_Id.h.h:438 msgid "<< Prev" msgstr "<< Precedentul" #. MSG_Exception -#: po/tmp/ap_String_Id.h.h:442 +#: po/tmp/ap_String_Id.h.h:440 msgid "" -"A fatal error has just occurred. Abiword is going to shutdown.\n" +"A fatal error has just occurred. AbiWord is going to shutdown.\n" "The current document has been saved to disc with a \".saved\" extension." -msgstr "" +msgstr "O eroare fatală tocmai a avut loc. AbiWord se va închide automat.\n" +"Documentul curent a fost salvat pe disc cu extensia \".saved\"." #. DLG_Options_Label_SpellSuggest -#: po/tmp/ap_String_Id.h.h:444 +#: po/tmp/ap_String_Id.h.h:442 msgid "A&lways suggest corrections" -msgstr "&Sugereaz ntotdeauna coreciile" +msgstr "&Sugerează întotdeauna corecțiile" #. FIELD_DateTime_AMPM -#: po/tmp/ap_String_Id.h.h:446 +#: po/tmp/ap_String_Id.h.h:444 msgid "AM/PM" msgstr "AM/PM" #. MSG_IE_BogusDocument -#: po/tmp/ap_String_Id.h.h:448 +#: po/tmp/ap_String_Id.h.h:446 #, c-format msgid "AbiWord cannot open %s. It appears to be an invalid document" -msgstr "Fiierul %s este un document invalid" +msgstr "Fișierul %s este un document invalid" #. MSG_SpellSelectionDone -#: po/tmp/ap_String_Id.h.h:450 +#: po/tmp/ap_String_Id.h.h:448 msgid "AbiWord finished checking the selection." -msgstr "" +msgstr "AbiWord a terminat de verificat selecția" #. DLG_FR_FinishedReplace -#: po/tmp/ap_String_Id.h.h:452 +#: po/tmp/ap_String_Id.h.h:450 #, c-format msgid "" "AbiWord has finished its search of the document and has made %d replacements." -msgstr "AbiWord a terminat de cutat in document i a fcut %d nlocuiri" +msgstr "AbiWord a terminat de căutat in document și a făcut %d înlocuiri" #. DLG_FR_FinishedFind -#: po/tmp/ap_String_Id.h.h:454 +#: po/tmp/ap_String_Id.h.h:452 msgid "AbiWord has finished searching the document." -msgstr "AbiWord a terminat de cutat n document" +msgstr "AbiWord a terminat de căutat în document" #. WINDOWS_COMCTL_WARNING -#: po/tmp/ap_String_Id.h.h:456 +#: po/tmp/ap_String_Id.h.h:454 msgid "" "AbiWord is designed for a newer version of the system file COMCTL32.DLL\n" "than the one currently on your system. (COMCTL32.DLL version 4.72 or newer)\n" @@ -1099,251 +1099,262 @@ "\thttp://www.abisource.com\n" "\n" "You can use the program, but the toolbar may be missing." -msgstr "" +msgstr "AbiWord a fost proiectat pentru o versiune mai nouă a fișierului de sistem COMCTL32.DLL\n" +"decât cea instalată în mod curent. (COMCTL32.DLL versiunea 4.72 sau mai nouă)\n" +"O souluție a acestei porbleme este expicată în FAQ pe pagina de web a produsului\n" +"la http://www.abisource.com." #. WINDOWS_NEED_UNICOWS -#: po/tmp/ap_String_Id.h.h:458 +#: po/tmp/ap_String_Id.h.h:456 #, c-format msgid "" "AbiWord needs the file %s.dll\n" "Please download and install it from http://www.microsoft.com/msdownload/" "platformsdk/sdkupdate/psdkredist.htm" -msgstr "" +msgstr "AbiWord are nevoie de fișierul %s.dll.\n" +"Vă rugăm să-l descărcați și instalați de la http://www.microsoft.com/msdownload/" +"platformsdk/dskupdate/psdkredist.htm" #. MENU_LABEL_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:460 +#: po/tmp/ap_String_Id.h.h:458 msgid "About G&NOME Office" -msgstr "Despre G&NOME Office" +msgstr "Despre &GNOME Office" #. MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:462 +#: po/tmp/ap_String_Id.h.h:460 msgid "About the GNOME Office project" -msgstr "Informaii despre proiectul GNOME Office" +msgstr "Informații despre proiectul GNOME Office" #. MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION -#: po/tmp/ap_String_Id.h.h:464 +#: po/tmp/ap_String_Id.h.h:462 msgid "Accept the suggested change" -msgstr "Accept modificarea sugerat" +msgstr "Acceptă modificarea sugerată" #. TOOLBAR_STATUSLINE_ADD_COLUMN #. TOOLBAR_TOOLTIP_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:467 +#: po/tmp/ap_String_Id.h.h:465 msgid "Add a column to this table after the current column" -msgstr "" +msgstr "Adaugă o coloană după colana curentă" #. TOOLBAR_STATUSLINE_ADD_ROW #. TOOLBAR_TOOLTIP_ADD_ROW -#: po/tmp/ap_String_Id.h.h:470 +#: po/tmp/ap_String_Id.h.h:468 msgid "Add a row to this table after the current row" -msgstr "" +msgstr "Adaugă un rând după rândul curent" #. MENU_STATUSLINE_FMT_BORDERS -#: po/tmp/ap_String_Id.h.h:472 +#: po/tmp/ap_String_Id.h.h:470 msgid "Add borders and shading to the selection" -msgstr "Adaug margini i umbre zonei selectate" +msgstr "Adaugă margini și umbre zonei selectate" #. TOOLBAR_LABEL_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:474 +#: po/tmp/ap_String_Id.h.h:472 msgid "Add column after" -msgstr "" +msgstr "Adaugă coloană după" #. MENU_STATUSLINE_FMT_BULLETS -#: po/tmp/ap_String_Id.h.h:476 +#: po/tmp/ap_String_Id.h.h:474 msgid "Add or modify bullets and numbering for selected paragraphs" -msgstr "" -"Adaug sau schimb o list ordonat sau neordonat pentru paragraful selectat" +msgstr "Adaugă sau schimbă o listă ordonată sau neordonată pentru paragraful selectat" #. TOOLBAR_LABEL_ADD_ROW -#: po/tmp/ap_String_Id.h.h:478 +#: po/tmp/ap_String_Id.h.h:476 msgid "Add row after" -msgstr "" +msgstr "Adaugă rând după" #. MENU_STATUSLINE_SPELL_ADD -#: po/tmp/ap_String_Id.h.h:480 +#: po/tmp/ap_String_Id.h.h:478 msgid "Add this word to the custom dictionary" -msgstr "Adaug acest cuvnt la dicionarul personal" +msgstr "Adaugă acest cuvânt la dicționarul personal" #. DLG_Styles_ModifyTemplate -#: po/tmp/ap_String_Id.h.h:482 +#: po/tmp/ap_String_Id.h.h:480 msgid "Add to template" -msgstr "ablon" +msgstr "Șablon" #. DLG_Para_LabelAfter -#: po/tmp/ap_String_Id.h.h:484 +#: po/tmp/ap_String_Id.h.h:482 msgid "Aft&er:" -msgstr "&Dup:" +msgstr "&După:" #. DLG_Para_LabelAlignment -#: po/tmp/ap_String_Id.h.h:486 +#: po/tmp/ap_String_Id.h.h:484 msgid "Ali&gnment:" msgstr "&Aliniere:" #. DLG_Tab_Label_Alignment #. DLG_PageNumbers_Alignment_No_Colon -#: po/tmp/ap_String_Id.h.h:489 +#: po/tmp/ap_String_Id.h.h:487 msgid "Alignment" msgstr "Aliniament" #. DLG_PageNumbers_Alignment -#: po/tmp/ap_String_Id.h.h:491 +#: po/tmp/ap_String_Id.h.h:489 msgid "Alignment:" -msgstr "Aliniere" +msgstr "Aliniere:" #. DLG_Styles_LBL_All #. DLG_UP_All -#: po/tmp/ap_String_Id.h.h:493 po/tmp/xap_String_Id.h.h:51 +#: po/tmp/ap_String_Id.h.h:491 po/tmp/xap_String_Id.h.h:51 msgid "All" msgstr "Toate stilurile" #. DLG_Options_Label_CheckAllowCustomToolbars -#: po/tmp/ap_String_Id.h.h:495 +#: po/tmp/ap_String_Id.h.h:493 msgid "Allow Custom Toolbars" -msgstr "Permite bara de instrumente personalizabil" +msgstr "Permite personalizarea &barei de unelte" #. MENU_STATUSLINE_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:497 +#: po/tmp/ap_String_Id.h.h:495 msgid "Allow formatting using styles only" -msgstr "" +msgstr "Permite formatarea folosind numai stiluri" #. DLG_Options_Label_CheckWhiteForTransparent -#: po/tmp/ap_String_Id.h.h:499 +#: po/tmp/ap_String_Id.h.h:497 msgid "Allow screen colors other than white" -msgstr "Permite culori de fundal altele dect albul" +msgstr "Permite culori de fundal altele decât albul" + +#. MENU_LABEL_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:499 +msgid "Annotation" +msgstr "Notă explicativă" #. FIELD_Application #: po/tmp/ap_String_Id.h.h:501 msgid "Application" -msgstr "Aplicaie" +msgstr "Aplicație" #. DLG_Options_Label_AppStartup #: po/tmp/ap_String_Id.h.h:503 msgid "Application Startup" -msgstr "" +msgstr "Pornirea aplicației" #. DLG_Options_Btn_Apply #. DLG_Apply #: po/tmp/ap_String_Id.h.h:505 po/tmp/xap_String_Id.h.h:63 msgid "Apply" -msgstr "Aplic" +msgstr "Aplică" #. TOOLBAR_STATUSLINE_FMTPAINTER #. TOOLBAR_TOOLTIP_FMTPAINTER #: po/tmp/ap_String_Id.h.h:508 msgid "Apply the previously copied paragraph formatting onto the selected text" -msgstr "" +msgstr "Aplilcă formatarea paragrafului precedent întregului text selectat" #. DLG_Lists_Apply_Current #: po/tmp/ap_String_Id.h.h:510 msgid "Apply to Current List" -msgstr "Aplic listei curente" +msgstr "Aplică listei curente" #. DLG_FormatTable_Apply_To #: po/tmp/ap_String_Id.h.h:512 msgid "Apply to:" -msgstr "" +msgstr "Aplică la:" #. DLG_Lists_Arabic_List #: po/tmp/ap_String_Id.h.h:514 msgid "Arabic List" -msgstr "List arab" +msgstr "Listă arabă" #. MSG_AutoRevisionOffWarning #: po/tmp/ap_String_Id.h.h:516 msgid "" "Are you sure you do not want to maintain full history record? If you " "proceed, you will not be able to restore earlier versions of this document." -msgstr "" +msgstr "Sunteți sigur că nu doriți să mențineți întreaga istorie? Dacă " +"continuați cu această comandă, nu vă veți putea întoarce la " +"o versiune anterioară a acestui document." #. DLG_Para_SpacingAtLeast #: po/tmp/ap_String_Id.h.h:518 msgid "At least" -msgstr "Cel puin" +msgstr "Cel puțin" #. DLG_Lists_Resume #: po/tmp/ap_String_Id.h.h:520 msgid "Attach to Previous List" -msgstr "Ataeaz la lista anterioar" +msgstr "Atașează la lista anterioară" #. DLG_MetaData_Author_LBL #. DLG_PLUGIN_MANAGER_AUTHOR -#: po/tmp/ap_String_Id.h.h:522 po/tmp/xap_String_Id.h.h:83 +#: po/tmp/ap_String_Id.h.h:522 po/tmp/xap_String_Id.h.h:85 msgid "Author:" msgstr "Autor:" #. DLG_Options_Label_AutoSaveUnderline #: po/tmp/ap_String_Id.h.h:524 msgid "Auto &Save" -msgstr "" +msgstr "&Salvare automată" #. DLG_Options_Label_AutoSaveCurrent #: po/tmp/ap_String_Id.h.h:526 msgid "Auto &save current file every" -msgstr "&Salveaz documentul curent la fiecare" +msgstr "&Salvează documentul curent la fiecare" #. DLG_Options_Label_AutoSave #: po/tmp/ap_String_Id.h.h:528 msgid "Auto Save" -msgstr "Salveaz automat" +msgstr "Salvează automat" #. DLG_Options_Label_SpellAutoReplace #: po/tmp/ap_String_Id.h.h:530 msgid "Auto replace misspelled words" -msgstr "nlocuiete automat cuvintele scrise greit" +msgstr "Înlocuiește automat cuvintele scrise greșit" #. DLG_InsertTable_AutoFit_Capital #: po/tmp/ap_String_Id.h.h:532 msgid "AutoFit Behavior" -msgstr "" +msgstr "Dimensionare automată" #. DLG_InsertTable_AutoFit #: po/tmp/ap_String_Id.h.h:534 msgid "AutoFit behavior" -msgstr "Dimensionare automat" +msgstr "Dimensionare automată" #. MENU_STATUSLINE_TABLE_AUTOFIT #: po/tmp/ap_String_Id.h.h:536 msgid "Autofit Table" -msgstr "Dimensioneaz automat tabelul" +msgstr "Dimensionează automat tabelul" #. DLG_Options_Label_Grammar #: po/tmp/ap_String_Id.h.h:538 msgid "Automatic Grammar Checking" -msgstr "" +msgstr "Verificare automată de gramatică" #. DLG_InsertTable_AutoColSize #: po/tmp/ap_String_Id.h.h:540 msgid "Automatic column size" -msgstr "Dimensionare automat a coloanei" +msgstr "Dimensionare automată a coloanei" #. DLG_Options_Label_CheckAutoLoadPlugins #: po/tmp/ap_String_Id.h.h:542 msgid "Automatically load all plugins found" -msgstr "ncarc automat toate modulele gsite" +msgstr "Încarcă automat toate modulele &găsite" #. MENU_STATUSLINE_TOOLS_AUTOSPELL #: po/tmp/ap_String_Id.h.h:544 msgid "Automatically spell-check the document" -msgstr "Controleaz automat ortografia documentului" +msgstr "Controlează automat ortografia documentului" #. DLG_Styles_ModifyAutomatic #: po/tmp/ap_String_Id.h.h:546 msgid "Automatically update" -msgstr "Actualizare automat" +msgstr "Actualizare automată" #. MSG_AutoMerge #: po/tmp/ap_String_Id.h.h:548 msgid "Automerge" -msgstr "" +msgstr "Combinare automată" #. DLG_MailMerge_AvailableFields #: po/tmp/ap_String_Id.h.h:550 msgid "Available Fields" -msgstr "" +msgstr "Câmpuri disponibile" #. DLG_DateTime_AvailableFormats_Capital #: po/tmp/ap_String_Id.h.h:552 msgid "Available Formats" -msgstr "" +msgstr "Formate disponibile" #. DLG_Styles_Available #: po/tmp/ap_String_Id.h.h:554 @@ -1359,23 +1370,23 @@ #. DLG_FormatTable_Background #: po/tmp/ap_String_Id.h.h:559 msgid "Background" -msgstr "" +msgstr "Fundal" #. DLG_FormatFrame_Background_Color #. DLG_FormatTable_Background_Color #: po/tmp/ap_String_Id.h.h:562 msgid "Background color:" -msgstr "" +msgstr "Culoare de fundal:" #. DLG_Tab_Radio_Bar #: po/tmp/ap_String_Id.h.h:564 msgid "Bar" -msgstr "Bar" +msgstr "Bară" #. TabToggleBarTab #: po/tmp/ap_String_Id.h.h:566 msgid "Bar Tab" -msgstr "Bar separatoare" +msgstr "Bară separatoare" #. DLG_Styles_ModifyBasedOn #: po/tmp/ap_String_Id.h.h:568 @@ -1385,15 +1396,15 @@ #. DLG_Options_Label_BiDiOptions #: po/tmp/ap_String_Id.h.h:570 msgid "Bi-Directional Options" -msgstr "Opiuni pentru scrierea bidirecional" +msgstr "Opțiuni pentru scrierea bidirecțională" #. TOOLBAR_LABEL_FMT_BOLD #. TOOLBAR_STATUSLINE_FMT_BOLD #. TOOLBAR_TOOLTIP_FMT_BOLD #. DLG_UFS_StyleBold -#: po/tmp/ap_String_Id.h.h:574 po/tmp/xap_String_Id.h.h:111 +#: po/tmp/ap_String_Id.h.h:574 po/tmp/xap_String_Id.h.h:119 msgid "Bold" -msgstr "" +msgstr "Îngroșat" #. MENU_LABEL_INSERT_BOOKMARK #: po/tmp/ap_String_Id.h.h:576 @@ -1409,45 +1420,45 @@ #: po/tmp/ap_String_Id.h.h:580 #, c-format msgid "Bookmark \"%s\" was not found in this document." -msgstr "Semnul de carte \"%s\" nu a putut fi gsit n acest document" +msgstr "Semnul de carte \"%s\" nu a putut fi găsit în acest document" #. DLG_FormatFrame_Border_Color #. DLG_FormatTable_Border_Color #: po/tmp/ap_String_Id.h.h:583 msgid "Border color:" -msgstr "" +msgstr "Culoare margine:" #. DLG_FormatFrame_Borders #. DLG_FormatTable_Borders #: po/tmp/ap_String_Id.h.h:586 msgid "Borders" -msgstr "" +msgstr "Margini" #. MENU_LABEL_FMT_BORDERS #: po/tmp/ap_String_Id.h.h:588 msgid "Borders and Shading" -msgstr "Margini i u&mbre" +msgstr "Margini și u&mbre" #. BottomMarginStatus #: po/tmp/ap_String_Id.h.h:590 #, c-format msgid "Bottom Margin [%s]" -msgstr "Marginea inferioar [%s]" +msgstr "Marginea inferioară [%s]" #. MENU_LABEL_FMT_BOTTOMLINE #. TOOLBAR_LABEL_FMT_BOTTOMLINE #. TOOLBAR_STATUSLINE_FMT_BOTTOMLINE #. TOOLBAR_TOOLTIP_FMT_BOTTOMLINE #. DLG_UFS_BottomlineCheck -#: po/tmp/ap_String_Id.h.h:595 po/tmp/xap_String_Id.h.h:115 +#: po/tmp/ap_String_Id.h.h:595 po/tmp/xap_String_Id.h.h:123 msgid "Bottomline" msgstr "Linie dedesupt" #. DLG_Lists_Box_List #. STYLE_BOXLIST -#: po/tmp/ap_String_Id.h.h:597 po/tmp/xap_String_Id.h.h:117 +#: po/tmp/ap_String_Id.h.h:597 po/tmp/xap_String_Id.h.h:125 msgid "Box List" -msgstr "List cu \"box\"-uri" +msgstr "Listă cu \"box\"-uri" #. FIELD_Application_BuildId #: po/tmp/ap_String_Id.h.h:599 @@ -1457,35 +1468,35 @@ #. FIELD_Application_Options #: po/tmp/ap_String_Id.h.h:601 msgid "Build Options" -msgstr "Opiunile de compilare" +msgstr "Opțiunile de compilare" #. FIELD_Application_Target #: po/tmp/ap_String_Id.h.h:603 msgid "Build Target" -msgstr "Directorul n care a fost compilat" +msgstr "Directorul în care a fost compilat" #. DLG_Lists_Type_bullet #: po/tmp/ap_String_Id.h.h:605 msgid "Bullet" -msgstr "Neordonat" +msgstr "Listă Neordonată" #. DLG_Lists_Bullet_List #. STYLE_BULLETLIST -#: po/tmp/ap_String_Id.h.h:607 po/tmp/xap_String_Id.h.h:125 +#: po/tmp/ap_String_Id.h.h:607 po/tmp/xap_String_Id.h.h:133 msgid "Bullet List" -msgstr "List cu puncte" +msgstr "Listă neordonată" #. TOOLBAR_LABEL_LISTS_BULLETS #. TOOLBAR_STATUSLINE_LISTS_BULLETS #. TOOLBAR_TOOLTIP_LISTS_BULLETS #: po/tmp/ap_String_Id.h.h:611 msgid "Bullets" -msgstr "" +msgstr "Listă neordonată" #. MENU_LABEL_FMT_BULLETS #: po/tmp/ap_String_Id.h.h:613 msgid "Bullets and &Numbering" -msgstr "Liste ordonate/&neordonate" +msgstr "&Liste ordonate și neordonate" #. DLG_Options_Label_Look #: po/tmp/ap_String_Id.h.h:615 @@ -1495,12 +1506,12 @@ #. MENU_LABEL_FMT_TOGGLECASE #: po/tmp/ap_String_Id.h.h:617 msgid "C&hange Case" -msgstr "S&chimb MAJUSCULE/minuscule" +msgstr "&Schimbă MAJUSCULE/minuscule" #. MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION #: po/tmp/ap_String_Id.h.h:619 msgid "C&opy hyperlink location" -msgstr "" +msgstr "C&opiază locația legăturii web" #. MENU_LABEL_HELP_CREDITS #: po/tmp/ap_String_Id.h.h:621 @@ -1510,17 +1521,17 @@ #. MSG_NoBreakInsideTable #: po/tmp/ap_String_Id.h.h:623 msgid "Can not insert a Break inside a table" -msgstr "" +msgstr "Nu pot să inserez un Break într-un tabel" #. MSG_NoBreakInsideFrame #: po/tmp/ap_String_Id.h.h:625 msgid "Can not insert a Break inside a text box" -msgstr "" +msgstr "Nu pot să inserez un Break într-un dreptunghi de text" #. DLG_Styles_ErrStyleCantDelete #: po/tmp/ap_String_Id.h.h:627 msgid "Cannot delete this style" -msgstr "Nu pot terge acest stil" +msgstr "Nu pot șterge acest stil" #. DLG_Styles_ErrStyleBuiltin #: po/tmp/ap_String_Id.h.h:629 @@ -1530,7 +1541,7 @@ #. PRINT_CANNOTSTARTPRINTJOB #: po/tmp/ap_String_Id.h.h:631 msgid "Cannot start print job" -msgstr "" +msgstr "Nu pot să încep tipărirea" #. DLG_MetaData_Category_LBL #: po/tmp/ap_String_Id.h.h:633 @@ -1547,18 +1558,18 @@ #. TabToggleCenterTab #: po/tmp/ap_String_Id.h.h:639 msgid "Center Tab" -msgstr "Aliniere centrat" +msgstr "Aliniere centrată" #. TOOLBAR_STATUSLINE_ALIGN_CENTER #. TOOLBAR_TOOLTIP_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:642 msgid "Center alignment" -msgstr "" +msgstr "Aliniere centrală" #. MENU_STATUSLINE_ALIGN_CENTER #: po/tmp/ap_String_Id.h.h:644 msgid "Center-align the paragraph" -msgstr "Aliniaz paragraful la centru" +msgstr "Aliniază paragraful la centru" #. DLG_Para_AlignCentered #: po/tmp/ap_String_Id.h.h:646 @@ -1568,91 +1579,91 @@ #. DLG_Spell_ChangeTo #: po/tmp/ap_String_Id.h.h:648 msgid "Change &to:" -msgstr "nlocuiete cu:" +msgstr "Înlocuiește cu:" #. DLG_Spell_ChangeAll #: po/tmp/ap_String_Id.h.h:650 msgid "Change A&ll" -msgstr "nlocuiete peste tot" +msgstr "Înlocuiește &peste tot" #. DLG_Background_Title #: po/tmp/ap_String_Id.h.h:652 msgid "Change Background Color" -msgstr "Schimb culoarea de fundal" +msgstr "Schimbă culoarea de fundal" #. DLG_ToggleCase_Title #: po/tmp/ap_String_Id.h.h:654 msgid "Change Case" -msgstr "Schimb MAJUSCULE/minuscule" +msgstr "Schimbă MAJUSCULE/minuscule" #. DLG_Lists_Cur_Change_Start #: po/tmp/ap_String_Id.h.h:656 msgid "" "Change Current \n" "List" -msgstr "Schimb actuala x0a;Listeaz" +msgstr "Schimbă actuala \nListează" #. DLG_Background_TitleHighlight #: po/tmp/ap_String_Id.h.h:658 msgid "Change Highlight Color" -msgstr "Schimb culoarea de subliniere " +msgstr "Schimbă culoarea de evidențiere" #. DLG_FormatTOC_ChangeStyle #: po/tmp/ap_String_Id.h.h:660 msgid "Change Style" -msgstr "" +msgstr "Schimbă stilul" #. DLG_Background_TitleFore #: po/tmp/ap_String_Id.h.h:662 msgid "Change Text Color" -msgstr "Schimb culoarea textului" +msgstr "Schimbă culoarea textului" #. MENU_STATUSLINE_FMT_DIRECTION #: po/tmp/ap_String_Id.h.h:664 msgid "Change directional properties of text" -msgstr "" +msgstr "Schmbă proprietățile de direcție ale textului" #. TOOLBAR_STATUSLINE_FMT_DOM_DIRECTION #. TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION #: po/tmp/ap_String_Id.h.h:667 msgid "Change dominant direction of paragraph" -msgstr "" +msgstr "Schimbă direcția dominantă a paragrafului" #. MENU_STATUSLINE_FMT_TOGGLECASE #: po/tmp/ap_String_Id.h.h:669 msgid "Change the case of the selected text" -msgstr "Schimb din MAJUSCULE n minuscule textul selectat" +msgstr "Schimbă din MAJUSCULE în minuscule textul selectat" #. MENU_STATUSLINE_FMT_FONT #: po/tmp/ap_String_Id.h.h:671 msgid "Change the font of the selected text" -msgstr "Schimb fontul textului selectat" +msgstr "Schimbă fontul textului selectat" #. MENU_STATUSLINE_FMT_PARAGRAPH #: po/tmp/ap_String_Id.h.h:673 msgid "Change the format of the selected paragraph" -msgstr "Schimb formatul paragrafului selectat" +msgstr "Schimbă formatul paragrafului selectat" #. MENU_STATUSLINE_FMT_LANGUAGE #. MENU_STATUSLINE_TOOLS_LANGUAGE #: po/tmp/ap_String_Id.h.h:676 msgid "Change the language of the selected text" -msgstr "Schimb limba textului selectat" +msgstr "Schimbă limba textului selectat" #. MENU_STATUSLINE_FMT_COLUMNS #: po/tmp/ap_String_Id.h.h:678 msgid "Change the number of columns" -msgstr "Schimb numrul de coloane" +msgstr "Schimbă numărul de coloane" #. MENU_STATUSLINE_FILE_PAGESETUP #: po/tmp/ap_String_Id.h.h:680 msgid "Change the printing options" -msgstr "Schimb opiunile de printare" +msgstr "Schimbă opțiunile de tipărire a paginii" #. MENU_STATUSLINE_FMT_FRAME #: po/tmp/ap_String_Id.h.h:682 msgid "Change the properties of the Text Box" -msgstr "" +msgstr "Schimbă proprietățile dreptunghiului de text" #. MENU_STATUSLINE_SPELL_SUGGEST_1 #. MENU_STATUSLINE_SPELL_SUGGEST_2 @@ -1665,17 +1676,17 @@ #. MENU_STATUSLINE_SPELL_SUGGEST_9 #: po/tmp/ap_String_Id.h.h:692 msgid "Change to this suggested spelling" -msgstr "Schimb in forma sugerat de scriere" +msgstr "Schimb in forma sugerată de scriere" #. MENU_STATUSLINE_FMT_BACKGROUND #: po/tmp/ap_String_Id.h.h:694 msgid "Change your document's page background" -msgstr "Schimb culoarea de fundal" +msgstr "Schimbă culoarea de fundal a documentului" #. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_COLOR #: po/tmp/ap_String_Id.h.h:696 msgid "Change your document's page color" -msgstr "" +msgstr "Schimbă culoarea paginii documentului" #. DLG_Styles_ModifyCharacter #: po/tmp/ap_String_Id.h.h:698 @@ -1685,12 +1696,12 @@ #. FIELD_Numbers_CharCount #: po/tmp/ap_String_Id.h.h:700 msgid "Character Count" -msgstr "Numrul de caractere" +msgstr "Numărul de caractere" #. FIELD_Numbers_NbspCount #: po/tmp/ap_String_Id.h.h:702 msgid "Character Count (w/o spaces)" -msgstr "Numrul de caractere (fr spaii)" +msgstr "Numărul de caractere (fără spații)" #. DLG_Styles_CharPrev #: po/tmp/ap_String_Id.h.h:704 @@ -1700,38 +1711,37 @@ #. DLG_WordCount_Characters_No #: po/tmp/ap_String_Id.h.h:706 msgid "Characters (no spaces):" -msgstr "Caractere (fr spaii)" +msgstr "Caractere (fără spații)" #. DLG_WordCount_Characters_Sp #: po/tmp/ap_String_Id.h.h:708 msgid "Characters (with spaces):" -msgstr "Caractere (cu spaii)" +msgstr "Caractere (cu spații)" #. MENU_LABEL_TOOLS_SPELL #: po/tmp/ap_String_Id.h.h:710 msgid "Check &Spelling" -msgstr "&Control ortografic" +msgstr "&Corectare ortografică" #. DLG_Options_Label_GrammarCheck #: po/tmp/ap_String_Id.h.h:712 msgid "Check &grammar as you type" -msgstr "" +msgstr "Verifică &gramatica pe măsură ce textul este introdus" #. MENU_LABEL_HELP_CHECKVER #: po/tmp/ap_String_Id.h.h:714 -#, fuzzy msgid "Check for &Updates" -msgstr "Actualizare automat" +msgstr "&Actualizare automată" #. MENU_STATUSLINE_HELP_CHECKVER #: po/tmp/ap_String_Id.h.h:716 msgid "Check online for newer versions of AbiWord" -msgstr "" +msgstr "Verifică online dacă există versiuni noi de AbiWord" #. DLG_Options_Label_SpellCheckAsType #: po/tmp/ap_String_Id.h.h:718 msgid "Check s&pelling as you type" -msgstr "Controleaz ortografia n timpul scrierii" +msgstr "Controlează &ortografia în timpul scrierii" #. MENU_STATUSLINE_TOOLS_SPELL #: po/tmp/ap_String_Id.h.h:720 @@ -1741,7 +1751,7 @@ #. DLG_NEW_Choose #: po/tmp/ap_String_Id.h.h:722 msgid "Choose" -msgstr "Alegei" +msgstr "Alegeți" #. DLG_Options_Label_ChooseForTransparent #: po/tmp/ap_String_Id.h.h:724 @@ -1751,12 +1761,12 @@ #. DLG_Options_Label_ColorChooserLabel #: po/tmp/ap_String_Id.h.h:726 msgid "Choose screen color for AbiWord" -msgstr "Alege culoarea de fundal n AbiWord" +msgstr "Alege culoarea de fundal în AbiWord" #. MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL #: po/tmp/ap_String_Id.h.h:728 msgid "Choose which revision you wish to view" -msgstr "Alegei corecia pentru vizualizare" +msgstr "Alegeți corecția pentru vizualizare" #. DLG_Goto_Label_Help #: po/tmp/ap_String_Id.h.h:730 @@ -1766,74 +1776,73 @@ "desired number. You can use + and - to perform relative movement.\tI.e., if " "you write \"+2\" and you select \"Line\", the \"Go To\" will go 2 lines " "below your current position." -msgstr "" -"Alegei o operaiune din stnga.x0a;Pentru a folosi butonul \"Du-te la\" " -"completai cmpul \"Numrul\" cu numrul dorit. Se poate folosi + i - " -"pentru a obine o micare relativ. De exemplu, dac scriei \"+2\" i " -"selectai \"Linia\", \"Du-te la\" te va duce dou linii sub poziia actual." +msgstr "Alegeți o operațiune din stânga.x0a;Pentru a folosi butonul \"Du-te la\" " +"completați câmpul \"Numărul\" cu numărul dorit. Se poate folosi + și - " +"pentru a obține o mișcare relativă. De exemplu, dacă scrieți \"+2\" și " +"selectați \"Linia\", \"Du-te la\" te va duce două linii sub poziția actuală." #. MENU_LABEL_EDIT_CLEAR #: po/tmp/ap_String_Id.h.h:732 msgid "Cle&ar" -msgstr "&terge" +msgstr "Ș&terge" #. DLG_Tab_Button_Clear #: po/tmp/ap_String_Id.h.h:734 msgid "Clear" -msgstr "Anulez" +msgstr "Anuleză" #. DLG_Tab_Button_ClearAll #: po/tmp/ap_String_Id.h.h:736 msgid "Clear &All" -msgstr "Anuleaz &totul" +msgstr "Anulează &totul" #. DLG_Background_ClearClr #: po/tmp/ap_String_Id.h.h:738 msgid "Clear Background Color" -msgstr "Anuleaz culoarea de fundal" +msgstr "Anulează culoarea de fundal" #. DLG_Background_ClearHighlight #: po/tmp/ap_String_Id.h.h:740 msgid "Clear Highlight Color" -msgstr "Anulez culoarea de subliniere" +msgstr "Anuleză culoarea de evidențiere" #. MSG_QueryExit #: po/tmp/ap_String_Id.h.h:742 msgid "Close all windows and exit?" -msgstr "nchidei toate ferestrele i ieiti?" +msgstr "Închideți toate ferestrele și ieșiti?" #. MENU_STATUSLINE_FILE_EXIT #: po/tmp/ap_String_Id.h.h:744 msgid "Close all windows in the application and exit" -msgstr "nchide toate ferestrele aplicaiei i prsete programul" +msgstr "Închide toate ferestrele aplicației și părăsește programul" #. MENU_STATUSLINE_FILE_CLOSE #: po/tmp/ap_String_Id.h.h:746 msgid "Close the document" -msgstr "nchide documentul" +msgstr "Închide documentul" #. MENU_LABEL_TABLE_SELECT_COLUMN #: po/tmp/ap_String_Id.h.h:748 msgid "Co&lumn" -msgstr "Selecteaz co&loan" +msgstr "&Coloană" #. DLG_FormatFrame_Color #. DLG_FormatTable_Color #. DLG_UFS_ColorLabel -#: po/tmp/ap_String_Id.h.h:751 po/tmp/xap_String_Id.h.h:177 +#: po/tmp/ap_String_Id.h.h:751 po/tmp/xap_String_Id.h.h:191 msgid "Color:" -msgstr "" +msgstr "Culoare:" #. DLG_FormatTable_Apply_To_Column #: po/tmp/ap_String_Id.h.h:753 msgid "Column" -msgstr "" +msgstr "Coloană" #. ColumnGapStatus #: po/tmp/ap_String_Id.h.h:755 #, c-format msgid "Column Gap [%s]" -msgstr "Spaiu ntre coloane[%s]" +msgstr "Spațiu între coloane[%s]" #. ColumnStatus #: po/tmp/ap_String_Id.h.h:757 @@ -1849,17 +1858,17 @@ #. MENU_LABEL_TABLE_INSERT_COLUMNS_BEFORE #: po/tmp/ap_String_Id.h.h:761 msgid "Columns &Left" -msgstr "Insereaz coloane &nainte" +msgstr "&Coloane înainte" #. MENU_LABEL_TABLE_INSERT_COLUMNS_AFTER #: po/tmp/ap_String_Id.h.h:763 msgid "Columns &Right" -msgstr "Insereaz coloane &dup" +msgstr "Coloane &după" #. DLG_ListRevisions_Column3Label #: po/tmp/ap_String_Id.h.h:765 msgid "Comment" -msgstr "" +msgstr "Comentariu" #. DLG_MarkRevisions_Comment2Label #: po/tmp/ap_String_Id.h.h:767 @@ -1869,885 +1878,900 @@ #. MENU_STATUSLINE_TOOLS_REVISIONS_COMPARE_DOCUMENTS #: po/tmp/ap_String_Id.h.h:769 msgid "Compare active document to another document" -msgstr "" +msgstr "Compară documentul activ cu altul" #. FIELD_Application_CompileDate #: po/tmp/ap_String_Id.h.h:771 msgid "Compile Date" -msgstr "Data compilrii" +msgstr "Data compilării" #. FIELD_Application_CompileTime #: po/tmp/ap_String_Id.h.h:773 msgid "Compile Time" -msgstr "Ora compilrii" +msgstr "Ora compilării" #. DLG_Break_Continuous #: po/tmp/ap_String_Id.h.h:775 msgid "Con&tinuous" -msgstr "R&nd" +msgstr "R&ând" -#. DLG_MarkRevisions_Check1Label +#. TOC_TocHeading #: po/tmp/ap_String_Id.h.h:777 +msgid "Contents" +msgstr "&Cuprins" + +#. DLG_MarkRevisions_Check1Label +#: po/tmp/ap_String_Id.h.h:779 #, c-format msgid "Continue previous revision (number %d)" -msgstr "Continu revizia precedent (numr %d)" +msgstr "Continuă revizia precedentă (număr %d)" #. FIELD_Document_Contributor -#: po/tmp/ap_String_Id.h.h:779 +#: po/tmp/ap_String_Id.h.h:781 msgid "Contributor" -msgstr "" +msgstr "Contribuitor" #. DLG_MetaData_CoAuthor_LBL -#: po/tmp/ap_String_Id.h.h:781 +#: po/tmp/ap_String_Id.h.h:783 msgid "Contributor(s):" msgstr "Colaborator(i):" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:783 +#: po/tmp/ap_String_Id.h.h:785 msgid "Convert Selected Text to a Table" -msgstr "" +msgstr "Convertește textul selectat într-un tabel" #. MENU_LABEL_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:785 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:787 msgid "Convert Table to Text" -msgstr "Inserarai tabel" +msgstr "Con&vertește tabelul în text" #. MENU_LABEL_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:787 +#: po/tmp/ap_String_Id.h.h:789 msgid "Convert Text to Table" -msgstr "" +msgstr "Convertește te&xtul în tabel" #. MENU_STATUSLINE_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:789 +#: po/tmp/ap_String_Id.h.h:791 msgid "Convert from a Table to Text" -msgstr "" +msgstr "Convertește tabelul în text normal" #. TOOLBAR_LABEL_EDIT_COPY #. TOOLBAR_STATUSLINE_EDIT_COPY #. TOOLBAR_TOOLTIP_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:793 +#: po/tmp/ap_String_Id.h.h:795 msgid "Copy" -msgstr "" +msgstr "Copiază" #. MENU_STATUSLINE_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:795 +#: po/tmp/ap_String_Id.h.h:797 msgid "Copy Embedded Object" -msgstr "" +msgstr "Copiază obiect embedded" #. MENU_LABEL_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:797 +#: po/tmp/ap_String_Id.h.h:799 msgid "Copy Image" -msgstr "" +msgstr "Copiază imagine" #. MENU_LABEL_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:799 +#: po/tmp/ap_String_Id.h.h:801 msgid "Copy Object" -msgstr "" +msgstr "Copiază obiect" #. MENU_LABEL_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:801 +#: po/tmp/ap_String_Id.h.h:803 msgid "Copy Text Box" -msgstr "" +msgstr "Copiază dreptungi de text" #. MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION -#: po/tmp/ap_String_Id.h.h:803 +#: po/tmp/ap_String_Id.h.h:805 msgid "Copy hyperlink location" -msgstr "" +msgstr "Copiază locația legăturii web" #. MENU_STATUSLINE_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:805 +#: po/tmp/ap_String_Id.h.h:807 msgid "Copy the Text Box to the clipboard" -msgstr "" +msgstr "Copiază dreptunghiul de text în clipboard" #. MENU_STATUSLINE_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:807 +#: po/tmp/ap_String_Id.h.h:809 msgid "Copy the Text Box to the clipboard then remove it" -msgstr "" +msgstr "Copiază dreptunghil de text în clipboard și șterge-l" #. MENU_STATUSLINE_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:809 +#: po/tmp/ap_String_Id.h.h:811 msgid "Copy the selection and put it on the Clipboard" -msgstr "Copiaz selecia i o pune n clipboard" +msgstr "Copiază textul selectat și pune-l în clipboard" #. MSG_IE_CouldNotOpen -#: po/tmp/ap_String_Id.h.h:811 +#: po/tmp/ap_String_Id.h.h:813 #, c-format msgid "Could not open file %s for writing" -msgstr "Nu am putut deschide fiierul %s pentru scriere" +msgstr "Nu am putut deschide fișierul %s pentru scriere" #. MSG_OpenFailed -#: po/tmp/ap_String_Id.h.h:813 +#: po/tmp/ap_String_Id.h.h:815 #, c-format msgid "Could not open file %s." -msgstr "Nu am putut deschide fiierul %s." +msgstr "Nu am putut deschide fișierul %s." #. MSG_IE_CouldNotWrite -#: po/tmp/ap_String_Id.h.h:815 +#: po/tmp/ap_String_Id.h.h:817 #, c-format msgid "Could not write to file %s" -msgstr "Nu am putut scrie n fiierul %s" +msgstr "Nu am putut scrie în fișierul %s" #. MSG_SaveFailed -#: po/tmp/ap_String_Id.h.h:817 +#: po/tmp/ap_String_Id.h.h:819 #, c-format msgid "Could not write to the file %s." -msgstr "Nu pot salva fiierul %s" +msgstr "Nu pot salva fișierul %s" #. MENU_STATUSLINE_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:819 +#: po/tmp/ap_String_Id.h.h:821 msgid "Count the number of words in the document" -msgstr "Numr cuvintele din document" +msgstr "Numără cuvintele din document" #. FIELD_Document_Coverage -#: po/tmp/ap_String_Id.h.h:821 +#: po/tmp/ap_String_Id.h.h:823 msgid "Coverage" -msgstr "" +msgstr "Acoperire" #. DLG_MetaData_Coverage_LBL -#: po/tmp/ap_String_Id.h.h:823 +#: po/tmp/ap_String_Id.h.h:825 msgid "Coverage:" msgstr "Cuprinde:" #. DLG_NEW_Tab1_FAX1 -#: po/tmp/ap_String_Id.h.h:825 +#: po/tmp/ap_String_Id.h.h:827 msgid "Create a fax" -msgstr "Creai un fax" +msgstr "Creați un fax" #. DLG_NEW_Tab1_WP1 -#: po/tmp/ap_String_Id.h.h:827 +#: po/tmp/ap_String_Id.h.h:829 msgid "Create a new blank document" -msgstr "Creai un document gol" +msgstr "Crează un document gol" #. MENU_STATUSLINE_FILE_NEW #. TOOLBAR_STATUSLINE_FILE_NEW #. TOOLBAR_TOOLTIP_FILE_NEW -#: po/tmp/ap_String_Id.h.h:831 +#: po/tmp/ap_String_Id.h.h:833 msgid "Create a new document" -msgstr "Creaz un document nou" +msgstr "Crează un document nou" #. DLG_NEW_Create -#: po/tmp/ap_String_Id.h.h:833 +#: po/tmp/ap_String_Id.h.h:835 msgid "Create a new document from a template" -msgstr "Creai un nou document pornind de la un model" +msgstr "Creați un document nou pornind de la un șablon" #. MENU_STATUSLINE_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:835 +#: po/tmp/ap_String_Id.h.h:837 msgid "Create a new document using a template" -msgstr "" +msgstr "Crează un document nou folosind un șablon" #. DLG_NEW_StartEmpty -#: po/tmp/ap_String_Id.h.h:837 +#: po/tmp/ap_String_Id.h.h:839 msgid "Create an empty document" -msgstr "Pornii cu un document gol" +msgstr "Porniți cu un document gol" #. FIELD_Document_Creator -#: po/tmp/ap_String_Id.h.h:839 +#: po/tmp/ap_String_Id.h.h:841 msgid "Creator" -msgstr "" +msgstr "Creator" #. MENU_LABEL_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:841 +#: po/tmp/ap_String_Id.h.h:843 msgid "Cu&t" -msgstr "&Decupeaz" +msgstr "&Taie" #. FIELD_Datetime_CurrentDate -#: po/tmp/ap_String_Id.h.h:843 +#: po/tmp/ap_String_Id.h.h:845 msgid "Current Date" -msgstr "Data actual" +msgstr "Data actuală" #. DLG_Lists_Current_Font -#: po/tmp/ap_String_Id.h.h:845 +#: po/tmp/ap_String_Id.h.h:847 msgid "Current Font" msgstr "Fonturi actuale" #. DLG_Lists_Current_List_Label -#: po/tmp/ap_String_Id.h.h:847 +#: po/tmp/ap_String_Id.h.h:849 msgid "Current List Label" -msgstr "Eticheta actual a listei" +msgstr "Eticheta actuală a listei" #. DLG_Lists_Current_List_Type -#: po/tmp/ap_String_Id.h.h:849 +#: po/tmp/ap_String_Id.h.h:851 msgid "Current List Type" -msgstr "Tipul actual de list" +msgstr "Tipul actual de listă" #. MSG_EmptySelection -#: po/tmp/ap_String_Id.h.h:851 +#: po/tmp/ap_String_Id.h.h:853 msgid "Current Selection is Empty" msgstr "Nu a fost selectat nimic" #. DLG_Styles_DefCurrent -#: po/tmp/ap_String_Id.h.h:853 +#: po/tmp/ap_String_Id.h.h:855 msgid "Current Settings" -msgstr "Setri curente" +msgstr "Setări curente" #. FIELD_Datetime_CurrentTime -#: po/tmp/ap_String_Id.h.h:855 +#: po/tmp/ap_String_Id.h.h:857 msgid "Current Time" -msgstr "Ora curent" +msgstr "Ora curentă" #. DLG_Options_Label_ViewCursorBlink -#: po/tmp/ap_String_Id.h.h:857 +#: po/tmp/ap_String_Id.h.h:859 msgid "Cursor &blink" -msgstr "Cursor &clipind" +msgstr "C&ursor clipitor" #. DLG_Options_Label_SpellCustomDict -#: po/tmp/ap_String_Id.h.h:859 +#: po/tmp/ap_String_Id.h.h:861 msgid "Custom Dictionary:" -msgstr "Dicionar personal:" +msgstr "Dicționar personal:" #. FIELD_DateTime_Custom -#: po/tmp/ap_String_Id.h.h:861 +#: po/tmp/ap_String_Id.h.h:863 msgid "Customizable date/time" -msgstr "" +msgstr "Dată/timp setabil" #. DLG_Lists_Customize -#: po/tmp/ap_String_Id.h.h:863 +#: po/tmp/ap_String_Id.h.h:865 msgid "Customized List" -msgstr "Personalizat" +msgstr "Personalizată" #. TOOLBAR_LABEL_EDIT_CUT #. TOOLBAR_STATUSLINE_EDIT_CUT #. TOOLBAR_TOOLTIP_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:867 +#: po/tmp/ap_String_Id.h.h:869 msgid "Cut" -msgstr "" +msgstr "Taie" #. MENU_STATUSLINE_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:869 +#: po/tmp/ap_String_Id.h.h:871 msgid "Cut Embedded Object" -msgstr "" +msgstr "Taie obiect embedded" #. MENU_LABEL_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:871 +#: po/tmp/ap_String_Id.h.h:873 msgid "Cut Image" -msgstr "" +msgstr "Taie imagine" #. MENU_LABEL_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:873 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:875 msgid "Cut Object" -msgstr "Subiect" +msgstr "Șterge obiect" #. MENU_LABEL_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:875 +#: po/tmp/ap_String_Id.h.h:877 msgid "Cut Text Box" -msgstr "" +msgstr "Taie dreptunghi text" #. MENU_STATUSLINE_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:877 +#: po/tmp/ap_String_Id.h.h:879 msgid "Cut the selection and put it on the Clipboard" -msgstr "Taie selecia i o pune n clipboard" +msgstr "Șterge textul selectat și pune-l în clipboard" #. MENU_LABEL_FMT_DIRECTION -#: po/tmp/ap_String_Id.h.h:879 +#: po/tmp/ap_String_Id.h.h:881 msgid "D&irectional" -msgstr "" +msgstr "&Direcție" #. DLG_Lists_Dashed_List #. STYLE_DASHEDLIST -#: po/tmp/ap_String_Id.h.h:881 po/tmp/xap_String_Id.h.h:225 +#: po/tmp/ap_String_Id.h.h:883 po/tmp/xap_String_Id.h.h:241 msgid "Dashed List" -msgstr "List cu linii" +msgstr "Listă cu linii" #. FIELD_Document_Date #. DLG_ListRevisions_Column2Label -#: po/tmp/ap_String_Id.h.h:884 +#: po/tmp/ap_String_Id.h.h:886 msgid "Date" msgstr "Comentariu" #. MENU_LABEL_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:886 +#: po/tmp/ap_String_Id.h.h:888 msgid "Date and &Time" -msgstr "Da&ta i ora" +msgstr "Da&ta și ora" #. FIELD_Type_Datetime -#: po/tmp/ap_String_Id.h.h:888 +#: po/tmp/ap_String_Id.h.h:890 msgid "Date and Time" -msgstr "Data i ora" +msgstr "Data și ora" #. FIELD_DateTime_DOY -#: po/tmp/ap_String_Id.h.h:890 +#: po/tmp/ap_String_Id.h.h:892 msgid "Day # in the year" msgstr "Ziua anului" #. DLG_Options_Btn_Default -#: po/tmp/ap_String_Id.h.h:892 +#: po/tmp/ap_String_Id.h.h:894 msgid "De&faults" msgstr "Prede&finit" #. DLG_Tab_Radio_Decimal -#: po/tmp/ap_String_Id.h.h:894 +#: po/tmp/ap_String_Id.h.h:896 msgid "Decimal" msgstr "Zecimal" #. TabToggleDecimalTab -#: po/tmp/ap_String_Id.h.h:896 +#: po/tmp/ap_String_Id.h.h:898 msgid "Decimal Tab" msgstr "Zecimal" #. TOOLBAR_LABEL_UNINDENT #. TOOLBAR_STATUSLINE_UNINDENT #. TOOLBAR_TOOLTIP_UNINDENT -#: po/tmp/ap_String_Id.h.h:900 +#: po/tmp/ap_String_Id.h.h:902 msgid "Decrease indent" -msgstr "" +msgstr "Micșorează indentare" #. FIELD_DateTime_DefaultDateNoTime -#: po/tmp/ap_String_Id.h.h:902 +#: po/tmp/ap_String_Id.h.h:904 msgid "Default date (w/o time)" -msgstr "Data predefinit (fr or)" +msgstr "Data implicită (fără oră)" #. FIELD_DateTime_DefaultDate -#: po/tmp/ap_String_Id.h.h:904 +#: po/tmp/ap_String_Id.h.h:906 msgid "Default date representation" -msgstr "Reprezentarea predefinit a datei" +msgstr "Reprezentarea implicită a datei" #. DLG_Options_Label_DefaultPageSize -#: po/tmp/ap_String_Id.h.h:906 +#: po/tmp/ap_String_Id.h.h:908 msgid "Default page size" -msgstr "Dimensiune predefinit a paginii" +msgstr "Dimensiune implicită a paginii" #. DLG_Tab_Label_DefaultTS -#: po/tmp/ap_String_Id.h.h:908 +#: po/tmp/ap_String_Id.h.h:910 msgid "Default tab stops:" -msgstr "&Tabulare predefinit:" +msgstr "&Tabulare implicită:" #. DLG_Options_Label_DirectionRtl -#: po/tmp/ap_String_Id.h.h:910 +#: po/tmp/ap_String_Id.h.h:912 msgid "Default to right-to-left direction of text" -msgstr "Seteaz direcia predefinita de la drepta la stnga" +msgstr "Setează &direcția implicită de la drepta la stânga" #. DLG_FormatTOC_LevelDefs -#: po/tmp/ap_String_Id.h.h:912 +#: po/tmp/ap_String_Id.h.h:914 msgid "Define Main Properties" -msgstr "" +msgstr "Definește proprietățile principale" #. MENU_STATUSLINE_FMT_STYLE #. MENU_STATUSLINE_FMT_STYLE_DEFINE -#: po/tmp/ap_String_Id.h.h:915 +#: po/tmp/ap_String_Id.h.h:917 msgid "Define or apply style for the selection" -msgstr "Definete sau aplic un stil zonei selectate" +msgstr "Definește sau aplică un stil zonei selectate" #. DLG_Styles_Delete #. MENU_STATUSLINE_TABLE_DELETE #. DLG_Delete -#: po/tmp/ap_String_Id.h.h:918 po/tmp/xap_String_Id.h.h:239 +#: po/tmp/ap_String_Id.h.h:920 po/tmp/xap_String_Id.h.h:255 msgid "Delete" -msgstr "terge" +msgstr "Șterge" #. MENU_STATUSLINE_TABLE_DELETE_CELLS -#: po/tmp/ap_String_Id.h.h:920 +#: po/tmp/ap_String_Id.h.h:922 msgid "Delete Cells" -msgstr "terge celule" +msgstr "Șterge celule" #. MENU_LABEL_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:922 +#: po/tmp/ap_String_Id.h.h:924 msgid "Delete Co&lumn" -msgstr "" +msgstr "Șterge Co&loană" #. MENU_STATUSLINE_TABLE_DELETE_COLUMNS #. MENU_STATUSLINE_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:925 +#: po/tmp/ap_String_Id.h.h:927 msgid "Delete Column" -msgstr "terge coloane" +msgstr "Șterge coloane" #. MENU_STATUSLINE_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:927 +#: po/tmp/ap_String_Id.h.h:929 msgid "Delete Embedded Object" -msgstr "" +msgstr "Șterge obiect embedded" #. MENU_LABEL_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:929 +#: po/tmp/ap_String_Id.h.h:931 msgid "Delete Image" -msgstr "" +msgstr "Șterge imagine" #. MENU_LABEL_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:931 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:933 msgid "Delete Object" -msgstr "terge tabel" +msgstr "Șterge obiect" #. MENU_LABEL_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:933 +#: po/tmp/ap_String_Id.h.h:935 msgid "Delete Ro&w" -msgstr "" +msgstr "Șterge rând" #. MENU_STATUSLINE_TABLE_DELETE_ROWS #. MENU_STATUSLINE_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:936 +#: po/tmp/ap_String_Id.h.h:938 msgid "Delete Row" -msgstr "terge linii" +msgstr "Șterge rând" #. MENU_LABEL_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:938 +#: po/tmp/ap_String_Id.h.h:940 msgid "Delete Tabl&e" -msgstr "" +msgstr "Șterge tab&elă" #. MENU_STATUSLINE_TABLE_DELETE_TABLE #. MENU_STATUSLINE_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:941 +#: po/tmp/ap_String_Id.h.h:943 msgid "Delete Table" -msgstr "terge tabel" +msgstr "Șterge tabel" #. MENU_LABEL_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:943 +#: po/tmp/ap_String_Id.h.h:945 msgid "Delete Text Box" -msgstr "" +msgstr "Șterge dreptunghi text" #. TOOLBAR_LABEL_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:945 +#: po/tmp/ap_String_Id.h.h:947 msgid "Delete column" -msgstr "" +msgstr "Șterge coloană" #. MENU_STATUSLINE_INSERT_DELETE_HYPERLINK -#: po/tmp/ap_String_Id.h.h:947 +#: po/tmp/ap_String_Id.h.h:949 msgid "Delete hyperlink" -msgstr "terge hiperlegtura" +msgstr "Șterge legătura web" #. TOOLBAR_LABEL_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:949 +#: po/tmp/ap_String_Id.h.h:951 msgid "Delete row" -msgstr "" +msgstr "Șterge rând" #. MENU_STATUSLINE_EDIT_CLEAR -#: po/tmp/ap_String_Id.h.h:951 +#: po/tmp/ap_String_Id.h.h:953 msgid "Delete the selection" -msgstr "Anuleaz selecia" +msgstr "Șterge textul selectat" #. TOOLBAR_STATUSLINE_DELETE_COLUMN #. TOOLBAR_TOOLTIP_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:954 +#: po/tmp/ap_String_Id.h.h:956 msgid "Delete this column from its table" -msgstr "" +msgstr "Șterge această coloană din tabelă" #. TOOLBAR_STATUSLINE_DELETE_ROW #. TOOLBAR_TOOLTIP_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:957 +#: po/tmp/ap_String_Id.h.h:959 msgid "Delete this row from its table" -msgstr "" +msgstr "Șterge acest rând din tabelă" #. DLG_Styles_Description #. DLG_Styles_ModifyDescription #. FIELD_Document_Description -#: po/tmp/ap_String_Id.h.h:961 +#: po/tmp/ap_String_Id.h.h:963 msgid "Description" msgstr "Descriere" #. DLG_MetaData_Description_LBL #. DLG_PLUGIN_MANAGER_DESC #. DLG_Image_LblDescription -#: po/tmp/ap_String_Id.h.h:963 po/tmp/xap_String_Id.h.h:242 +#: po/tmp/ap_String_Id.h.h:965 po/tmp/xap_String_Id.h.h:258 msgid "Description:" msgstr "Descriere:" #. DLG_Lists_Diamond_List #. STYLE_DIAMONLIST -#: po/tmp/ap_String_Id.h.h:965 po/tmp/xap_String_Id.h.h:244 +#: po/tmp/ap_String_Id.h.h:967 po/tmp/xap_String_Id.h.h:260 msgid "Diamond List" -msgstr "List cu diamante" +msgstr "Listă cu diamante" #. DLG_Options_Label_SpellDictionaries -#: po/tmp/ap_String_Id.h.h:967 +#: po/tmp/ap_String_Id.h.h:969 msgid "Dictionaries" -msgstr "" +msgstr "Dicționare" #. DLG_HdrFtr_FooterEven -#: po/tmp/ap_String_Id.h.h:969 +#: po/tmp/ap_String_Id.h.h:971 msgid "Different footer on facing pages" -msgstr "Subsoluri diferite n paginile pare/impare" +msgstr "Subsoluri diferite în paginile pare/impare" #. DLG_HdrFtr_FooterFirst -#: po/tmp/ap_String_Id.h.h:971 +#: po/tmp/ap_String_Id.h.h:973 msgid "Different footer on first page" -msgstr "Subsol diferit pe prima pagin" +msgstr "Subsol diferit pe prima pagină" #. DLG_HdrFtr_FooterLast -#: po/tmp/ap_String_Id.h.h:973 +#: po/tmp/ap_String_Id.h.h:975 msgid "Different footer on last page" -msgstr "Subsol diferit pe ultima pagin" +msgstr "Subsol diferit pe ultima pagină" #. DLG_HdrFtr_HeaderEven -#: po/tmp/ap_String_Id.h.h:975 +#: po/tmp/ap_String_Id.h.h:977 msgid "Different header on facing pages" -msgstr "Antete diferite n paginile pare/impare" +msgstr "Antete diferite în paginile pare/impare" #. DLG_HdrFtr_HeaderFirst -#: po/tmp/ap_String_Id.h.h:977 +#: po/tmp/ap_String_Id.h.h:979 msgid "Different header on first page" -msgstr "Antet diferit pe prima pagin" +msgstr "Antet diferit pe prima pagină" #. DLG_HdrFtr_HeaderLast -#: po/tmp/ap_String_Id.h.h:979 +#: po/tmp/ap_String_Id.h.h:981 msgid "Different header on last page" -msgstr " Antet diferit pe ultima pagin" +msgstr "Antet diferit pe ultima pagină" #. DLG_Styles_StylesLocked -#: po/tmp/ap_String_Id.h.h:981 +#: po/tmp/ap_String_Id.h.h:983 msgid "Disable all formatting commands, except styles" -msgstr "Se blocheaz comenzile de formatare care nu aparin stilului" +msgstr "Se blochează comenzile de formatare care nu aparțin stilului" #. MENU_STATUSLINE_HELP_CREDITS -#: po/tmp/ap_String_Id.h.h:983 +#: po/tmp/ap_String_Id.h.h:985 msgid "Display Credits" -msgstr "Arat oamenii din spatele AbiWord" +msgstr "Arată oamenii din spatele AbiWord" #. MENU_STATUSLINE_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:985 +#: po/tmp/ap_String_Id.h.h:987 msgid "Display Help Contents" -msgstr "Afieaz coninutul rubricii de ajutor" +msgstr "Afișează conținutul rubricii de ajutor" #. MENU_STATUSLINE_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:987 +#: po/tmp/ap_String_Id.h.h:989 msgid "Display Help Index" -msgstr "Afieaz indexul rubricii de ajutor" +msgstr "Afișează indexul rubricii de ajutor" #. MENU_STATUSLINE_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:989 +#: po/tmp/ap_String_Id.h.h:991 msgid "Display non-printing characters" -msgstr "Arat caracterele speciale de formatare" +msgstr "Arată caracterele speciale de formatare" #. MENU_STATUSLINE_HELP_ABOUT -#: po/tmp/ap_String_Id.h.h:991 +#: po/tmp/ap_String_Id.h.h:993 msgid "Display program information, version number, and copyright" -msgstr "Afieaz informaii despre program, numrul versiunii i copyright" +msgstr "Afișează informații despre program, numărul versiunii și copyright" #. DLG_FormatTOC_DispStyle -#: po/tmp/ap_String_Id.h.h:993 +#: po/tmp/ap_String_Id.h.h:995 msgid "Display style:" -msgstr "" +msgstr "Stil de afișare:" #. DLG_Options_Prompt_IgnoreResetAll -#: po/tmp/ap_String_Id.h.h:995 +#: po/tmp/ap_String_Id.h.h:997 msgid "Do you want to reset ignored words in all the documents?" -msgstr "Dorii s nlocuii cuvintele ignorate din toate documentele?" +msgstr "Doriți să înlocuiți cuvintele ignorate din toate documentele?" #. DLG_Options_Prompt_IgnoreResetCurrent -#: po/tmp/ap_String_Id.h.h:997 +#: po/tmp/ap_String_Id.h.h:999 msgid "Do you want to reset ignored words in the current document?" -msgstr "Dorii s nlocuii cuvintele ignorate din documentul actual?" +msgstr "Doriți să înlocuiți cuvintele ignorate din documentul actual?" #. FIELD_Type_Document -#: po/tmp/ap_String_Id.h.h:999 +#: po/tmp/ap_String_Id.h.h:1001 msgid "Document" -msgstr "" +msgstr "Document" #. DLG_MetaData_Title -#: po/tmp/ap_String_Id.h.h:1001 +#: po/tmp/ap_String_Id.h.h:1003 msgid "Document Properties" -msgstr "Proprieti document" +msgstr "Proprietăți document" #. DLG_Options_Label_Documents -#: po/tmp/ap_String_Id.h.h:1003 +#: po/tmp/ap_String_Id.h.h:1005 msgid "Documents" -msgstr "" +msgstr "Documente" #. DLG_FormatFootnotes_FootRestartNone -#: po/tmp/ap_String_Id.h.h:1005 +#: po/tmp/ap_String_Id.h.h:1007 msgid "Don't restart" -msgstr "" +msgstr "Nu reporni" #. DLG_Para_SpacingDouble -#: po/tmp/ap_String_Id.h.h:1007 +#: po/tmp/ap_String_Id.h.h:1009 msgid "Double" -msgstr "Dubl" +msgstr "Dublă" #. TOOLBAR_LABEL_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1009 +#: po/tmp/ap_String_Id.h.h:1011 msgid "Double Spacing" -msgstr "" +msgstr "Spațiere dublă" #. TOOLBAR_STATUSLINE_DOUBLE_SPACE #. TOOLBAR_TOOLTIP_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1012 +#: po/tmp/ap_String_Id.h.h:1014 msgid "Double spacing" -msgstr "" +msgstr "Spațiere dublă" + +#. MENU_LABEL_EDIT_LATEXEQUATION +#: po/tmp/ap_String_Id.h.h:1016 +msgid "Edit Equation" +msgstr "Editează ecuația" #. MENU_LABEL_EDIT_EDITFOOTER #. TOOLBAR_LABEL_EDIT_FOOTER #. TOOLBAR_STATUSLINE_EDIT_FOOTER #. TOOLBAR_TOOLTIP_EDIT_FOOTER -#: po/tmp/ap_String_Id.h.h:1017 +#: po/tmp/ap_String_Id.h.h:1021 msgid "Edit Footer" -msgstr "Editeaz subsol" +msgstr "Editează subsol" #. MENU_LABEL_EDIT_EDITHEADER #. TOOLBAR_LABEL_EDIT_HEADER #. TOOLBAR_STATUSLINE_EDIT_HEADER #. TOOLBAR_TOOLTIP_EDIT_HEADER -#: po/tmp/ap_String_Id.h.h:1022 +#: po/tmp/ap_String_Id.h.h:1026 msgid "Edit Header" -msgstr "Editeaz antet" +msgstr "Editează antet" + +#. MENU_STATUSLINE_EDIT_LATEXEQUATION +#: po/tmp/ap_String_Id.h.h:1028 +msgid "Edit Latex Equation" +msgstr "Editează ecuație LaTeX" #. MENU_STATUSLINE_INSERT_EDIT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1024 +#: po/tmp/ap_String_Id.h.h:1030 msgid "Edit hyperlink" -msgstr "" +msgstr "Editează legătură web" #. MENU_STATUSLINE_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:1026 +#: po/tmp/ap_String_Id.h.h:1032 msgid "Edit text at the top or bottom of every page" -msgstr "Editeaz textul din antetul sau subsolul fiecrui document" +msgstr "Editează textul din antetul sau subsolul fiecărui document" #. MENU_STATUSLINE_EDIT_EDITFOOTER -#: po/tmp/ap_String_Id.h.h:1028 +#: po/tmp/ap_String_Id.h.h:1034 msgid "Edit the Footer on the current page" -msgstr "Editeaz subsolul paginii curente" +msgstr "Editează subsolul paginii curente" #. MENU_STATUSLINE_EDIT_EDITHEADER -#: po/tmp/ap_String_Id.h.h:1030 +#: po/tmp/ap_String_Id.h.h:1036 msgid "Edit the Header on the current page" -msgstr "Editeaz antetul paginii curente" +msgstr "Editează antetul paginii curente" + +#. TB_Embedded +#: po/tmp/ap_String_Id.h.h:1038 +msgid "Embedded" +msgstr "Embedded" #. MENU_LABEL_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:1032 +#: po/tmp/ap_String_Id.h.h:1040 msgid "Enable F&ormatting Tools" -msgstr "" +msgstr "&Unelte de formatare" #. DLG_Options_Label_CheckEnableSmoothScrolling -#: po/tmp/ap_String_Id.h.h:1034 +#: po/tmp/ap_String_Id.h.h:1042 msgid "Enable Smooth Scrolling" -msgstr "" +msgstr "Activează derularea ușoară" #. FIELD_Numbers_EndnoteAnchor -#: po/tmp/ap_String_Id.h.h:1036 +#: po/tmp/ap_String_Id.h.h:1044 msgid "Endnote anchor" -msgstr "Tot despre nota de final" +msgstr "Ancoră notă de sfârșit" #. FIELD_Numbers_EndnoteReference -#: po/tmp/ap_String_Id.h.h:1038 +#: po/tmp/ap_String_Id.h.h:1046 msgid "Endnote reference" -msgstr "Referin la nota de final a paginii" +msgstr "Referință la nota de sfârșit" #. DLG_FormatFootnotes_EndStyle -#: po/tmp/ap_String_Id.h.h:1040 +#: po/tmp/ap_String_Id.h.h:1048 msgid "Endnote style" -msgstr "" +msgstr "Stil" #. MENU_LABEL_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1042 +#: po/tmp/ap_String_Id.h.h:1050 msgid "Equation" -msgstr "" +msgstr "Ecuație" #. FIELD_Error -#: po/tmp/ap_String_Id.h.h:1044 +#: po/tmp/ap_String_Id.h.h:1052 msgid "Error calculating value!" msgstr "Eroare la calcularea valorii!" #. SCRIPT_CANTRUN -#: po/tmp/ap_String_Id.h.h:1046 +#: po/tmp/ap_String_Id.h.h:1054 #, c-format msgid "Error executing script %s" -msgstr "Eroare la execuia scriptului %s" +msgstr "Eroare la execuția scriptului %s" #. MSG_ImportError -#: po/tmp/ap_String_Id.h.h:1048 +#: po/tmp/ap_String_Id.h.h:1056 #, c-format msgid "Error importing file %s." -msgstr "Eroare la importarea fiierului %s" +msgstr "Eroare la importarea fișierului %s" #. MSG_SaveFailedExport -#: po/tmp/ap_String_Id.h.h:1050 +#: po/tmp/ap_String_Id.h.h:1058 #, c-format msgid "Error while attempting to save %s: could not construct exporter" -msgstr "Nu pot exporta fiierul %s" +msgstr "Nu pot exporta fișierul %s" #. MSG_SaveFailedName -#: po/tmp/ap_String_Id.h.h:1052 +#: po/tmp/ap_String_Id.h.h:1060 #, c-format msgid "Error while attempting to save %s: invalid name" -msgstr "Nu pot salva fiierul %s: numele nu este valid" +msgstr "Nu pot salva fișierul %s: numele nu este valid" #. TOOLBAR_LABEL_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1054 +#: po/tmp/ap_String_Id.h.h:1062 msgid "Ex. script" -msgstr "" +msgstr "Execută scriptul" #. DLG_Para_SpacingExactly -#: po/tmp/ap_String_Id.h.h:1056 +#: po/tmp/ap_String_Id.h.h:1064 msgid "Exactly" msgstr "Exact" #. DLG_Latex_Example -#: po/tmp/ap_String_Id.h.h:1058 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1066 msgid "Example:" -msgstr "Exemplu" +msgstr "Exemplu:" #. MENU_STATUSLINE_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1060 +#: po/tmp/ap_String_Id.h.h:1068 msgid "Execute helper scripts" -msgstr "Execut scripturile ajuttoare" +msgstr "Execută scripturile ajutătoare" #. TOOLBAR_STATUSLINE_SCRIPT_PLAY #. TOOLBAR_TOOLTIP_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1063 +#: po/tmp/ap_String_Id.h.h:1071 msgid "Execute script" -msgstr "" +msgstr "Execută scriptul" #. DLG_ListRevisions_Label1 -#: po/tmp/ap_String_Id.h.h:1065 +#: po/tmp/ap_String_Id.h.h:1073 msgid "Existing revisions:" msgstr "Revizii existente:" #. TB_Extra -#: po/tmp/ap_String_Id.h.h:1067 +#: po/tmp/ap_String_Id.h.h:1075 msgid "Extra" -msgstr "" +msgstr "Extra" #. DLG_Field_Parameters_Capital -#: po/tmp/ap_String_Id.h.h:1069 +#: po/tmp/ap_String_Id.h.h:1077 msgid "Extra Parameters" -msgstr "" +msgstr "Parametri adiționali" #. DLG_Options_Label_ViewExtraTB -#: po/tmp/ap_String_Id.h.h:1071 +#: po/tmp/ap_String_Id.h.h:1079 msgid "Extra Toolbar" -msgstr "Bara de instrumente extra" +msgstr "Bara de unelte extra" #. DLG_Field_Parameters -#: po/tmp/ap_String_Id.h.h:1073 +#: po/tmp/ap_String_Id.h.h:1081 msgid "Extra parameters:" msgstr "Parametri extra:" #. MENU_LABEL_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1075 +#: po/tmp/ap_String_Id.h.h:1083 msgid "F&ile" -msgstr "&Inserare fiier" +msgstr "&Inserare fișier" #. MENU_LABEL_FORMAT -#: po/tmp/ap_String_Id.h.h:1077 +#: po/tmp/ap_String_Id.h.h:1085 msgid "F&ormat" msgstr "F&ormatare" #. MENU_LABEL_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:1079 +#: po/tmp/ap_String_Id.h.h:1087 msgid "F&ull Screen" msgstr "Pe tot &ecranul" #. DLG_FR_FindLabel -#: po/tmp/ap_String_Id.h.h:1081 +#: po/tmp/ap_String_Id.h.h:1089 msgid "Fi&nd what:" -msgstr "C&aut:" +msgstr "C&aută:" #. DLG_MailMerge_Insert_No_Colon -#: po/tmp/ap_String_Id.h.h:1083 +#: po/tmp/ap_String_Id.h.h:1091 msgid "Field Name" -msgstr "" +msgstr "Numele câmpului" #. DLG_MailMerge_Insert -#: po/tmp/ap_String_Id.h.h:1085 +#: po/tmp/ap_String_Id.h.h:1093 msgid "Field Name:" -msgstr "" +msgstr "Numele câmpului:" #. MSG_IE_UnsupportedType -#: po/tmp/ap_String_Id.h.h:1087 +#: po/tmp/ap_String_Id.h.h:1095 #, c-format msgid "File %s is not of a currently supported file type" -msgstr "Fiierul %s este de un tip deocamdat nesuportat" +msgstr "Fișierul %s este de un tip deocamdată nesuportat" #. MSG_IE_FakeType -#: po/tmp/ap_String_Id.h.h:1089 +#: po/tmp/ap_String_Id.h.h:1097 #, c-format msgid "File %s is not of the type it claims to be" -msgstr "Fiierul %s este de alt tip dect extensia sa" +msgstr "Fișierul %s este de alt tip decât extensia sa" #. MSG_IE_UnknownType -#: po/tmp/ap_String_Id.h.h:1091 +#: po/tmp/ap_String_Id.h.h:1099 #, c-format msgid "File %s is of unknown type" -msgstr "Fiierul %s este de un tip deocamdat nesuportat" +msgstr "Fișierul %s este de un tip deocamdată nesuportat" #. MSG_IE_FileNotFound -#: po/tmp/ap_String_Id.h.h:1093 +#: po/tmp/ap_String_Id.h.h:1101 #, c-format msgid "File %s not found" -msgstr "Fiierul %s nu a putut fi gsit" +msgstr "Fișierul %s nu a putut fi găsit" #. FIELD_Application_Filename -#: po/tmp/ap_String_Id.h.h:1095 +#: po/tmp/ap_String_Id.h.h:1103 msgid "File Name" -msgstr "Numele fiierului" +msgstr "Numele fișierului" #. DLG_FormatTOC_FillStyle -#: po/tmp/ap_String_Id.h.h:1097 +#: po/tmp/ap_String_Id.h.h:1105 msgid "Fill style:" -msgstr "" +msgstr "Stilul de umplere:" #. DLG_FR_FindTitle -#: po/tmp/ap_String_Id.h.h:1099 +#: po/tmp/ap_String_Id.h.h:1107 msgid "Find" -msgstr "Caut" +msgstr "Caută" #. MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1101 +#: po/tmp/ap_String_Id.h.h:1109 msgid "Find &next revision" -msgstr "" +msgstr "Găsește revizia următoare" #. MENU_LABEL_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1103 +#: po/tmp/ap_String_Id.h.h:1111 msgid "Find &previous revision" -msgstr "" +msgstr "Găsește revizia &precedentă" #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1105 +#: po/tmp/ap_String_Id.h.h:1113 msgid "Find next visible revision in the document" -msgstr "" +msgstr "Găsește următoarea revisie visibilă a documentului" #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1107 +#: po/tmp/ap_String_Id.h.h:1115 msgid "Find previous visible revision in the document" -msgstr "" +msgstr "Găsește revizia precedentă vizibilă a documentului" #. MENU_STATUSLINE_EDIT_FIND -#: po/tmp/ap_String_Id.h.h:1109 +#: po/tmp/ap_String_Id.h.h:1117 msgid "Find the specified text" -msgstr "Caut textul specificat" +msgstr "Caută textul specificat" #. FirstLineIndentStatus -#: po/tmp/ap_String_Id.h.h:1111 +#: po/tmp/ap_String_Id.h.h:1119 #, c-format msgid "First Line Indent [%s]" msgstr "Indentarea primei linii [%s]" #. DLG_Para_SpecialFirstLine -#: po/tmp/ap_String_Id.h.h:1113 +#: po/tmp/ap_String_Id.h.h:1121 msgid "First line" msgstr "Pozitiv" #. DLG_InsertTable_FixedColSize -#: po/tmp/ap_String_Id.h.h:1115 +#: po/tmp/ap_String_Id.h.h:1123 msgid "Fixed column size:" -msgstr "Mrime fix a coloanei:" +msgstr "Mărime fixă a coloanei:" #. DLG_Lists_FoldingLevel1 -#: po/tmp/ap_String_Id.h.h:1117 +#: po/tmp/ap_String_Id.h.h:1125 msgid "Fold below level 1" -msgstr "" +msgstr "Împachetează (fold) sub nivelul 1" #. DLG_Lists_FoldingLevel2 -#: po/tmp/ap_String_Id.h.h:1119 +#: po/tmp/ap_String_Id.h.h:1127 msgid "Fold below level 2" -msgstr "" +msgstr "Împachetează (fold) sub nivelul 2" #. DLG_Lists_FoldingLevel3 -#: po/tmp/ap_String_Id.h.h:1121 +#: po/tmp/ap_String_Id.h.h:1129 msgid "Fold below level 3" -msgstr "" +msgstr "Împachetează (fold) sub nivelul 3" #. DLG_Lists_FoldingLevel4 -#: po/tmp/ap_String_Id.h.h:1123 +#: po/tmp/ap_String_Id.h.h:1131 msgid "Fold below level 4" -msgstr "" +msgstr "Împachetează (fold) sub nivelul 4" #. DLG_Para_PreviewFollowParagraph -#: po/tmp/ap_String_Id.h.h:1125 +#: po/tmp/ap_String_Id.h.h:1133 msgid "" "Following Paragraph Following Paragraph Following Paragraph Following " "Paragraph Following Paragraph Following Paragraph Following Paragraph" -msgstr "" -"Paragraful Urmator Paragraful Urmator Paragraful Urmator Paragraful Urmator " -"Paragraful Urmator Paragraful Urmator Paragraful Urmator" +msgstr "Paragraful Următor Paragraful Următor Paragraful Următor Paragraful Următor " +"Paragraful Următor Paragraful Următor Paragraful Următor" #. DLG_Styles_ModifyFont #. TOOLBAR_LABEL_FMT_FONT @@ -2755,1344 +2779,1360 @@ #. TOOLBAR_TOOLTIP_FMT_FONT #. DLG_UFS_FontTitle #. DLG_UFS_FontTab -#: po/tmp/ap_String_Id.h.h:1130 po/tmp/xap_String_Id.h.h:315 +#: po/tmp/ap_String_Id.h.h:1138 po/tmp/xap_String_Id.h.h:335 msgid "Font" msgstr "Font" +#. TOOLBAR_STATUSLINE_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:1140 +msgid "Font Choose" +msgstr "Alegeți font" + #. TOOLBAR_LABEL_FMT_SIZE #. TOOLBAR_STATUSLINE_FMT_SIZE #. TOOLBAR_TOOLTIP_FMT_SIZE -#: po/tmp/ap_String_Id.h.h:1134 +#: po/tmp/ap_String_Id.h.h:1144 msgid "Font Size" -msgstr "" +msgstr "Mărime font" + +#. TOOLBAR_LABEL_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:1146 +msgid "Font choose" +msgstr "Alege font" #. TOOLBAR_LABEL_COLOR_FORE #. TOOLBAR_STATUSLINE_COLOR_FORE #. TOOLBAR_TOOLTIP_COLOR_FORE -#: po/tmp/ap_String_Id.h.h:1138 +#: po/tmp/ap_String_Id.h.h:1150 msgid "Font color" -msgstr "" +msgstr "Culoare font" #. DLG_Lists_ButtonFont -#: po/tmp/ap_String_Id.h.h:1140 +#: po/tmp/ap_String_Id.h.h:1152 msgid "Font..." msgstr "Fonturi..." #. DLG_Lists_Font #. DLG_UFS_FontLabel -#: po/tmp/ap_String_Id.h.h:1142 po/tmp/xap_String_Id.h.h:317 +#: po/tmp/ap_String_Id.h.h:1154 po/tmp/xap_String_Id.h.h:337 msgid "Font:" msgstr "Font:" #. MENU_LABEL_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1144 +#: po/tmp/ap_String_Id.h.h:1156 msgid "Foot¬e" -msgstr "" +msgstr "&Notă de pagină" #. DLG_PageNumbers_Footer #. MENU_LABEL_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1147 +#: po/tmp/ap_String_Id.h.h:1159 msgid "Footer" -msgstr "Subsol" +msgstr "&Subsol" #. DLG_HdrFtr_FooterFrame -#: po/tmp/ap_String_Id.h.h:1149 +#: po/tmp/ap_String_Id.h.h:1161 msgid "Footer Properties" -msgstr "Proprieti subsol" +msgstr "Proprietăți subsol" #. FooterStatus -#: po/tmp/ap_String_Id.h.h:1151 +#: po/tmp/ap_String_Id.h.h:1163 #, c-format msgid "Footer [%s]" msgstr "Subsol [%s]" #. FIELD_Numbers_FootnoteAnchor -#: po/tmp/ap_String_Id.h.h:1153 +#: po/tmp/ap_String_Id.h.h:1165 msgid "Footnote anchor" -msgstr "" +msgstr "Ancoră notă de pagină" #. FIELD_Numbers_FootnoteReference -#: po/tmp/ap_String_Id.h.h:1155 +#: po/tmp/ap_String_Id.h.h:1167 msgid "Footnote reference" -msgstr "" +msgstr "Referință notă de pagină" #. DLG_FormatFootnotes_FootStyle -#: po/tmp/ap_String_Id.h.h:1157 +#: po/tmp/ap_String_Id.h.h:1169 msgid "Footnote style" -msgstr "" +msgstr "Stil" #. MENU_LABEL_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:1159 +#: po/tmp/ap_String_Id.h.h:1171 msgid "Footnotes and Endnotes" -msgstr "" +msgstr "&Note de pagină și de sfârșit" #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1162 +#: po/tmp/ap_String_Id.h.h:1174 msgid "Force LTR direction of text" -msgstr "" +msgstr "Forțează direcția de la stânga la dreapta a textului" #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_RTL #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1165 +#: po/tmp/ap_String_Id.h.h:1177 msgid "Force RTL direction of text" -msgstr "" +msgstr "Forțează direcția de la drepta la stânga a textului" #. MENU_STATUSLINE_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:1167 +#: po/tmp/ap_String_Id.h.h:1179 msgid "Force left-to-right direction of text" -msgstr "" +msgstr "Forțează direcția de la stânga la dreapta a textului" #. MENU_STATUSLINE_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:1169 +#: po/tmp/ap_String_Id.h.h:1181 msgid "Force right-to-left direction of text" -msgstr "" +msgstr "Forțează direcția de la dreapta la stânga a textului" #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1171 +#: po/tmp/ap_String_Id.h.h:1183 msgid "Force text LTR" -msgstr "" +msgstr "Forțează textul de la stânga la dreapta" #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1173 +#: po/tmp/ap_String_Id.h.h:1185 msgid "Force text RTL" -msgstr "" +msgstr "Forțează textul de la dreapta la stânga" #. DLG_Styles_ModifyFormat #. TB_Format -#: po/tmp/ap_String_Id.h.h:1176 +#: po/tmp/ap_String_Id.h.h:1188 msgid "Format" msgstr "Format" #. MENU_STATUSLINE_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1178 +#: po/tmp/ap_String_Id.h.h:1190 msgid "Format Embedded Object" -msgstr "" +msgstr "Format obiect embedded" #. DLG_FormatFootnotes_Endnotes -#: po/tmp/ap_String_Id.h.h:1180 +#: po/tmp/ap_String_Id.h.h:1192 msgid "Format Endnotes" -msgstr "" +msgstr "Formatul notelor de sfârșit" #. DLG_FormatFootnotes_Footnotes -#: po/tmp/ap_String_Id.h.h:1182 +#: po/tmp/ap_String_Id.h.h:1194 msgid "Format Footnotes" -msgstr "" +msgstr "Formatul notelor de pagină" #. DLG_FormatFootnotes_Title -#: po/tmp/ap_String_Id.h.h:1184 +#: po/tmp/ap_String_Id.h.h:1196 msgid "Format Footnotes and Endnotes" -msgstr "" +msgstr "Formatare note de pagină și de sfârșit" #. DLG_HdrFtr_Title -#: po/tmp/ap_String_Id.h.h:1186 +#: po/tmp/ap_String_Id.h.h:1198 msgid "Format Header/Footers" -msgstr "Formatare antet/subsol" +msgstr "Formatare antet șisubsol" #. MENU_LABEL_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1188 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1200 msgid "Format Object" -msgstr "Formateaz tabel" +msgstr "Formatează obiect" #. TOOLBAR_LABEL_FMTPAINTER -#: po/tmp/ap_String_Id.h.h:1190 +#: po/tmp/ap_String_Id.h.h:1202 msgid "Format Painter" -msgstr "" +msgstr "Formatare pensulă" #. DLG_FormatTableTitle #. MENU_STATUSLINE_TABLE_FORMAT -#: po/tmp/ap_String_Id.h.h:1193 +#: po/tmp/ap_String_Id.h.h:1205 msgid "Format Table" -msgstr "Formateaz tabel" +msgstr "Formatează tabel" #. DLG_FormatTOC_Title -#: po/tmp/ap_String_Id.h.h:1195 +#: po/tmp/ap_String_Id.h.h:1207 msgid "Format Table of Contents" -msgstr "" +msgstr "Format cuprins" #. DLG_FormatFrameTitle -#: po/tmp/ap_String_Id.h.h:1197 +#: po/tmp/ap_String_Id.h.h:1209 msgid "Format Text Box" -msgstr "" +msgstr "Format dreptunghi de text" #. DLG_Options_Label_ViewFormatTB -#: po/tmp/ap_String_Id.h.h:1199 +#: po/tmp/ap_String_Id.h.h:1211 msgid "Format Toolbar" -msgstr "Bara de instrumente de formatare" +msgstr "Bara de unelte de formatare" #. MENU_STATUSLINE_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:1201 +#: po/tmp/ap_String_Id.h.h:1213 msgid "Format this image" -msgstr "" +msgstr "Formatarea acestei imagini" #. MENU_STATUSLINE_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:1203 +#: po/tmp/ap_String_Id.h.h:1215 msgid "Format your document using styles" -msgstr "" +msgstr "Formatează documentul folosind stiluri" #. DLG_Lists_Format #. DLG_DocComparison_Fmt -#: po/tmp/ap_String_Id.h.h:1205 po/tmp/xap_String_Id.h.h:323 +#: po/tmp/ap_String_Id.h.h:1217 po/tmp/xap_String_Id.h.h:343 msgid "Format:" msgstr "Format:" #. MENU_LABEL_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1207 +#: po/tmp/ap_String_Id.h.h:1219 msgid "From File" -msgstr "" +msgstr "Din fișierul" #. MENU_LABEL_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1209 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1221 msgid "From LaTeX" -msgstr "De la: " +msgstr "Din LaTeX" + +#. TOOLBAR_LABEL_VIEW_FULL_SCREEN +#. TOOLBAR_STATUSLINE_VIEW_FULL_SCREEN +#. TOOLBAR_TOOLTIP_VIEW_FULL_SCREEN +#: po/tmp/ap_String_Id.h.h:1225 +msgid "Full Screen" +msgstr "Pe tot ecranul" #. DLG_FormatTOC_General #. DLG_Options_Label_General #. DLG_MetaData_TAB_General -#: po/tmp/ap_String_Id.h.h:1213 +#: po/tmp/ap_String_Id.h.h:1229 msgid "General" msgstr "General" #. DLG_Goto_Btn_Goto -#: po/tmp/ap_String_Id.h.h:1215 +#: po/tmp/ap_String_Id.h.h:1231 msgid "Go To" msgstr "Du-te la" #. DLG_Goto_Label_What -#: po/tmp/ap_String_Id.h.h:1217 +#: po/tmp/ap_String_Id.h.h:1233 msgid "Go To &What:" msgstr "Du-te la &:" #. DLG_Goto_Title -#: po/tmp/ap_String_Id.h.h:1219 +#: po/tmp/ap_String_Id.h.h:1235 msgid "Go to..." msgstr "Du-te la..." #. DLG_FormatTOC_HasLabel -#: po/tmp/ap_String_Id.h.h:1221 +#: po/tmp/ap_String_Id.h.h:1237 msgid "H&as label" -msgstr "" +msgstr "&Are etichetă" #. DLG_FormatTOC_HeadingText -#: po/tmp/ap_String_Id.h.h:1223 +#: po/tmp/ap_String_Id.h.h:1239 msgid "H&eading text:" -msgstr "" +msgstr "Text de titlu" #. DLG_Lists_Hand_List #. STYLE_HANDLIST -#: po/tmp/ap_String_Id.h.h:1225 po/tmp/xap_String_Id.h.h:363 +#: po/tmp/ap_String_Id.h.h:1241 po/tmp/xap_String_Id.h.h:383 msgid "Hand List" -msgstr "List cu \"mnue\"" +msgstr "Listă cu \"mânuțe\"" #. DLG_Para_SpecialHanging -#: po/tmp/ap_String_Id.h.h:1227 +#: po/tmp/ap_String_Id.h.h:1243 msgid "Hanging" msgstr "Negativ" #. DLG_PageNumbers_Header #. MENU_LABEL_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1230 +#: po/tmp/ap_String_Id.h.h:1246 msgid "Header" -msgstr "Antet" +msgstr "&Antet" #. DLG_HdrFtr_HeaderFrame -#: po/tmp/ap_String_Id.h.h:1232 +#: po/tmp/ap_String_Id.h.h:1248 msgid "Header Properties" -msgstr "Proprieti antetului" +msgstr "Proprietăți antetului" #. HeaderStatus -#: po/tmp/ap_String_Id.h.h:1234 +#: po/tmp/ap_String_Id.h.h:1250 #, c-format msgid "Header [%s]" msgstr "Antet [%s]" #. MENU_LABEL_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:1236 +#: po/tmp/ap_String_Id.h.h:1252 msgid "Header/Footers" -msgstr "Antet i subsol" +msgstr "Antet și su&bsol" #. MSG_CHECK_PRINT_MODE -#: po/tmp/ap_String_Id.h.h:1238 +#: po/tmp/ap_String_Id.h.h:1254 msgid "" "Headers and Footers can only be created and edited while in Print View " "Mode. \n" " To enter this mode choose View then Print Layout from the Menus. \n" " Would you like to enter Print Layout mode right now?" -msgstr "" -"Antetul i subsolul paginii nu pot fi create i modificate dect n modul " -"Pagin.x0a;Pentru a intra n acest mod alegei din meniu Vizualizare apoi " -"Pagin.x0a;Dorii s intrai n modul Pagin chiar acum ?" +msgstr "Antetul și subsolul paginii nu pot fi create și modificate decât în modul " +"Pagină.\nPentru a intra în acest mod alegeți din meniu Vizualizare apoi " +"Pagină\nDoriți să intrați în modul Pagină chiar acum ?" #. DLG_Stylist_HeadingStyles -#: po/tmp/ap_String_Id.h.h:1240 +#: po/tmp/ap_String_Id.h.h:1256 msgid "Heading Styles" -msgstr "" +msgstr "Stilul titlului" #. DLG_FormatTOC_HeadingStyle -#: po/tmp/ap_String_Id.h.h:1242 +#: po/tmp/ap_String_Id.h.h:1258 msgid "Heading style:" -msgstr "" +msgstr "Stilul titlului:" #. DLG_Lists_Heart_List #. STYLE_HEARTLIST -#: po/tmp/ap_String_Id.h.h:1244 po/tmp/xap_String_Id.h.h:379 +#: po/tmp/ap_String_Id.h.h:1260 po/tmp/xap_String_Id.h.h:399 msgid "Heart List" -msgstr "List cu inimioare" +msgstr "Listă cu inimioare" #. DLG_Lists_Hebrew_List -#: po/tmp/ap_String_Id.h.h:1246 +#: po/tmp/ap_String_Id.h.h:1262 msgid "Hebrew List" -msgstr "List ebraic" +msgstr "Listă ebraică" #. TOOLBAR_LABEL_HELP #. TOOLBAR_STATUSLINE_HELP #. TOOLBAR_TOOLTIP_HELP -#: po/tmp/ap_String_Id.h.h:1250 +#: po/tmp/ap_String_Id.h.h:1266 msgid "Help" -msgstr "" +msgstr "Ajutor" #. MENU_LABEL_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:1252 +#: po/tmp/ap_String_Id.h.h:1268 msgid "Help &Contents" -msgstr "&Coninut" +msgstr "&Conținut" #. MENU_LABEL_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:1254 +#: po/tmp/ap_String_Id.h.h:1270 msgid "Help &Introduction" msgstr "&Index" #. DLG_Options_Label_Hide -#: po/tmp/ap_String_Id.h.h:1256 +#: po/tmp/ap_String_Id.h.h:1272 msgid "Hide" msgstr "Ascunde" #. DLG_Options_Label_SpellHideErrors -#: po/tmp/ap_String_Id.h.h:1258 +#: po/tmp/ap_String_Id.h.h:1274 msgid "Hide &spelling errors in the document" msgstr "&Ascunde erorile de editare din document" #. DLG_Lists_FoldingLevelexp -#: po/tmp/ap_String_Id.h.h:1260 +#: po/tmp/ap_String_Id.h.h:1276 msgid "Hide text below List Levels" -msgstr "" +msgstr "Ascunde textul sub nivelele listelor" #. TOOLBAR_LABEL_COLOR_BACK #. TOOLBAR_STATUSLINE_COLOR_BACK #. TOOLBAR_TOOLTIP_COLOR_BACK -#: po/tmp/ap_String_Id.h.h:1264 +#: po/tmp/ap_String_Id.h.h:1280 msgid "Highlight" -msgstr "" +msgstr "Evidențiere" #. DLG_Spell_IgnoreAll -#: po/tmp/ap_String_Id.h.h:1266 +#: po/tmp/ap_String_Id.h.h:1282 msgid "I&gnore All" -msgstr "Ignor tot" +msgstr "Ignoră &tot" #. DLG_FormatTOC_Indent -#: po/tmp/ap_String_Id.h.h:1268 +#: po/tmp/ap_String_Id.h.h:1284 msgid "I&ndent:" -msgstr "" +msgstr "I&ndentare:" #. InsertModeFieldINS -#: po/tmp/ap_String_Id.h.h:1270 +#: po/tmp/ap_String_Id.h.h:1286 msgid "INS" msgstr "INS" #. DLG_Options_Label_Icons -#: po/tmp/ap_String_Id.h.h:1272 +#: po/tmp/ap_String_Id.h.h:1288 msgid "Icons" -msgstr "Iconie" +msgstr "Iconițe" #. DLG_Options_Label_Ignore -#: po/tmp/ap_String_Id.h.h:1274 +#: po/tmp/ap_String_Id.h.h:1290 msgid "Ignore" -msgstr "Ignor" +msgstr "Ignoră" #. DLG_Options_Label_SpellIgnoreWords -#: po/tmp/ap_String_Id.h.h:1276 +#: po/tmp/ap_String_Id.h.h:1292 msgid "Ignore Words" -msgstr "" +msgstr "Ignoră cuvintele" #. MENU_STATUSLINE_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:1278 +#: po/tmp/ap_String_Id.h.h:1294 msgid "Ignore all occurrences of this word in the document" -msgstr "Ignor intotdeauna acest cuvnt n documente" +msgstr "Ignoră intotdeauna acest cuvânt în documente" #. DLG_Options_Label_SpellIgnoredWord -#: po/tmp/ap_String_Id.h.h:1280 +#: po/tmp/ap_String_Id.h.h:1296 msgid "Ignored words:" msgstr "Cuvinte ignorate:" #. DLG_FormatFrame_SetImageBackground #. DLG_FormatTable_SetImageBackground -#: po/tmp/ap_String_Id.h.h:1283 +#: po/tmp/ap_String_Id.h.h:1299 msgid "Image For Background" -msgstr "" +msgstr "Imagine de fundal" #. DLG_Lists_Implies_List #. STYLE_IMPLIES_LIST -#: po/tmp/ap_String_Id.h.h:1285 po/tmp/xap_String_Id.h.h:413 +#: po/tmp/ap_String_Id.h.h:1301 po/tmp/xap_String_Id.h.h:433 msgid "Implies List" -msgstr "List cu simboluri implicaionale" +msgstr "Listă cu simboluri implicaționale" #. MENU_STATUSLINE_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:1287 +#: po/tmp/ap_String_Id.h.h:1303 msgid "Import style definitions from a document" -msgstr "" +msgstr "Importă definițiile de stiluri din alt document" #. DLG_Styles_LBL_InUse -#: po/tmp/ap_String_Id.h.h:1289 +#: po/tmp/ap_String_Id.h.h:1305 msgid "In Use" msgstr "Stiluri folosite" #. WORD_PassInvalid -#: po/tmp/ap_String_Id.h.h:1291 +#: po/tmp/ap_String_Id.h.h:1307 msgid "Incorrect Password" -msgstr "Parola nu este corect" +msgstr "Parola nu este corectă" #. TOOLBAR_LABEL_INDENT #. TOOLBAR_STATUSLINE_INDENT #. TOOLBAR_TOOLTIP_INDENT -#: po/tmp/ap_String_Id.h.h:1295 +#: po/tmp/ap_String_Id.h.h:1311 msgid "Increase indent" -msgstr "" +msgstr "Mărește indentarea" #. DLG_Para_LabelIndentation -#: po/tmp/ap_String_Id.h.h:1297 +#: po/tmp/ap_String_Id.h.h:1313 msgid "Indentation" msgstr "Indentare" #. DLG_Para_TabLabelIndentsAndSpacing -#: po/tmp/ap_String_Id.h.h:1299 +#: po/tmp/ap_String_Id.h.h:1315 msgid "Indents and Spacing" -msgstr "&Indentare i spaiere" +msgstr "&Indentare și spațiere" #. DLG_ToggleCase_FirstUpperCase -#: po/tmp/ap_String_Id.h.h:1301 +#: po/tmp/ap_String_Id.h.h:1317 msgid "Initial Caps" -msgstr "Prima liter majuscul" +msgstr "Prima literă majusculă" #. DLG_FormatFootnotes_EndInitialVal -#: po/tmp/ap_String_Id.h.h:1303 +#: po/tmp/ap_String_Id.h.h:1319 msgid "Initial Endnote value" -msgstr "" +msgstr "Valoare inițială" #. DLG_FormatFootnotes_FootInitialVal -#: po/tmp/ap_String_Id.h.h:1305 +#: po/tmp/ap_String_Id.h.h:1321 msgid "Initial Footnote value" -msgstr "" +msgstr "Valoare inițială" #. DLG_Break_Insert #. MENU_STATUSLINE_TABLE_INSERT #. DLG_IP_Button_Label -#: po/tmp/ap_String_Id.h.h:1308 po/tmp/xap_String_Id.h.h:423 +#: po/tmp/ap_String_Id.h.h:1324 po/tmp/xap_String_Id.h.h:443 msgid "Insert" -msgstr "ntrerupe :" +msgstr "Întrerupe :" #. MENU_LABEL_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1310 +#: po/tmp/ap_String_Id.h.h:1326 msgid "Insert &Columns" -msgstr "" +msgstr "Inserare &coloane" #. MENU_LABEL_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1312 +#: po/tmp/ap_String_Id.h.h:1328 msgid "Insert &Rows" -msgstr "" +msgstr "Inserare &rânduri" #. MENU_LABEL_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1314 +#: po/tmp/ap_String_Id.h.h:1330 msgid "Insert &Table" -msgstr "" +msgstr "Inserare &Tabel" #. DLG_InsertBookmark_Title #. TOOLBAR_LABEL_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1317 +#: po/tmp/ap_String_Id.h.h:1333 msgid "Insert Bookmark" -msgstr "Insereaz semn de carte" +msgstr "Inserează semn de carte" #. DLG_Break_BreakTitle_Capital -#: po/tmp/ap_String_Id.h.h:1319 +#: po/tmp/ap_String_Id.h.h:1335 msgid "Insert Break" -msgstr "" +msgstr "Inserare Break" #. MENU_STATUSLINE_TABLE_INSERT_CELLS -#: po/tmp/ap_String_Id.h.h:1321 +#: po/tmp/ap_String_Id.h.h:1337 msgid "Insert Cells" -msgstr "Insereaz celule" +msgstr "Inserează celule" #. MENU_STATUSLINE_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1323 +#: po/tmp/ap_String_Id.h.h:1339 msgid "Insert Clipboard contents" -msgstr "Insereaz coninutul clipboard-ului" +msgstr "Inserează conținutul clipboard-ului" #. DLG_DateTime_DateTimeTitle -#: po/tmp/ap_String_Id.h.h:1325 +#: po/tmp/ap_String_Id.h.h:1341 msgid "Insert Date and Time" -msgstr "Data i ora" +msgstr "Data și ora" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1327 +#: po/tmp/ap_String_Id.h.h:1343 msgid "Insert Equation" -msgstr "" +msgstr "Inserare ecuație" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1329 +#: po/tmp/ap_String_Id.h.h:1345 msgid "Insert Equation from a LaTeX expression" -msgstr "" +msgstr "Inserare ecuație din expresie LaTeX" #. DLG_Field_FieldTitle_Capital -#: po/tmp/ap_String_Id.h.h:1331 +#: po/tmp/ap_String_Id.h.h:1347 msgid "Insert Field" -msgstr "" +msgstr "Inserare câmp" #. DLG_InsertHyperlink_Title #. TOOLBAR_LABEL_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1334 +#: po/tmp/ap_String_Id.h.h:1350 msgid "Insert Hyperlink" -msgstr "Insereaz hiperlegtur" +msgstr "Inserează legătură web" #. TOOLBAR_LABEL_IMG -#: po/tmp/ap_String_Id.h.h:1336 +#: po/tmp/ap_String_Id.h.h:1352 msgid "Insert Image" -msgstr "" +msgstr "Inserare imagine" #. DLG_MailMerge_MailMergeTitle -#: po/tmp/ap_String_Id.h.h:1338 +#: po/tmp/ap_String_Id.h.h:1354 msgid "Insert Mail Merge Field" -msgstr "" +msgstr "Inserează câmp de combinare mail" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1340 +#: po/tmp/ap_String_Id.h.h:1356 msgid "Insert MathML from a file" -msgstr "" +msgstr "Inserare MathML din fișier" #. DLG_InsertTable_TableTitle #. MENU_STATUSLINE_TABLE_INSERT_TABLE #. MENU_STATUSLINE_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1344 +#: po/tmp/ap_String_Id.h.h:1360 msgid "Insert Table" -msgstr "Inserarai tabel" +msgstr "Inserează tabel" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER -#: po/tmp/ap_String_Id.h.h:1346 +#: po/tmp/ap_String_Id.h.h:1362 msgid "Insert Unicode direction marker into the document" -msgstr "" +msgstr "Inserare marker direcție Unicode în document" #. MENU_STATUSLINE_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1348 +#: po/tmp/ap_String_Id.h.h:1364 msgid "Insert a Footer" -msgstr "" +msgstr "Inserează un subsol" #. MENU_STATUSLINE_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1350 +#: po/tmp/ap_String_Id.h.h:1366 msgid "Insert a Header" -msgstr "" +msgstr "Inserează un antet" #. MENU_STATUSLINE_INSERT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:1352 +#: po/tmp/ap_String_Id.h.h:1368 msgid "Insert a Table of Contents based on Headings" -msgstr "" +msgstr "Inserează un cuprins bazat pe titluri" #. MENU_STATUSLINE_INSERT_TEXTBOX -#: po/tmp/ap_String_Id.h.h:1354 +#: po/tmp/ap_String_Id.h.h:1370 msgid "Insert a Text Box" -msgstr "" +msgstr "Inserează un dreptunghi de text" #. TOOLBAR_STATUSLINE_FMT_BOOKMARK #. TOOLBAR_TOOLTIP_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1357 +#: po/tmp/ap_String_Id.h.h:1373 msgid "Insert a bookmark into the document" -msgstr "" +msgstr "Inserează un semn de carte în document" #. MENU_STATUSLINE_INSERT_FIELD -#: po/tmp/ap_String_Id.h.h:1359 +#: po/tmp/ap_String_Id.h.h:1375 msgid "Insert a calculated field" -msgstr "Insereaz un cmp de calcul" +msgstr "Inserează un câmp de calcul" #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_BEFORE -#: po/tmp/ap_String_Id.h.h:1361 +#: po/tmp/ap_String_Id.h.h:1377 msgid "Insert a column to the left" -msgstr "Insereaz coloane nainte" +msgstr "Inserează coloane înainte" #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_AFTER #. MENU_STATUSLINE_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1364 +#: po/tmp/ap_String_Id.h.h:1380 msgid "Insert a column to the right" -msgstr "Insereaz coloane dup" +msgstr "Inserează coloane după" #. MENU_STATUSLINE_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1366 +#: po/tmp/ap_String_Id.h.h:1382 msgid "Insert a footnote" -msgstr "" +msgstr "Inserează o notă de pagină" #. TOOLBAR_STATUSLINE_FMT_HYPERLINK #. TOOLBAR_TOOLTIP_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1369 +#: po/tmp/ap_String_Id.h.h:1385 msgid "Insert a hyperlink into the document" -msgstr "" +msgstr "Inserează legătură web în document" #. MENU_STATUSLINE_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1371 +#: po/tmp/ap_String_Id.h.h:1387 msgid "Insert a mail merge field" -msgstr "" +msgstr "Inserează un câmp de combinare mail" #. TOOLBAR_STATUSLINE_INSERT_TABLE #. TOOLBAR_TOOLTIP_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1374 +#: po/tmp/ap_String_Id.h.h:1390 msgid "Insert a new table into your document" -msgstr "" +msgstr "Inserează o tablelă nouă în document" #. MENU_STATUSLINE_INSERT_BREAK -#: po/tmp/ap_String_Id.h.h:1376 +#: po/tmp/ap_String_Id.h.h:1392 msgid "Insert a page, column, or section break" -msgstr "Insereaz o ntrerupere de pagin,coloan sau seciune" - -#. MENU_STATUSLINE_INSERT_PICTURE -#: po/tmp/ap_String_Id.h.h:1378 -msgid "Insert a picture" -msgstr "Insereaz o imagine" +msgstr "Inserează o întrerupere de pagină, coloană sau secțiune" #. MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1380 +#: po/tmp/ap_String_Id.h.h:1394 msgid "Insert a row above" -msgstr "Insereaz rnduri nainte" +msgstr "Inserează rânduri înainte" #. MENU_STATUSLINE_TABLE_INSERT_ROWS_AFTER #. MENU_STATUSLINE_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1383 +#: po/tmp/ap_String_Id.h.h:1397 msgid "Insert a row below" -msgstr "Insereaz rnduri dup" +msgstr "Inserează rânduri după" #. MENU_STATUSLINE_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1385 +#: po/tmp/ap_String_Id.h.h:1399 msgid "Insert a symbol or other special character" -msgstr "Insereaz un simbol sau un alt caracter special" +msgstr "Inserează un simbol sau un alt caracter special" + +#. MENU_STATUSLINE_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:1401 +msgid "Insert an Annotation" +msgstr "Inserează o notă explicativă" #. MENU_STATUSLINE_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1387 +#: po/tmp/ap_String_Id.h.h:1403 msgid "Insert an automatically-updated page number" -msgstr "Insereaz numrul paginii" +msgstr "Inserează numărul paginii" #. MENU_STATUSLINE_INSERT_ENDNOTE -#: po/tmp/ap_String_Id.h.h:1389 +#: po/tmp/ap_String_Id.h.h:1405 msgid "Insert an endnote" -msgstr "Insereaz o not de ncheiere" +msgstr "Inserează o notă de sfârșit" #. MENU_STATUSLINE_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:1391 +#: po/tmp/ap_String_Id.h.h:1407 msgid "Insert an existing picture from another file" -msgstr "Insereaz o imagine dintr-un alt fiier" +msgstr "Inserează o imagine dintr-un alt fișier" #. TOOLBAR_STATUSLINE_IMG #. TOOLBAR_TOOLTIP_IMG -#: po/tmp/ap_String_Id.h.h:1394 +#: po/tmp/ap_String_Id.h.h:1410 msgid "Insert an image into the document" -msgstr "" +msgstr "Inserează o imagine în document" #. MENU_STATUSLINE_INSERT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1396 +#: po/tmp/ap_String_Id.h.h:1412 msgid "Insert bookmark" -msgstr "Insereaz un semn de carte" +msgstr "Inserează un semn de carte" #. DLG_Break_BreakTitle -#: po/tmp/ap_String_Id.h.h:1398 +#: po/tmp/ap_String_Id.h.h:1414 msgid "Insert break" -msgstr "ntrerupere" +msgstr "Întrerupere" #. MENU_STATUSLINE_INSERT_CLIPART -#: po/tmp/ap_String_Id.h.h:1400 +#: po/tmp/ap_String_Id.h.h:1416 msgid "Insert clipart" -msgstr "Insereaz o imagine din clipart" +msgstr "Inserează o imagine din clipart" #. DLG_Field_FieldTitle -#: po/tmp/ap_String_Id.h.h:1402 +#: po/tmp/ap_String_Id.h.h:1418 msgid "Insert field" -msgstr "Cmp" +msgstr "Câmp" #. MENU_STATUSLINE_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1404 +#: po/tmp/ap_String_Id.h.h:1420 msgid "Insert hyperlink" -msgstr "Insereaz o hiperlegtura" +msgstr "Inserează o legătură web" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:1406 +#: po/tmp/ap_String_Id.h.h:1422 msgid "Insert left-to-right direction marker (LRM)" -msgstr "" +msgstr "Inserează marker de direcție de la stânga la dreapta" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:1408 +#: po/tmp/ap_String_Id.h.h:1424 msgid "Insert right-to-left direction marker (RLM)" -msgstr "" +msgstr "Inserează marker de direcție de la drepta la stânga" #. TOOLBAR_STATUSLINE_INSERT_SYMBOL #. TOOLBAR_TOOLTIP_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1411 +#: po/tmp/ap_String_Id.h.h:1427 msgid "Insert symbol" -msgstr "" +msgstr "Inserează simbol" #. TOOLBAR_LABEL_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1413 +#: po/tmp/ap_String_Id.h.h:1429 msgid "Insert table" -msgstr "" +msgstr "Inserează tabelă" #. MENU_STATUSLINE_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:1415 +#: po/tmp/ap_String_Id.h.h:1431 msgid "Insert the Sum of a Table Column" -msgstr "" +msgstr "Inserează suma unei coloane de tabelă" #. MENU_STATUSLINE_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:1417 +#: po/tmp/ap_String_Id.h.h:1433 msgid "Insert the Sum of a Table Row" -msgstr "" +msgstr "Inserează suma unui rând de tabelă" #. MENU_STATUSLINE_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1419 +#: po/tmp/ap_String_Id.h.h:1435 msgid "Insert the contents of another file" -msgstr "Insereaz coninutul unui alt fiier" +msgstr "Inserează conținutul unui alt fișier" #. MENU_STATUSLINE_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:1421 +#: po/tmp/ap_String_Id.h.h:1437 msgid "Insert the date and/or time" -msgstr "Insereaz data sau/i ora" +msgstr "Inserează data și/sau ora" #. MENU_STATUSLINE_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1423 +#: po/tmp/ap_String_Id.h.h:1439 msgid "Insert unformatted clipboard contents" -msgstr "Insereaz coninutul clipboard-ului fr formatare" +msgstr "Inserează conținutul clipboard-ului fără formatare" #. DLG_Options_Label_ViewUnprintable -#: po/tmp/ap_String_Id.h.h:1425 +#: po/tmp/ap_String_Id.h.h:1441 msgid "Invisible &Layout Marks" -msgstr "&Caraterele netipribile" +msgstr "&Caraterele netipăribile" #. TOOLBAR_LABEL_FMT_ITALIC #. TOOLBAR_STATUSLINE_FMT_ITALIC #. TOOLBAR_TOOLTIP_FMT_ITALIC #. DLG_UFS_StyleItalic -#: po/tmp/ap_String_Id.h.h:1429 po/tmp/xap_String_Id.h.h:453 +#: po/tmp/ap_String_Id.h.h:1445 po/tmp/xap_String_Id.h.h:473 msgid "Italic" -msgstr "" +msgstr "Înclinat" #. MENU_STATUSLINE_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1431 +#: po/tmp/ap_String_Id.h.h:1447 msgid "Jump to hyperlink" -msgstr "" +msgstr "Sari la legătura web" #. DLG_Para_AlignJustified -#: po/tmp/ap_String_Id.h.h:1433 +#: po/tmp/ap_String_Id.h.h:1449 msgid "Justified" msgstr "Aliniat la margini" #. TOOLBAR_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1435 +#: po/tmp/ap_String_Id.h.h:1451 msgid "Justify" -msgstr "" +msgstr "Aliniază la margini" #. TOOLBAR_STATUSLINE_ALIGN_JUSTIFY #. TOOLBAR_TOOLTIP_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1438 +#: po/tmp/ap_String_Id.h.h:1454 msgid "Justify paragraph" -msgstr "" +msgstr "Aliniază paragraful la margini" #. MENU_STATUSLINE_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1440 +#: po/tmp/ap_String_Id.h.h:1456 msgid "Justify the paragraph" -msgstr "Aliniaz paragraful la margini" +msgstr "Aliniază paragraful la margini" #. DLG_Para_PushKeepWithNext -#: po/tmp/ap_String_Id.h.h:1442 +#: po/tmp/ap_String_Id.h.h:1458 msgid "Keep with ne&xt" msgstr "&Paragrafe solitare" #. FIELD_PieceTable_Test -#: po/tmp/ap_String_Id.h.h:1444 +#: po/tmp/ap_String_Id.h.h:1460 msgid "Kevins Test" msgstr "Testul lui Kevin" #. FIELD_Document_Keywords -#: po/tmp/ap_String_Id.h.h:1446 +#: po/tmp/ap_String_Id.h.h:1462 msgid "Keywords" -msgstr "" +msgstr "Cuvinte cheie" #. DLG_MetaData_Keywords_LBL -#: po/tmp/ap_String_Id.h.h:1448 +#: po/tmp/ap_String_Id.h.h:1464 msgid "Keywords:" msgstr "Cuvinte cheie:" #. DLG_Latex_LatexTitle #. DLG_Latex_LatexEquation -#: po/tmp/ap_String_Id.h.h:1451 +#: po/tmp/ap_String_Id.h.h:1467 msgid "LaTeX Equation" -msgstr "" +msgstr "Ecuație LaTeX" #. DLG_Lists_Indent -#: po/tmp/ap_String_Id.h.h:1453 +#: po/tmp/ap_String_Id.h.h:1469 msgid "Label Align:" -msgstr "Alinierea indentrii:" +msgstr "Alinierea indentării:" #. DLG_FormatTOC_DetailsTop -#: po/tmp/ap_String_Id.h.h:1455 +#: po/tmp/ap_String_Id.h.h:1471 msgid "Label Definitions" -msgstr "" +msgstr "Definiții de etichete" #. DLG_Styles_ModifyLanguage #. DLG_Options_Label_Language #. FIELD_Document_Language -#: po/tmp/ap_String_Id.h.h:1459 +#: po/tmp/ap_String_Id.h.h:1475 msgid "Language" msgstr "Limba" #. DLG_Options_Label_LangSettings -#: po/tmp/ap_String_Id.h.h:1461 +#: po/tmp/ap_String_Id.h.h:1477 msgid "Language settings" -msgstr "" +msgstr "Setări de limbă" #. DLG_MetaData_Languages_LBL -#: po/tmp/ap_String_Id.h.h:1463 +#: po/tmp/ap_String_Id.h.h:1479 msgid "Language(s):" -msgstr "Limba(i):" +msgstr "Limba:" #. DLG_Options_Label_Layout -#: po/tmp/ap_String_Id.h.h:1465 +#: po/tmp/ap_String_Id.h.h:1481 msgid "Layout" msgstr "Paginare" #. DLG_FormatTOC_LayoutDetails -#: po/tmp/ap_String_Id.h.h:1467 +#: po/tmp/ap_String_Id.h.h:1483 msgid "Layout Details" -msgstr "" +msgstr "Detalii layout" #. DLG_Tab_Label_Leader -#: po/tmp/ap_String_Id.h.h:1469 +#: po/tmp/ap_String_Id.h.h:1485 msgid "Leader" -msgstr "Se nlocuiete cu:" +msgstr "Se înlocuiește cu:" #. DLG_Para_AlignLeft #. DLG_Tab_Radio_Left #. DLG_PageNumbers_Left #. TOOLBAR_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1474 +#: po/tmp/ap_String_Id.h.h:1490 msgid "Left" -msgstr "La stnga" +msgstr "La stânga" #. LeftIndentStatus -#: po/tmp/ap_String_Id.h.h:1476 +#: po/tmp/ap_String_Id.h.h:1492 #, c-format msgid "Left Indent [%s]" -msgstr "Indentare stnga [%s]" +msgstr "Indentare stânga [%s]" #. LeftIndentTextIndentStatus -#: po/tmp/ap_String_Id.h.h:1478 +#: po/tmp/ap_String_Id.h.h:1494 #, c-format msgid "Left Indent [%s] First Line Indent [%s]" -msgstr "Indentare stnga [%s] Indentarea primei linii [%s]" +msgstr "Indentare stânga [%s] Indentarea primei linii [%s]" #. LeftMarginStatus -#: po/tmp/ap_String_Id.h.h:1480 +#: po/tmp/ap_String_Id.h.h:1496 #, c-format msgid "Left Margin [%s]" -msgstr "Marginea stng [%s]" +msgstr "Marginea stângă [%s]" #. TabToggleLeftTab -#: po/tmp/ap_String_Id.h.h:1482 +#: po/tmp/ap_String_Id.h.h:1498 msgid "Left Tab" -msgstr "Aliniere la stnga" +msgstr "Aliniere la stânga" #. TOOLBAR_STATUSLINE_ALIGN_LEFT #. TOOLBAR_TOOLTIP_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1485 +#: po/tmp/ap_String_Id.h.h:1501 msgid "Left alignment" -msgstr "" +msgstr "Aliniere la stânga" #. MENU_STATUSLINE_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1487 +#: po/tmp/ap_String_Id.h.h:1503 msgid "Left-align the paragraph" -msgstr "Aliniaz paragraful la stnga" +msgstr "Aliniază paragraful la stânga" #. DLG_FormatTOC_Level1 -#: po/tmp/ap_String_Id.h.h:1489 +#: po/tmp/ap_String_Id.h.h:1505 msgid "Level 1" -msgstr "" +msgstr "Nivelul 1" #. DLG_FormatTOC_Level2 -#: po/tmp/ap_String_Id.h.h:1491 +#: po/tmp/ap_String_Id.h.h:1507 msgid "Level 2" -msgstr "" +msgstr "Nivelul 2" #. DLG_FormatTOC_Level3 -#: po/tmp/ap_String_Id.h.h:1493 +#: po/tmp/ap_String_Id.h.h:1509 msgid "Level 3" -msgstr "" +msgstr "Nivelul 3" #. DLG_FormatTOC_Level4 -#: po/tmp/ap_String_Id.h.h:1495 +#: po/tmp/ap_String_Id.h.h:1511 msgid "Level 4" -msgstr "" +msgstr "Nivelul 4" #. DLG_Lists_DelimiterString -#: po/tmp/ap_String_Id.h.h:1497 +#: po/tmp/ap_String_Id.h.h:1513 msgid "Level Delimiter:" msgstr "Delimitator nivele:" #. DLG_Lists_Level -#: po/tmp/ap_String_Id.h.h:1499 +#: po/tmp/ap_String_Id.h.h:1515 msgid "Level:" msgstr "Nivel:" #. DLG_Para_LabelLineSpacing -#: po/tmp/ap_String_Id.h.h:1501 +#: po/tmp/ap_String_Id.h.h:1517 msgid "Li&ne spacing:" -msgstr "&Spaiere linii:" +msgstr "&Spațiere linii:" #. DLG_Goto_Target_Line -#: po/tmp/ap_String_Id.h.h:1503 +#: po/tmp/ap_String_Id.h.h:1519 msgid "Line" msgstr "Linia" #. FIELD_Numbers_LineCount -#: po/tmp/ap_String_Id.h.h:1505 +#: po/tmp/ap_String_Id.h.h:1521 msgid "Line Count" -msgstr "Numrul de linii" +msgstr "Numărul de linii" #. MENU_STATUSLINE_FMT_TOPLINE -#: po/tmp/ap_String_Id.h.h:1507 +#: po/tmp/ap_String_Id.h.h:1523 msgid "Line above the selection (toggle)" -msgstr "Pune o line deasupra zonei selectate (comut)" +msgstr "Pune o line deasupra zonei selectate (comută)" #. DLG_Para_TabLabelLineAndPageBreaks -#: po/tmp/ap_String_Id.h.h:1509 +#: po/tmp/ap_String_Id.h.h:1525 msgid "Line and Page Breaks" -msgstr "&ntreruperi de linie si pagin" +msgstr "&Întreruperi de linie si pagină" #. MENU_STATUSLINE_FMT_BOTTOMLINE -#: po/tmp/ap_String_Id.h.h:1511 +#: po/tmp/ap_String_Id.h.h:1527 msgid "Line below the selection (toggle)" -msgstr "Linie sub zona marcat (comut)" +msgstr "Linie sub zona marcată (comută)" #. DLG_Column_Line_Between -#: po/tmp/ap_String_Id.h.h:1513 +#: po/tmp/ap_String_Id.h.h:1529 msgid "Line between" msgstr "Linie separatoare" #. DLG_WordCount_Lines -#: po/tmp/ap_String_Id.h.h:1515 +#: po/tmp/ap_String_Id.h.h:1531 msgid "Lines:" msgstr "Linii" #. DLG_Styles_List -#: po/tmp/ap_String_Id.h.h:1517 +#: po/tmp/ap_String_Id.h.h:1533 msgid "List" -msgstr "List" +msgstr "Listă" #. FIELD_Numbers_ListLabel -#: po/tmp/ap_String_Id.h.h:1519 +#: po/tmp/ap_String_Id.h.h:1535 msgid "List Label" msgstr "Eticheta listei" #. DLG_Lists_PageProperties -#: po/tmp/ap_String_Id.h.h:1521 +#: po/tmp/ap_String_Id.h.h:1537 msgid "List Properties" -msgstr "" +msgstr "Lista de proprietăți" #. DLG_Stylist_ListStyles -#: po/tmp/ap_String_Id.h.h:1523 +#: po/tmp/ap_String_Id.h.h:1539 msgid "List Styles" -msgstr "" +msgstr "Lista de stiluri" #. DLG_Lists_Title -#: po/tmp/ap_String_Id.h.h:1525 +#: po/tmp/ap_String_Id.h.h:1541 msgid "Lists for " -msgstr "Liste ordonate i neordonate" +msgstr "Liste ordonate și neordonate" #. MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1527 +#: po/tmp/ap_String_Id.h.h:1543 msgid "Lock the layout of the current toolbars" -msgstr "" +msgstr "Încuie formatul curent al barei de unelte" #. DLG_Lists_Lower_Case_List #. STYLE_LOWERCASELIST -#: po/tmp/ap_String_Id.h.h:1529 po/tmp/xap_String_Id.h.h:489 +#: po/tmp/ap_String_Id.h.h:1545 po/tmp/xap_String_Id.h.h:512 msgid "Lower Case List" -msgstr "List cu litere minuscule" +msgstr "Listă cu litere minuscule" #. DLG_Lists_Lower_Roman_List #. STYLE_LOWERROMANLIST -#: po/tmp/ap_String_Id.h.h:1531 po/tmp/xap_String_Id.h.h:491 +#: po/tmp/ap_String_Id.h.h:1547 po/tmp/xap_String_Id.h.h:514 msgid "Lower Roman List" -msgstr "List cu minuscule romane" - -#. MENU_LABEL_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1533 -msgid "M&erge documents" -msgstr "" +msgstr "Listă cu minuscule romane" #. FIELD_Application_MailMerge #. MENU_STATUSLINE_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1536 +#: po/tmp/ap_String_Id.h.h:1550 msgid "Mail Merge" -msgstr "" +msgstr "Combinare mail" #. MENU_STATUSLINE_FMT_BOLD -#: po/tmp/ap_String_Id.h.h:1538 +#: po/tmp/ap_String_Id.h.h:1552 msgid "Make the selection bold (toggle)" -msgstr "ngroa fonturile selectate (comut)" +msgstr "Îngroașă textul selectat (comută)" #. MENU_STATUSLINE_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:1540 +#: po/tmp/ap_String_Id.h.h:1554 msgid "Make the selection italic (toggle)" -msgstr "nclin fonturile selectate (comut)" +msgstr "Înclină textul selectat (comută)" #. MENU_STATUSLINE_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:1542 +#: po/tmp/ap_String_Id.h.h:1556 msgid "Make the selection subscript (toggle)" -msgstr "Scrie fonturile mai jos dect n mod normal (comut)" +msgstr "Coboară în jos textul selectat (comută)" #. MENU_STATUSLINE_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:1544 +#: po/tmp/ap_String_Id.h.h:1558 msgid "Make the selection superscript (toggle)" -msgstr "Scrie fonturile mai sus dect n mod normal (comut)" +msgstr "Ridică în sus textul selectat (comută)" #. MENU_STATUSLINE_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:1546 +#: po/tmp/ap_String_Id.h.h:1560 msgid "Manage changes in document" -msgstr "Gestioneaz modificrile din document" +msgstr "Gestionează modificările din document" #. MENU_STATUSLINE_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:1548 +#: po/tmp/ap_String_Id.h.h:1562 msgid "Manage plugins" -msgstr "Gestioneaz modulele" +msgstr "Gestionează modulele" #. DLG_PageSetup_Margin -#: po/tmp/ap_String_Id.h.h:1550 +#: po/tmp/ap_String_Id.h.h:1564 msgid "Margin" -msgstr "&Margini" +msgstr "Margini" #. DLG_MarkRevisions_Title -#: po/tmp/ap_String_Id.h.h:1552 +#: po/tmp/ap_String_Id.h.h:1566 msgid "Mark Revisions" -msgstr "Marcheaz reviziile" +msgstr "Marchează reviziile" #. MENU_STATUSLINE_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:1554 +#: po/tmp/ap_String_Id.h.h:1568 msgid "Mark changes as you type" -msgstr "Marcheaz modificrile n timpul editrii" +msgstr "Marchează modificările în timpul editării" #. FIELD_PieceTable_MartinTest -#: po/tmp/ap_String_Id.h.h:1556 +#: po/tmp/ap_String_Id.h.h:1570 msgid "Martins Test" msgstr "Testul lui Martin" #. DLG_Column_Size -#: po/tmp/ap_String_Id.h.h:1558 +#: po/tmp/ap_String_Id.h.h:1572 msgid "Max Column size" -msgstr "Lungimea maxim a coloanei" +msgstr "Lungimea maximă a coloanei" + +#. TOOLBAR_LABEL_MENU +#. TOOLBAR_STATUSLINE_MENU +#. TOOLBAR_TOOLTIP_MENU +#: po/tmp/ap_String_Id.h.h:1576 +msgid "Menu" +msgstr "Meniu" #. DLG_MergeCells_Above -#: po/tmp/ap_String_Id.h.h:1560 +#: po/tmp/ap_String_Id.h.h:1578 msgid "Merge Above" -msgstr "" +msgstr "Combinare deasupra" #. DLG_MergeCells_Below -#: po/tmp/ap_String_Id.h.h:1562 +#: po/tmp/ap_String_Id.h.h:1580 msgid "Merge Below" -msgstr "" +msgstr "Combinare dedesupt" #. DLG_MergeCellsTitle #. DLG_MergeCells_Frame #. MENU_STATUSLINE_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1566 +#: po/tmp/ap_String_Id.h.h:1584 msgid "Merge Cells" -msgstr "Combin celule" +msgstr "Combină celule" #. DLG_MergeCells_Left -#: po/tmp/ap_String_Id.h.h:1568 +#: po/tmp/ap_String_Id.h.h:1586 msgid "Merge Left" -msgstr "" +msgstr "Combină la stânga" #. DLG_MergeCells_Right -#: po/tmp/ap_String_Id.h.h:1570 +#: po/tmp/ap_String_Id.h.h:1588 msgid "Merge Right" -msgstr "" +msgstr "Combină la dreapta" #. TOOLBAR_LABEL_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1572 +#: po/tmp/ap_String_Id.h.h:1590 msgid "Merge above" -msgstr "" +msgstr "Combină deasupra" #. MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1574 +#: po/tmp/ap_String_Id.h.h:1592 msgid "Merge another document into the active document using revision marks" -msgstr "" +msgstr "Combină un alt document cu cel activ folosind markerii de revizii" #. TOOLBAR_LABEL_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1576 +#: po/tmp/ap_String_Id.h.h:1594 msgid "Merge below" -msgstr "" +msgstr "Combină dedesupt" #. TOOLBAR_LABEL_MERGE_CELLS #. TOOLBAR_STATUSLINE_MERGE_CELLS #. TOOLBAR_TOOLTIP_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1580 +#: po/tmp/ap_String_Id.h.h:1598 msgid "Merge cells" -msgstr "" +msgstr "Combină celule" #. TOOLBAR_LABEL_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1582 +#: po/tmp/ap_String_Id.h.h:1600 msgid "Merge left" -msgstr "" +msgstr "Combină la stânga" #. TOOLBAR_LABEL_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1584 +#: po/tmp/ap_String_Id.h.h:1602 msgid "Merge right" -msgstr "" +msgstr "Combină la dreapta" #. TOOLBAR_STATUSLINE_MERGEABOVE #. TOOLBAR_TOOLTIP_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1587 +#: po/tmp/ap_String_Id.h.h:1605 msgid "Merge with cell above" -msgstr "" +msgstr "Combină cu celula de deasupra" #. TOOLBAR_STATUSLINE_MERGEBELOW #. TOOLBAR_TOOLTIP_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1590 +#: po/tmp/ap_String_Id.h.h:1608 msgid "Merge with cell below" -msgstr "" +msgstr "Combină cu celula de dedesupt" #. TOOLBAR_STATUSLINE_MERGELEFT #. TOOLBAR_TOOLTIP_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1593 +#: po/tmp/ap_String_Id.h.h:1611 msgid "Merge with left cell" -msgstr "" +msgstr "Combină cu celula din stânga" #. TOOLBAR_STATUSLINE_MERGERIGHT #. TOOLBAR_TOOLTIP_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1596 +#: po/tmp/ap_String_Id.h.h:1614 msgid "Merge with right cell" -msgstr "" +msgstr "Combină cu celula din dreapta" #. FIELD_DateTime_MilTime -#: po/tmp/ap_String_Id.h.h:1598 +#: po/tmp/ap_String_Id.h.h:1616 msgid "Military Time" msgstr "Ora 24H" #. DLG_Options_TabLabel_Misc -#: po/tmp/ap_String_Id.h.h:1600 +#: po/tmp/ap_String_Id.h.h:1618 msgid "Misc." msgstr "Diverse" #. DLG_Stylist_MiscStyles -#: po/tmp/ap_String_Id.h.h:1602 +#: po/tmp/ap_String_Id.h.h:1620 msgid "Miscellaneous Styles" -msgstr "" +msgstr "Stiluri diverse" #. DLG_Styles_ModifyTitle -#: po/tmp/ap_String_Id.h.h:1604 +#: po/tmp/ap_String_Id.h.h:1622 msgid "Modify Styles" -msgstr "Modific stilul" +msgstr "Modifică stilul" #. DLG_Styles_Modify -#: po/tmp/ap_String_Id.h.h:1606 +#: po/tmp/ap_String_Id.h.h:1624 msgid "Modify..." -msgstr "Modific..." +msgstr "&Modifică..." #. FIELD_DateTime_MonthDayYear -#: po/tmp/ap_String_Id.h.h:1608 +#: po/tmp/ap_String_Id.h.h:1626 msgid "Month Day, Year" msgstr "Luna Ziua, An" #. MENU_STATUSLINE_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:1610 +#: po/tmp/ap_String_Id.h.h:1628 msgid "Move the insertion point to a specific location" -msgstr "Mut cursorul ntr-o zon anume" +msgstr "Mută cursorul într-o zonă anume" #. FIELD_DateTime_MthDayYear -#: po/tmp/ap_String_Id.h.h:1612 +#: po/tmp/ap_String_Id.h.h:1630 msgid "Mth. Day, Year" -msgstr "Luna (abreviat) Ziua, An" +msgstr "Luna (abreviată) Ziua, An" #. DLG_Para_SpacingMultiple -#: po/tmp/ap_String_Id.h.h:1614 +#: po/tmp/ap_String_Id.h.h:1632 msgid "Multiple" msgstr "Multiplu" #. TOOLBAR_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:1616 +#: po/tmp/ap_String_Id.h.h:1634 msgid "New" -msgstr "" +msgstr "Nou" #. DLG_NEW_Title -#: po/tmp/ap_String_Id.h.h:1618 +#: po/tmp/ap_String_Id.h.h:1636 msgid "New Document" -msgstr "Alegei un model" +msgstr "Alegeți un model" #. DLG_Lists_New_List_Label -#: po/tmp/ap_String_Id.h.h:1620 +#: po/tmp/ap_String_Id.h.h:1638 msgid "New List Label" -msgstr "Noua etichet a listei" +msgstr "Noua etichetă a listei" #. DLG_Lists_New_List_Type -#: po/tmp/ap_String_Id.h.h:1622 +#: po/tmp/ap_String_Id.h.h:1640 msgid "" "New List \n" "Type" -msgstr "List nou x0a;Tip" +msgstr "Listă nouă \nTip" #. DLG_Lists_Starting_Value -#: po/tmp/ap_String_Id.h.h:1624 +#: po/tmp/ap_String_Id.h.h:1642 msgid "" "New Starting \n" "Value" -msgstr "Nou iniializare x0a;valoare" +msgstr "Nouă inițializare \nvaloare" #. DLG_Styles_NewTitle -#: po/tmp/ap_String_Id.h.h:1626 +#: po/tmp/ap_String_Id.h.h:1644 msgid "New Style" msgstr "Stil nou" #. DLG_Styles_New -#: po/tmp/ap_String_Id.h.h:1628 +#: po/tmp/ap_String_Id.h.h:1646 msgid "New..." msgstr "Nou..." #. DLG_Goto_Btn_Next -#: po/tmp/ap_String_Id.h.h:1630 +#: po/tmp/ap_String_Id.h.h:1648 msgid "Next >>" -msgstr "Urmtorul >>" +msgstr "Următorul >>" #. DLG_NEW_NoFile -#: po/tmp/ap_String_Id.h.h:1632 +#: po/tmp/ap_String_Id.h.h:1650 msgid "No File" -msgstr "Nici un fiier" +msgstr "Nici un fișier" #. DLG_Lists_FoldingLevel0 -#: po/tmp/ap_String_Id.h.h:1634 +#: po/tmp/ap_String_Id.h.h:1652 msgid "No Folding" -msgstr "" +msgstr "Fără împachetare (folding)" #. DLG_Styles_ErrNoStyle -#: po/tmp/ap_String_Id.h.h:1636 +#: po/tmp/ap_String_Id.h.h:1654 msgid "" "No Style selected \n" " so it cannot be modified" msgstr "Nu a fost selectat nici un stil x0a; ca atare nu a putut fi modificat" #. SCRIPT_NOSCRIPTS -#: po/tmp/ap_String_Id.h.h:1638 +#: po/tmp/ap_String_Id.h.h:1656 msgid "No scripts found" -msgstr "Nu a fost gsit nici un script" +msgstr "Nu a fost găsit nici un script" #. DLG_FormatTOC_None #. DLG_Styles_DefNone #. DLG_Tab_Radio_NoAlign #. DLG_Lists_Type_none -#: po/tmp/ap_String_Id.h.h:1643 +#: po/tmp/ap_String_Id.h.h:1661 msgid "None" msgstr "Nci unul" #. TOOLBAR_LABEL_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:1645 +#: po/tmp/ap_String_Id.h.h:1663 msgid "None before" -msgstr "" +msgstr "Nimic înainte" #. MENU_STATUSLINE_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:1647 +#: po/tmp/ap_String_Id.h.h:1665 msgid "Normal View" -msgstr "Vedere normal" +msgstr "Vedere normală" #. DLG_Spell_UnknownWord -#: po/tmp/ap_String_Id.h.h:1649 +#: po/tmp/ap_String_Id.h.h:1667 msgid "Not in dictionary&:" -msgstr "Cuvnt necunoscut:" +msgstr "Cuvânt necunoscut:" #. DLG_Stylist_FootnoteStyles -#: po/tmp/ap_String_Id.h.h:1651 +#: po/tmp/ap_String_Id.h.h:1669 msgid "Note Styles" -msgstr "" +msgstr "Stilurile notei" #. DLG_Column_Number_Cols -#: po/tmp/ap_String_Id.h.h:1653 +#: po/tmp/ap_String_Id.h.h:1671 msgid "Number of Columns" -msgstr "Numr de coloane" +msgstr "Număr de coloane" #. FIELD_Numbers_PagesCount -#: po/tmp/ap_String_Id.h.h:1655 +#: po/tmp/ap_String_Id.h.h:1673 msgid "Number of Pages" -msgstr "Numrul de pagini" +msgstr "Numărul de pagini" #. DLG_Column_Number -#: po/tmp/ap_String_Id.h.h:1657 +#: po/tmp/ap_String_Id.h.h:1675 msgid "Number of columns" -msgstr "Numr de coloane" +msgstr "Număr de coloane" #. DLG_InsertTable_NumCols -#: po/tmp/ap_String_Id.h.h:1659 +#: po/tmp/ap_String_Id.h.h:1677 msgid "Number of columns:" -msgstr "Numr coloane:" +msgstr "Număr coloane:" #. DLG_InsertTable_NumRows -#: po/tmp/ap_String_Id.h.h:1661 +#: po/tmp/ap_String_Id.h.h:1679 msgid "Number of rows:" -msgstr "Numr linii:" +msgstr "Număr linii:" #. DLG_Lists_Type_numbered -#: po/tmp/ap_String_Id.h.h:1663 +#: po/tmp/ap_String_Id.h.h:1681 msgid "Numbered" -msgstr "Ordonat" +msgstr "Ordonată" #. DLG_Lists_Numbered_List #. STYLE_NUMBER_LIST -#: po/tmp/ap_String_Id.h.h:1665 po/tmp/xap_String_Id.h.h:531 +#: po/tmp/ap_String_Id.h.h:1683 po/tmp/xap_String_Id.h.h:558 msgid "Numbered List" -msgstr "List numerotat" +msgstr "Listă numerotată" #. DLG_FormatFootnotes_FootnoteRestart #. DLG_Styles_ModifyNumbering #. TOOLBAR_LABEL_LISTS_NUMBERS #. TOOLBAR_STATUSLINE_LISTS_NUMBERS #. TOOLBAR_TOOLTIP_LISTS_NUMBERS -#: po/tmp/ap_String_Id.h.h:1671 +#: po/tmp/ap_String_Id.h.h:1689 msgid "Numbering" msgstr "Numerotare" #. FIELD_Type_Numbers -#: po/tmp/ap_String_Id.h.h:1673 +#: po/tmp/ap_String_Id.h.h:1691 msgid "Numbers" msgstr "Numere" #. InsertModeFieldOVR -#: po/tmp/ap_String_Id.h.h:1675 +#: po/tmp/ap_String_Id.h.h:1693 msgid "OVR" msgstr "OVR" #. DLG_Column_One -#: po/tmp/ap_String_Id.h.h:1677 +#: po/tmp/ap_String_Id.h.h:1695 msgid "One" msgstr "Una" #. MENU_LABEL_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1679 +#: po/tmp/ap_String_Id.h.h:1697 msgid "Op&en Copy" msgstr "Des&chide copie" #. TOOLBAR_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1681 +#: po/tmp/ap_String_Id.h.h:1699 msgid "Open" -msgstr "" +msgstr "Deschide" #. MENU_LABEL_OPEN_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1683 +#: po/tmp/ap_String_Id.h.h:1701 msgid "Open Template" -msgstr "Deschide ablon" +msgstr "Deschide șablon" #. MENU_STATUSLINE_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1685 +#: po/tmp/ap_String_Id.h.h:1703 msgid "Open a document by making a copy" -msgstr "Import un document" +msgstr "Importă un document" #. MENU_STATUSLINE_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1687 +#: po/tmp/ap_String_Id.h.h:1705 msgid "Open a recently used document" msgstr "Deschide acest document" @@ -4100,14 +4140,14 @@ #. MENU_STATUSLINE_FILE_OPEN #. TOOLBAR_STATUSLINE_FILE_OPEN #. TOOLBAR_TOOLTIP_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1692 +#: po/tmp/ap_String_Id.h.h:1710 msgid "Open an existing document" -msgstr "Deschidei un document existent" +msgstr "Deschide un document existent" #. MENU_STATUSLINE_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:1694 +#: po/tmp/ap_String_Id.h.h:1712 msgid "Open another window for the document" -msgstr "Deschide nc o fereastr pentru document" +msgstr "Deschide încă o fereastră pentru document" #. MENU_STATUSLINE_FILE_RECENT_1 #. MENU_STATUSLINE_FILE_RECENT_2 @@ -4118,256 +4158,255 @@ #. MENU_STATUSLINE_FILE_RECENT_7 #. MENU_STATUSLINE_FILE_RECENT_8 #. MENU_STATUSLINE_FILE_RECENT_9 -#: po/tmp/ap_String_Id.h.h:1704 +#: po/tmp/ap_String_Id.h.h:1722 msgid "Open this document" msgstr "Deschide acest document" #. DLG_PageSetup_Orient -#: po/tmp/ap_String_Id.h.h:1706 +#: po/tmp/ap_String_Id.h.h:1724 msgid "Orientation..." msgstr "Orientare..." #. DLG_Options_TabLabel_Other -#: po/tmp/ap_String_Id.h.h:1708 +#: po/tmp/ap_String_Id.h.h:1726 msgid "Other" msgstr "Altul" #. MSG_IE_NoMemory -#: po/tmp/ap_String_Id.h.h:1710 +#: po/tmp/ap_String_Id.h.h:1728 #, c-format msgid "Out of memory attempting to open %s" -msgstr "Nu mai este memorie liber pentru deschiderea fiierului %s" +msgstr "Nu mai este memorie liberă pentru deschiderea fișierului %s" #. TOOLBAR_LABEL_FMT_OVERLINE #. TOOLBAR_STATUSLINE_FMT_OVERLINE #. TOOLBAR_TOOLTIP_FMT_OVERLINE #. DLG_UFS_OverlineCheck -#: po/tmp/ap_String_Id.h.h:1714 po/tmp/xap_String_Id.h.h:545 +#: po/tmp/ap_String_Id.h.h:1732 po/tmp/xap_String_Id.h.h:572 msgid "Overline" -msgstr "" +msgstr "Barat" #. MENU_STATUSLINE_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:1716 +#: po/tmp/ap_String_Id.h.h:1734 msgid "Overline the selection (toggle)" -msgstr "Pune o linie sub zonei selectate (comut)" +msgstr "Pune o linie deasupra zonei selectate (comută)" #. MENU_LABEL_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:1718 +#: po/tmp/ap_String_Id.h.h:1736 msgid "P&roperties" -msgstr "P&roprieti" +msgstr "&Proprietăți" #. MENU_LABEL_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1720 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1738 msgid "P&urge revisions" -msgstr "&Corecii" +msgstr "C&urăță reviziile" #. MENU_LABEL_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1722 +#: po/tmp/ap_String_Id.h.h:1740 msgid "Pa&ste Unformatted" -msgstr "Lipete &fr formatare" +msgstr "Lipește &fără formatare" #. DLG_Goto_Target_Page #. DLG_PageSetup_Page -#: po/tmp/ap_String_Id.h.h:1725 +#: po/tmp/ap_String_Id.h.h:1743 msgid "Page" msgstr "Pagina" #. DLG_Para_PushPageBreakBefore -#: po/tmp/ap_String_Id.h.h:1727 +#: po/tmp/ap_String_Id.h.h:1745 msgid "Page &break before" -msgstr "&ntrerupere de pagina nainte" +msgstr "&Întrerupere de pagina înainte" #. MENU_LABEL_FMT_BACKGROUND -#: po/tmp/ap_String_Id.h.h:1729 +#: po/tmp/ap_String_Id.h.h:1747 msgid "Page Background" -msgstr "&Fundal" +msgstr "F&undal" #. MENU_LABEL_FMT_BACKGROUND_PAGE_COLOR -#: po/tmp/ap_String_Id.h.h:1731 +#: po/tmp/ap_String_Id.h.h:1749 msgid "Page C&olor" -msgstr "" +msgstr "&Culoarea paginii" #. MENU_LABEL_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:1733 +#: po/tmp/ap_String_Id.h.h:1751 msgid "Page Image" -msgstr "" +msgstr "&Imaginea paginii" #. MENU_LABEL_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1735 +#: po/tmp/ap_String_Id.h.h:1753 msgid "Page N&umbers" msgstr "N&umerotare pagini" #. FIELD_Numbers_PageNumber -#: po/tmp/ap_String_Id.h.h:1737 +#: po/tmp/ap_String_Id.h.h:1755 msgid "Page Number" -msgstr "Numrul paginii" +msgstr "Numărul paginii" #. DLG_HdrFtr_PageNumberProperties -#: po/tmp/ap_String_Id.h.h:1739 +#: po/tmp/ap_String_Id.h.h:1757 msgid "Page Number Properties" -msgstr "" +msgstr "Proprietățile numărului paginii" #. DLG_PageNumbers_Title -#: po/tmp/ap_String_Id.h.h:1741 +#: po/tmp/ap_String_Id.h.h:1759 msgid "Page Numbers" -msgstr "Numrul de pagini" +msgstr "Numărul de pagini" #. FIELD_Numbers_PageReference -#: po/tmp/ap_String_Id.h.h:1743 +#: po/tmp/ap_String_Id.h.h:1761 msgid "Page Reference" -msgstr "Referina paginii" +msgstr "Referința paginii" #. MENU_LABEL_FILE_PAGESETUP -#: po/tmp/ap_String_Id.h.h:1745 +#: po/tmp/ap_String_Id.h.h:1763 msgid "Page Set&up" -msgstr "Setare pa&gin" +msgstr "Aranjare în pa&gină" #. DLG_PageSetup_Title -#: po/tmp/ap_String_Id.h.h:1747 +#: po/tmp/ap_String_Id.h.h:1765 msgid "Page Setup" -msgstr "Setri pagin" +msgstr "Setări pagină" #. PageInfoField -#: po/tmp/ap_String_Id.h.h:1749 +#: po/tmp/ap_String_Id.h.h:1767 #, c-format msgid "Page: %d/%d" msgstr "Pagina: %d/%d" #. DLG_WordCount_Pages -#: po/tmp/ap_String_Id.h.h:1751 +#: po/tmp/ap_String_Id.h.h:1769 msgid "Pages:" msgstr "Pagini" #. DLG_Para_LabelPagination -#: po/tmp/ap_String_Id.h.h:1753 +#: po/tmp/ap_String_Id.h.h:1771 msgid "Pagination" msgstr "Paginare" #. DLG_PageSetup_Paper_Size -#: po/tmp/ap_String_Id.h.h:1755 +#: po/tmp/ap_String_Id.h.h:1773 msgid "Paper Si&ze:" msgstr "&Formatul paginii:" #. DLG_PageSetup_Paper -#: po/tmp/ap_String_Id.h.h:1757 +#: po/tmp/ap_String_Id.h.h:1775 msgid "Paper..." msgstr "Foaie..." #. DLG_Styles_ModifyParagraph #. DLG_Para_ParaTitle -#: po/tmp/ap_String_Id.h.h:1760 +#: po/tmp/ap_String_Id.h.h:1778 msgid "Paragraph" msgstr "Paragraf" #. FIELD_Numbers_ParaCount -#: po/tmp/ap_String_Id.h.h:1762 +#: po/tmp/ap_String_Id.h.h:1780 msgid "Paragraph Count" -msgstr "Numrul de paragrafe" +msgstr "Numărul de paragrafe" #. TOOLBAR_LABEL_FMT_DOM_DIRECTION -#: po/tmp/ap_String_Id.h.h:1764 +#: po/tmp/ap_String_Id.h.h:1782 msgid "Paragraph Direction" -msgstr "" +msgstr "Direcția paragrafului" #. DLG_Styles_ParaPrev -#: po/tmp/ap_String_Id.h.h:1766 +#: po/tmp/ap_String_Id.h.h:1784 msgid "Paragraph Preview" msgstr "Previzualizare paragraf" #. DLG_WordCount_Paragraphs -#: po/tmp/ap_String_Id.h.h:1768 +#: po/tmp/ap_String_Id.h.h:1786 msgid "Paragraphs:" msgstr "Paragrafe" #. WORD_PassRequired -#: po/tmp/ap_String_Id.h.h:1770 +#: po/tmp/ap_String_Id.h.h:1788 msgid "Password required, this is an encrypted document" -msgstr "E nevoie de parol, acesta este un document criptat" +msgstr "E nevoie de parolă, acesta este un document criptat" #. TOOLBAR_LABEL_EDIT_PASTE #. TOOLBAR_STATUSLINE_EDIT_PASTE #. TOOLBAR_TOOLTIP_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1774 +#: po/tmp/ap_String_Id.h.h:1792 msgid "Paste" -msgstr "" +msgstr "Lipește" #. DLG_MetaData_TAB_Permission -#: po/tmp/ap_String_Id.h.h:1776 +#: po/tmp/ap_String_Id.h.h:1794 msgid "Permissions" msgstr "Permisii" #. DLG_Goto_Target_Picture -#: po/tmp/ap_String_Id.h.h:1778 +#: po/tmp/ap_String_Id.h.h:1796 msgid "Picture" msgstr "Imagine" #. FIELD_Type_PieceTable -#: po/tmp/ap_String_Id.h.h:1780 +#: po/tmp/ap_String_Id.h.h:1798 msgid "Piece Table" -msgstr "Pri de tabele" +msgstr "Părți de tabele" #. DLG_FormatFootnotes_EndPlaceEndDoc -#: po/tmp/ap_String_Id.h.h:1782 +#: po/tmp/ap_String_Id.h.h:1800 msgid "Place at end of document" -msgstr "" +msgstr "Plasează la sfârșitul documentului" #. DLG_FormatFootnotes_EndPlaceEndSec -#: po/tmp/ap_String_Id.h.h:1784 +#: po/tmp/ap_String_Id.h.h:1802 msgid "Place at end of section" -msgstr "" +msgstr "Plasează la sfârșitul secțiunii" #. DLG_FormatFootnotes_EndPlacement -#: po/tmp/ap_String_Id.h.h:1786 +#: po/tmp/ap_String_Id.h.h:1804 msgid "Placement" -msgstr "" +msgstr "Plasare" #. DLG_Tab_Label_Position #. DLG_PageNumbers_Position_No_Colon -#: po/tmp/ap_String_Id.h.h:1789 +#: po/tmp/ap_String_Id.h.h:1807 msgid "Position" -msgstr "" +msgstr "Poziție" #. DLG_FormatFrame_PositionTo -#: po/tmp/ap_String_Id.h.h:1791 +#: po/tmp/ap_String_Id.h.h:1809 msgid "Position Text Box" -msgstr "" +msgstr "Poziție dreptunghi text" #. DLG_FormatFrame_SetToColumn -#: po/tmp/ap_String_Id.h.h:1793 +#: po/tmp/ap_String_Id.h.h:1811 msgid "Position to Column" -msgstr "" +msgstr "Poziție coloană" #. DLG_FormatFrame_SetToPage -#: po/tmp/ap_String_Id.h.h:1795 +#: po/tmp/ap_String_Id.h.h:1813 msgid "Position to Page" -msgstr "" +msgstr "Poziție în pagină" #. DLG_FormatFrame_SetToParagraph -#: po/tmp/ap_String_Id.h.h:1797 +#: po/tmp/ap_String_Id.h.h:1815 msgid "Position to Paragraph" -msgstr "" +msgstr "Poziție în paragraf" #. DLG_PageNumbers_Position -#: po/tmp/ap_String_Id.h.h:1799 +#: po/tmp/ap_String_Id.h.h:1817 msgid "Position:" -msgstr "Poziie" +msgstr "Poziție" #. MENU_LABEL_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:1801 +#: po/tmp/ap_String_Id.h.h:1819 msgid "Pr&eferences" -msgstr "&Opiuni" +msgstr "&Opțiuni" #. DLG_Options_TabLabel_Preferences #. DLG_Options_Label_Schemes -#: po/tmp/ap_String_Id.h.h:1804 +#: po/tmp/ap_String_Id.h.h:1822 msgid "Preference Schemes" -msgstr "Preferine" +msgstr "Preferințe" #. DLG_Options_OptionsTitle -#: po/tmp/ap_String_Id.h.h:1806 +#: po/tmp/ap_String_Id.h.h:1824 msgid "Preferences" -msgstr "Opiuni" +msgstr "Opțiuni" #. DLG_Styles_ModifyPreview #. DLG_Para_LabelPreview @@ -4377,330 +4416,332 @@ #. DLG_Lists_Preview #. DLG_PageNumbers_Preview #. DLG_Zoom_PreviewFrame -#: po/tmp/ap_String_Id.h.h:1814 po/tmp/xap_String_Id.h.h:575 +#: po/tmp/ap_String_Id.h.h:1832 po/tmp/xap_String_Id.h.h:604 msgid "Preview" msgstr "Previzualizare" #. MENU_STATUSLINE_WEB_WEBPREVIEW #. MENU_STATUSLINE_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:1817 +#: po/tmp/ap_String_Id.h.h:1835 msgid "Preview the document as a web page" -msgstr "Previzualizeaz documentul ca pagin web" +msgstr "Previzualizează documentul ca pagină web" #. MENU_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1821 +#: po/tmp/ap_String_Id.h.h:1839 msgid "Preview the document before printing" -msgstr "Previzualizeaz documentul nainte de printare" +msgstr "Previzualizează documentul înainte de tipărire" #. DLG_Para_PreviewPrevParagraph -#: po/tmp/ap_String_Id.h.h:1823 +#: po/tmp/ap_String_Id.h.h:1841 msgid "" "Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph " "Previous Paragraph Previous Paragraph Previous Paragraph" -msgstr "" -"Paragraful Precedent Paragraful Precedent Paragraful Precedent Paragraful " +msgstr "Paragraful Precedent Paragraful Precedent Paragraful Precedent Paragraful " "Precedent Paragraful Precedent Paragraful Precedent Paragraful Precedent" #. TOOLBAR_LABEL_FILE_PRINT #. DLG_UP_PrintTitle #. DLG_UP_PrintButton -#: po/tmp/ap_String_Id.h.h:1825 po/tmp/xap_String_Id.h.h:580 +#: po/tmp/ap_String_Id.h.h:1843 po/tmp/xap_String_Id.h.h:609 msgid "Print" -msgstr "" +msgstr "Tipărește" #. MENU_LABEL_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1827 +#: po/tmp/ap_String_Id.h.h:1845 msgid "Print &directly" -msgstr "Printeaz &direct" +msgstr "Țipărește &direct" #. MENU_STATUSLINE_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:1829 +#: po/tmp/ap_String_Id.h.h:1847 msgid "Print Layout" -msgstr "Vedere pagin" +msgstr "Vedere pagină" #. MENU_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1831 +#: po/tmp/ap_String_Id.h.h:1849 msgid "Print P&review" -msgstr "Pre&vizualizeaz printarea" +msgstr "Pre&vizualizare tipărire" #. TOOLBAR_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1833 +#: po/tmp/ap_String_Id.h.h:1851 msgid "Print Preview" -msgstr "" +msgstr "Previzualizare tipărire" #. MENU_STATUSLINE_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1835 +#: po/tmp/ap_String_Id.h.h:1853 msgid "Print all or part of the document" -msgstr "Printeaz totul sau o parte din document" +msgstr "Țipărește totul sau o parte din document" #. TOOLBAR_STATUSLINE_FILE_PRINT #. TOOLBAR_TOOLTIP_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1838 +#: po/tmp/ap_String_Id.h.h:1856 msgid "Print the document" -msgstr "" +msgstr "Tipărește documentul" #. MENU_STATUSLINE_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1840 +#: po/tmp/ap_String_Id.h.h:1858 msgid "Print using the internal PS driver" -msgstr "Printeaz folosind driverul intern PostScript" +msgstr "Tipărește folosind driverul intern PostScript" #. MSG_PrintingDoc -#: po/tmp/ap_String_Id.h.h:1842 +#: po/tmp/ap_String_Id.h.h:1860 msgid "Printing Document.." msgstr "Printez documentul..." #. MSG_PrintStatus -#: po/tmp/ap_String_Id.h.h:1844 +#: po/tmp/ap_String_Id.h.h:1862 #, c-format msgid "Printing page %d of %d" msgstr "Printez paginile de la %d la %d" #. FIELD_Document_Publisher -#: po/tmp/ap_String_Id.h.h:1846 +#: po/tmp/ap_String_Id.h.h:1864 msgid "Publisher" -msgstr "" +msgstr "Editor" #. DLG_MetaData_Publisher_LBL -#: po/tmp/ap_String_Id.h.h:1848 +#: po/tmp/ap_String_Id.h.h:1866 msgid "Publisher:" msgstr "Editura:" #. MENU_LABEL_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1850 +#: po/tmp/ap_String_Id.h.h:1868 msgid "R&eplace" -msgstr "&nlocuiete" +msgstr "Î&nlocuiește" + +#. MENU_LABEL_FMT_DIRECTION_DOCD_RTL +#: po/tmp/ap_String_Id.h.h:1870 +msgid "RTL &Document" +msgstr "&Document: de la dreapta la stânga" #. MENU_LABEL_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:1852 +#: po/tmp/ap_String_Id.h.h:1872 msgid "RTL &Paragraph" -msgstr "" +msgstr "&Paragraf: de la dreapta la stânga" + +#. MENU_LABEL_FMT_DIRECTION_SD_RTL +#: po/tmp/ap_String_Id.h.h:1874 +msgid "RTL &Section" +msgstr "&Secțiune: de la dreapta la stânga" #. DLG_FR_ReplaceWithLabel -#: po/tmp/ap_String_Id.h.h:1854 +#: po/tmp/ap_String_Id.h.h:1876 msgid "Re&place with:" -msgstr "&nlocuiete cu:" +msgstr "Î&nlocuiește cu:" #. DLG_FR_ReverseFind -#: po/tmp/ap_String_Id.h.h:1856 +#: po/tmp/ap_String_Id.h.h:1878 msgid "Re&verse find" -msgstr "" +msgstr "Caută înapoi" #. MENU_LABEL_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1858 +#: po/tmp/ap_String_Id.h.h:1880 msgid "Re&vert" msgstr "&Revenire" #. MENU_LABEL_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1860 +#: po/tmp/ap_String_Id.h.h:1882 msgid "Recent &Files" msgstr "&1 %s" #. TOOLBAR_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1862 +#: po/tmp/ap_String_Id.h.h:1884 msgid "Redo" -msgstr "" +msgstr "Refă" #. TOOLBAR_STATUSLINE_EDIT_REDO #. TOOLBAR_TOOLTIP_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1865 +#: po/tmp/ap_String_Id.h.h:1887 msgid "Redo editing" -msgstr "" +msgstr "Refă editare" #. MENU_STATUSLINE_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1867 +#: po/tmp/ap_String_Id.h.h:1889 msgid "Redo previously undone editing" -msgstr "Repet operaiunea anterior anulat" +msgstr "Repetă operațiunea anterior anulată" #. MENU_STATUSLINE_VIEW_ZOOM_MENU #. MENU_STATUSLINE_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:1870 +#: po/tmp/ap_String_Id.h.h:1892 msgid "Reduce or enlarge the document display" -msgstr "Mrete sau micoreaz vizualizarea documentului" +msgstr "Mărește sau micșorează vizualizarea documentului" #. DLG_MetaData_Relation_LBL -#: po/tmp/ap_String_Id.h.h:1872 +#: po/tmp/ap_String_Id.h.h:1894 msgid "Relation:" -msgstr "Relaii:" +msgstr "Relații:" #. DLG_Styles_RemoveButton -#: po/tmp/ap_String_Id.h.h:1874 +#: po/tmp/ap_String_Id.h.h:1896 msgid "Remove" -msgstr "terge" +msgstr "Șterge" #. MENU_LABEL_EDIT_REMOVEFOOTER #. TOOLBAR_LABEL_EDIT_REMOVEFOOTER #. TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER #. TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1879 +#: po/tmp/ap_String_Id.h.h:1901 msgid "Remove Footer" -msgstr "Elimin subsol" +msgstr "Șter&ge subsol" #. MENU_LABEL_EDIT_REMOVEHEADER #. TOOLBAR_LABEL_EDIT_REMOVEHEADER #. TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER #. TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1884 +#: po/tmp/ap_String_Id.h.h:1906 msgid "Remove Header" -msgstr "Elimin antet" +msgstr "&Elimină antet" #. DLG_Styles_RemoveLab -#: po/tmp/ap_String_Id.h.h:1886 +#: po/tmp/ap_String_Id.h.h:1908 msgid "Remove Property from Style" -msgstr "terge proprietile stilului" +msgstr "Șterge proprietățile stilului" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1888 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1910 msgid "Remove Row as Heading" -msgstr "Transform linia n antet" +msgstr "Șterge rândul ca titlu" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1890 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1912 msgid "Remove Row as the page Heading" -msgstr "Transform linia n antet" +msgstr "Șterge rândul ca titlu de pagină" #. MENU_STATUSLINE_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1892 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1914 msgid "Remove all revision information from the document" -msgstr "terge antetul acestei pagini din document" +msgstr "Șterge toată informația despre revizii din document" #. MENU_STATUSLINE_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:1894 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1916 msgid "Remove full document history from the document" -msgstr "terge antetul acestei pagini din document" +msgstr "Șterge istoria documentului din document" #. MENU_STATUSLINE_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1896 +#: po/tmp/ap_String_Id.h.h:1918 msgid "Remove the Footer on this page from the Document" -msgstr "terge subsolul acestei pagini din document" +msgstr "Șterge subsolul acestei pagini din document" #. MENU_STATUSLINE_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1898 +#: po/tmp/ap_String_Id.h.h:1920 msgid "Remove the Header on this page from the Document" -msgstr "terge antetul acestei pagini din document" +msgstr "Șterge antetul acestei pagini din document" #. MENU_STATUSLINE_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:1900 +#: po/tmp/ap_String_Id.h.h:1922 msgid "Remove the Image and save a copy on the clipboard" -msgstr "" +msgstr "Șterge imaginea și salvează o copie pe clipboard" #. MENU_STATUSLINE_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:1902 +#: po/tmp/ap_String_Id.h.h:1924 msgid "Remove the Image from the Document" -msgstr "" +msgstr "Șterge imaginea și salvează o copie în clipboard" #. MENU_STATUSLINE_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:1904 +#: po/tmp/ap_String_Id.h.h:1926 msgid "Remove the Text Box from the Document" -msgstr "" +msgstr "Șterge dreptunghiul de text" #. MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:1906 +#: po/tmp/ap_String_Id.h.h:1928 msgid "Remove the suggested change" -msgstr "Renun la modificarea sugerat" +msgstr "Renunță la modificarea sugerată" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1908 +#: po/tmp/ap_String_Id.h.h:1930 msgid "Repeat Row as Heading" -msgstr "Transform linia n antet" +msgstr "RepetA rândul ca titlu" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1910 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1932 msgid "Repeat Row as Heading on each new page" -msgstr "Transform linia n antet" +msgstr "Repetă rândul ca titlu pe fiecare pagină nouă" #. DLG_FR_ReplaceTitle -#: po/tmp/ap_String_Id.h.h:1912 +#: po/tmp/ap_String_Id.h.h:1934 msgid "Replace" -msgstr "nlocuiete" +msgstr "Înlocuiește" #. DLG_FR_ReplaceAllButton -#: po/tmp/ap_String_Id.h.h:1914 +#: po/tmp/ap_String_Id.h.h:1936 msgid "Replace &All" -msgstr "nlocuiete t&ot" +msgstr "Înlocuiește t&ot" #. MENU_STATUSLINE_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1916 +#: po/tmp/ap_String_Id.h.h:1938 msgid "Replace the specified text with different text" -msgstr "nlocuiete textul specificat cu un altul" +msgstr "Înlocuiește textul specificat cu un altul" #. MENU_LABEL_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1918 +#: po/tmp/ap_String_Id.h.h:1940 msgid "Report a &Bug" -msgstr "Raporteaz o &problem" +msgstr "&Raportează o problemă" #. MENU_STATUSLINE_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1920 +#: po/tmp/ap_String_Id.h.h:1942 msgid "Report a bug and help AbiWord become a better product" -msgstr "" -"Raporteaz problemele ntlnite n AbiWord i ajut-l s devin un program " -"mai bun" +msgstr "Vă rugăm să ajutați AbiWord prin raportarea tuturor problemelor întâlnite" #. MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1922 +#: po/tmp/ap_String_Id.h.h:1944 msgid "Reset the current toolbar layout to its defaults" -msgstr "" +msgstr "Resetează bara de unelte la valoarea implicită" #. MENU_STATUSLINE_FMT_IMAGE -#: po/tmp/ap_String_Id.h.h:1924 +#: po/tmp/ap_String_Id.h.h:1946 msgid "Resize this image" -msgstr "Redimensioneaz aceast imagine" +msgstr "Redimensionează această imagine" #. DLG_HdrFtr_RestartNumbers -#: po/tmp/ap_String_Id.h.h:1926 +#: po/tmp/ap_String_Id.h.h:1948 msgid "Restart numbering at:" -msgstr "Rencepe numerotarea de la:" +msgstr "Reîncepe numerotarea de la:" #. DLG_FormatFootnotes_FootRestartPage -#: po/tmp/ap_String_Id.h.h:1928 +#: po/tmp/ap_String_Id.h.h:1950 msgid "Restart on each page" -msgstr "" +msgstr "Repornește pe fiecare pagină" #. DLG_FormatFootnotes_FootRestartSec #. DLG_FormatFootnotes_EndRestartSec -#: po/tmp/ap_String_Id.h.h:1931 +#: po/tmp/ap_String_Id.h.h:1953 msgid "Restart on each section" -msgstr "" +msgstr "Repornește în fiecare sesiune" #. DLG_HdrFtr_RestartCheck -#: po/tmp/ap_String_Id.h.h:1933 +#: po/tmp/ap_String_Id.h.h:1955 msgid "Restart page numbers on new sections" -msgstr "Rencepe numerotarea paginilor n seciunile noi" +msgstr "Reîncepe numerotarea paginilor în secțiunile noi" #. DLG_Lists_Resume_Previous_List -#: po/tmp/ap_String_Id.h.h:1935 +#: po/tmp/ap_String_Id.h.h:1957 msgid "Resume Previous List" -msgstr "Ataeaz la lista anterioar" +msgstr "Atașează la lista anterioară" #. MENU_STATUSLINE_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:1937 +#: po/tmp/ap_String_Id.h.h:1959 msgid "Retain all document changes" -msgstr "" +msgstr "Reține toate schimbările documentului" #. MSG_RevertFile -#: po/tmp/ap_String_Id.h.h:1939 +#: po/tmp/ap_String_Id.h.h:1961 msgid "Revert file to last saved state?" -msgstr "Revenii la ultima versiune nesalvata a documentului?" +msgstr "Reveniți la ultima versiune nesalvata a documentului?" #. MENU_STATUSLINE_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1941 +#: po/tmp/ap_String_Id.h.h:1963 msgid "Revert the document to the last saved state" -msgstr "Revino la ultima salvare disponibil a documentului" +msgstr "Revino la ultima salvare disponibilă a documentului" #. MSG_RevertBuffer -#: po/tmp/ap_String_Id.h.h:1943 +#: po/tmp/ap_String_Id.h.h:1965 #, c-format msgid "Revert to saved copy of %s?" -msgstr "Revenii la ultima salvare a %s?" +msgstr "Reveniți la ultima salvare a %s?" #. DLG_ListRevisions_Column1Label -#: po/tmp/ap_String_Id.h.h:1945 +#: po/tmp/ap_String_Id.h.h:1967 msgid "Revision ID" msgstr "ID revizie" @@ -4708,846 +4749,869 @@ #. DLG_Tab_Radio_Right #. DLG_PageNumbers_Right #. TOOLBAR_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1950 +#: po/tmp/ap_String_Id.h.h:1972 msgid "Right" msgstr "La dreapta" #. RightIndentStatus -#: po/tmp/ap_String_Id.h.h:1952 +#: po/tmp/ap_String_Id.h.h:1974 #, c-format msgid "Right Indent [%s]" msgstr "Indentare dreapta [%s]" #. RightMarginStatus -#: po/tmp/ap_String_Id.h.h:1954 +#: po/tmp/ap_String_Id.h.h:1976 #, c-format msgid "Right Margin [%s]" -msgstr "Marginea dreapt [%s]" +msgstr "Marginea dreaptă [%s]" #. TabToggleRightTab -#: po/tmp/ap_String_Id.h.h:1956 +#: po/tmp/ap_String_Id.h.h:1978 msgid "Right Tab" msgstr "Aliniere la dreapta" #. TOOLBAR_STATUSLINE_ALIGN_RIGHT #. TOOLBAR_TOOLTIP_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1959 +#: po/tmp/ap_String_Id.h.h:1981 msgid "Right alignment" -msgstr "" +msgstr "Aliniere la dreapta" #. MENU_STATUSLINE_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1961 +#: po/tmp/ap_String_Id.h.h:1983 msgid "Right-align the paragraph" -msgstr "Aliniaz paragraful la dreapta" +msgstr "Aliniază paragraful la dreapta" #. DLG_Para_DomDirection -#: po/tmp/ap_String_Id.h.h:1963 +#: po/tmp/ap_String_Id.h.h:1985 msgid "Right-to-left &dominant" -msgstr "&De la dreapta la stnga" +msgstr "&De la dreapta la stânga" #. FIELD_Document_Rights -#: po/tmp/ap_String_Id.h.h:1965 +#: po/tmp/ap_String_Id.h.h:1987 msgid "Rights" -msgstr "" +msgstr "Drepturi" #. DLG_MetaData_Rights_LBL -#: po/tmp/ap_String_Id.h.h:1967 +#: po/tmp/ap_String_Id.h.h:1989 msgid "Rights:" msgstr "Drepturi:" #. DLG_FormatTable_Apply_To_Row -#: po/tmp/ap_String_Id.h.h:1969 +#: po/tmp/ap_String_Id.h.h:1991 msgid "Row" -msgstr "" +msgstr "Rând" #. MENU_LABEL_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1971 +#: po/tmp/ap_String_Id.h.h:1993 msgid "Rows &Above" -msgstr "nsereaz li&nii nainte" +msgstr "Li&nii înainte" #. MENU_LABEL_TABLE_INSERT_ROWS_AFTER -#: po/tmp/ap_String_Id.h.h:1973 +#: po/tmp/ap_String_Id.h.h:1995 msgid "Rows &Below" -msgstr "Insereaz &linii dupa" +msgstr "&Linii după" #. MENU_LABEL_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1975 +#: po/tmp/ap_String_Id.h.h:1997 msgid "S&cripts" msgstr "&Scripturi" #. MENU_LABEL_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:1977 +#: po/tmp/ap_String_Id.h.h:1999 msgid "S&how revisions" -msgstr "" +msgstr "Arată revizia" #. MENU_LABEL_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:1979 +#: po/tmp/ap_String_Id.h.h:2001 msgid "S&plit Cells" -msgstr "Se&par celule" +msgstr "Se&pară celule" #. DLG_Options_Btn_Save -#: po/tmp/ap_String_Id.h.h:1981 +#: po/tmp/ap_String_Id.h.h:2003 msgid "Sa&ve" -msgstr "Sal&veaz" +msgstr "Sal&vează" #. MENU_LABEL_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:1983 +#: po/tmp/ap_String_Id.h.h:2005 msgid "Sav&e Copy" -msgstr "&Salveaz copie" +msgstr "Salvea&ză copie" #. TOOLBAR_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:1985 +#: po/tmp/ap_String_Id.h.h:2007 msgid "Save" -msgstr "" +msgstr "Salvează" #. MENU_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:1987 +#: po/tmp/ap_String_Id.h.h:2009 msgid "Save &As" -msgstr "Sa&lveaz ca" +msgstr "S&alvează ca" #. MENU_LABEL_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1989 +#: po/tmp/ap_String_Id.h.h:2011 msgid "Save &Template" -msgstr "Salveaz &ablon" +msgstr "Salvează &șablon" #. TOOLBAR_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:1991 +#: po/tmp/ap_String_Id.h.h:2013 msgid "Save As" -msgstr "" +msgstr "Salvează ca" #. MENU_STATUSLINE_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:1993 +#: po/tmp/ap_String_Id.h.h:2015 msgid "Save a copy of the image on the clipboard" -msgstr "" +msgstr "Salvează o copie a imaginii pe clipboard" #. MSG_ConfirmSave -#: po/tmp/ap_String_Id.h.h:1995 +#: po/tmp/ap_String_Id.h.h:2017 #, c-format msgid "Save changes to document %s before closing?" -msgstr "Salvai modificrile fiierului %s?" +msgstr "Salvați modificările fișierului %s?" #. MENU_STATUSLINE_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:1997 +#: po/tmp/ap_String_Id.h.h:2019 msgid "Save the Embedded Object" -msgstr "" +msgstr "Salvează obiectul embedded" #. MENU_STATUSLINE_FILE_SAVE #. TOOLBAR_STATUSLINE_FILE_SAVE #. TOOLBAR_TOOLTIP_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:2001 +#: po/tmp/ap_String_Id.h.h:2023 msgid "Save the document" -msgstr "Salveaz documentul" +msgstr "Salvează documentul" #. MENU_STATUSLINE_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:2003 +#: po/tmp/ap_String_Id.h.h:2025 msgid "Save the document as a template" -msgstr "Salveaz documentul ca ablon" +msgstr "Salvează documentul ca șablon" #. MENU_STATUSLINE_FILE_SAVEAS #. TOOLBAR_STATUSLINE_FILE_SAVEAS #. TOOLBAR_TOOLTIP_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:2007 +#: po/tmp/ap_String_Id.h.h:2029 msgid "Save the document under a different name" -msgstr "Salveaz documentul sub un alt nume" +msgstr "Salvează documentul sub un alt nume" #. MENU_STATUSLINE_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:2009 +#: po/tmp/ap_String_Id.h.h:2031 msgid "Save the document without changing the current name" -msgstr "Export documentul" +msgstr "Exportă documentul" #. MENU_STATUSLINE_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:2011 +#: po/tmp/ap_String_Id.h.h:2033 msgid "Save the selected image to a file" -msgstr "Salveaz intr-un fiier imaginea selectat" +msgstr "Salvează într-un fișier imaginea selectată" #. MENU_LABEL_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:2013 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2035 msgid "Save to file" -msgstr "Salveaz ca" +msgstr "Salvează ca" #. DLG_PageSetup_Scale -#: po/tmp/ap_String_Id.h.h:2015 +#: po/tmp/ap_String_Id.h.h:2037 msgid "Scale..." -msgstr "Scaleaz..." +msgstr "Scalează..." #. MENU_STATUSLINE_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:2017 +#: po/tmp/ap_String_Id.h.h:2039 msgid "Search for help about..." -msgstr "Caut ajutor despre ..." +msgstr "Caută ajutor despre ..." #. DLG_WordCount_Update_Rate -#: po/tmp/ap_String_Id.h.h:2019 +#: po/tmp/ap_String_Id.h.h:2041 msgid "Seconds between updates" -msgstr "Secunde ntre actualizri" +msgstr "Secunde între actualizări" #. FIELD_DateTime_Epoch -#: po/tmp/ap_String_Id.h.h:2021 +#: po/tmp/ap_String_Id.h.h:2043 msgid "Seconds since the epoch" msgstr "Secundele din 1970" #. DLG_Break_SectionBreaks_Capital -#: po/tmp/ap_String_Id.h.h:2023 +#: po/tmp/ap_String_Id.h.h:2045 msgid "Section Breaks" -msgstr "" +msgstr "Întrerupere de scțiune" #. DLG_Break_SectionBreaks -#: po/tmp/ap_String_Id.h.h:2025 +#: po/tmp/ap_String_Id.h.h:2047 msgid "Section breaks" -msgstr "ntrerupere de seciune :" +msgstr "Întrerupere de secțiune" #. MENU_STATUSLINE_TOOLS_HISTORY -#: po/tmp/ap_String_Id.h.h:2027 +#: po/tmp/ap_String_Id.h.h:2049 msgid "See history of the current document" -msgstr "" +msgstr "Arată istoria acestui document" #. MENU_STATUSLINE_TABLE_SELECT #. DLG_Select -#: po/tmp/ap_String_Id.h.h:2029 po/tmp/xap_String_Id.h.h:630 +#: po/tmp/ap_String_Id.h.h:2051 po/tmp/xap_String_Id.h.h:667 msgid "Select" -msgstr "Selecteaz" +msgstr "Selectează" #. MENU_LABEL_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2031 +#: po/tmp/ap_String_Id.h.h:2053 msgid "Select A&ll" -msgstr "S&electeaz tot" +msgstr "Selectea&ză tot" #. MENU_STATUSLINE_TABLE_SELECT_CELL -#: po/tmp/ap_String_Id.h.h:2033 +#: po/tmp/ap_String_Id.h.h:2055 msgid "Select Cell" -msgstr "Selecteaz celula" +msgstr "Selectează celula" #. MENU_STATUSLINE_TABLE_SELECT_COLUMN -#: po/tmp/ap_String_Id.h.h:2035 +#: po/tmp/ap_String_Id.h.h:2057 msgid "Select Column" -msgstr "Selecteaz coloana" +msgstr "Selectează coloana" + +#. TOOLBAR_TOOLTIP_FMT_CHOOSE +#: po/tmp/ap_String_Id.h.h:2059 +msgid "Select Font" +msgstr "Selectează fontul" #. DLG_ListRevisions_Title -#: po/tmp/ap_String_Id.h.h:2037 +#: po/tmp/ap_String_Id.h.h:2061 msgid "Select Revision" -msgstr "Selecteaz revizia" +msgstr "Selectează revizia" #. MENU_STATUSLINE_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:2039 +#: po/tmp/ap_String_Id.h.h:2063 msgid "Select Row" -msgstr "Selecteaz linia" +msgstr "Selectează linia" #. MENU_STATUSLINE_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:2041 +#: po/tmp/ap_String_Id.h.h:2065 msgid "Select Table" -msgstr "Selecteaz tabelul" +msgstr "Selectează tabelul" #. MENU_LABEL_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2043 +#: po/tmp/ap_String_Id.h.h:2067 msgid "Select Text Box" -msgstr "" +msgstr "Selectează dreptunghi de text" #. DLG_InsertHyperlink_Msg -#: po/tmp/ap_String_Id.h.h:2045 +#: po/tmp/ap_String_Id.h.h:2069 msgid "Select a target bookmark from the list." -msgstr "Alege semnul de carte dorit din list" +msgstr "Alege semnul de carte dorit din listă" #. DLG_FormatFrame_SelectImage #. DLG_FormatTable_SelectImage -#: po/tmp/ap_String_Id.h.h:2048 +#: po/tmp/ap_String_Id.h.h:2072 msgid "Select image from File" -msgstr "" +msgstr "Selectează imaginea din fișier" #. MENU_STATUSLINE_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2050 +#: po/tmp/ap_String_Id.h.h:2074 msgid "Select the Text Box" -msgstr "" +msgstr "Selectează dreptunghi de text" #. MENU_STATUSLINE_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2052 +#: po/tmp/ap_String_Id.h.h:2076 msgid "Select the entire document" -msgstr "Selecteaz tot documentul" +msgstr "Selectează tot documentul" #. DLG_FormatTable_Apply_To_Selection #. DLG_UP_Selection -#: po/tmp/ap_String_Id.h.h:2054 po/tmp/xap_String_Id.h.h:638 +#: po/tmp/ap_String_Id.h.h:2078 po/tmp/xap_String_Id.h.h:675 msgid "Selection" -msgstr "" +msgstr "Selecție" #. DLG_ToggleCase_SentenceCase -#: po/tmp/ap_String_Id.h.h:2056 +#: po/tmp/ap_String_Id.h.h:2080 msgid "Sentence case" -msgstr "Majuscul la nceput de fraz" +msgstr "Majusculă la început de frază" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2058 +#: po/tmp/ap_String_Id.h.h:2082 msgid "Separate table items with commas" -msgstr "" +msgstr "Separă membrii tabelului cu virgule" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2060 +#: po/tmp/ap_String_Id.h.h:2084 msgid "Separate table items with commas and tabs" -msgstr "" +msgstr "Separă membrii tabelului cu virgule și taburi" #. MENU_STATUSLINE_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2062 +#: po/tmp/ap_String_Id.h.h:2086 msgid "Separate table items with tabs" -msgstr "" +msgstr "Separă membrii tabelului cu taburi" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2064 +#: po/tmp/ap_String_Id.h.h:2088 msgid "Separate with commas" -msgstr "" +msgstr "Separă cu &virgule" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2066 +#: po/tmp/ap_String_Id.h.h:2090 msgid "Separate with commas and tabs" -msgstr "" +msgstr "&Separă cu virgule și taburi" #. MENU_LABEL_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2068 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2092 msgid "Separate with tabs" -msgstr "Caractere (cu spaii)" +msgstr "Separă cu &taburi" #. DLG_Tab_Button_Set -#: po/tmp/ap_String_Id.h.h:2070 +#: po/tmp/ap_String_Id.h.h:2094 msgid "Set" -msgstr "Aplic" +msgstr "Aplică" #. MENU_LABEL_FMT_LANGUAGE -#: po/tmp/ap_String_Id.h.h:2072 +#: po/tmp/ap_String_Id.h.h:2096 msgid "Set &Language" msgstr "&Limba" #. DLG_Lists_SetDefault -#: po/tmp/ap_String_Id.h.h:2074 +#: po/tmp/ap_String_Id.h.h:2098 msgid "Set Default Values" -msgstr "Seteaz valorile predefinite" +msgstr "Setează valorile implicite" #. DLG_FormatFrame_SetImage #. DLG_FormatTable_SetImage -#: po/tmp/ap_String_Id.h.h:2077 +#: po/tmp/ap_String_Id.h.h:2101 msgid "Set Image" -msgstr "" +msgstr "Setează imagine" + +#. MENU_LABEL_FMT_SETPOSIMAGE +#: po/tmp/ap_String_Id.h.h:2103 +msgid "Set Positioned Image" +msgstr "Setează poziție imagine" #. DLG_FormatFrame_SetTextWrapping -#: po/tmp/ap_String_Id.h.h:2079 +#: po/tmp/ap_String_Id.h.h:2105 msgid "Set Text Wrapping" -msgstr "" +msgstr "Setează împachetarea de text (text wrapping)" #. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:2081 +#: po/tmp/ap_String_Id.h.h:2107 msgid "Set an image as a background for your page" -msgstr "" +msgstr "Setează o imagine ca fundal pentru pagină" + +#. MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL +#: po/tmp/ap_String_Id.h.h:2109 +msgid "Set dominant direction of document to RTL" +msgstr "Setează direcția principală a documentului de la dreapta la stânga" #. MENU_STATUSLINE_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:2083 +#: po/tmp/ap_String_Id.h.h:2111 msgid "Set dominant direction of paragraph to RTL" -msgstr "" +msgstr "Setează direcția dominantă a paragrafului de la drepta la stânga" + +#. MENU_STATUSLINE_FMT_DIRECTION_SD_RTL +#: po/tmp/ap_String_Id.h.h:2113 +msgid "Set dominant direction of section to RTL" +msgstr "Setează direcția dominantă a secțiunii de la dreapta la stânga" #. MENU_STATUSLINE_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:2085 +#: po/tmp/ap_String_Id.h.h:2115 msgid "Set meta-data properties" -msgstr "Seteaz proprietile metadatei" +msgstr "Setează proprietățile fișierului" #. DLG_Tab_Label_New -#: po/tmp/ap_String_Id.h.h:2087 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2117 msgid "Set new Tab" -msgstr "Aliniere centrat" +msgstr "Setează un nou tab" #. DLG_FormatFrame_NoImageBackground #. DLG_FormatTable_NoImageBackground -#: po/tmp/ap_String_Id.h.h:2090 +#: po/tmp/ap_String_Id.h.h:2120 msgid "Set no image" -msgstr "" +msgstr "Setează fără imagine" #. MENU_STATUSLINE_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:2092 +#: po/tmp/ap_String_Id.h.h:2122 msgid "Set preferences" -msgstr "Seteaz preferinele" +msgstr "Setează preferințele" #. MENU_STATUSLINE_FMT_TABS -#: po/tmp/ap_String_Id.h.h:2094 +#: po/tmp/ap_String_Id.h.h:2124 msgid "Set tab stops" -msgstr "Seteaz tabularea" +msgstr "Setează tabularea" #. MENU_STATUSLINE_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2096 +#: po/tmp/ap_String_Id.h.h:2126 msgid "Set the type and styles of the Table of Contents" -msgstr "" +msgstr "Setează tipul și stilul cuprinsului" #. MENU_STATUSLINE_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:2098 +#: po/tmp/ap_String_Id.h.h:2128 msgid "Set the types of Footnotes and Endnotes" -msgstr "" +msgstr "Definește tipurile de note de pagină și de sfârșit" #. MENU_STATUSLINE_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:2100 +#: po/tmp/ap_String_Id.h.h:2130 msgid "Set the types of Headers and Footers" -msgstr "Definete tipurile de antet si de subsol" +msgstr "Definește tipurile de antet si de subsol" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2102 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2132 msgid "Set this Row as Heading" -msgstr "Transform linia n antet" +msgstr "Setează acest rând ca titlu" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2104 +#: po/tmp/ap_String_Id.h.h:2134 msgid "Set this Row as the Heading on each page" -msgstr "" +msgstr "Setează acest rând ca titlu pe fiecare pagină" + +#. MENU_STATUSLINE_FMT_SETPOSIMAGE +#: po/tmp/ap_String_Id.h.h:2136 +msgid "Set this image to be positioned" +msgstr "Setează această imagine să fie poziționată" #. MENU_STATUSLINE_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2106 +#: po/tmp/ap_String_Id.h.h:2138 msgid "Set your spelling preferences" -msgstr "Seteaz preferinele pentru controlul ortografic" +msgstr "Setează preferințele pentru controlul ortografic" #. MENU_STATUSLINE_FMT_DOCUMENT -#: po/tmp/ap_String_Id.h.h:2108 +#: po/tmp/ap_String_Id.h.h:2140 msgid "Setup your document's page properties such as page size and margins" -msgstr "" -"Seteaz proprietile paginilor documentului, cum ar fi mrimea paginii sau " -"marginile" +msgstr "Setează proprietățile paginii documentului, cum ar fi dimensiunile și marginile" #. DLG_Styles_ModifyShortCut -#: po/tmp/ap_String_Id.h.h:2110 +#: po/tmp/ap_String_Id.h.h:2142 msgid "Shortcut Key" -msgstr "Combinaie taste" +msgstr "Combinație taste" #. DLG_Options_Label_Show #. DLG_Show -#: po/tmp/ap_String_Id.h.h:2112 po/tmp/xap_String_Id.h.h:650 +#: po/tmp/ap_String_Id.h.h:2144 po/tmp/xap_String_Id.h.h:687 msgid "Show" -msgstr "Arat splash-screen-ul AbiWord la fiecare pornire" +msgstr "Arată splash-screen-ul AbiWord la fiecare pornire" #. MENU_LABEL_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2114 +#: po/tmp/ap_String_Id.h.h:2146 msgid "Show &Ruler" -msgstr "&Rigl" +msgstr "&Riglă" #. TOOLBAR_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2116 +#: po/tmp/ap_String_Id.h.h:2148 msgid "Show All" -msgstr "" +msgstr "Arată tot`" #. MENU_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2118 +#: po/tmp/ap_String_Id.h.h:2150 msgid "Show For&matting Marks" -msgstr "Arat semnele de fo&rmatare" +msgstr "Arată semnele de &formatare" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2120 +#: po/tmp/ap_String_Id.h.h:2152 msgid "Show document &before revisions" -msgstr "" +msgstr "Arată documentul înainte de revizii" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2122 +#: po/tmp/ap_String_Id.h.h:2154 msgid "Show document a&fter revisions" -msgstr "" +msgstr "Arată document după revizii" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2124 +#: po/tmp/ap_String_Id.h.h:2156 msgid "Show document after &previous revisions" -msgstr "" +msgstr "Arată document după revizia precedentă" #. MENU_STATUSLINE_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:2126 +#: po/tmp/ap_String_Id.h.h:2158 msgid "Show full list of documents" -msgstr "Afieaz lista tuturor ferestrelor" +msgstr "Afișează lista tuturor ferestrelor" #. MENU_STATUSLINE_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2128 +#: po/tmp/ap_String_Id.h.h:2160 msgid "Show or hide the rulers" -msgstr "Arat sau ascunde rigla" +msgstr "Arată sau ascunde rigla" #. MENU_STATUSLINE_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:2130 +#: po/tmp/ap_String_Id.h.h:2162 msgid "Show or hide the status bar" -msgstr "Arat sau ascunde bara de status" +msgstr "Arată sau ascunde bara de status" #. MENU_STATUSLINE_VIEW_TB_1 #. MENU_STATUSLINE_VIEW_TB_2 #. MENU_STATUSLINE_VIEW_TB_3 #. MENU_STATUSLINE_VIEW_TB_4 -#: po/tmp/ap_String_Id.h.h:2135 +#: po/tmp/ap_String_Id.h.h:2167 msgid "Show or hide the toolbar" -msgstr "" +msgstr "Arată sau ascunde uneltele" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:2137 +#: po/tmp/ap_String_Id.h.h:2169 msgid "Show revisions that are present in document" -msgstr "" - -#. DLG_Options_Label_ShowSplash -#: po/tmp/ap_String_Id.h.h:2139 -msgid "Show the AbiWord splash screen on application startup" -msgstr "Arat splash-screen-ul AbiWord la fiecare pornire" +msgstr "Arată reviziile care sunt prezente în document" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2141 +#: po/tmp/ap_String_Id.h.h:2171 msgid "Show what the document looks like after previous revisions" -msgstr "" +msgstr "Arată documentul după revizia precedentă" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2143 +#: po/tmp/ap_String_Id.h.h:2173 msgid "Show what the document looks like after revisions" -msgstr "" +msgstr "Arată documentul după revizii" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2145 +#: po/tmp/ap_String_Id.h.h:2175 msgid "Show what the document looks like before revisions" -msgstr "" +msgstr "Arată documentul înainte de revizii" #. DLG_Options_Label_ViewShowHide -#: po/tmp/ap_String_Id.h.h:2147 +#: po/tmp/ap_String_Id.h.h:2177 msgid "Show..." -msgstr "Afieaz/Ascunde..." +msgstr "Afișează/Ascunde..." #. TOOLBAR_STATUSLINE_VIEW_SHOWPARA #. TOOLBAR_TOOLTIP_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2150 +#: po/tmp/ap_String_Id.h.h:2180 msgid "Show/hide formatting marks" -msgstr "" +msgstr "Arată/ascunde semnele de formatare" + +#. TB_Simple +#: po/tmp/ap_String_Id.h.h:2182 +msgid "Simple" +msgstr "Simplu" + +#. DLG_Options_Label_ViewSimpleTB +#: po/tmp/ap_String_Id.h.h:2184 +msgid "Simple Toolbar" +msgstr "Bara de unelte simplă" #. DLG_Para_SpacingSingle -#: po/tmp/ap_String_Id.h.h:2152 +#: po/tmp/ap_String_Id.h.h:2186 msgid "Single" -msgstr "Simpl" +msgstr "Simplă" #. TOOLBAR_LABEL_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2154 +#: po/tmp/ap_String_Id.h.h:2188 msgid "Single Spacing" -msgstr "" +msgstr "Un singur spațiu" #. TOOLBAR_STATUSLINE_SINGLE_SPACE #. TOOLBAR_TOOLTIP_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2157 +#: po/tmp/ap_String_Id.h.h:2191 msgid "Single spacing" -msgstr "" +msgstr "Un singur spațiu" #. MENU_LABEL_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2159 +#: po/tmp/ap_String_Id.h.h:2193 msgid "So&rt Table" -msgstr "So&rteaz tabel" +msgstr "So&rtează tabel" #. MENU_LABEL_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2161 +#: po/tmp/ap_String_Id.h.h:2195 msgid "Sort Columns in Ascending Order" -msgstr "" +msgstr "Sortează coloanele în ordine crescătoare" #. MENU_STATUSLINE_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2163 +#: po/tmp/ap_String_Id.h.h:2197 msgid "Sort Columns in Ascending Order based on Selected Row" -msgstr "" +msgstr "Sortează coloanele în ordine crescătoare bazat pe rândul selectat" #. MENU_LABEL_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2165 +#: po/tmp/ap_String_Id.h.h:2199 msgid "Sort Columns in Descending Order" -msgstr "" +msgstr "Sortează coloanele în ordine descrescătoare" #. MENU_STATUSLINE_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2167 +#: po/tmp/ap_String_Id.h.h:2201 msgid "Sort Columns in Descending Order based on Selected Row" -msgstr "" +msgstr "Sortează coloanele în ordine descrescătoare bazat pe rândul selectat" #. MENU_LABEL_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2169 +#: po/tmp/ap_String_Id.h.h:2203 msgid "Sort Rows in Ascending Order" -msgstr "" +msgstr "Sortează rânduri în ordine crescătoare" #. MENU_STATUSLINE_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2171 +#: po/tmp/ap_String_Id.h.h:2205 msgid "Sort Rows in Ascending Order based on selected Column" -msgstr "" +msgstr "Sorează rânduri în ordine crescătoare bazat pe coloana selectată" #. MENU_LABEL_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2173 +#: po/tmp/ap_String_Id.h.h:2207 msgid "Sort Rows in Descending Order" -msgstr "" +msgstr "Sortează rânduri în ordine descrescătoare" #. MENU_STATUSLINE_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2175 +#: po/tmp/ap_String_Id.h.h:2209 msgid "Sort Rows in Descending Order based on Selected Column" -msgstr "" +msgstr "Sortează rânduri în ordine descrescătoare bazat pe coloana selectată" #. MENU_STATUSLINE_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2177 +#: po/tmp/ap_String_Id.h.h:2211 msgid "Sort Table" -msgstr "Sorteaz tabelul" +msgstr "Sortează tabelul" #. DLG_MetaData_Source_LBL -#: po/tmp/ap_String_Id.h.h:2179 +#: po/tmp/ap_String_Id.h.h:2213 msgid "Source:" msgstr "Sursa:" #. DLG_Column_Space_After -#: po/tmp/ap_String_Id.h.h:2181 +#: po/tmp/ap_String_Id.h.h:2215 msgid "Space after Column" -msgstr "Spaiu dup coloan" +msgstr "Spațiu după coloană" #. TOOLBAR_STATUSLINE_PARA_12BEFORE #. TOOLBAR_TOOLTIP_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:2184 +#: po/tmp/ap_String_Id.h.h:2218 msgid "Space before: 12 pt" -msgstr "" +msgstr "Spațiu înainte: 12 pt" #. TOOLBAR_STATUSLINE_PARA_0BEFORE #. TOOLBAR_TOOLTIP_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:2187 +#: po/tmp/ap_String_Id.h.h:2221 msgid "Space before: None" -msgstr "" +msgstr "Spațiu înainte: nimic" #. DLG_Para_LabelSpacing -#: po/tmp/ap_String_Id.h.h:2189 +#: po/tmp/ap_String_Id.h.h:2223 msgid "Spacing" -msgstr "Spaiere" +msgstr "Spațiere" #. DLG_Options_SpellCheckingTitle -#: po/tmp/ap_String_Id.h.h:2191 +#: po/tmp/ap_String_Id.h.h:2225 msgid "Spell Checking" -msgstr "" +msgstr "Corectare ortografică" #. TOOLBAR_LABEL_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2193 +#: po/tmp/ap_String_Id.h.h:2227 msgid "Spellcheck" -msgstr "" +msgstr "Corectează" #. TOOLBAR_STATUSLINE_SPELLCHECK #. TOOLBAR_TOOLTIP_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2196 +#: po/tmp/ap_String_Id.h.h:2230 msgid "Spellcheck the document" -msgstr "" +msgstr "Corectează acest document" #. DLG_Spell_SpellTitle #. DLG_Options_TabLabel_Spelling -#: po/tmp/ap_String_Id.h.h:2199 +#: po/tmp/ap_String_Id.h.h:2233 msgid "Spelling" -msgstr "Controlul ortografic" +msgstr "Corectare ortografică" #. MENU_LABEL_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2201 +#: po/tmp/ap_String_Id.h.h:2235 msgid "Spelling &Options" -msgstr "&Opiuni control ortografic" +msgstr "&Opțiuni corectare ortografică" #. MENU_LABEL_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2203 +#: po/tmp/ap_String_Id.h.h:2237 msgid "Spli&t Table" -msgstr "Sepa&r tabel" +msgstr "Sepa&ră tabel" #. DLG_SplitCellsTitle #. DLG_SplitCells_Frame #. MENU_STATUSLINE_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2207 +#: po/tmp/ap_String_Id.h.h:2241 msgid "Split Cells" -msgstr "Separ celule" +msgstr "Separă celule" #. MENU_STATUSLINE_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2209 +#: po/tmp/ap_String_Id.h.h:2243 msgid "Split Table" -msgstr "Separ tabel" +msgstr "Separă tabel" #. TOOLBAR_LABEL_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2211 +#: po/tmp/ap_String_Id.h.h:2245 msgid "Split cells" -msgstr "" +msgstr "Separă celule" #. DLG_SplitCells_HoriMid #. DLG_SplitCells_VertMid -#: po/tmp/ap_String_Id.h.h:2214 +#: po/tmp/ap_String_Id.h.h:2248 msgid "Split in Middle" -msgstr "" +msgstr "Separă la jumătate" #. DLG_SplitCells_Below -#: po/tmp/ap_String_Id.h.h:2216 +#: po/tmp/ap_String_Id.h.h:2250 msgid "Split on Bottom Side" -msgstr "" +msgstr "Separă în partea de jos" #. DLG_SplitCells_Left -#: po/tmp/ap_String_Id.h.h:2218 +#: po/tmp/ap_String_Id.h.h:2252 msgid "Split on Left Side" -msgstr "" +msgstr "Separă în partea din stânga" #. DLG_SplitCells_Right -#: po/tmp/ap_String_Id.h.h:2220 +#: po/tmp/ap_String_Id.h.h:2254 msgid "Split on Right Side" -msgstr "" +msgstr "Separă în partea din dreapta" #. DLG_SplitCells_Above -#: po/tmp/ap_String_Id.h.h:2222 +#: po/tmp/ap_String_Id.h.h:2256 msgid "Split on Top Side" -msgstr "" +msgstr "Separă în partea de sus" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2224 +#: po/tmp/ap_String_Id.h.h:2258 msgid "Split on all delimiters except spaces" -msgstr "" +msgstr "Separă folosind delimtatorii de cuvinte, mai puțin spațiile" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2226 +#: po/tmp/ap_String_Id.h.h:2260 msgid "Split on all word delimiters including spaces" -msgstr "" +msgstr "Separă folosind delimitatorii de cuvinte inclusiv spațiile" #. MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2228 +#: po/tmp/ap_String_Id.h.h:2262 msgid "Split text at commas or tabs" -msgstr "" +msgstr "Separă textul folosind &virgulile și taburile" #. MENU_LABEL_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2230 +#: po/tmp/ap_String_Id.h.h:2264 msgid "Split text at spaces, commas, or tabs" -msgstr "" +msgstr "Separă textul folosind &spații, virgule și taburile" #. TOOLBAR_STATUSLINE_SPLIT_CELLS #. TOOLBAR_TOOLTIP_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2233 +#: po/tmp/ap_String_Id.h.h:2267 msgid "Split this cell" -msgstr "" +msgstr "Împarte această celulă" #. DLG_Lists_Square_List #. STYLE_SQUARELIST -#: po/tmp/ap_String_Id.h.h:2235 po/tmp/xap_String_Id.h.h:662 +#: po/tmp/ap_String_Id.h.h:2269 po/tmp/xap_String_Id.h.h:699 msgid "Square List" -msgstr "List cu ptrele" +msgstr "Listă cu pătrățele" #. MENU_LABEL_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2237 +#: po/tmp/ap_String_Id.h.h:2271 msgid "St&yle" msgstr "St&il" #. TB_Standard -#: po/tmp/ap_String_Id.h.h:2239 +#: po/tmp/ap_String_Id.h.h:2273 msgid "Standard" -msgstr "" +msgstr "Standard" #. DLG_Options_Label_ViewStandardTB -#: po/tmp/ap_String_Id.h.h:2241 +#: po/tmp/ap_String_Id.h.h:2275 msgid "Standard Toolbar" -msgstr "Bara de instrumente standard" +msgstr "Bara de unelte standard" #. DLG_Lists_Star_List #. STYLE_STARLIST -#: po/tmp/ap_String_Id.h.h:2243 po/tmp/xap_String_Id.h.h:666 +#: po/tmp/ap_String_Id.h.h:2277 po/tmp/xap_String_Id.h.h:703 msgid "Star List" -msgstr "List cu stele" +msgstr "Listă cu stele" #. DLG_Lists_Start -#: po/tmp/ap_String_Id.h.h:2245 +#: po/tmp/ap_String_Id.h.h:2279 msgid "Start At:" -msgstr "Iniiaz o nou list" +msgstr "Începe la:" #. DLG_Lists_Start_New_List #. DLG_Lists_Start_New -#: po/tmp/ap_String_Id.h.h:2248 +#: po/tmp/ap_String_Id.h.h:2282 msgid "Start New List" -msgstr "Iniiaz o nou list" +msgstr "Inițiază o nouă listă" #. DLG_Lists_Start_Sub -#: po/tmp/ap_String_Id.h.h:2250 +#: po/tmp/ap_String_Id.h.h:2284 msgid "Start Sublist" -msgstr "Iniiaz o sublist" +msgstr "Inițiază o sublistă" #. DLG_MarkRevisions_Check2Label -#: po/tmp/ap_String_Id.h.h:2252 +#: po/tmp/ap_String_Id.h.h:2286 msgid "Start a new revision" -msgstr "ncepe o nou revizie" +msgstr "Începe o nouă revizie" #. MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2254 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2288 msgid "Start ne&w revision" -msgstr "ncepe o nou revizie" +msgstr "Începe o nouă revizie" #. MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2256 +#: po/tmp/ap_String_Id.h.h:2290 msgid "Start revision distinct from the current one" -msgstr "" +msgstr "Începe o revizie distinctă de cea curentă" #. DLG_WordCount_Statistics -#: po/tmp/ap_String_Id.h.h:2258 +#: po/tmp/ap_String_Id.h.h:2292 msgid "Statistics:" msgstr "Statistici:" #. DLG_Lists_Stop_Current_List -#: po/tmp/ap_String_Id.h.h:2260 +#: po/tmp/ap_String_Id.h.h:2294 msgid "Stop Current List" -msgstr "ntrerupe lista actual" +msgstr "Întrerupe lista actuală" #. MENU_LABEL_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2262 +#: po/tmp/ap_String_Id.h.h:2296 msgid "Stri&ke" -msgstr "&Tiat" +msgstr "&Tăiat" #. TOOLBAR_LABEL_FMT_STRIKE #. TOOLBAR_STATUSLINE_FMT_STRIKE #. TOOLBAR_TOOLTIP_FMT_STRIKE #. DLG_UFS_StrikeoutCheck -#: po/tmp/ap_String_Id.h.h:2266 po/tmp/xap_String_Id.h.h:668 +#: po/tmp/ap_String_Id.h.h:2300 po/tmp/xap_String_Id.h.h:705 msgid "Strike" -msgstr "" +msgstr "Tăiat" #. MENU_STATUSLINE_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2268 +#: po/tmp/ap_String_Id.h.h:2302 msgid "Strikeout the selection (toggle)" -msgstr "Taie cu o linie fonturile selectate (comut)" +msgstr "Taie cu o linie fonturile selectate (comută)" #. MENU_LABEL_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:2270 +#: po/tmp/ap_String_Id.h.h:2304 msgid "Sty&list" -msgstr "" +msgstr "S&tilist" #. TOOLBAR_LABEL_FMT_STYLE #. TOOLBAR_STATUSLINE_FMT_STYLE #. TOOLBAR_TOOLTIP_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2274 +#: po/tmp/ap_String_Id.h.h:2308 msgid "Style" -msgstr "" +msgstr "Stil" #. DLG_Styles_ErrNotTitle1 -#: po/tmp/ap_String_Id.h.h:2276 +#: po/tmp/ap_String_Id.h.h:2310 msgid "Style Name - " msgstr "Numele stilului - " #. DLG_Styles_ModifyName -#: po/tmp/ap_String_Id.h.h:2278 +#: po/tmp/ap_String_Id.h.h:2312 msgid "Style Name:" msgstr "Numele stilului:" #. DLG_Styles_ModifyType -#: po/tmp/ap_String_Id.h.h:2280 +#: po/tmp/ap_String_Id.h.h:2314 msgid "Style Type" msgstr "Tipul de stil" #. DLG_Styles_ModifyFollowing -#: po/tmp/ap_String_Id.h.h:2282 +#: po/tmp/ap_String_Id.h.h:2316 msgid "Style for following paragraph" -msgstr "Stil pentru paragraful urmtor" +msgstr "Stil pentru paragraful următor" #. DLG_Styles_ErrBlankName -#: po/tmp/ap_String_Id.h.h:2284 +#: po/tmp/ap_String_Id.h.h:2318 msgid "Style name cannot be left blank" -msgstr "Trebuie completat i numele stilului" +msgstr "Trebuie completat și numele stilului" #. DLG_Lists_Style #. DLG_UFS_StyleLabel -#: po/tmp/ap_String_Id.h.h:2286 po/tmp/xap_String_Id.h.h:670 +#: po/tmp/ap_String_Id.h.h:2320 po/tmp/xap_String_Id.h.h:707 msgid "Style:" msgstr "Stil:" #. DLG_Styles_StylesTitle #. DLG_Stylist_Styles -#: po/tmp/ap_String_Id.h.h:2289 +#: po/tmp/ap_String_Id.h.h:2323 msgid "Styles" msgstr "Stiluri" #. DLG_Stylist_Title -#: po/tmp/ap_String_Id.h.h:2291 +#: po/tmp/ap_String_Id.h.h:2325 msgid "Stylist" -msgstr "" +msgstr "Stilist" #. FIELD_Document_Subject -#: po/tmp/ap_String_Id.h.h:2293 +#: po/tmp/ap_String_Id.h.h:2327 msgid "Subject" msgstr "Subiect" #. DLG_MetaData_Subject_LBL -#: po/tmp/ap_String_Id.h.h:2295 +#: po/tmp/ap_String_Id.h.h:2329 msgid "Subject:" msgstr "Subiect:" @@ -5555,47 +5619,47 @@ #. TOOLBAR_STATUSLINE_FMT_SUBSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUBSCRIPT #. DLG_UFS_SubScript -#: po/tmp/ap_String_Id.h.h:2299 po/tmp/xap_String_Id.h.h:674 +#: po/tmp/ap_String_Id.h.h:2333 po/tmp/xap_String_Id.h.h:711 msgid "Subscript" -msgstr "" +msgstr "Indice" #. DLG_Spell_Suggestions -#: po/tmp/ap_String_Id.h.h:2301 +#: po/tmp/ap_String_Id.h.h:2335 msgid "Sugg&estions:" msgstr "Sug&estii:" #. DLG_Options_Label_SpellMainOnly -#: po/tmp/ap_String_Id.h.h:2303 +#: po/tmp/ap_String_Id.h.h:2337 msgid "Suggest from &main dictionary only" -msgstr "Sugereaz doar pe baza dicionarului &principal" +msgstr "Sugerează doar pe baza dicționarului &principal" #. MENU_LABEL_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:2305 +#: po/tmp/ap_String_Id.h.h:2339 msgid "Sum a Column" -msgstr "" +msgstr "Adună &o coloană" #. MENU_LABEL_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:2307 +#: po/tmp/ap_String_Id.h.h:2341 msgid "Sum a Row" -msgstr "" +msgstr "A&dună un rând" #. FIELD_Numbers_TableSumRows -#: po/tmp/ap_String_Id.h.h:2309 +#: po/tmp/ap_String_Id.h.h:2343 msgid "Sum a Table Column" -msgstr "" +msgstr "Adună o coloană de tabel" #. FIELD_Numbers_TableSumCols -#: po/tmp/ap_String_Id.h.h:2311 +#: po/tmp/ap_String_Id.h.h:2345 msgid "Sum a Table Row" -msgstr "" +msgstr "Adună un rând de tabel" #. DLG_MetaData_TAB_Summary -#: po/tmp/ap_String_Id.h.h:2313 +#: po/tmp/ap_String_Id.h.h:2347 msgid "Summary" msgstr "Sumar" #. MENU_LABEL_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:2315 +#: po/tmp/ap_String_Id.h.h:2349 msgid "Supe&rscript" msgstr "&Putere" @@ -5603,295 +5667,286 @@ #. TOOLBAR_STATUSLINE_FMT_SUPERSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUPERSCRIPT #. DLG_UFS_SuperScript -#: po/tmp/ap_String_Id.h.h:2319 po/tmp/xap_String_Id.h.h:676 +#: po/tmp/ap_String_Id.h.h:2353 po/tmp/xap_String_Id.h.h:713 msgid "Superscript" -msgstr "" +msgstr "Putere" #. MENU_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2321 +#: po/tmp/ap_String_Id.h.h:2355 msgid "Sy&mbol" -msgstr "&Simbol" +msgstr "Sim&bol" #. TOOLBAR_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2323 +#: po/tmp/ap_String_Id.h.h:2357 msgid "Symbol" -msgstr "" +msgstr "Simbol" #. MENU_LABEL_TABLE -#: po/tmp/ap_String_Id.h.h:2325 +#: po/tmp/ap_String_Id.h.h:2359 msgid "T&able" -msgstr "T&abel" +msgstr "Ta&bel" #. TabStopStatus -#: po/tmp/ap_String_Id.h.h:2327 +#: po/tmp/ap_String_Id.h.h:2361 #, c-format msgid "Tab Stop [%s]" -msgstr "&Poziionare tabulare [%s]" +msgstr "&Poziționare tabulare [%s]" #. DLG_Tab_Label_TabPosition -#: po/tmp/ap_String_Id.h.h:2329 +#: po/tmp/ap_String_Id.h.h:2363 msgid "Tab stop position:" -msgstr "Poziie tabulare:" +msgstr "Poziție tabulare:" #. DLG_Tab_Label_TabToClear -#: po/tmp/ap_String_Id.h.h:2331 +#: po/tmp/ap_String_Id.h.h:2365 msgid "Tab stops to be cleared:" -msgstr "Tabulare de anulare :" +msgstr "Tabulare de anulare:" #. DLG_FormatTable_Apply_To_Table #. MENU_STATUSLINE_TABLE #. TB_Table -#: po/tmp/ap_String_Id.h.h:2335 po/tmp/xap_String_Id.h.h:686 +#: po/tmp/ap_String_Id.h.h:2369 po/tmp/xap_String_Id.h.h:723 msgid "Table" msgstr "Tabel" #. DLG_InsertTable_TableSize_Capital -#: po/tmp/ap_String_Id.h.h:2337 +#: po/tmp/ap_String_Id.h.h:2371 msgid "Table Size" -msgstr "" +msgstr "Dimensiunea tabelului" #. DLG_Options_Label_ViewTableTB -#: po/tmp/ap_String_Id.h.h:2339 +#: po/tmp/ap_String_Id.h.h:2373 msgid "Table Toolbar" -msgstr "" +msgstr "Bara de unelte a tabelului" -#. TOC_TocHeading #. MENU_LABEL_INSERT_TABLEOFCONTENTS #. MENU_LABEL_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2343 +#: po/tmp/ap_String_Id.h.h:2376 msgid "Table of Contents" -msgstr "" +msgstr "Cu&prins" #. FIELD_Numbers_TOCListLabel -#: po/tmp/ap_String_Id.h.h:2345 +#: po/tmp/ap_String_Id.h.h:2378 msgid "Table of Contents List Label" -msgstr "" +msgstr "Lista de etichete a cuprinsului" #. FIELD_Numbers_TOCPageNumber -#: po/tmp/ap_String_Id.h.h:2347 +#: po/tmp/ap_String_Id.h.h:2380 msgid "Table of Contents Page" -msgstr "" +msgstr "Pagina cuprinsului" #. DLG_InsertTable_TableSize -#: po/tmp/ap_String_Id.h.h:2349 +#: po/tmp/ap_String_Id.h.h:2382 msgid "Table size" -msgstr "Mrime tabel" +msgstr "Mărime tabel" #. DLG_Styles_ModifyTabs #. DLG_Tab_TabTitle -#: po/tmp/ap_String_Id.h.h:2352 +#: po/tmp/ap_String_Id.h.h:2385 msgid "Tabs" msgstr "Tabulare" #. DLG_FormatTOC_DetailsTabPage -#: po/tmp/ap_String_Id.h.h:2354 +#: po/tmp/ap_String_Id.h.h:2387 msgid "Tabs and Page Numbering" -msgstr "" +msgstr "Tabulare și numărare de pagini" #. MENU_LABEL_FMT -#: po/tmp/ap_String_Id.h.h:2356 +#: po/tmp/ap_String_Id.h.h:2389 msgid "Te&xt Formatting" msgstr "Formatarea te&xtului" #. DLG_Options_Label_Text -#: po/tmp/ap_String_Id.h.h:2358 +#: po/tmp/ap_String_Id.h.h:2391 msgid "Text" msgstr "Text" #. DLG_FormatTOC_TextAfter -#: po/tmp/ap_String_Id.h.h:2360 +#: po/tmp/ap_String_Id.h.h:2393 msgid "Text &after:" -msgstr "" +msgstr "Text după:" #. DLG_FormatTOC_TextBefore -#: po/tmp/ap_String_Id.h.h:2362 +#: po/tmp/ap_String_Id.h.h:2395 msgid "Text &before:" -msgstr "" +msgstr "Text înainte:" #. DLG_Lists_Align -#: po/tmp/ap_String_Id.h.h:2364 +#: po/tmp/ap_String_Id.h.h:2397 msgid "Text Align:" msgstr "Alinierea textului:" #. MENU_LABEL_INSERT_TEXTBOX #. MENU_LABEL_FMT_FRAME -#: po/tmp/ap_String_Id.h.h:2367 +#: po/tmp/ap_String_Id.h.h:2400 msgid "Text Box" -msgstr "" +msgstr "&Dreptunghi text" #. DLG_Lists_PageFolding -#: po/tmp/ap_String_Id.h.h:2369 +#: po/tmp/ap_String_Id.h.h:2402 msgid "Text Folding" -msgstr "" +msgstr "Împachetare text (folding)" #. DLG_FormatFrame_TextWrapping -#: po/tmp/ap_String_Id.h.h:2371 +#: po/tmp/ap_String_Id.h.h:2404 msgid "Text Wrapping" -msgstr "" +msgstr "Împachetare de text (wrapping)" #. DLG_Options_Label_Both -#: po/tmp/ap_String_Id.h.h:2373 +#: po/tmp/ap_String_Id.h.h:2406 msgid "Text and Icon" -msgstr "Text i iconie" - -#. MSG_MergeDocsNotRelated -#: po/tmp/ap_String_Id.h.h:2375 -msgid "" -"The documents you are trying to merge are unrelated. AbiWord will attempt to " -"merge them, but the result might be meaningless." -msgstr "" +msgstr "Text și iconițe" #. DLG_PageSetup_ErrBigMargins -#: po/tmp/ap_String_Id.h.h:2377 +#: po/tmp/ap_String_Id.h.h:2408 msgid "The margins selected are too large to fit on the page." -msgstr "Marginile selectate sunt prea mari pentru a ncpea pe pagin" +msgstr "Marginile selectate sunt prea mari pentru a încăpea pe pagină" #. DLG_Options_Prompt_YouMustRestart -#: po/tmp/ap_String_Id.h.h:2379 +#: po/tmp/ap_String_Id.h.h:2410 msgid "" "The new user interface language will take effect the next time that you " "start the application" -msgstr "" +msgstr "Noul limbaj al interfeței grafice va intra în efect data viitoare când porniți aplicația" #. MSG_SpellDone -#: po/tmp/ap_String_Id.h.h:2381 +#: po/tmp/ap_String_Id.h.h:2412 msgid "The spelling check is complete." -msgstr "Verificarea ortografic a fost terminat" +msgstr "Verificarea ortografică a fost terminată" #. MSG_HyperlinkCrossesBoundaries -#: po/tmp/ap_String_Id.h.h:2383 +#: po/tmp/ap_String_Id.h.h:2414 msgid "" "The text to which the hyperlink is to be attached must be within a single " "paragraph." -msgstr "" -"Textul de care va fi ataat hiperlegtura trebuie s fie ntr-un singur " +msgstr "Textul de care va fi atașată legătura html trebuie să fie într-un singur " "paragraf" #. FIELD_DateTime_Wkday -#: po/tmp/ap_String_Id.h.h:2385 +#: po/tmp/ap_String_Id.h.h:2416 msgid "The weekday" -msgstr "Ziua sptmnii" +msgstr "Ziua săptămânii" #. DLG_FormatTable_Thickness -#: po/tmp/ap_String_Id.h.h:2387 +#: po/tmp/ap_String_Id.h.h:2418 msgid "Thickness:" -msgstr "" +msgstr "Grosime" #. MSG_AfterRestartNew -#: po/tmp/ap_String_Id.h.h:2389 +#: po/tmp/ap_String_Id.h.h:2420 msgid "" "This change will only take effect when you restart AbiWord or create a new " "document." -msgstr "" -"Aceste schimbri vor avea efect dup repornirea AbiWord sau la creerea unui " +msgstr "Aceste schimbări vor avea efect după repornirea AbiWord sau la creerea unui " "nou document" #. MSG_HiddenRevisions -#: po/tmp/ap_String_Id.h.h:2391 +#: po/tmp/ap_String_Id.h.h:2422 msgid "" "This document contains revisions which are currently hidden from view. " "Please see AbiWord documentation for information on working with revisions." -msgstr "" +msgstr "Acest document conține revizii ascunse. " +"Vă rugăm să consultați documentația AbiWord pentru informații privind lucrul cu revizii." #. DLG_Para_PreviewSampleFallback -#: po/tmp/ap_String_Id.h.h:2393 +#: po/tmp/ap_String_Id.h.h:2424 msgid "" "This paragraph represents words as they might appear in your document. To " "see text from your document used in this preview, position your cursor in a " "document paragraph with some text in it and open this dialog." -msgstr "" -"Acest paragraf reprezinta cuvintele asa cum pot aparea in documentul " -"dumneavoastra. Pentru a vedea cuvintele din paragraful dumneavoastra aici, " -"pozitionati cursorul intr-un paragraf din document si deschideti aceasta " -"fereastra." +msgstr "Acest paragraf reprezintă cuvintele așa cum pot să apară în documentul " +"dumneavoastră. Pentru a vedea cuvintele aici, " +"pozitionati cursorul într-un paragraf din document și deschideți această " +"fereastră de dialog." #. DLG_Styles_ErrStyleNot -#: po/tmp/ap_String_Id.h.h:2395 +#: po/tmp/ap_String_Id.h.h:2426 msgid "" "This style does not exist \n" " so it cannot be modified" -msgstr "Acest stil nu exist x0a; ca atare nu a putut fi modificat" +msgstr "Acest stil nu există \n" +" ca atare nu a putut fi modificat" #. DLG_Column_Three -#: po/tmp/ap_String_Id.h.h:2397 +#: po/tmp/ap_String_Id.h.h:2428 msgid "Three" msgstr "Trei" #. DLG_Lists_Tick_List #. STYLE_TICKLIST -#: po/tmp/ap_String_Id.h.h:2399 po/tmp/xap_String_Id.h.h:718 +#: po/tmp/ap_String_Id.h.h:2430 po/tmp/xap_String_Id.h.h:757 msgid "Tick List" -msgstr "List cu \"vzut\"-uri" +msgstr "Listă cu \"văzut\"-uri" #. FIELD_DateTime_TimeZone -#: po/tmp/ap_String_Id.h.h:2401 +#: po/tmp/ap_String_Id.h.h:2432 msgid "Time Zone" msgstr "Fusul orar" #. FIELD_Document_Title -#: po/tmp/ap_String_Id.h.h:2403 +#: po/tmp/ap_String_Id.h.h:2434 msgid "Title" -msgstr "" +msgstr "Titlu" #. DLG_ToggleCase_TitleCase -#: po/tmp/ap_String_Id.h.h:2405 +#: po/tmp/ap_String_Id.h.h:2436 msgid "Title Case" -msgstr "Majuscul Doar Prima Liter" +msgstr "Majusculă Doar Prima Literă" #. DLG_MetaData_Title_LBL #. DLG_Image_LblTitle -#: po/tmp/ap_String_Id.h.h:2407 po/tmp/xap_String_Id.h.h:722 +#: po/tmp/ap_String_Id.h.h:2438 po/tmp/xap_String_Id.h.h:761 msgid "Title:" msgstr "Titlu:" #. DLG_Options_Label_Toolbars -#: po/tmp/ap_String_Id.h.h:2409 +#: po/tmp/ap_String_Id.h.h:2440 msgid "Toolbars" -msgstr "Bara de instrumente" +msgstr "Bara de unelte" #. TopMarginStatus -#: po/tmp/ap_String_Id.h.h:2411 +#: po/tmp/ap_String_Id.h.h:2442 #, c-format msgid "Top Margin [%s]" -msgstr "Marginea superioar [%s]" +msgstr "Marginea superioară [%s]" #. MENU_LABEL_FMT_TOPLINE #. TOOLBAR_LABEL_FMT_TOPLINE #. TOOLBAR_STATUSLINE_FMT_TOPLINE #. TOOLBAR_TOOLTIP_FMT_TOPLINE #. DLG_UFS_ToplineCheck -#: po/tmp/ap_String_Id.h.h:2416 po/tmp/xap_String_Id.h.h:728 +#: po/tmp/ap_String_Id.h.h:2447 po/tmp/xap_String_Id.h.h:767 msgid "Topline" msgstr "Linie deasupra" #. DLG_Lists_Triangle_List #. STYLE_TRIANGLELIST -#: po/tmp/ap_String_Id.h.h:2418 po/tmp/xap_String_Id.h.h:730 +#: po/tmp/ap_String_Id.h.h:2449 po/tmp/xap_String_Id.h.h:769 msgid "Triangle List" -msgstr "List cu triunghiuri" +msgstr "Listă cu triunghiuri" #. DLG_Column_Two -#: po/tmp/ap_String_Id.h.h:2420 +#: po/tmp/ap_String_Id.h.h:2451 msgid "Two" msgstr "Doua" #. FIELD_Document_Type -#: po/tmp/ap_String_Id.h.h:2422 +#: po/tmp/ap_String_Id.h.h:2453 msgid "Type" -msgstr "" +msgstr "Tip" #. DLG_InsertBookmark_Msg -#: po/tmp/ap_String_Id.h.h:2424 +#: po/tmp/ap_String_Id.h.h:2455 msgid "Type a name for the bookmark, or select an existing from the list." -msgstr "Scrie un nume pentru semnul de carte, sau selecteaz unul din list" +msgstr "Scrie un nume pentru semnul de carte, sau selectează unul din listă" #. DLG_Lists_Type -#: po/tmp/ap_String_Id.h.h:2426 +#: po/tmp/ap_String_Id.h.h:2457 msgid "Type:" msgstr "Tip:" #. DLG_ToggleCase_UpperCase -#: po/tmp/ap_String_Id.h.h:2428 +#: po/tmp/ap_String_Id.h.h:2459 msgid "UPPERCASE" msgstr "MAJUSCULE" @@ -5899,95 +5954,94 @@ #. TOOLBAR_STATUSLINE_FMT_UNDERLINE #. TOOLBAR_TOOLTIP_FMT_UNDERLINE #. DLG_UFS_UnderlineCheck -#: po/tmp/ap_String_Id.h.h:2432 po/tmp/xap_String_Id.h.h:750 +#: po/tmp/ap_String_Id.h.h:2463 po/tmp/xap_String_Id.h.h:789 msgid "Underline" -msgstr "" +msgstr "Subliniat" #. MENU_STATUSLINE_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:2434 +#: po/tmp/ap_String_Id.h.h:2465 msgid "Underline the selection (toggle)" -msgstr "Subliniaz zona selectat (comut)" +msgstr "Subliniază zona selectată (comută)" #. TOOLBAR_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2436 +#: po/tmp/ap_String_Id.h.h:2467 msgid "Undo" -msgstr "" +msgstr "Anulează" #. MENU_STATUSLINE_EDIT_UNDO #. TOOLBAR_STATUSLINE_EDIT_UNDO #. TOOLBAR_TOOLTIP_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2440 +#: po/tmp/ap_String_Id.h.h:2471 msgid "Undo editing" -msgstr "Anuleaz operaiunea" +msgstr "Anulează operația de editare" #. DLG_Lists_Upper_Case_List #. STYLE_UPPERCASTELIST -#: po/tmp/ap_String_Id.h.h:2442 po/tmp/xap_String_Id.h.h:784 +#: po/tmp/ap_String_Id.h.h:2473 po/tmp/xap_String_Id.h.h:823 msgid "Upper Case List" -msgstr "List cu litere majuscule" +msgstr "Listă cu litere majuscule" #. DLG_Lists_Upper_Roman_List #. STYLE_UPPERROMANLIST -#: po/tmp/ap_String_Id.h.h:2444 po/tmp/xap_String_Id.h.h:786 +#: po/tmp/ap_String_Id.h.h:2475 po/tmp/xap_String_Id.h.h:825 msgid "Upper Roman List" -msgstr "List cu majuscule romane" +msgstr "Listă cu majuscule romane" #. DLG_Column_RtlOrder -#: po/tmp/ap_String_Id.h.h:2446 +#: po/tmp/ap_String_Id.h.h:2477 msgid "Use RTL Order" -msgstr "Ordine de la dreapta la stnga" +msgstr "Ordine de la dreapta la stânga" #. DLG_Options_Label_HebrewContextGlyphs -#: po/tmp/ap_String_Id.h.h:2448 +#: po/tmp/ap_String_Id.h.h:2479 msgid "Use glyph shaping for Hebrew" -msgstr "Utilizeaz forma simbolurilor din ebraic" +msgstr "Utilizează forma simbolurilor din ebraică" #. DLG_Options_Label_UI -#: po/tmp/ap_String_Id.h.h:2450 +#: po/tmp/ap_String_Id.h.h:2481 msgid "User Interface" -msgstr "" +msgstr "Interfață utilizator" #. DLG_Options_Label_UILang -#: po/tmp/ap_String_Id.h.h:2452 +#: po/tmp/ap_String_Id.h.h:2483 msgid "User Interface Language" -msgstr "" +msgstr "Limba interfeței utiliazatorului" #. DLG_Stylist_UserStyles -#: po/tmp/ap_String_Id.h.h:2454 +#: po/tmp/ap_String_Id.h.h:2485 msgid "User defined Styles" -msgstr "" +msgstr "Stiluri definite de utilizator" #. DLG_Tab_Label_Existing -#: po/tmp/ap_String_Id.h.h:2456 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2487 msgid "User-defined Tabs" -msgstr "Stiluri definite de utilizator" +msgstr "Taburi definite de utilizatori" #. DLG_Styles_LBL_UserDefined -#: po/tmp/ap_String_Id.h.h:2458 +#: po/tmp/ap_String_Id.h.h:2489 msgid "User-defined styles" msgstr "Stiluri definite de utilizator" #. FIELD_Application_Version #. DLG_History_Version_Version -#: po/tmp/ap_String_Id.h.h:2460 po/tmp/xap_String_Id.h.h:792 +#: po/tmp/ap_String_Id.h.h:2491 po/tmp/xap_String_Id.h.h:833 msgid "Version" msgstr "Versiune" #. DLG_Options_TabLabel_View -#: po/tmp/ap_String_Id.h.h:2462 +#: po/tmp/ap_String_Id.h.h:2493 msgid "View" -msgstr "Vizualizeaz" +msgstr "Vizualizează" #. MENU_STATUSLINE_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:2464 +#: po/tmp/ap_String_Id.h.h:2495 msgid "View document history" -msgstr "" +msgstr "Vedeți istoria documentului" #. MENU_STATUSLINE_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:2466 +#: po/tmp/ap_String_Id.h.h:2497 msgid "View the document in full screen mode" -msgstr "Arat documentul pe tot ecranul" +msgstr "Arată documentul pe tot ecranul" #. MENU_STATUSLINE_WINDOW_1 #. MENU_STATUSLINE_WINDOW_2 @@ -5998,197 +6052,195 @@ #. MENU_STATUSLINE_WINDOW_7 #. MENU_STATUSLINE_WINDOW_8 #. MENU_STATUSLINE_WINDOW_9 -#: po/tmp/ap_String_Id.h.h:2476 +#: po/tmp/ap_String_Id.h.h:2507 msgid "View this document" -msgstr "Activeaz aceast fereastr" +msgstr "Activează această fereastră" #. DLG_Options_Label_ViewTooltips -#: po/tmp/ap_String_Id.h.h:2478 +#: po/tmp/ap_String_Id.h.h:2509 msgid "View tooltips" -msgstr "Arat ponturi" +msgstr "Arată ponturi" #. DLG_Options_Label_ViewViewFrame -#: po/tmp/ap_String_Id.h.h:2480 +#: po/tmp/ap_String_Id.h.h:2511 msgid "View..." -msgstr "Arat..." +msgstr "Arată..." #. DLG_Options_Label_Visible -#: po/tmp/ap_String_Id.h.h:2482 +#: po/tmp/ap_String_Id.h.h:2513 msgid "Visible" msgstr "Vizibil" #. MSG_HyperlinkNoBookmark -#: po/tmp/ap_String_Id.h.h:2484 +#: po/tmp/ap_String_Id.h.h:2515 #, c-format msgid "Warning: the bookmark you provided [%s] does not exist." -msgstr "Atenie: semnul de carte furnizat [%s] nu exist" +msgstr "Atenție: semnul de carte furnizat [%s] nu există" #. MENU_STATUSLINE_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:2486 +#: po/tmp/ap_String_Id.h.h:2517 msgid "Web Layout" msgstr "Vedere web" #. DLG_Styles_LBL_TxtMsg -#: po/tmp/ap_String_Id.h.h:2488 +#: po/tmp/ap_String_Id.h.h:2519 msgid "What Hath God Wrought" msgstr "Acesta este un paragraf" #. DLG_Options_Label_WithExtension -#: po/tmp/ap_String_Id.h.h:2490 +#: po/tmp/ap_String_Id.h.h:2521 msgid "With extension:" msgstr "Cu extensia:" #. DLG_WordCount_WordCountTitle #. FIELD_Numbers_WordCount -#: po/tmp/ap_String_Id.h.h:2493 +#: po/tmp/ap_String_Id.h.h:2524 msgid "Word Count" -msgstr "Numr cuvintele" +msgstr "Numără cuvintele" #. DLG_NEW_Tab1 -#: po/tmp/ap_String_Id.h.h:2495 +#: po/tmp/ap_String_Id.h.h:2526 msgid "Wordprocessing" msgstr "Procesare de text" #. DLG_WordCount_Words_No_Notes -#: po/tmp/ap_String_Id.h.h:2497 +#: po/tmp/ap_String_Id.h.h:2528 msgid "Words (no footnotes/endnotes):" -msgstr "" +msgstr "Cuvinte (fără notele de pagină și de sfârșit)" #. DLG_Options_Label_SpellUppercase -#: po/tmp/ap_String_Id.h.h:2499 +#: po/tmp/ap_String_Id.h.h:2530 msgid "Words in &UPPERCASE" -msgstr "Ignor cuvintele cu &MAJUSCULE" +msgstr "Ignoră cuvintele cu &MAJUSCULE" #. DLG_Options_Label_SpellNumbers -#: po/tmp/ap_String_Id.h.h:2501 +#: po/tmp/ap_String_Id.h.h:2532 msgid "Words with num&bers" -msgstr "Ignor cuvintele cu n&umere" +msgstr "Ignoră cuvintele cu n&umere" #. DLG_WordCount_Words -#: po/tmp/ap_String_Id.h.h:2503 +#: po/tmp/ap_String_Id.h.h:2534 msgid "Words:" msgstr "Cuvinte" #. MSG_SaveFailedWrite -#: po/tmp/ap_String_Id.h.h:2505 +#: po/tmp/ap_String_Id.h.h:2536 #, c-format msgid "Writing error when attempting to save %s" -msgstr "Nu pot salva fiierul %s" +msgstr "Nu pot salva fișierul %s" #. MSG_DefaultDirectionChg -#: po/tmp/ap_String_Id.h.h:2507 +#: po/tmp/ap_String_Id.h.h:2538 msgid "You have changed the default direction." -msgstr "Ai schimbat direcia predefinit" +msgstr "Ați schimbat direcția implicită" #. MSG_DirectionModeChg -#: po/tmp/ap_String_Id.h.h:2509 +#: po/tmp/ap_String_Id.h.h:2540 msgid "You have changed the direction mode." -msgstr "Ai schimbat direcia" +msgstr "Ați schimbat direcția" #. MSG_HyperlinkNoSelection -#: po/tmp/ap_String_Id.h.h:2511 +#: po/tmp/ap_String_Id.h.h:2542 msgid "You must select a portion of the document before inserting a hyperlink." -msgstr "" -"Trebuie s selectai o poriune din document nainte s inserai o " -"hiperlegatur" +msgstr "Trebuie să selectați o porțiune de text înainte de a insera o legătură web" #. DLG_Options_Label_InvalidRangeForAutoSave -#: po/tmp/ap_String_Id.h.h:2513 +#: po/tmp/ap_String_Id.h.h:2544 msgid "You should choose a range from 1 to 120 for the auto save frequency" -msgstr "" +msgstr "Vă rog să alegeți un număr între 1 și 120 ca perioadă de salvare automată" #. MSG_ConfirmSaveSecondary -#: po/tmp/ap_String_Id.h.h:2515 +#: po/tmp/ap_String_Id.h.h:2546 msgid "Your changes will be lost if you don't save them." -msgstr "" +msgstr "Modificările vor fi pierdute dacă nu sunt salvate" #. TOOLBAR_LABEL_ZOOM #. TOOLBAR_STATUSLINE_ZOOM #. TOOLBAR_TOOLTIP_ZOOM #. DLG_Zoom_ZoomTitle -#: po/tmp/ap_String_Id.h.h:2519 po/tmp/xap_String_Id.h.h:839 +#: po/tmp/ap_String_Id.h.h:2550 po/tmp/xap_String_Id.h.h:882 msgid "Zoom" -msgstr "" +msgstr "Zoom" #. MENU_LABEL_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2521 +#: po/tmp/ap_String_Id.h.h:2552 msgid "Zoom to &100%" msgstr "Zoom la &100%" #. MENU_LABEL_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2523 +#: po/tmp/ap_String_Id.h.h:2554 msgid "Zoom to &200%" msgstr "Zoom la &200%" #. MENU_LABEL_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2525 +#: po/tmp/ap_String_Id.h.h:2556 msgid "Zoom to &50%" msgstr "Zoom la &50%" #. MENU_LABEL_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2527 +#: po/tmp/ap_String_Id.h.h:2558 msgid "Zoom to &75%" msgstr "Zoom la &75%" #. MENU_STATUSLINE_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2529 +#: po/tmp/ap_String_Id.h.h:2560 msgid "Zoom to 100%" msgstr "Zoom la 100%" #. MENU_STATUSLINE_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2531 +#: po/tmp/ap_String_Id.h.h:2562 msgid "Zoom to 200%" msgstr "Zoom la 200%" #. MENU_STATUSLINE_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2533 +#: po/tmp/ap_String_Id.h.h:2564 msgid "Zoom to 50%" msgstr "Zoom la 50%" #. MENU_STATUSLINE_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2535 +#: po/tmp/ap_String_Id.h.h:2566 msgid "Zoom to 75%" msgstr "Zoom la 75%" #. MENU_STATUSLINE_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:2537 +#: po/tmp/ap_String_Id.h.h:2568 msgid "Zoom to page width" -msgstr "Zoom la ntreaga pagin" +msgstr "Zoom la întreaga pagină" #. MENU_STATUSLINE_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:2539 +#: po/tmp/ap_String_Id.h.h:2570 msgid "Zoom to whole page" -msgstr "Zoom la limea paginii" +msgstr "Zoom la lățimea paginii" #. DLG_Options_Label_CustomDict -#: po/tmp/ap_String_Id.h.h:2541 +#: po/tmp/ap_String_Id.h.h:2572 msgid "custom.dic" msgstr "custom.dic" #. FIELD_DateTime_DDMMYY -#: po/tmp/ap_String_Id.h.h:2543 +#: po/tmp/ap_String_Id.h.h:2574 msgid "dd/mm/yy" msgstr "zz/ll/aa" #. DLG_ToggleCase_LowerCase -#: po/tmp/ap_String_Id.h.h:2545 +#: po/tmp/ap_String_Id.h.h:2576 msgid "lowercase" msgstr "minuscule" #. DLG_Options_Label_Minutes -#: po/tmp/ap_String_Id.h.h:2547 +#: po/tmp/ap_String_Id.h.h:2578 msgid "minutes" msgstr "minute" #. FIELD_DateTime_MMDDYY -#: po/tmp/ap_String_Id.h.h:2549 +#: po/tmp/ap_String_Id.h.h:2580 msgid "mm/dd/yy" msgstr "ll/zz/aa" #. DLG_ToggleCase_ToggleCase -#: po/tmp/ap_String_Id.h.h:2551 +#: po/tmp/ap_String_Id.h.h:2582 msgid "tOGGLE cASE" -msgstr "iNVERSEZ mAJUSCULE cU mINUSCULE" +msgstr "iNVERSEZĂ mAJUSCULE cU mINUSCULE" #. #. * Translatable strings file generated by extract-ui. @@ -6217,17 +6269,17 @@ #. DLG_Zoom_PageWidth #: po/tmp/xap_String_Id.h.h:17 msgid "&Page width" -msgstr "Lrgimea paginii" +msgstr "Lărgimea paginii" #. DLG_ULANG_SetLangButton #: po/tmp/xap_String_Id.h.h:19 msgid "&Set Language" -msgstr "" +msgstr "&Selecție limbă" #. DLG_Zoom_WholePage #: po/tmp/xap_String_Id.h.h:23 msgid "&Whole page" -msgstr "ntreaga pagin" +msgstr "Întreaga pagină" #. LANG_0 #: po/tmp/xap_String_Id.h.h:25 @@ -6237,17 +6289,17 @@ #. DLG_DocComparison_TestSkipped #: po/tmp/xap_String_Id.h.h:27 msgid "(test skipped)" -msgstr "" +msgstr "(test sărit)" #. DLG_NoSaveFile_DirNotExist #: po/tmp/xap_String_Id.h.h:29 msgid "A directory in the given pathname does not exist." -msgstr "Un director aflat n cale nu exist." +msgstr "Un director aflat în cale nu există." #. DLG_PLUGIN_MANAGER_TITLE #: po/tmp/xap_String_Id.h.h:31 msgid "AbiWord Plugin Manager" -msgstr "Gestionai modulele Abiword" +msgstr "Gestionați modulele Abiword" #. SPELL_CANTLOAD_DLL #: po/tmp/xap_String_Id.h.h:33 @@ -6255,7 +6307,8 @@ msgid "" "AbiWord cannot find the spelling file %s.dll\n" "Please download and install Aspell from http://aspell.net/win32/" -msgstr "" +msgstr "AbiWord nu poate să găsească fișierul de corectare ortografică %s.dll\n" +"Vă rugăm să descărcați și instalați Aspell de la http://aspell.net/win32/" #. MSG_HistoryPartRestore1 #: po/tmp/xap_String_Id.h.h:35 @@ -6263,7 +6316,8 @@ msgid "" "AbiWord cannot fully restore version %d of the document because the version " "information is incomplete." -msgstr "" +msgstr "AbiWord nu poate să restaureze complet versiunea %d a documentului deoarece " +"informația este incompletă" #. MSG_HistoryNoRestore #: po/tmp/xap_String_Id.h.h:37 @@ -6271,12 +6325,13 @@ msgid "" "AbiWord cannot restore version %d of the document because the version " "information is missing." -msgstr "" +msgstr "AbiWord nu poate să restaureze versiunea %d a documentului deoarece " +"informația este incompletă" #. DLG_UP_PrintPreviewTitle #: po/tmp/xap_String_Id.h.h:39 msgid "AbiWord: Print Preview" -msgstr "AbiWord: Previzualizare printare" +msgstr "AbiWord: Previzualizare tipărire" #. DLG_ABOUT_Title #: po/tmp/xap_String_Id.h.h:41 @@ -6292,23 +6347,22 @@ #. LANG_AF_ZA #: po/tmp/xap_String_Id.h.h:45 msgid "Afrikaans" -msgstr "African" +msgstr "Africană" #. LANG_AK_GH #: po/tmp/xap_String_Id.h.h:47 -#, fuzzy msgid "Akan" -msgstr "African" +msgstr "Akan" #. LANG_SQ_AL #: po/tmp/xap_String_Id.h.h:49 msgid "Albanian" -msgstr "" +msgstr "Albaneză" #. DLG_FOSA_ALL #: po/tmp/xap_String_Id.h.h:53 msgid "All (*.*)" -msgstr "Toate fiierele de imagine" +msgstr "Toate fișierele de imagine" #. DLG_FOSA_ALLDOCS #: po/tmp/xap_String_Id.h.h:55 @@ -6318,1816 +6372,1933 @@ #. DLG_FOSA_ALLIMAGES #: po/tmp/xap_String_Id.h.h:57 msgid "All Image Files" -msgstr "Toate fiierele de imagine" +msgstr "Toate fișierele de imagine" #. DLG_HTMLOPT_ExpAllowAWML #: po/tmp/xap_String_Id.h.h:59 msgid "Allow extra markup in AWML namespace" -msgstr "" +msgstr "Permite markup suplimentar în spațiul de nume AWML" #. LANG_AM_ET #: po/tmp/xap_String_Id.h.h:61 msgid "Amharic (Ethiopia)" -msgstr "" +msgstr "Etiopiană" -#. LANG_AR_EG +#. LANG_AR #: po/tmp/xap_String_Id.h.h:65 +msgid "Arabic" +msgstr "Arabă" + +#. LANG_AR_EG +#: po/tmp/xap_String_Id.h.h:67 msgid "Arabic (Egypt)" -msgstr "Arab (Egipt)" +msgstr "Arabă (Egipt)" #. LANG_AR_SA -#: po/tmp/xap_String_Id.h.h:67 +#: po/tmp/xap_String_Id.h.h:69 msgid "Arabic (Saudi Arabia)" -msgstr "Arab (Arabia Saudit)" +msgstr "Arabă (Arabia Saudită)" #. ENC_ARAB_ISO -#: po/tmp/xap_String_Id.h.h:69 +#: po/tmp/xap_String_Id.h.h:71 msgid "Arabic, ISO-8859-6" -msgstr "Arab, ISO-8859-6" +msgstr "Arabă, ISO-8859-6" #. ENC_ARAB_MAC -#: po/tmp/xap_String_Id.h.h:71 +#: po/tmp/xap_String_Id.h.h:73 msgid "Arabic, Macintosh" -msgstr "Arab, Macintosh" +msgstr "Arabă, Macintosh" #. ENC_ARAB_WIN -#: po/tmp/xap_String_Id.h.h:73 +#: po/tmp/xap_String_Id.h.h:75 msgid "Arabic, Windows Code Page 1256" -msgstr "Arab, codurile Windows 1256" +msgstr "Arabă, Windows Code Page 1256" #. LANG_HY_AM -#: po/tmp/xap_String_Id.h.h:75 +#: po/tmp/xap_String_Id.h.h:77 msgid "Armenian" -msgstr "Armean" +msgstr "Armeană" #. ENC_ARME_ARMSCII -#: po/tmp/xap_String_Id.h.h:77 +#: po/tmp/xap_String_Id.h.h:79 msgid "Armenian, ARMSCII-8" -msgstr "Armen, ARMSCII-8" +msgstr "Armenă, ARMSCII-8" #. LANG_AS_IN -#: po/tmp/xap_String_Id.h.h:79 +#: po/tmp/xap_String_Id.h.h:81 msgid "Assamese" -msgstr "Asamez" +msgstr "Asameză" #. LANG_AST_ES -#: po/tmp/xap_String_Id.h.h:81 +#: po/tmp/xap_String_Id.h.h:83 msgid "Asturian (Spain)" -msgstr "" +msgstr "Asturiană (Spania)" #. DLG_Options_Label_DirMarkerAfterClosingParenthesis -#: po/tmp/xap_String_Id.h.h:85 +#: po/tmp/xap_String_Id.h.h:87 msgid "Auto-insert direction markers" -msgstr "" +msgstr "Inserare automată a markerilor de direcție" #. DLG_History_Version_AutoRevisioned -#: po/tmp/xap_String_Id.h.h:87 +#: po/tmp/xap_String_Id.h.h:89 msgid "Auto-revision" -msgstr "" +msgstr "Revizie automată" #. DLG_FOSA_FileTypeAutoDetect -#: po/tmp/xap_String_Id.h.h:89 +#: po/tmp/xap_String_Id.h.h:91 msgid "Automatically Detected" -msgstr "Dup extensie" +msgstr "După extensie" #. MSG_AutoRevision -#: po/tmp/xap_String_Id.h.h:91 +#: po/tmp/xap_String_Id.h.h:93 msgid "Autorevision" -msgstr "" +msgstr "Revizie automată" #. DLG_MW_AvailableDocuments -#: po/tmp/xap_String_Id.h.h:93 +#: po/tmp/xap_String_Id.h.h:95 msgid "Available Documents" -msgstr "" +msgstr "Documente disponibile" #. DLG_ULANG_AvailableLanguages -#: po/tmp/xap_String_Id.h.h:95 +#: po/tmp/xap_String_Id.h.h:97 msgid "Available Languages" -msgstr "" +msgstr "Limbi disponibile" + +#. LANG_AYM_BO +#: po/tmp/xap_String_Id.h.h:99 +msgid "Aymara (La Paz)" +msgstr "Aymara (La Paz)" + +#. LANG_AYC_BO +#: po/tmp/xap_String_Id.h.h:101 +msgid "Aymara (Oruro)" +msgstr "Aymara (Oruro)" #. ENC_BALT_ISO -#: po/tmp/xap_String_Id.h.h:97 +#: po/tmp/xap_String_Id.h.h:103 msgid "Baltic, ISO-8859-4" -msgstr "Baltic, ISO-8859-4" +msgstr "Baltică, ISO-8859-4" #. ENC_BALT_WIN -#: po/tmp/xap_String_Id.h.h:99 +#: po/tmp/xap_String_Id.h.h:105 msgid "Baltic, Windows Code Page 1257" -msgstr "Baltic, codurile Windows 1257" +msgstr "Baltică, Windows Code Page 1257" #. LANG_EU_ES -#: po/tmp/xap_String_Id.h.h:101 +#: po/tmp/xap_String_Id.h.h:107 msgid "Basque" -msgstr "Basc" +msgstr "Bască" #. LANG_BE_BY -#: po/tmp/xap_String_Id.h.h:103 +#: po/tmp/xap_String_Id.h.h:109 msgid "Belarusian" -msgstr "Bielorus" +msgstr "Bielorusă" + +#. LANG_BE_LATIN +#: po/tmp/xap_String_Id.h.h:111 +msgid "Belarusian, Latin" +msgstr "Bielorusă, Latină" #. LANG_BN_IN -#: po/tmp/xap_String_Id.h.h:105 +#: po/tmp/xap_String_Id.h.h:113 msgid "Bengali" -msgstr "" +msgstr "Bengalie" #. DLG_UP_BlackWhite -#: po/tmp/xap_String_Id.h.h:107 +#: po/tmp/xap_String_Id.h.h:115 msgid "Black & White" -msgstr "Alb i negru" +msgstr "Alb și negru" #. STYLE_BLOCKTEXT -#: po/tmp/xap_String_Id.h.h:109 +#: po/tmp/xap_String_Id.h.h:117 msgid "Block Text" msgstr "Text compact" #. DLG_UFS_StyleBoldItalic -#: po/tmp/xap_String_Id.h.h:113 +#: po/tmp/xap_String_Id.h.h:121 msgid "Bold Italic" -msgstr "Aldin italic" +msgstr "Înclinat-îngroșat" #. LANG_BR_FR -#: po/tmp/xap_String_Id.h.h:119 +#: po/tmp/xap_String_Id.h.h:127 msgid "Breton" -msgstr "" +msgstr "Bretonă" #. MSG_BuildingDoc -#: po/tmp/xap_String_Id.h.h:121 +#: po/tmp/xap_String_Id.h.h:129 msgid "Building Document:" msgstr "Construiesc documentul..." #. LANG_BG_BG -#: po/tmp/xap_String_Id.h.h:123 +#: po/tmp/xap_String_Id.h.h:131 msgid "Bulgarian" -msgstr "Bulgar" +msgstr "Bulgară" #. DLG_Cancel -#: po/tmp/xap_String_Id.h.h:127 +#: po/tmp/xap_String_Id.h.h:135 msgid "Cancel" -msgstr "Renun" +msgstr "Renunță" #. LANG_CA_ES -#: po/tmp/xap_String_Id.h.h:129 +#: po/tmp/xap_String_Id.h.h:137 msgid "Catalan" -msgstr "Catalan" +msgstr "Catalană" + +#. LANG_AYR +#: po/tmp/xap_String_Id.h.h:139 +msgid "Central Aymara" +msgstr "Aymara centrală" #. ENC_CENT_ISO -#: po/tmp/xap_String_Id.h.h:131 +#: po/tmp/xap_String_Id.h.h:141 msgid "Central European, ISO-8859-2" msgstr "Europa de est, ISO-8859-2" #. ENC_CENT_MAC -#: po/tmp/xap_String_Id.h.h:133 +#: po/tmp/xap_String_Id.h.h:143 msgid "Central European, Macintosh" msgstr "Europa de est, Macintosh" #. ENC_CENT_WIN -#: po/tmp/xap_String_Id.h.h:135 +#: po/tmp/xap_String_Id.h.h:145 msgid "Central European, Windows Code Page 1250" -msgstr "Europa de est, codurile Windows 1250" +msgstr "Europa de est, Windows 1250" #. DLG_Options_Label_LangWithKeyboard -#: po/tmp/xap_String_Id.h.h:137 +#: po/tmp/xap_String_Id.h.h:147 msgid "Change Language when changing keyboard" -msgstr "" +msgstr "Schimbă limba când schimbi tastatura" #. STYLE_CHAPHEADING -#: po/tmp/xap_String_Id.h.h:139 +#: po/tmp/xap_String_Id.h.h:149 msgid "Chapter Heading" -msgstr "Antet capitol" +msgstr "Titlu capitol" #. LANG_ZH_HK -#: po/tmp/xap_String_Id.h.h:141 +#: po/tmp/xap_String_Id.h.h:151 msgid "Chinese (Hong Kong)" -msgstr "Chinez (Hong Kong)" +msgstr "Chineză (Hong Kong)" #. LANG_ZH_CN -#: po/tmp/xap_String_Id.h.h:143 +#: po/tmp/xap_String_Id.h.h:153 msgid "Chinese (PRC)" -msgstr "Chinez (RPC)" +msgstr "Chineză (China)" #. LANG_ZH_SG -#: po/tmp/xap_String_Id.h.h:145 +#: po/tmp/xap_String_Id.h.h:155 msgid "Chinese (Singapore)" -msgstr "Chinez (Singapore)" +msgstr "Chineză (Singapore)" #. LANG_ZH_TW -#: po/tmp/xap_String_Id.h.h:147 +#: po/tmp/xap_String_Id.h.h:157 msgid "Chinese (Taiwan)" -msgstr "Chinez (Taiwan)" +msgstr "Chineză (Taiwan)" #. ENC_CHSI_EUC -#: po/tmp/xap_String_Id.h.h:149 +#: po/tmp/xap_String_Id.h.h:159 msgid "Chinese Simplified, EUC-CN (GB2312)" -msgstr "Chinez simplificat, EUC-CN" +msgstr "Chineză simplificată, EUC-CN (GB2312)" #. ENC_CHSI_GB -#: po/tmp/xap_String_Id.h.h:151 +#: po/tmp/xap_String_Id.h.h:161 msgid "Chinese Simplified, GB_2312-80" -msgstr "Chinez simplificat, GB_2312-80" +msgstr "Chineză simplificată, GB_2312-80" #. ENC_CHSI_HZ -#: po/tmp/xap_String_Id.h.h:153 +#: po/tmp/xap_String_Id.h.h:163 msgid "Chinese Simplified, HZ" -msgstr "Chinez simplificat, HZ" +msgstr "Chineză simplificată, HZ" #. ENC_CHSI_WIN -#: po/tmp/xap_String_Id.h.h:155 +#: po/tmp/xap_String_Id.h.h:165 msgid "Chinese Simplified, Windows Code Page 936" -msgstr "Chinez simplificat, codurile Windows 936" +msgstr "Chineză simplificată, Windows 936" #. ENC_CHTR_BIG5 -#: po/tmp/xap_String_Id.h.h:157 +#: po/tmp/xap_String_Id.h.h:167 msgid "Chinese Traditional, BIG5" -msgstr "Chinez tradiional, BIG5" +msgstr "Chineză tradițională, BIG5" #. ENC_CHTR_BIG5HKSCS -#: po/tmp/xap_String_Id.h.h:159 +#: po/tmp/xap_String_Id.h.h:169 msgid "Chinese Traditional, BIG5-HKSCS" -msgstr "Chinez tradiional, BIG5-HKSCS" +msgstr "Chineză tradițională, BIG5-HKSCS" #. ENC_CHTR_EUC -#: po/tmp/xap_String_Id.h.h:161 +#: po/tmp/xap_String_Id.h.h:171 msgid "Chinese Traditional, EUC-TW" -msgstr "Chinez tradiional, EUC-TW" +msgstr "Chineză tradițională, EUC-TW" #. ENC_CHTR_WIN -#: po/tmp/xap_String_Id.h.h:163 +#: po/tmp/xap_String_Id.h.h:173 msgid "Chinese Traditional, Windows Code Page 950" -msgstr "Chinez tradiional, codurile Windows 950" +msgstr "Chineză tradițională, Windows 950" #. DLG_LISTDOCS_Heading1 -#: po/tmp/xap_String_Id.h.h:165 +#: po/tmp/xap_String_Id.h.h:175 msgid "Choose document from the list:" -msgstr "" +msgstr "Alege documentul din listă" + +#. TB_ClearBackground +#: po/tmp/xap_String_Id.h.h:177 +msgid "Clear Background" +msgstr "Anulează culoarea de fundal" #. DLG_CLIPART_Title -#: po/tmp/xap_String_Id.h.h:167 +#: po/tmp/xap_String_Id.h.h:179 msgid "Clip Art" msgstr "Clip Art" +#. DLG_CLIPART_Error +#: po/tmp/xap_String_Id.h.h:181 +msgid "Clip Art could not be loaded" +msgstr "Clip Art să nu fie încărcată" + #. DLG_Close -#: po/tmp/xap_String_Id.h.h:169 +#: po/tmp/xap_String_Id.h.h:183 msgid "Close" -msgstr "nchide" +msgstr "Închide" #. DLG_Exit_CloseWithoutSaving -#: po/tmp/xap_String_Id.h.h:171 +#: po/tmp/xap_String_Id.h.h:185 msgid "Close &Without Saving" -msgstr "" +msgstr "&Ieși fără a salva" #. DLG_UP_Collate -#: po/tmp/xap_String_Id.h.h:173 +#: po/tmp/xap_String_Id.h.h:187 msgid "Collate" msgstr "Colaje" #. DLG_UP_Color -#: po/tmp/xap_String_Id.h.h:175 +#: po/tmp/xap_String_Id.h.h:189 msgid "Color" -msgstr "Color" +msgstr "Culoare" #. DLG_Compare -#: po/tmp/xap_String_Id.h.h:179 +#: po/tmp/xap_String_Id.h.h:193 msgid "Compare" -msgstr "" +msgstr "Compară" #. DLG_DocComparison_Content -#: po/tmp/xap_String_Id.h.h:181 +#: po/tmp/xap_String_Id.h.h:195 msgid "Content:" -msgstr "" +msgstr "Conținut:" #. STYLE_TOCHEADING1 -#: po/tmp/xap_String_Id.h.h:183 +#: po/tmp/xap_String_Id.h.h:197 msgid "Contents 1" -msgstr "" +msgstr "Cuprins 1" #. STYLE_TOCHEADING2 -#: po/tmp/xap_String_Id.h.h:185 +#: po/tmp/xap_String_Id.h.h:199 msgid "Contents 2" -msgstr "" +msgstr "Cuprins 2" #. STYLE_TOCHEADING3 -#: po/tmp/xap_String_Id.h.h:187 +#: po/tmp/xap_String_Id.h.h:201 msgid "Contents 3" -msgstr "" +msgstr "Cuprins 3" #. STYLE_TOCHEADING4 -#: po/tmp/xap_String_Id.h.h:189 +#: po/tmp/xap_String_Id.h.h:203 msgid "Contents 4" -msgstr "" +msgstr "Cuprins 4" #. STYLE_TOCHEADING -#: po/tmp/xap_String_Id.h.h:191 +#: po/tmp/xap_String_Id.h.h:205 msgid "Contents Header" -msgstr "" +msgstr "Antet cuprins" #. DLG_UP_Copies -#: po/tmp/xap_String_Id.h.h:193 +#: po/tmp/xap_String_Id.h.h:207 msgid "Copies: " -msgstr "Numr copii: " +msgstr "Număr copii: " + +#. LANG_COP_EG +#: po/tmp/xap_String_Id.h.h:209 +msgid "Coptic" +msgstr "Coptică" #. LANG_KW_GB -#: po/tmp/xap_String_Id.h.h:195 +#: po/tmp/xap_String_Id.h.h:211 msgid "Cornish" -msgstr "" +msgstr "Cornișă" #. LANG_CO_FR -#: po/tmp/xap_String_Id.h.h:197 +#: po/tmp/xap_String_Id.h.h:213 msgid "Corsican" -msgstr "" +msgstr "Corsicană" #. DLG_PLUGIN_MANAGER_COULDNT_LOAD -#: po/tmp/xap_String_Id.h.h:199 +#: po/tmp/xap_String_Id.h.h:215 msgid "Could not activate/load plugin" -msgstr "Nu am putut activa/ncrca modulul" +msgstr "Nu am putut activa/încărca modulul" #. DLG_PLUGIN_MANAGER_COULDNT_UNLOAD -#: po/tmp/xap_String_Id.h.h:201 +#: po/tmp/xap_String_Id.h.h:217 msgid "Could not deactivate plugin" msgstr "Nu am putut dezactiva modulul" #. SPELL_CANTLOAD_DICT -#: po/tmp/xap_String_Id.h.h:203 +#: po/tmp/xap_String_Id.h.h:219 #, c-format msgid "Could not load the dictionary for the %s language" -msgstr "Nu am putut ncrca dicionarul pentru limba %s" +msgstr "Nu am putut încărca dicționarul pentru limba %s" #. DLG_History_Version_Started -#: po/tmp/xap_String_Id.h.h:205 +#: po/tmp/xap_String_Id.h.h:221 msgid "Created" -msgstr "" +msgstr "Creat" #. DLG_History_Created -#: po/tmp/xap_String_Id.h.h:207 +#: po/tmp/xap_String_Id.h.h:223 msgid "Created:" -msgstr "" +msgstr "Creat:" -#. LANG_HR -#: po/tmp/xap_String_Id.h.h:209 +#. LANG_HR_HR +#: po/tmp/xap_String_Id.h.h:225 msgid "Croatian" -msgstr "" +msgstr "Croată" #. ENC_CROA_MAC -#: po/tmp/xap_String_Id.h.h:211 +#: po/tmp/xap_String_Id.h.h:227 msgid "Croatian, Macintosh" -msgstr "Croat, Macintosh" +msgstr "Croată, Macintosh" #. ENC_CYRL_ISO -#: po/tmp/xap_String_Id.h.h:213 +#: po/tmp/xap_String_Id.h.h:229 msgid "Cyrillic, ISO-8859-5" -msgstr "Chirilic, ISO-8859-5" +msgstr "Chirilică, ISO-8859-5" #. ENC_CYRL_KOI -#: po/tmp/xap_String_Id.h.h:215 +#: po/tmp/xap_String_Id.h.h:231 msgid "Cyrillic, KOI8-R" -msgstr "Chirilic, KOI8-R" +msgstr "Chirilică, KOI8-R" #. ENC_CYRL_MAC -#: po/tmp/xap_String_Id.h.h:217 +#: po/tmp/xap_String_Id.h.h:233 msgid "Cyrillic, Macintosh" -msgstr "Chirilic, Macintosh" +msgstr "Chirilică, Macintosh" #. ENC_CYRL_WIN -#: po/tmp/xap_String_Id.h.h:219 +#: po/tmp/xap_String_Id.h.h:235 msgid "Cyrillic, Windows Code Page 1251" -msgstr "Chirilic, codurile Windows 1251" +msgstr "Chirilică, Windows 1251" #. LANG_CS_CZ -#: po/tmp/xap_String_Id.h.h:221 +#: po/tmp/xap_String_Id.h.h:237 msgid "Czech" -msgstr "Ceh" +msgstr "Cehă" #. LANG_DA_DK -#: po/tmp/xap_String_Id.h.h:223 +#: po/tmp/xap_String_Id.h.h:239 msgid "Danish" -msgstr "Danez" +msgstr "Daneză" #. DLG_PLUGIN_MANAGER_DEACTIVATE_ALL -#: po/tmp/xap_String_Id.h.h:227 +#: po/tmp/xap_String_Id.h.h:243 msgid "Deactivate all plugins" -msgstr "Dezactivai toate modulele" +msgstr "Dezactivați toate modulele" #. DLG_PLUGIN_MANAGER_DEACTIVATE -#: po/tmp/xap_String_Id.h.h:229 +#: po/tmp/xap_String_Id.h.h:245 msgid "Deactivate plugin" -msgstr "Dezactivai un modul" +msgstr "Dezactivați un modul" #. DLG_HTMLOPT_ExpDeclareXML -#: po/tmp/xap_String_Id.h.h:231 +#: po/tmp/xap_String_Id.h.h:247 msgid "Declare as XML (version 1.0)" -msgstr "" +msgstr "Declarare ca XML (versiunea 1.0)" #. DLG_ULANG_DefaultLangLabel -#: po/tmp/xap_String_Id.h.h:233 +#: po/tmp/xap_String_Id.h.h:249 msgid "Default language: " -msgstr "" +msgstr "Limba implicită: " #. DLG_Image_Placement -#: po/tmp/xap_String_Id.h.h:235 +#: po/tmp/xap_String_Id.h.h:251 msgid "Define Image Placement" -msgstr "" +msgstr "Definiți plasarea imaginii" #. DLG_Image_TextWrapping -#: po/tmp/xap_String_Id.h.h:237 +#: po/tmp/xap_String_Id.h.h:253 msgid "Define Text Wrapping" -msgstr "" +msgstr "Definește împachetarea de text (wrapping)" #. DLG_Remove_Icon -#: po/tmp/xap_String_Id.h.h:246 +#: po/tmp/xap_String_Id.h.h:262 msgid "Do you want to remove this icon from the toolbar?" -msgstr "Dorii s tergei aceast iconia din bara de instrumente?" +msgstr "Doriți să ștergeți această iconița din bara de unelte?" #. DLG_DocComparison_WindowLabel -#: po/tmp/xap_String_Id.h.h:248 +#: po/tmp/xap_String_Id.h.h:264 msgid "Document Comparison" -msgstr "" +msgstr "Comparație de documente" #. DLG_History_DocumentDetails -#: po/tmp/xap_String_Id.h.h:250 +#: po/tmp/xap_String_Id.h.h:266 msgid "Document Details" -msgstr "" +msgstr "Detaliile documentului" #. DLG_History_WindowLabel -#: po/tmp/xap_String_Id.h.h:252 +#: po/tmp/xap_String_Id.h.h:268 msgid "Document History" -msgstr "" +msgstr "Istoria documentului" #. DLG_History_Path -#: po/tmp/xap_String_Id.h.h:254 +#: po/tmp/xap_String_Id.h.h:270 msgid "Document name:" -msgstr "" +msgstr "Nume:" #. DLG_DocComparison_DocsCompared -#: po/tmp/xap_String_Id.h.h:256 +#: po/tmp/xap_String_Id.h.h:272 msgid "Documents compared" -msgstr "" +msgstr "Documente comparate" #. LANG_NL_NL -#: po/tmp/xap_String_Id.h.h:258 +#: po/tmp/xap_String_Id.h.h:274 msgid "Dutch (Netherlands)" -msgstr "Olandez (Olanda)" +msgstr "Olandeză (Olanda)" #. DLG_History_EditTime -#: po/tmp/xap_String_Id.h.h:260 +#: po/tmp/xap_String_Id.h.h:276 msgid "Editing time:" -msgstr "" +msgstr "Editarea timpului:" #. DLG_UFS_EffectsFrameLabel -#: po/tmp/xap_String_Id.h.h:262 +#: po/tmp/xap_String_Id.h.h:278 msgid "Effects" msgstr "Efect" #. DLG_HTMLOPT_ExpEmbedCSS -#: po/tmp/xap_String_Id.h.h:264 +#: po/tmp/xap_String_Id.h.h:280 msgid "Embed (CSS) style sheet" -msgstr "" +msgstr "Include CSS style sheet" #. DLG_UP_EmbedFonts -#: po/tmp/xap_String_Id.h.h:266 +#: po/tmp/xap_String_Id.h.h:282 msgid "Embed Fonts" -msgstr "Alegei fonturile" +msgstr "Alegeți fonturile" #. DLG_HTMLOPT_ExpEmbedImages -#: po/tmp/xap_String_Id.h.h:268 +#: po/tmp/xap_String_Id.h.h:284 msgid "Embed images in URLs (Base64-encoded)" -msgstr "" +msgstr "Introdu imagini în URL-uri (Base64-encoding)" #. DLG_UENC_EncTitle -#: po/tmp/xap_String_Id.h.h:270 +#: po/tmp/xap_String_Id.h.h:286 msgid "Encoding" msgstr "Codarea" #. DLG_UFS_EncodingLabel -#: po/tmp/xap_String_Id.h.h:272 +#: po/tmp/xap_String_Id.h.h:288 msgid "Encoding:" msgstr "Codul:" #. STYLE_ENDREFERENCE -#: po/tmp/xap_String_Id.h.h:274 +#: po/tmp/xap_String_Id.h.h:290 msgid "Endnote Reference" -msgstr "Referine de final" +msgstr "Referință notă de sfârșit" #. STYLE_ENDTEXT -#: po/tmp/xap_String_Id.h.h:276 +#: po/tmp/xap_String_Id.h.h:292 msgid "Endnote Text" -msgstr "Text de final" +msgstr "Text notă de sfârșit" #. LANG_EN_AU -#: po/tmp/xap_String_Id.h.h:278 +#: po/tmp/xap_String_Id.h.h:294 msgid "English (Australia)" -msgstr "Englez (Australia)" +msgstr "Engleză (Australia)" #. LANG_EN_CA -#: po/tmp/xap_String_Id.h.h:280 +#: po/tmp/xap_String_Id.h.h:296 msgid "English (Canada)" -msgstr "Englez (Canada)" +msgstr "Engleză (Canada)" #. LANG_EN_IE -#: po/tmp/xap_String_Id.h.h:282 +#: po/tmp/xap_String_Id.h.h:298 msgid "English (Ireland)" -msgstr "Englez (Irlanda)" +msgstr "Engleză (Irlanda)" #. LANG_EN_NZ -#: po/tmp/xap_String_Id.h.h:284 +#: po/tmp/xap_String_Id.h.h:300 msgid "English (New Zealand)" -msgstr "Englez (Noua Zeeland)" +msgstr "Engleză (Noua Zeelandă)" #. LANG_EN_ZA -#: po/tmp/xap_String_Id.h.h:286 +#: po/tmp/xap_String_Id.h.h:302 msgid "English (South Africa)" -msgstr "Englez (Africa de Sud)" +msgstr "Engleză (Africa de Sud)" #. LANG_EN_GB -#: po/tmp/xap_String_Id.h.h:288 +#: po/tmp/xap_String_Id.h.h:304 msgid "English (UK)" -msgstr "Englez (Anglia)" +msgstr "Engleză (Anglia)" #. LANG_EN_US -#: po/tmp/xap_String_Id.h.h:290 +#: po/tmp/xap_String_Id.h.h:306 msgid "English (US)" -msgstr "Englez (SUA)" +msgstr "Engleză (SUA)" #. DLG_Password_Title -#: po/tmp/xap_String_Id.h.h:292 +#: po/tmp/xap_String_Id.h.h:308 msgid "Enter Password" -msgstr "Introducei parola" +msgstr "Introduceți parola" #. LANG_EO -#: po/tmp/xap_String_Id.h.h:294 +#: po/tmp/xap_String_Id.h.h:310 msgid "Esperanto" msgstr "Esperanto" #. LANG_ET -#: po/tmp/xap_String_Id.h.h:296 +#: po/tmp/xap_String_Id.h.h:312 msgid "Estonian" -msgstr "" +msgstr "Estoniană" #. DLG_FOSA_ExportTitle -#: po/tmp/xap_String_Id.h.h:298 +#: po/tmp/xap_String_Id.h.h:314 msgid "Export File" -msgstr "Salveaz fiierul" +msgstr "Salvează fișierul" #. DLG_HTMLOPT_ExpIs4 -#: po/tmp/xap_String_Id.h.h:300 +#: po/tmp/xap_String_Id.h.h:316 msgid "Export as HTML 4.01" -msgstr "" +msgstr "Exportă ca HTML 4.01" #. DLG_HTMLOPT_ExpAbiWebDoc -#: po/tmp/xap_String_Id.h.h:302 +#: po/tmp/xap_String_Id.h.h:318 msgid "Export with PHP instructions" -msgstr "" +msgstr "Exportă cu instrucțiuni PHP" #. LANG_FA_IR -#: po/tmp/xap_String_Id.h.h:304 +#: po/tmp/xap_String_Id.h.h:320 msgid "Farsi" -msgstr "Persan" +msgstr "Persană" #. DLG_UP_File -#: po/tmp/xap_String_Id.h.h:306 +#: po/tmp/xap_String_Id.h.h:322 msgid "File" -msgstr "Fiier" +msgstr "Fișier" #. DLG_OverwriteFile -#: po/tmp/xap_String_Id.h.h:308 +#: po/tmp/xap_String_Id.h.h:324 #, c-format msgid "File already exists. Overwrite file '%s'?" -msgstr "Fiierul exista. Suprascriu '%s'?" +msgstr "Fișierul există. Suprascriu '%s'?" + +#. DLG_FOSA_RecordToFileLabel +#: po/tmp/xap_String_Id.h.h:326 +msgid "File to record editing:" +msgstr "Fișier să înregistrez comenzile de editarea:" + +#. DLG_FOSA_ReplayFromFileLabel +#: po/tmp/xap_String_Id.h.h:328 +msgid "File to replay editing:" +msgstr "Fișier cu comenzile de editare pe care să le rulez:" #. LANG_FI_FI -#: po/tmp/xap_String_Id.h.h:310 +#: po/tmp/xap_String_Id.h.h:330 msgid "Finnish" -msgstr "Finlandez" +msgstr "Finlandeză" #. LANG_NL_BE -#: po/tmp/xap_String_Id.h.h:312 +#: po/tmp/xap_String_Id.h.h:332 msgid "Flemish (Belgium)" -msgstr "Olandez (Belgia)" +msgstr "Olandeză (Belgia)" #. STYLE_FOOTREFERENCE -#: po/tmp/xap_String_Id.h.h:319 +#: po/tmp/xap_String_Id.h.h:339 msgid "Footnote Reference" -msgstr "" +msgstr "Referință notă de pagină" #. STYLE_FOOTTEXT -#: po/tmp/xap_String_Id.h.h:321 +#: po/tmp/xap_String_Id.h.h:341 msgid "Footnote Text" -msgstr "" +msgstr "Text notă de pagină" #. LANG_FR_BE -#: po/tmp/xap_String_Id.h.h:325 +#: po/tmp/xap_String_Id.h.h:345 msgid "French (Belgium)" -msgstr "Francez (Belgia)" +msgstr "Franceză (Belgia)" #. LANG_FR_CA -#: po/tmp/xap_String_Id.h.h:327 +#: po/tmp/xap_String_Id.h.h:347 msgid "French (Canada)" -msgstr "Francez (Canada)" +msgstr "Franceză (Canada)" #. LANG_FR_FR -#: po/tmp/xap_String_Id.h.h:329 +#: po/tmp/xap_String_Id.h.h:349 msgid "French (France)" -msgstr "Francez (Frana)" +msgstr "Franceză (Franța)" #. LANG_FR_CH -#: po/tmp/xap_String_Id.h.h:331 +#: po/tmp/xap_String_Id.h.h:351 msgid "French (Switzerland)" -msgstr "Francez (Elveia)" +msgstr "Franceză (Elveția)" #. LANG_FY_NL -#: po/tmp/xap_String_Id.h.h:333 +#: po/tmp/xap_String_Id.h.h:353 msgid "Frisian" -msgstr "" +msgstr "Frisan" #. DLG_UP_From -#: po/tmp/xap_String_Id.h.h:335 +#: po/tmp/xap_String_Id.h.h:355 msgid "From: " msgstr "De la: " -#. LANG_GL_ES -#: po/tmp/xap_String_Id.h.h:337 -msgid "Galician" -msgstr "Galiian" +#. LANG_GL +#: po/tmp/xap_String_Id.h.h:357 +msgid "Galician (Galego)" +msgstr "Galițiană" #. LANG_KA_GE -#: po/tmp/xap_String_Id.h.h:339 +#: po/tmp/xap_String_Id.h.h:359 msgid "Georgian" -msgstr "Georgian" +msgstr "Georgiană" #. ENC_GEOR_ACADEMY -#: po/tmp/xap_String_Id.h.h:341 +#: po/tmp/xap_String_Id.h.h:361 msgid "Georgian, Academy" -msgstr "Georgian, Academy" +msgstr "Georgiană, Academy" #. ENC_GEOR_PS -#: po/tmp/xap_String_Id.h.h:343 +#: po/tmp/xap_String_Id.h.h:363 msgid "Georgian, PS" -msgstr "Georgian, PS" +msgstr "Georgiană, PS" #. LANG_DE_AT -#: po/tmp/xap_String_Id.h.h:345 +#: po/tmp/xap_String_Id.h.h:365 msgid "German (Austria)" -msgstr "German (Austria)" +msgstr "Germană (Austria)" #. LANG_DE_DE -#: po/tmp/xap_String_Id.h.h:347 +#: po/tmp/xap_String_Id.h.h:367 msgid "German (Germany)" -msgstr "German (Germania)" +msgstr "Germană (Germania)" #. LANG_DE_CH -#: po/tmp/xap_String_Id.h.h:349 +#: po/tmp/xap_String_Id.h.h:369 msgid "German (Switzerland)" -msgstr "German (Elveia)" +msgstr "Germană (Elveția)" #. DLG_UP_Grayscale -#: po/tmp/xap_String_Id.h.h:351 +#: po/tmp/xap_String_Id.h.h:371 msgid "Grayscale" msgstr "Tonuri de gri" #. LANG_EL_GR -#: po/tmp/xap_String_Id.h.h:353 +#: po/tmp/xap_String_Id.h.h:373 msgid "Greek" -msgstr "Greac" +msgstr "Greacă" #. ENC_GREE_ISO -#: po/tmp/xap_String_Id.h.h:355 +#: po/tmp/xap_String_Id.h.h:375 msgid "Greek, ISO-8859-7" -msgstr "Greac, ISO-8859-7" +msgstr "Greacă, ISO-8859-7" #. ENC_GREE_MAC -#: po/tmp/xap_String_Id.h.h:357 +#: po/tmp/xap_String_Id.h.h:377 msgid "Greek, Macintosh" -msgstr "Greac, Macintosh" +msgstr "Greacă, Macintosh" #. ENC_GREE_WIN -#: po/tmp/xap_String_Id.h.h:359 +#: po/tmp/xap_String_Id.h.h:379 msgid "Greek, Windows Code Page 1253" -msgstr "Greac, codurile Windows 1253" +msgstr "Greacă, Windows 1253" #. DLG_HTMLOPT_ExpTitle -#: po/tmp/xap_String_Id.h.h:361 +#: po/tmp/xap_String_Id.h.h:381 msgid "HTML Export Options" -msgstr "" +msgstr "Opțiuni export HTML" #. LANG_HA_NE -#: po/tmp/xap_String_Id.h.h:365 +#: po/tmp/xap_String_Id.h.h:385 msgid "Hausa (Niger)" -msgstr "" +msgstr "Hausa (Niger)" #. LANG_HA_NG -#: po/tmp/xap_String_Id.h.h:367 +#: po/tmp/xap_String_Id.h.h:387 msgid "Hausa (Nigeria)" -msgstr "" +msgstr "Hausa (Nigeria)" #. LANG_HAW_US -#: po/tmp/xap_String_Id.h.h:369 +#: po/tmp/xap_String_Id.h.h:389 msgid "Hawaiian" -msgstr "" +msgstr "Hawaiană" #. STYLE_HEADING1 -#: po/tmp/xap_String_Id.h.h:371 +#: po/tmp/xap_String_Id.h.h:391 msgid "Heading 1" msgstr "Titlul 1" #. STYLE_HEADING2 -#: po/tmp/xap_String_Id.h.h:373 +#: po/tmp/xap_String_Id.h.h:393 msgid "Heading 2" msgstr "Titlul 2" #. STYLE_HEADING3 -#: po/tmp/xap_String_Id.h.h:375 +#: po/tmp/xap_String_Id.h.h:395 msgid "Heading 3" msgstr "Titlul 3" #. STYLE_HEADING4 -#: po/tmp/xap_String_Id.h.h:377 +#: po/tmp/xap_String_Id.h.h:397 msgid "Heading 4" -msgstr "" +msgstr "Titlul 4" #. LANG_HE_IL -#: po/tmp/xap_String_Id.h.h:381 +#: po/tmp/xap_String_Id.h.h:401 msgid "Hebrew" -msgstr "Ebraic" +msgstr "Ebraică" #. ENC_HEBR_ISO -#: po/tmp/xap_String_Id.h.h:383 +#: po/tmp/xap_String_Id.h.h:403 msgid "Hebrew, ISO-8859-8" -msgstr "Ebraic, ISO-8859-8" +msgstr "Ebraică, ISO-8859-8" #. ENC_HEBR_MAC -#: po/tmp/xap_String_Id.h.h:385 +#: po/tmp/xap_String_Id.h.h:405 msgid "Hebrew, Macintosh" -msgstr "Ebraic, Macintosh" +msgstr "Ebraică, Macintosh" #. ENC_HEBR_WIN -#: po/tmp/xap_String_Id.h.h:387 +#: po/tmp/xap_String_Id.h.h:407 msgid "Hebrew, Windows Code Page 1255" -msgstr "Ebraic, codurile Windows 1255" +msgstr "Ebraică, Windows 1255" #. DLG_Image_Height -#: po/tmp/xap_String_Id.h.h:389 +#: po/tmp/xap_String_Id.h.h:409 msgid "Height:" -msgstr "nlime:" +msgstr "Înălțime:" #. DLG_IP_Height_Label -#: po/tmp/xap_String_Id.h.h:391 +#: po/tmp/xap_String_Id.h.h:411 msgid "Height: " -msgstr "nlime: " +msgstr "Înălțime: " #. DLG_UFS_HiddenCheck -#: po/tmp/xap_String_Id.h.h:393 +#: po/tmp/xap_String_Id.h.h:413 msgid "Hidden" msgstr "Ascuns" #. DLG_UFS_BGColorTab -#: po/tmp/xap_String_Id.h.h:395 +#: po/tmp/xap_String_Id.h.h:415 msgid "HighLight Color" -msgstr "Culoarea de evideniere" +msgstr "Culoarea de evidențiere" #. LANG_HI_IN -#: po/tmp/xap_String_Id.h.h:397 +#: po/tmp/xap_String_Id.h.h:417 msgid "Hindi" -msgstr "Hindus" +msgstr "Hindusă" #. LANG_HU_HU -#: po/tmp/xap_String_Id.h.h:399 +#: po/tmp/xap_String_Id.h.h:419 msgid "Hungarian" -msgstr "Ungar" +msgstr "Ungară" #. LANG_IS_IS -#: po/tmp/xap_String_Id.h.h:401 +#: po/tmp/xap_String_Id.h.h:421 msgid "Icelandic" -msgstr "Islandez" +msgstr "Islandeză" #. ENC_ICEL_MAC -#: po/tmp/xap_String_Id.h.h:403 +#: po/tmp/xap_String_Id.h.h:423 msgid "Icelandic, Macintosh" -msgstr "Irlandez, Macintosh" +msgstr "Irlandeză, Macintosh" #. DLG_History_Id -#: po/tmp/xap_String_Id.h.h:405 +#: po/tmp/xap_String_Id.h.h:425 msgid "Identifier:" -msgstr "" +msgstr "Identificator:" #. DLG_Image_Title -#: po/tmp/xap_String_Id.h.h:407 +#: po/tmp/xap_String_Id.h.h:427 msgid "Image Properties" -msgstr "Proprietile imaginii " +msgstr "Proprietățile imaginii " #. DLG_Image_WrappedNone -#: po/tmp/xap_String_Id.h.h:409 +#: po/tmp/xap_String_Id.h.h:429 msgid "Image floats above text" -msgstr "" +msgstr "Imaginea plutește deasupra textului" #. DLG_Image_InLine -#: po/tmp/xap_String_Id.h.h:411 +#: po/tmp/xap_String_Id.h.h:431 msgid "Image placed in-line (no text wrapping)" -msgstr "" +msgstr "Imaginea este pasată în document (fără împachetare de text)" #. DLG_FOSA_ImportTitle -#: po/tmp/xap_String_Id.h.h:415 +#: po/tmp/xap_String_Id.h.h:435 msgid "Import File" -msgstr "Deschide fiierul" +msgstr "Deschide fișierul" #. MSG_ImportingDoc -#: po/tmp/xap_String_Id.h.h:417 -msgid "Importing Document.." +#: po/tmp/xap_String_Id.h.h:437 +msgid "Importing Document..." msgstr "Import documentul..." #. LANG_ID_ID -#: po/tmp/xap_String_Id.h.h:419 +#: po/tmp/xap_String_Id.h.h:439 msgid "Indonesian" -msgstr "Indonezian" +msgstr "Indoneziană" #. XIM_Methods -#: po/tmp/xap_String_Id.h.h:421 +#: po/tmp/xap_String_Id.h.h:441 msgid "Input Methods" -msgstr "" +msgstr "Metode de intrare" #. DLG_FOSA_InsertObject -#: po/tmp/xap_String_Id.h.h:425 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:445 msgid "Insert Embeddable Object" -msgstr "Inserarai tabel" +msgstr "Inserează obiect embedded" #. DLG_FOSA_FileInsertObject -#: po/tmp/xap_String_Id.h.h:427 +#: po/tmp/xap_String_Id.h.h:447 msgid "Insert Embeddable Object file:" -msgstr "" +msgstr "Inserează fișier obiect embedded" #. DLG_FOSA_InsertTitle -#: po/tmp/xap_String_Id.h.h:429 +#: po/tmp/xap_String_Id.h.h:449 msgid "Insert File" -msgstr "Insereaz fiierul" +msgstr "Inserează fișierul" #. DLG_FOSA_InsertMath -#: po/tmp/xap_String_Id.h.h:431 +#: po/tmp/xap_String_Id.h.h:451 msgid "Insert Math File" -msgstr "" +msgstr "Inserează fișier Math" #. DLG_FOSA_FileInsertMath -#: po/tmp/xap_String_Id.h.h:433 +#: po/tmp/xap_String_Id.h.h:453 msgid "Insert MathML file:" -msgstr "" +msgstr "Inserați fișier MathML:" #. TB_InsertNewTable -#: po/tmp/xap_String_Id.h.h:435 +#: po/tmp/xap_String_Id.h.h:455 msgid "Insert New Table" -msgstr "" +msgstr "Inserează un tabel nou" #. DLG_IP_Title -#: po/tmp/xap_String_Id.h.h:437 +#: po/tmp/xap_String_Id.h.h:457 msgid "Insert Picture" -msgstr "Inserai imagine" +msgstr "Inserează imagine" #. DLG_Insert_SymbolTitle -#: po/tmp/xap_String_Id.h.h:439 +#: po/tmp/xap_String_Id.h.h:459 msgid "Insert Symbol" -msgstr "Inserai simbol" +msgstr "Inserază simbol" #. DLG_PLUGIN_MANAGER_INSTALL -#: po/tmp/xap_String_Id.h.h:441 +#: po/tmp/xap_String_Id.h.h:461 msgid "Install new plugin" -msgstr "Instalai un nou modul" +msgstr "Instalează un modul nou" #. LANG_IA -#: po/tmp/xap_String_Id.h.h:443 +#: po/tmp/xap_String_Id.h.h:463 msgid "Interlingua" msgstr "Interlingua" #. LANG_IU_CA -#: po/tmp/xap_String_Id.h.h:445 +#: po/tmp/xap_String_Id.h.h:465 msgid "Inuktitut" -msgstr "" +msgstr "Inuktitu" #. DLG_InvalidPathname -#: po/tmp/xap_String_Id.h.h:447 +#: po/tmp/xap_String_Id.h.h:467 msgid "Invalid pathname." -msgstr "Calea nu e valid." +msgstr "Calea nu e validă." #. LANG_GA_IE -#: po/tmp/xap_String_Id.h.h:449 +#: po/tmp/xap_String_Id.h.h:469 msgid "Irish" -msgstr "Irlandez" +msgstr "Irlandeză" #. LANG_IT_IT -#: po/tmp/xap_String_Id.h.h:451 +#: po/tmp/xap_String_Id.h.h:471 msgid "Italian (Italy)" -msgstr "Italian (Italia)" +msgstr "Italiană (Italia)" #. LANG_JA_JP -#: po/tmp/xap_String_Id.h.h:455 +#: po/tmp/xap_String_Id.h.h:475 msgid "Japanese" -msgstr "Japonez" +msgstr "Japoneză" #. ENC_JAPN_EUC -#: po/tmp/xap_String_Id.h.h:457 +#: po/tmp/xap_String_Id.h.h:477 msgid "Japanese, EUC-JP" -msgstr "Japonez, EUC-JP" +msgstr "Japoneză, EUC-JP" #. ENC_JAPN_ISO -#: po/tmp/xap_String_Id.h.h:459 +#: po/tmp/xap_String_Id.h.h:479 msgid "Japanese, ISO-2022-JP" -msgstr "Japonez, ISO-2022-JP" +msgstr "Japoneză, ISO-2022-JP" #. ENC_JAPN_SJIS -#: po/tmp/xap_String_Id.h.h:461 +#: po/tmp/xap_String_Id.h.h:481 msgid "Japanese, Shift-JIS" -msgstr "Japonez, Shift-JIS" +msgstr "Japoneză, Shift-JIS" #. ENC_JAPN_WIN -#: po/tmp/xap_String_Id.h.h:463 +#: po/tmp/xap_String_Id.h.h:483 msgid "Japanese, Windows Code Page 932" -msgstr "Japonez, codurile Windows 932" +msgstr "Japoneză, Windows 932" #. LANG_KN_IN -#: po/tmp/xap_String_Id.h.h:465 +#: po/tmp/xap_String_Id.h.h:485 msgid "Kannada" -msgstr "" +msgstr "Kannada" #. LANG_KO_KR -#: po/tmp/xap_String_Id.h.h:467 +#. LANG_KO +#: po/tmp/xap_String_Id.h.h:488 msgid "Korean" -msgstr "Corean" +msgstr "Coreană" #. ENC_KORE_EUC -#: po/tmp/xap_String_Id.h.h:469 +#: po/tmp/xap_String_Id.h.h:490 msgid "Korean, EUC-KR" -msgstr "Corean, EUC-KR" +msgstr "Coreană, EUC-KR" #. ENC_KORE_JOHAB -#: po/tmp/xap_String_Id.h.h:471 +#: po/tmp/xap_String_Id.h.h:492 msgid "Korean, Johab" -msgstr "Corean, Johab" +msgstr "Coreană, Johab" #. ENC_KORE_KSC -#: po/tmp/xap_String_Id.h.h:473 +#: po/tmp/xap_String_Id.h.h:494 msgid "Korean, KSC_5601" -msgstr "Corean, KSC_5601" +msgstr "Coreană, KSC_5601" #. ENC_KORE_WIN -#: po/tmp/xap_String_Id.h.h:475 +#: po/tmp/xap_String_Id.h.h:496 msgid "Korean, Windows Code Page 949" -msgstr "Corean, codurile Windows 949" +msgstr "Coreană, Windows 949" #. LANG_KU -#: po/tmp/xap_String_Id.h.h:477 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:498 msgid "Kurdish" -msgstr "Turc" +msgstr "Kurdă" #. LANG_LO_LA -#: po/tmp/xap_String_Id.h.h:479 +#: po/tmp/xap_String_Id.h.h:500 msgid "Lao" -msgstr "" +msgstr "Loațiană" #. DLG_History_LastSaved -#: po/tmp/xap_String_Id.h.h:481 +#: po/tmp/xap_String_Id.h.h:502 msgid "Last saved:" -msgstr "" +msgstr "Ultima salvare:" #. LANG_LA_IT -#: po/tmp/xap_String_Id.h.h:483 +#: po/tmp/xap_String_Id.h.h:504 msgid "Latin (Renaissance)" -msgstr "Latin (Renacentist)" +msgstr "Latină (Renașcentistă)" #. LANG_LV_LV -#: po/tmp/xap_String_Id.h.h:485 +#: po/tmp/xap_String_Id.h.h:506 msgid "Latvian" -msgstr "Leton" +msgstr "Letonă" #. LANG_LT_LT -#: po/tmp/xap_String_Id.h.h:487 +#: po/tmp/xap_String_Id.h.h:508 msgid "Lithuanian" -msgstr "Lituanian" +msgstr "Lituaniană" + +#. DLG_CLIPART_Loading +#: po/tmp/xap_String_Id.h.h:510 +msgid "Loading Clip Art" +msgstr "Încărcare Clip Art" #. LANG_MK -#: po/tmp/xap_String_Id.h.h:493 +#: po/tmp/xap_String_Id.h.h:516 msgid "Macedonian" -msgstr "" +msgstr "Macedoniană" #. DLG_ULANG_DefaultLangChkbox -#: po/tmp/xap_String_Id.h.h:495 +#: po/tmp/xap_String_Id.h.h:518 msgid "Make default for document" -msgstr "" +msgstr "Setează pentru tot documentul" + +#. LANG_MS_MY +#: po/tmp/xap_String_Id.h.h:520 +msgid "Malay" +msgstr "Malay" #. LANG_MI_NZ -#: po/tmp/xap_String_Id.h.h:497 +#: po/tmp/xap_String_Id.h.h:522 msgid "Maori" -msgstr "" +msgstr "Maori" #. LANG_MR_IN -#: po/tmp/xap_String_Id.h.h:499 +#: po/tmp/xap_String_Id.h.h:524 msgid "Marathi" -msgstr "" +msgstr "Marathi" #. LANG_MH_MH -#: po/tmp/xap_String_Id.h.h:501 +#: po/tmp/xap_String_Id.h.h:526 msgid "Marshallese (Marshall Islands)" -msgstr "" +msgstr "Marșaleză (Marshall Islands)" #. LANG_MH_NR -#: po/tmp/xap_String_Id.h.h:503 +#: po/tmp/xap_String_Id.h.h:528 msgid "Marshallese (Nauru)" -msgstr "" +msgstr "Marșaleză (Naru)" #. DLG_Merge -#: po/tmp/xap_String_Id.h.h:505 +#: po/tmp/xap_String_Id.h.h:530 msgid "Merge" -msgstr "" +msgstr "Combină" #. LANG_MN_MN -#: po/tmp/xap_String_Id.h.h:507 +#: po/tmp/xap_String_Id.h.h:532 msgid "Mongolian" -msgstr "" +msgstr "Mongolă" #. DLG_PLUGIN_MANAGER_NAME -#: po/tmp/xap_String_Id.h.h:509 +#: po/tmp/xap_String_Id.h.h:534 msgid "Name:" -msgstr "Nume" +msgstr "Nume:" + +#. LANG_NE_NP +#: po/tmp/xap_String_Id.h.h:536 +msgid "Nepali (Nepal)" +msgstr "Nepaleză (Nepal)" #. DLG_QNXMB_No -#: po/tmp/xap_String_Id.h.h:511 +#: po/tmp/xap_String_Id.h.h:538 msgid "No" msgstr "Nu" #. DLG_IP_No_Picture_Label -#: po/tmp/xap_String_Id.h.h:513 +#: po/tmp/xap_String_Id.h.h:540 msgid "No Picture" msgstr "Nici o imagine" #. DLG_PLUGIN_MANAGER_NONE_SELECTED -#: po/tmp/xap_String_Id.h.h:515 +#: po/tmp/xap_String_Id.h.h:542 msgid "No plugin selected" msgstr "Nci un modul selectat" #. STYLE_NORMAL -#: po/tmp/xap_String_Id.h.h:517 +#: po/tmp/xap_String_Id.h.h:544 msgid "Normal" msgstr "Normal" #. LANG_NB_NO -#: po/tmp/xap_String_Id.h.h:519 +#: po/tmp/xap_String_Id.h.h:546 msgid "Norwegian Bokmal" -msgstr "Norvegian Bokmal" +msgstr "Norvegiană Bokmal" #. LANG_NN_NO -#: po/tmp/xap_String_Id.h.h:521 +#: po/tmp/xap_String_Id.h.h:548 msgid "Norwegian Nynorsk" -msgstr "Norvegian Nynorsk" +msgstr "Norvegiană Nynorsk" #. DLG_PLUGIN_MANAGER_NOT_AVAILABLE -#: po/tmp/xap_String_Id.h.h:523 +#: po/tmp/xap_String_Id.h.h:550 msgid "Not available" -msgstr "" +msgstr "Nu este disponibil" #. STYLE_NUMHEAD1 -#: po/tmp/xap_String_Id.h.h:525 +#: po/tmp/xap_String_Id.h.h:552 msgid "Numbered Heading 1" msgstr "Titlul 1 numerotat" #. STYLE_NUMHEAD2 -#: po/tmp/xap_String_Id.h.h:527 +#: po/tmp/xap_String_Id.h.h:554 msgid "Numbered Heading 2" msgstr "Titlul 2 numerotat" #. STYLE_NUMHEAD3 -#: po/tmp/xap_String_Id.h.h:529 +#: po/tmp/xap_String_Id.h.h:556 msgid "Numbered Heading 3" msgstr "Titlul 3 numerotat" #. DLG_OK -#: po/tmp/xap_String_Id.h.h:533 +#: po/tmp/xap_String_Id.h.h:560 msgid "OK" msgstr "OK" #. LANG_OC_FR -#: po/tmp/xap_String_Id.h.h:535 +#: po/tmp/xap_String_Id.h.h:562 msgid "Occitan" -msgstr "" +msgstr "Occitană" #. DLG_FOSA_OpenTitle -#: po/tmp/xap_String_Id.h.h:537 +#: po/tmp/xap_String_Id.h.h:564 msgid "Open File" -msgstr "Deschide fiier" +msgstr "Deschide fișier" #. DLG_FOSA_FileOpenTypeLabel -#: po/tmp/xap_String_Id.h.h:539 +#: po/tmp/xap_String_Id.h.h:566 msgid "Open file as type:" -msgstr "Deschide un fiier de tip:" +msgstr "Deschide un fișier de tip:" #. DLG_LISTDOCS_Title -#: po/tmp/xap_String_Id.h.h:541 +#: po/tmp/xap_String_Id.h.h:568 msgid "Opened Documents" -msgstr "" +msgstr "Documente deschise" #. TB_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:543 +#: po/tmp/xap_String_Id.h.h:570 msgid "Other..." msgstr "Procentual" #. DLG_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:547 +#: po/tmp/xap_String_Id.h.h:574 msgid "P&ercent:" msgstr "Procentual:" #. TB_Zoom_PageWidth -#: po/tmp/xap_String_Id.h.h:549 +#: po/tmp/xap_String_Id.h.h:576 msgid "Page Width" -msgstr "Lime" +msgstr "Lățime" #. DLG_UP_PageRanges -#: po/tmp/xap_String_Id.h.h:551 +#: po/tmp/xap_String_Id.h.h:578 msgid "Page ranges:" msgstr "Selectare pagini:" +#. LANG_PS +#: po/tmp/xap_String_Id.h.h:580 +msgid "Pashto" +msgstr "Pașto" + #. DLG_Password_Password -#: po/tmp/xap_String_Id.h.h:553 +#: po/tmp/xap_String_Id.h.h:582 msgid "Password:" msgstr "Parola:" #. STYLE_PLAIN_TEXT -#: po/tmp/xap_String_Id.h.h:555 +#: po/tmp/xap_String_Id.h.h:584 msgid "Plain Text" msgstr "Text simplu" #. DLG_PLUGIN_MANAGER_DETAILS -#: po/tmp/xap_String_Id.h.h:557 +#: po/tmp/xap_String_Id.h.h:586 msgid "Plugin Details:" msgstr "Detalii despre modul" #. DLG_PLUGIN_MANAGER_LIST -#: po/tmp/xap_String_Id.h.h:559 +#: po/tmp/xap_String_Id.h.h:588 msgid "Plugin List" msgstr "Lista modulelor" #. LANG_PL_PL -#: po/tmp/xap_String_Id.h.h:561 +#: po/tmp/xap_String_Id.h.h:590 msgid "Polish" -msgstr "Polonez" +msgstr "Poloneză" #. LANG_PT_BR -#: po/tmp/xap_String_Id.h.h:563 +#: po/tmp/xap_String_Id.h.h:592 msgid "Portuguese (Brazil)" -msgstr "Portughez (Brazilia)" +msgstr "Portugheză (Brazilia)" #. LANG_PT_PT -#: po/tmp/xap_String_Id.h.h:565 +#: po/tmp/xap_String_Id.h.h:594 msgid "Portuguese (Portugal)" -msgstr "Portughez (Portugalia)" +msgstr "Portugheză (Portugalia)" #. DLG_Image_PlaceColumn -#: po/tmp/xap_String_Id.h.h:567 +#: po/tmp/xap_String_Id.h.h:596 msgid "Position relative to its Column" -msgstr "" +msgstr "Poziția este relativă coloanei" #. DLG_Image_PlacePage -#: po/tmp/xap_String_Id.h.h:569 +#: po/tmp/xap_String_Id.h.h:598 msgid "Position relative to its Page" -msgstr "" +msgstr "Poziția este relativă paginii" #. DLG_Image_PlaceParagraph -#: po/tmp/xap_String_Id.h.h:571 +#: po/tmp/xap_String_Id.h.h:600 msgid "Position relative to nearest paragraph" -msgstr "" +msgstr "Poziția este relativă la cel mai apropiat paragraf" #. DLG_Image_Aspect -#: po/tmp/xap_String_Id.h.h:573 +#: po/tmp/xap_String_Id.h.h:602 msgid "Preserve aspect ratio" -msgstr "Pstrai raportul nlime/lime:" +msgstr "Păstrați raportul înălțime/lățime:" #. DLG_IP_Activate_Label -#: po/tmp/xap_String_Id.h.h:577 +#: po/tmp/xap_String_Id.h.h:606 msgid "Preview Picture" msgstr "Previzualizare" #. DLG_FOSA_PrintToFileTitle -#: po/tmp/xap_String_Id.h.h:582 +#: po/tmp/xap_String_Id.h.h:611 msgid "Print To File" -msgstr "Printai ntr-un fiier" +msgstr "Tipărește într-un fișier" #. DLG_FOSA_FilePrintTypeLabel -#: po/tmp/xap_String_Id.h.h:584 +#: po/tmp/xap_String_Id.h.h:613 msgid "Print file as type:" -msgstr "Printai ntr-un fiier de tipul:" +msgstr "Tipărește într-un fișier de tipul:" #. DLG_UP_PrintIn -#: po/tmp/xap_String_Id.h.h:586 +#: po/tmp/xap_String_Id.h.h:615 msgid "Print in: " -msgstr "Printeaz: " +msgstr "Tipărește în: " #. DLG_UP_PrintTo -#: po/tmp/xap_String_Id.h.h:588 +#: po/tmp/xap_String_Id.h.h:617 msgid "Print to: " -msgstr "Printeaz ctre: " +msgstr "Tipărește către: " #. DLG_UP_Printer -#: po/tmp/xap_String_Id.h.h:590 +#: po/tmp/xap_String_Id.h.h:619 msgid "Printer" -msgstr "Imprimant" +msgstr "Imprimantă" #. DLG_UP_PrinterCommand -#: po/tmp/xap_String_Id.h.h:592 +#: po/tmp/xap_String_Id.h.h:621 msgid "Printer command: " -msgstr "Comanda de printare: " +msgstr "Comandă de imprimantă: " #. LANG_PA_IN -#: po/tmp/xap_String_Id.h.h:594 +#: po/tmp/xap_String_Id.h.h:623 msgid "Punjabi (Gurmukhi)" -msgstr "" +msgstr "Punjabi (Gurmukhi)" #. LANG_PA_PK -#: po/tmp/xap_String_Id.h.h:596 +#: po/tmp/xap_String_Id.h.h:625 msgid "Punjabi (Shahmukhi)" -msgstr "" +msgstr "Punjabi (Shahmukhi)" #. LANG_QU_BO -#: po/tmp/xap_String_Id.h.h:598 +#: po/tmp/xap_String_Id.h.h:627 msgid "Quechua" -msgstr "" +msgstr "Quechua" + +#. LANG_QUH_BO +#: po/tmp/xap_String_Id.h.h:629 +msgid "Quechua (3 vowels)" +msgstr "Quechua (3 vocale)" + +#. LANG_QUL_BO +#: po/tmp/xap_String_Id.h.h:631 +msgid "Quechua (5 vowels)" +msgstr "Quechua (5 vocale)" + +#. DLG_FOSA_RecordToFileTitle +#: po/tmp/xap_String_Id.h.h:633 +msgid "Record Editing to File" +msgstr "Înregistrează comenzi editare în fișier" #. DLG_UFS_StyleRegular -#: po/tmp/xap_String_Id.h.h:600 +#: po/tmp/xap_String_Id.h.h:635 msgid "Regular" -msgstr "Obinuit" +msgstr "Obișnuit" #. DLG_DocComparison_Relationship -#: po/tmp/xap_String_Id.h.h:602 +#: po/tmp/xap_String_Id.h.h:637 msgid "Relationship:" -msgstr "" +msgstr "Relație:" + +#. DLG_FOSA_ReplayFromFileTitle +#: po/tmp/xap_String_Id.h.h:639 +msgid "Replay Editing from File" +msgstr "Rulează comenzile de editare din fișier" #. DLG_Restore -#: po/tmp/xap_String_Id.h.h:604 +#: po/tmp/xap_String_Id.h.h:641 msgid "Restore" -msgstr "" +msgstr "Refă" #. DLG_HTMLOPT_ExpRestore -#: po/tmp/xap_String_Id.h.h:606 +#: po/tmp/xap_String_Id.h.h:643 msgid "Restore Settings" -msgstr "" +msgstr "Refă setările" #. DLG_DocComparison_Results -#: po/tmp/xap_String_Id.h.h:608 +#: po/tmp/xap_String_Id.h.h:645 msgid "Results" -msgstr "" +msgstr "Rezultate" #. LANG_RO_RO -#: po/tmp/xap_String_Id.h.h:610 +#: po/tmp/xap_String_Id.h.h:647 msgid "Romanian" -msgstr "Romn" +msgstr "Română" #. ENC_ROMA_MAC -#: po/tmp/xap_String_Id.h.h:612 +#: po/tmp/xap_String_Id.h.h:649 msgid "Romanian, Macintosh" -msgstr "Romn, Macintosh" +msgstr "Română, Macintosh" #. LANG_RU_RU -#: po/tmp/xap_String_Id.h.h:614 +#: po/tmp/xap_String_Id.h.h:651 msgid "Russian (Russia)" -msgstr "Rus (Rusia)" +msgstr "Rusă (Rusia)" #. DLG_UFS_SampleFrameLabel -#: po/tmp/xap_String_Id.h.h:616 +#: po/tmp/xap_String_Id.h.h:653 msgid "Sample" msgstr "Exemplu" #. LANG_SC_IT -#: po/tmp/xap_String_Id.h.h:618 +#: po/tmp/xap_String_Id.h.h:655 msgid "Sardinian" -msgstr "" +msgstr "Sardiniană" #. DLG_FOSA_SaveAsTitle -#: po/tmp/xap_String_Id.h.h:620 +#: po/tmp/xap_String_Id.h.h:657 msgid "Save File As" -msgstr "Salveaz ca" +msgstr "Salvează ca" #. DLG_HTMLOPT_ExpSave -#: po/tmp/xap_String_Id.h.h:622 +#: po/tmp/xap_String_Id.h.h:659 msgid "Save Settings" -msgstr "" +msgstr "Salvează setările" #. DLG_FOSA_FileSaveTypeLabel -#: po/tmp/xap_String_Id.h.h:624 +#: po/tmp/xap_String_Id.h.h:661 msgid "Save file as type:" -msgstr "Salveaza fiierul ca:" +msgstr "Salvează fișierul ca:" #. DLG_UFS_ScriptLabel -#: po/tmp/xap_String_Id.h.h:626 +#: po/tmp/xap_String_Id.h.h:663 msgid "Script:" msgstr "Script:" #. STYLE_SECTHEADING -#: po/tmp/xap_String_Id.h.h:628 +#: po/tmp/xap_String_Id.h.h:665 msgid "Section Heading" -msgstr "Titlul seciunii" +msgstr "Titlul secțiunii" #. DLG_UENC_EncLabel -#: po/tmp/xap_String_Id.h.h:632 +#: po/tmp/xap_String_Id.h.h:669 msgid "Select Encoding:" -msgstr "Alegei codarea:" +msgstr "Alegeți codarea:" #. DLG_HTMLOPT_ExpLabel -#: po/tmp/xap_String_Id.h.h:634 +#: po/tmp/xap_String_Id.h.h:671 msgid "Select HTML export options:" -msgstr "" +msgstr "Selectați opțiunile de export HTML:" #. DLG_ULANG_LangLabel -#: po/tmp/xap_String_Id.h.h:636 +#: po/tmp/xap_String_Id.h.h:673 msgid "Select Language:" -msgstr "Alegei limba:" +msgstr "Alegeți limba:" #. LANG_SR -#: po/tmp/xap_String_Id.h.h:640 +#: po/tmp/xap_String_Id.h.h:677 msgid "Serbian" -msgstr "" +msgstr "Sârbă" #. DLG_Image_ImageDesc -#: po/tmp/xap_String_Id.h.h:642 +#: po/tmp/xap_String_Id.h.h:679 msgid "Set Image Name" -msgstr "" +msgstr "Setează numele imaginii" #. DLG_Image_ImageSize -#: po/tmp/xap_String_Id.h.h:644 +#: po/tmp/xap_String_Id.h.h:681 msgid "Set Image Size" -msgstr "" +msgstr "Setează dimensiunile imaginii" #. DLG_ULANG_LangTitle -#: po/tmp/xap_String_Id.h.h:646 +#: po/tmp/xap_String_Id.h.h:683 msgid "Set Language" msgstr "Limba" #. DLG_UFS_TransparencyCheck -#: po/tmp/xap_String_Id.h.h:648 +#: po/tmp/xap_String_Id.h.h:685 msgid "Set no Highlight Color" -msgstr "Fr culoare de evideniere" +msgstr "Fără culoare de evidențiere" #. DLG_UFS_SizeLabel -#: po/tmp/xap_String_Id.h.h:652 +#: po/tmp/xap_String_Id.h.h:689 msgid "Size:" msgstr "Dimensiune:" #. LANG_SK_SK -#: po/tmp/xap_String_Id.h.h:654 +#: po/tmp/xap_String_Id.h.h:691 msgid "Slovak" -msgstr "Slovac" +msgstr "Slovacă" #. LANG_SL_SI -#: po/tmp/xap_String_Id.h.h:656 +#: po/tmp/xap_String_Id.h.h:693 msgid "Slovenian" -msgstr "Sloven" +msgstr "Slovenă" #. LANG_ES_MX -#: po/tmp/xap_String_Id.h.h:658 +#: po/tmp/xap_String_Id.h.h:695 msgid "Spanish (Mexico)" -msgstr "Spaniol (Mexic)" +msgstr "Spaniolă (Mexic)" #. LANG_ES_ES -#: po/tmp/xap_String_Id.h.h:660 +#: po/tmp/xap_String_Id.h.h:697 msgid "Spanish (Spain)" -msgstr "Spaniol (Spania)" +msgstr "Spaniolă (Spania)" #. DLG_Image_SquareWrap -#: po/tmp/xap_String_Id.h.h:664 +#: po/tmp/xap_String_Id.h.h:701 msgid "Square text wrapping" -msgstr "" +msgstr "Împachetare (wrapping) dreptunghiulară" #. DLG_DocComparison_Styles -#: po/tmp/xap_String_Id.h.h:672 +#: po/tmp/xap_String_Id.h.h:709 msgid "Styles:" -msgstr "" +msgstr "Stiluri:" #. LANG_SW -#: po/tmp/xap_String_Id.h.h:678 +#: po/tmp/xap_String_Id.h.h:715 msgid "Swahili" -msgstr "" +msgstr "Swahili" #. LANG_SV_SE -#: po/tmp/xap_String_Id.h.h:680 +#: po/tmp/xap_String_Id.h.h:717 msgid "Swedish" -msgstr "Suedez" +msgstr "Suedeză" #. TB_Font_Symbol -#: po/tmp/xap_String_Id.h.h:682 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:719 msgid "Symbols" -msgstr "&Simbol" +msgstr "&Simboluri" #. LANG_SYR -#: po/tmp/xap_String_Id.h.h:684 +#: po/tmp/xap_String_Id.h.h:721 msgid "Syriac" -msgstr "" +msgstr "Siriană" #. LANG_TL_PH -#: po/tmp/xap_String_Id.h.h:688 +#: po/tmp/xap_String_Id.h.h:725 msgid "Tagalog" -msgstr "" +msgstr "Tagalog" #. LANG_TA_IN -#: po/tmp/xap_String_Id.h.h:690 +#: po/tmp/xap_String_Id.h.h:727 msgid "Tamil" -msgstr "" +msgstr "Tamil" #. LANG_TE_IN -#: po/tmp/xap_String_Id.h.h:692 +#: po/tmp/xap_String_Id.h.h:729 msgid "Telugu" -msgstr "" +msgstr "Telugu" #. DLG_UFS_ColorTab -#: po/tmp/xap_String_Id.h.h:694 +#: po/tmp/xap_String_Id.h.h:731 msgid "Text Color" -msgstr " Culoare " +msgstr "Culoare text" #. DLG_Image_WrappedBoth -#: po/tmp/xap_String_Id.h.h:696 +#: po/tmp/xap_String_Id.h.h:733 msgid "Text wrapped on both sides of the Image" -msgstr "" +msgstr "Text împachetat (wrapped) pe ambele părți ale imaginii" #. DLG_Image_WrappedLeft -#: po/tmp/xap_String_Id.h.h:698 +#: po/tmp/xap_String_Id.h.h:735 msgid "Text wrapped to the Left of the Image" -msgstr "" +msgstr "Text împachetat (wrapped) la stânga imaginii" #. DLG_Image_WrappedRight -#: po/tmp/xap_String_Id.h.h:700 +#: po/tmp/xap_String_Id.h.h:737 msgid "Text wrapped to the Right of the Image" -msgstr "" +msgstr "Text împachetat (wrapped) la dreapta imaginii" #. LANG_TH_TH -#: po/tmp/xap_String_Id.h.h:702 +#: po/tmp/xap_String_Id.h.h:739 msgid "Thai" -msgstr "Tailandez" +msgstr "Tailandeză" #. ENC_THAI_MAC -#: po/tmp/xap_String_Id.h.h:704 +#: po/tmp/xap_String_Id.h.h:741 msgid "Thai, Macintosh" -msgstr "Thailandez, Macintosh" +msgstr "Thailandeză, Macintosh" #. ENC_THAI_TIS -#: po/tmp/xap_String_Id.h.h:706 +#: po/tmp/xap_String_Id.h.h:743 msgid "Thai, TIS-620" -msgstr "Thailandez, TIS-620" +msgstr "Thailandeză, TIS-620" #. ENC_THAI_WIN -#: po/tmp/xap_String_Id.h.h:708 +#: po/tmp/xap_String_Id.h.h:745 msgid "Thai, Windows Code Page 874" -msgstr "Thailandez, codurile Windows 874" +msgstr "Thailandeză, Windows 874" #. DLG_NoSaveFile_DirNotWriteable -#: po/tmp/xap_String_Id.h.h:710 +#: po/tmp/xap_String_Id.h.h:747 #, c-format msgid "The directory '%s' is write-protected." msgstr "Directorul '%s' e protejat la scriere." +#. DLG_FOSA_ExtensionDoesNotMatch +#: po/tmp/xap_String_Id.h.h:749 +msgid "" +"The given file extension does not match the chosen file type. Do you want to " +"use this name anyway?" +msgstr "Extensia specificată a fișierului nu corespunde tipului de fișeire ales. Doriți să " +"folosiți acest nume?" + #. MSG_HistoryPartRestore2 -#: po/tmp/xap_String_Id.h.h:712 +#: po/tmp/xap_String_Id.h.h:751 #, c-format msgid "" "The nearest version that can be restored fully is %d. Would you like to " "restore this version instead? To partially restore version %d press No." -msgstr "" +msgstr "Cea mai apropriată versiune care poate fi restaurată complet este %d. Doriți " +"să restaurez această versiune? Pentru a restaura versiunea %d parțial " +"apăsați Nu.:" #. DLG_UP_InvalidPrintString -#: po/tmp/xap_String_Id.h.h:714 +#: po/tmp/xap_String_Id.h.h:753 msgid "The print command string is not valid." -msgstr "Comanda de printare furnizat nu este valid." +msgstr "Comanda de tipărire furnizată nu este validă." #. MSG_NoUndo -#: po/tmp/xap_String_Id.h.h:716 +#: po/tmp/xap_String_Id.h.h:755 msgid "This operation cannot be undone. Are you sure you want to proceed?" -msgstr "" +msgstr "Această operație nu poate fi anulată. Sunteți sigur că doriți să mergeți mai departe?" #. DLG_Image_TightWrap -#: po/tmp/xap_String_Id.h.h:720 +#: po/tmp/xap_String_Id.h.h:759 msgid "Tight text wrapping" -msgstr "" +msgstr "Împachetare îngesuită (tight text wrapping)" #. MSG_HistoryPartRestore3 -#: po/tmp/xap_String_Id.h.h:724 +#: po/tmp/xap_String_Id.h.h:763 msgid "To continue anyway, press OK." -msgstr "" +msgstr "Pentru a continua oricum, apăsați OK" #. MSG_HistoryPartRestore4 -#: po/tmp/xap_String_Id.h.h:726 +#: po/tmp/xap_String_Id.h.h:765 msgid "To quit the restoration attempt, press Cancel." -msgstr "" +msgstr "Pentru a părăsi încercarea de restaurare, apăsați Renunță." #. LANG_TR_TR -#: po/tmp/xap_String_Id.h.h:732 +#: po/tmp/xap_String_Id.h.h:771 msgid "Turkish" -msgstr "Turc" +msgstr "Turcă" #. ENC_TURK_ISO -#: po/tmp/xap_String_Id.h.h:734 +#: po/tmp/xap_String_Id.h.h:773 msgid "Turkish, ISO-8859-9" -msgstr "Turc, ISO-8859-9" +msgstr "Turcă, ISO-8859-9" #. ENC_TURK_MAC -#: po/tmp/xap_String_Id.h.h:736 +#: po/tmp/xap_String_Id.h.h:775 msgid "Turkish, Macintosh" -msgstr "Turc, Macintosh" +msgstr "Turcă, Macintosh" #. ENC_TURK_WIN -#: po/tmp/xap_String_Id.h.h:738 +#: po/tmp/xap_String_Id.h.h:777 msgid "Turkish, Windows Code Page 1254" -msgstr "Turc, codurile Windows 1254" +msgstr "Turcă, Windows 1254" #. DLG_Image_WrapType -#: po/tmp/xap_String_Id.h.h:740 +#: po/tmp/xap_String_Id.h.h:779 msgid "Type of text wrapping" -msgstr "" +msgstr "Tipul de împachetare text (text wrapping)" #. ENC_WEST_ASCII -#: po/tmp/xap_String_Id.h.h:742 +#: po/tmp/xap_String_Id.h.h:781 msgid "US-ASCII" msgstr "ASCII" #. LANG_UK_UA -#: po/tmp/xap_String_Id.h.h:744 +#: po/tmp/xap_String_Id.h.h:783 msgid "Ukrainian" -msgstr "Ucrainian" +msgstr "Ucrainiană" #. ENC_UKRA_KOI -#: po/tmp/xap_String_Id.h.h:746 +#: po/tmp/xap_String_Id.h.h:785 msgid "Ukrainian, KOI8-U" -msgstr "Ucrainian, KOI8-U" +msgstr "Ucrainiană, KOI8-U" #. ENC_UKRA_MAC -#: po/tmp/xap_String_Id.h.h:748 +#: po/tmp/xap_String_Id.h.h:787 msgid "Ukrainian, Macintosh" -msgstr "Ucrainian, Macintosh" +msgstr "Ucrainiană, Macintosh" #. ENC_UNIC_UCS2 -#: po/tmp/xap_String_Id.h.h:752 +#: po/tmp/xap_String_Id.h.h:791 msgid "Unicode UCS-2" msgstr "Unicode UCS-2" #. ENC_UNIC_UCS_2BE -#: po/tmp/xap_String_Id.h.h:754 +#: po/tmp/xap_String_Id.h.h:793 msgid "Unicode UCS-2 Big Endian" msgstr "Unicode UCS-2 Big Endian" #. ENC_UNIC_UCS_2LE -#: po/tmp/xap_String_Id.h.h:756 +#: po/tmp/xap_String_Id.h.h:795 msgid "Unicode UCS-2 Little Endian" msgstr "Unicode UCS-2 Little Endian" #. ENC_UNIC_UCS4 -#: po/tmp/xap_String_Id.h.h:758 +#: po/tmp/xap_String_Id.h.h:797 msgid "Unicode UCS-4" msgstr "Unicode UCS-4" #. ENC_UNIC_UCS_4BE -#: po/tmp/xap_String_Id.h.h:760 +#: po/tmp/xap_String_Id.h.h:799 msgid "Unicode UCS-4 Big Endian" msgstr "Unicode UCS-4 Big Endian" #. ENC_UNIC_UCS_4LE -#: po/tmp/xap_String_Id.h.h:762 +#: po/tmp/xap_String_Id.h.h:801 msgid "Unicode UCS-4 Little Endian" msgstr "Unicode UCS-4 Little Endian" #. ENC_UNIC_UTF_16 -#: po/tmp/xap_String_Id.h.h:764 +#: po/tmp/xap_String_Id.h.h:803 msgid "Unicode UTF-16" msgstr "Unicode UTF-16" #. ENC_UNIC_UTF_16BE -#: po/tmp/xap_String_Id.h.h:766 +#: po/tmp/xap_String_Id.h.h:805 msgid "Unicode UTF-16 Big Endian" msgstr "Unicode UTF-16 Big Endian" #. ENC_UNIC_UTF_16LE -#: po/tmp/xap_String_Id.h.h:768 +#: po/tmp/xap_String_Id.h.h:807 msgid "Unicode UTF-16 Little Endian" msgstr "Unicode UTF-16 Little Endian" #. ENC_UNIC_UTF_32 -#: po/tmp/xap_String_Id.h.h:770 +#: po/tmp/xap_String_Id.h.h:809 msgid "Unicode UTF-32" msgstr "Unicode UTF-32" #. ENC_UNIC_UTF_32BE -#: po/tmp/xap_String_Id.h.h:772 +#: po/tmp/xap_String_Id.h.h:811 msgid "Unicode UTF-32 Big Endian" msgstr "Unicode UTF-32 Big Endian" #. ENC_UNIC_UTF_32LE -#: po/tmp/xap_String_Id.h.h:774 +#: po/tmp/xap_String_Id.h.h:813 msgid "Unicode UTF-32 Little Endian" msgstr "Unicode UTF-32 Little Endian" #. ENC_UNIC_UTF_7 -#: po/tmp/xap_String_Id.h.h:776 +#: po/tmp/xap_String_Id.h.h:815 msgid "Unicode UTF-7" msgstr "Unicode UTF-7" #. ENC_UNIC_UTF_8 -#: po/tmp/xap_String_Id.h.h:778 +#: po/tmp/xap_String_Id.h.h:817 msgid "Unicode UTF-8" msgstr "Unicode UTF-8" #. UntitledDocument -#: po/tmp/xap_String_Id.h.h:780 +#: po/tmp/xap_String_Id.h.h:819 #, c-format msgid "Untitled%d" -msgstr "Fr titlu %d" +msgstr "Fără titlu %d" #. DLG_Update -#: po/tmp/xap_String_Id.h.h:782 +#: po/tmp/xap_String_Id.h.h:821 msgid "Update" -msgstr "Actualizeaz" +msgstr "Actualizează" -#. LANG_UR_PK -#: po/tmp/xap_String_Id.h.h:788 +#. LANG_UR +#: po/tmp/xap_String_Id.h.h:827 msgid "Urdu" -msgstr "" +msgstr "Urdu" + +#. LANG_UR_PK +#: po/tmp/xap_String_Id.h.h:829 +msgid "Urdu (Pakistan)" +msgstr "Urdu (Pachistan)" #. LANG_UZ_UZ -#: po/tmp/xap_String_Id.h.h:790 +#: po/tmp/xap_String_Id.h.h:831 msgid "Uzbek" -msgstr "" +msgstr "Uzbecă" #. DLG_History_List_Title -#: po/tmp/xap_String_Id.h.h:794 +#: po/tmp/xap_String_Id.h.h:835 msgid "Version history" -msgstr "" +msgstr "Istoria versiunilor" #. DLG_PLUGIN_MANAGER_VERSION #. DLG_History_Version -#: po/tmp/xap_String_Id.h.h:797 +#: po/tmp/xap_String_Id.h.h:838 msgid "Version:" -msgstr "Versiune" +msgstr "Versiune:" #. LANG_VI_VN -#: po/tmp/xap_String_Id.h.h:799 +#: po/tmp/xap_String_Id.h.h:840 msgid "Vietnamese" -msgstr "Vietnamez" +msgstr "Vietnameză" #. ENC_VIET_TCVN -#: po/tmp/xap_String_Id.h.h:801 +#: po/tmp/xap_String_Id.h.h:842 msgid "Vietnamese, TCVN" -msgstr "Vietnamez, TCVN" +msgstr "Vietnameză, TCVN" #. ENC_VIET_VISCII -#: po/tmp/xap_String_Id.h.h:803 +#: po/tmp/xap_String_Id.h.h:844 msgid "Vietnamese, VISCII" -msgstr "Vietnamez, VISCII" +msgstr "Vietnameză, VISCII" #. ENC_VIET_WIN -#: po/tmp/xap_String_Id.h.h:805 +#: po/tmp/xap_String_Id.h.h:846 msgid "Vietnamese, Windows Code Page 1258" -msgstr "Vietnamez, codurile Windows 1258" +msgstr "Vietnameză, Windows 1258" #. DLG_MW_MoreWindows -#: po/tmp/xap_String_Id.h.h:807 +#: po/tmp/xap_String_Id.h.h:848 msgid "View Document" -msgstr "Fereastr activ" +msgstr "Fereastră activă" #. DLG_MW_Activate -#: po/tmp/xap_String_Id.h.h:809 +#: po/tmp/xap_String_Id.h.h:850 msgid "View:" -msgstr "Activat:" +msgstr "Activată:" #. LANG_CY_GB -#: po/tmp/xap_String_Id.h.h:811 +#: po/tmp/xap_String_Id.h.h:852 msgid "Welsh" -msgstr "Galez" +msgstr "Galeză" #. ENC_US_DOS -#: po/tmp/xap_String_Id.h.h:813 +#: po/tmp/xap_String_Id.h.h:854 msgid "Western European, DOS/Windows Code Page 437" -msgstr "" +msgstr "Europa de vest, DOS/Windows 437" #. ENC_MLNG_DOS -#: po/tmp/xap_String_Id.h.h:815 +#: po/tmp/xap_String_Id.h.h:856 msgid "Western European, DOS/Windows Code Page 850" -msgstr "" +msgstr "Europa de vest, DOS/Windows 850" #. ENC_WEST_HP -#: po/tmp/xap_String_Id.h.h:817 +#: po/tmp/xap_String_Id.h.h:858 msgid "Western European, HP" msgstr "Europa de est, HP" #. ENC_WEST_ISO -#: po/tmp/xap_String_Id.h.h:819 +#: po/tmp/xap_String_Id.h.h:860 msgid "Western European, ISO-8859-1" -msgstr "European, ISO-8859-1" +msgstr "Europeană, ISO-8859-1" #. ENC_WEST_MAC -#: po/tmp/xap_String_Id.h.h:821 +#: po/tmp/xap_String_Id.h.h:862 msgid "Western European, Macintosh" -msgstr "European, Macintosh" +msgstr "Europeană, Macintosh" #. ENC_WEST_NXT -#: po/tmp/xap_String_Id.h.h:823 +#: po/tmp/xap_String_Id.h.h:864 msgid "Western European, NeXT" msgstr "Europa de est, NeXT" #. ENC_WEST_WIN -#: po/tmp/xap_String_Id.h.h:825 +#: po/tmp/xap_String_Id.h.h:866 msgid "Western European, Windows Code Page 1252" -msgstr "European, codurile Windows 1252" +msgstr "Europeană, Windows 1252" #. TB_Zoom_WholePage -#: po/tmp/xap_String_Id.h.h:827 +#: po/tmp/xap_String_Id.h.h:868 msgid "Whole Page" -msgstr "Pagin" +msgstr "Pagină" #. DLG_Image_Width -#: po/tmp/xap_String_Id.h.h:829 +#: po/tmp/xap_String_Id.h.h:870 msgid "Width:" -msgstr "Lime:" +msgstr "Lățime:" #. DLG_IP_Width_Label -#: po/tmp/xap_String_Id.h.h:831 +#: po/tmp/xap_String_Id.h.h:872 msgid "Width: " -msgstr "Lime: " +msgstr "Lățime: " + +#. LANG_WO_SN +#: po/tmp/xap_String_Id.h.h:874 +msgid "Wolof (Senegal)" +msgstr "Wolof (Senegal)" #. DLG_QNXMB_Yes -#: po/tmp/xap_String_Id.h.h:833 +#: po/tmp/xap_String_Id.h.h:876 msgid "Yes" msgstr "Da" #. LANG_YI -#: po/tmp/xap_String_Id.h.h:835 +#: po/tmp/xap_String_Id.h.h:878 msgid "Yiddish" -msgstr "" +msgstr "Idiș" #. MSG_HistoryConfirmSave -#: po/tmp/xap_String_Id.h.h:837 +#: po/tmp/xap_String_Id.h.h:880 #, c-format msgid "You have to save changes to document %s before proceeding. Save now?" -msgstr "" +msgstr "Este nevoie să salvați modificările documentului %s înainte de a continua. Salvați acum?" #. DLG_Zoom_RadioFrameCaption -#: po/tmp/xap_String_Id.h.h:841 +#: po/tmp/xap_String_Id.h.h:884 msgid "Zoom to" msgstr "Zoom la" #. DLG_UnixMB_No -#: po/tmp/xap_String_Id.h.h:843 +#: po/tmp/xap_String_Id.h.h:886 msgid "_No" msgstr "_Nu" #. DLG_UnixMB_Yes -#: po/tmp/xap_String_Id.h.h:845 +#: po/tmp/xap_String_Id.h.h:888 msgid "_Yes" msgstr "_Da" #. DLG_Unit_cm -#: po/tmp/xap_String_Id.h.h:847 +#: po/tmp/xap_String_Id.h.h:890 msgid "cm" msgstr "cm" #. DLG_DocComparison_Different -#: po/tmp/xap_String_Id.h.h:849 +#: po/tmp/xap_String_Id.h.h:892 msgid "different" -msgstr "" +msgstr "diferit" #. DLG_DocComparison_DivergingPos -#: po/tmp/xap_String_Id.h.h:851 +#: po/tmp/xap_String_Id.h.h:894 #, c-format msgid "diverging after document position %d" -msgstr "" +msgstr "diverge după poziția %d în document" #. DLG_DocComparison_Diverging -#: po/tmp/xap_String_Id.h.h:853 +#: po/tmp/xap_String_Id.h.h:896 #, c-format msgid "diverging after version %d of %s" -msgstr "" +msgstr "diverge după versiunea %d a %s" #. DLG_DocComparison_Identical -#: po/tmp/xap_String_Id.h.h:855 +#: po/tmp/xap_String_Id.h.h:898 msgid "identical" -msgstr "" +msgstr "identic" #. DLG_Unit_inch -#: po/tmp/xap_String_Id.h.h:857 +#: po/tmp/xap_String_Id.h.h:900 msgid "inch" msgstr "inch" #. DLG_Unit_mm -#: po/tmp/xap_String_Id.h.h:859 +#: po/tmp/xap_String_Id.h.h:902 msgid "mm" msgstr "mm" #. DLG_Unit_pica -#: po/tmp/xap_String_Id.h.h:861 +#: po/tmp/xap_String_Id.h.h:904 msgid "pica" -msgstr "" +msgstr "pica" #. DLG_Unit_points -#: po/tmp/xap_String_Id.h.h:863 +#: po/tmp/xap_String_Id.h.h:906 msgid "points" msgstr "puncte" #. DLG_DocComparison_Siblings -#: po/tmp/xap_String_Id.h.h:865 +#: po/tmp/xap_String_Id.h.h:908 msgid "siblings" -msgstr "" +msgstr "gemeni" #. DLG_DocComparison_Unrelated -#: po/tmp/xap_String_Id.h.h:867 +#: po/tmp/xap_String_Id.h.h:910 msgid "unrelated" -msgstr "" +msgstr "fără nicio legătură" + +#~ msgid "&From File" +#~ msgstr "&Din fișier" + +#~ msgid "Insert a picture" +#~ msgstr "Inserează o imagine" + +#~ msgid "Show the AbiWord splash screen on application startup" +#~ msgstr "Arată splash-screen-ul AbiWord la fiecare pornire" #~ msgid "&Autotext" #~ msgstr "Sintagme &standard" @@ -8142,49 +8313,49 @@ #~ msgstr "Despre &Open Source" #~ msgid "About the GNU project" -#~ msgstr "Informaii despre proiectul GNU" +#~ msgstr "Informații despre proiectul GNU" #~ msgid "Attention:" -#~ msgstr "Atenie:" +#~ msgstr "Atenție:" #~ msgid "BCC:" #~ msgstr "BCC:" #~ msgid "Best regards," -#~ msgstr "Sincere salutri," +#~ msgstr "Sincere salutări," #~ msgid "Best wishes," -#~ msgstr "Multe salutri," +#~ msgstr "Multe salutări," #~ msgid "CC:" #~ msgstr "CC:" #~ msgid "CERTIFIED MAIL" -#~ msgstr "RECOMANDAT" +#~ msgstr "RECOMANDATĂ" #~ msgid "CONFIDENTIAL" -#~ msgstr "CONFIDENIAL" +#~ msgstr "CONFIDENȚIALĂ" #~ msgid "Check &Version" -#~ msgstr "Verific &versiunea" +#~ msgstr "Verifică &versiunea" #~ msgid "Closing:" -#~ msgstr "nchidere:" +#~ msgstr "Închidere:" #~ msgid "Cordially," -#~ msgstr "Prietenete," +#~ msgstr "Prietenește," #~ msgid "Dear Mom and Dad," -#~ msgstr "Drag mam i tat," +#~ msgstr "Dragă mamă și tată," #~ msgid "Dear Sir or Madam:" -#~ msgstr "Stimat domn sau doamn:" +#~ msgstr "Stimat domn sau doamnă:" #~ msgid "Display information about Open Source" -#~ msgstr "Afieaz informaii despre Open Source" +#~ msgstr "Afișează informații despre Open Source" #~ msgid "Display program version number" -#~ msgstr "Afieaz versiunea programului" +#~ msgstr "Afișează versiunea programului" #~ msgid "Email:" #~ msgstr "Email:" @@ -8196,7 +8367,7 @@ #~ msgstr "Fwd:" #~ msgid "In reply to:" -#~ msgstr "Ca rspuns la:" +#~ msgstr "Ca răspuns la:" #~ msgid "Ladies and Gentlemen:" #~ msgstr "Doamnelor si domnilor:" @@ -8205,10 +8376,10 @@ #~ msgstr "Cu dragoste," #~ msgid "Mail Instructions:" -#~ msgstr "Instruciuni potale:" +#~ msgstr "Instrucțiuni poștale:" #~ msgid "PERSONAL" -#~ msgstr "PERSONAL" +#~ msgstr "PERSONALĂ" #~ msgid "RE:" #~ msgstr "RE:" @@ -8217,13 +8388,13 @@ #~ msgstr "EXPRES" #~ msgid "Reference:" -#~ msgstr "Referin:" +#~ msgstr "Referință:" #~ msgid "Regards," -#~ msgstr "Salutri," +#~ msgstr "Salutări," #~ msgid "Respectfully yours," -#~ msgstr "Cu respect al dumneavoastr," +#~ msgstr "Cu respect al dumneavoastră," #~ msgid "Respectfully," #~ msgstr "Cu respect," @@ -8232,25 +8403,25 @@ #~ msgstr "URGENT" #~ msgid "Salutation:" -#~ msgstr "Salutri:" +#~ msgstr "Salutări:" #~ msgid "Sincerely yours," -#~ msgstr "Sincer al dumneavoastr," +#~ msgstr "Sincer al dumneavoastră," #~ msgid "Take care," -#~ msgstr "Ai grij," +#~ msgstr "Ai grijă," #~ msgid "Thank you," -#~ msgstr "Cu multe mulumiri," +#~ msgstr "Cu multe mulțumiri," #~ msgid "Thanks," -#~ msgstr "Cu mulumiri," +#~ msgstr "Cu mulțumiri," #~ msgid "To Whom It May Concern:" -#~ msgstr "Ctre cei interesai:" +#~ msgstr "Către cei interesați:" #~ msgid "To:" -#~ msgstr "Ctre:" +#~ msgstr "Către:" #~ msgid "VIA AIRMAIL" #~ msgstr "FULGER" @@ -8262,7 +8433,7 @@ #~ msgstr "PRIORIPOST" #~ msgid "Yours truly," -#~ msgstr "Al tu," +#~ msgstr "Al tău," #~ msgid "\tFont " -#~ msgstr " Fonturi " +#~ msgstr "\tFonturi " diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/po/sk-SK.po /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/po/sk-SK.po --- abiword-2.6.2/abiword/po/sk-SK.po 2008-04-06 17:00:53.000000000 +0100 +++ abiword-2.6.8repack2/abiword/po/sk-SK.po 2009-07-15 16:56:23.000000000 +0100 @@ -1,20 +1,24 @@ -# Slovak messages for abiword. -# Copyright (C) 2000 Free Software Foundation, Inc. +# Copyright (C) 2000-2008 Free Software Foundation, Inc. # Jaroslav Rynk , 2008. -#. +# msgid "" msgstr "" -"Project-Id-Version: abiword VERSION\n" +"Project-Id-Version: AbiWord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-09 05:15+0100\n" -"PO-Revision-Date: 2005-05-16 12:26GMT+0100\n" -"Last-Translator: Martin Lacko , 2001\n" +"POT-Creation-Date: 2008-10-26 05:26+0100\n" +"PO-Revision-Date: 2008-12-23 11:36+0100\n" +"Last-Translator: Jaroslav Rynk \n" "Language-Team: Slovak\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 0.9.6\n" +"X-Poedit-Language: Slovak\n" +"X-Poedit-Country: SLOVAKIA\n" +#. +#. * Translatable strings file generated by extract-ui. +#. * DO NOT compile this file as part of your application. +#. #. MENU_LABEL__BOGUS1__ #. MENU_LABEL__BOGUS2__ #. MENU_STATUSLINE__BOGUS1__ @@ -32,28 +36,29 @@ #. MENU_STATUSLINE_ALIGN #. MENU_STATUSLINE_WINDOW #. MENU_STATUSLINE_HELP -#: po/tmp/ap_String_Id.h.h:25 +#: po/tmp/ap_String_Id.h.h:23 msgid " " msgstr " " #. DLG_Styles_ErrNotTitle2 -#: po/tmp/ap_String_Id.h.h:27 +#: po/tmp/ap_String_Id.h.h:25 msgid "" " - Reserved. \n" " You cannot use this name. Choose Another \n" msgstr "" -" - Obsaden. \n" -" Toto meno nemete poui. Prosm, vyberte si in \n" +" - Pouit. \n" +" Tento nzov nemete poui. Prosm, vyberte si in. \n" #. DLG_WordCount_Auto_Update -#: po/tmp/ap_String_Id.h.h:29 +#: po/tmp/ap_String_Id.h.h:27 msgid " Auto Update" -msgstr " Automaticky pota" +msgstr "Automaticky prepotava slov" #. DLG_PageSetup_Percent -#: po/tmp/ap_String_Id.h.h:31 +#: po/tmp/ap_String_Id.h.h:29 +#, fuzzy, c-format msgid "% of normal size" -msgstr "% normlnej vekosti" +msgstr "% normlnej vekosti" #. MENU_LABEL_SPELL_SUGGEST_1 #. MENU_LABEL_SPELL_SUGGEST_2 @@ -64,13 +69,13 @@ #. MENU_LABEL_SPELL_SUGGEST_7 #. MENU_LABEL_SPELL_SUGGEST_8 #. MENU_LABEL_SPELL_SUGGEST_9 -#: po/tmp/ap_String_Id.h.h:41 +#: po/tmp/ap_String_Id.h.h:39 #, c-format msgid "%s" msgstr "%s" #. MSG_DlgNotImp -#: po/tmp/ap_String_Id.h.h:43 +#: po/tmp/ap_String_Id.h.h:41 #, c-format msgid "" "%s not implemented yet.\n" @@ -82,10 +87,10 @@ "\n" "Otherwise, please be patient." msgstr "" -"Funkcia %s ete nie je implementovan.\n" +"Funkcia %s ete nie je implementovan.\n" "\n" -"Ak ste programtor, mete doplni kd %s, riadok %d\n" -"a posla patch na:\n" +"Ak ste programtor, pokojne mete doplni kd %s, riadok %d\n" +"a posla patch na:\n" "\n" "\tabiword-dev@abisource.com\n" "\n" @@ -94,1382 +99,1353 @@ #. MENU_LABEL_FILE_RECENT_1 #. MENU_LABEL_VIEW_TB_1 #. MENU_LABEL_WINDOW_1 -#: po/tmp/ap_String_Id.h.h:47 +#: po/tmp/ap_String_Id.h.h:45 #, c-format msgid "&1 %s" msgstr "&1 %s" #. DLG_Tab_Radio_None -#: po/tmp/ap_String_Id.h.h:49 +#: po/tmp/ap_String_Id.h.h:47 msgid "&1 None" -msgstr "&1 iadny" +msgstr "&1 iadne" #. MENU_LABEL_FILE_RECENT_2 #. MENU_LABEL_VIEW_TB_2 #. MENU_LABEL_WINDOW_2 -#: po/tmp/ap_String_Id.h.h:53 +#: po/tmp/ap_String_Id.h.h:51 #, c-format msgid "&2 %s" msgstr "&2 %s" #. DLG_Tab_Radio_Dot -#: po/tmp/ap_String_Id.h.h:55 +#: po/tmp/ap_String_Id.h.h:53 msgid "&2 .........." msgstr "&2 .........." #. MENU_LABEL_FILE_RECENT_3 #. MENU_LABEL_VIEW_TB_3 #. MENU_LABEL_WINDOW_3 -#: po/tmp/ap_String_Id.h.h:59 +#: po/tmp/ap_String_Id.h.h:57 #, c-format msgid "&3 %s" msgstr "&3 %s" #. DLG_Tab_Radio_Dash -#: po/tmp/ap_String_Id.h.h:61 +#: po/tmp/ap_String_Id.h.h:59 msgid "&3 ----------" msgstr "&3 ----------" #. MENU_LABEL_FILE_RECENT_4 #. MENU_LABEL_VIEW_TB_4 #. MENU_LABEL_WINDOW_4 -#: po/tmp/ap_String_Id.h.h:65 +#: po/tmp/ap_String_Id.h.h:63 #, c-format msgid "&4 %s" msgstr "&4 %s" #. DLG_Tab_Radio_Underline -#: po/tmp/ap_String_Id.h.h:67 +#: po/tmp/ap_String_Id.h.h:65 msgid "&4 __________" -msgstr "&4 __________" +msgstr "&4 _____" #. MENU_LABEL_FILE_RECENT_5 #. MENU_LABEL_WINDOW_5 -#: po/tmp/ap_String_Id.h.h:70 +#: po/tmp/ap_String_Id.h.h:68 #, c-format msgid "&5 %s" msgstr "&5 %s" #. MENU_LABEL_FILE_RECENT_6 #. MENU_LABEL_WINDOW_6 -#: po/tmp/ap_String_Id.h.h:73 +#: po/tmp/ap_String_Id.h.h:71 #, c-format msgid "&6 %s" msgstr "&6 %s" #. MENU_LABEL_FILE_RECENT_7 #. MENU_LABEL_WINDOW_7 -#: po/tmp/ap_String_Id.h.h:76 +#: po/tmp/ap_String_Id.h.h:74 #, c-format msgid "&7 %s" msgstr "&7 %s" #. MENU_LABEL_FILE_RECENT_8 #. MENU_LABEL_WINDOW_8 -#: po/tmp/ap_String_Id.h.h:79 +#: po/tmp/ap_String_Id.h.h:77 #, c-format msgid "&8 %s" msgstr "&8 %s" #. MENU_LABEL_FILE_RECENT_9 #. MENU_LABEL_WINDOW_9 -#: po/tmp/ap_String_Id.h.h:82 +#: po/tmp/ap_String_Id.h.h:80 #, c-format msgid "&9 %s" msgstr "&9 %s" #. MENU_LABEL_HELP_ABOUT -#: po/tmp/ap_String_Id.h.h:84 +#: po/tmp/ap_String_Id.h.h:82 #, c-format msgid "&About %s" msgstr "O programe &%s" #. MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION -#: po/tmp/ap_String_Id.h.h:86 +#: po/tmp/ap_String_Id.h.h:84 msgid "&Accept revision" -msgstr "&Prija zmenu v texte" +msgstr "&Prija zmenu v texte" #. DLG_Spell_AddToDict #. MENU_LABEL_SPELL_ADD -#: po/tmp/ap_String_Id.h.h:89 +#: po/tmp/ap_String_Id.h.h:87 msgid "&Add" msgstr "&Pridaj do slovnka" #. DLG_PageSetup_Adjust -#: po/tmp/ap_String_Id.h.h:91 +#: po/tmp/ap_String_Id.h.h:89 msgid "&Adjust to:" -msgstr "U&pravi na:" +msgstr "U&pravi na:" #. MENU_LABEL_ALIGN -#: po/tmp/ap_String_Id.h.h:93 +#: po/tmp/ap_String_Id.h.h:91 msgid "&Align" -msgstr "&Zarovna" +msgstr "&Zarovna" #. DLG_Options_Label_ViewAll -#: po/tmp/ap_String_Id.h.h:95 +#: po/tmp/ap_String_Id.h.h:93 msgid "&All" -msgstr "&Vetko" - -#. MENU_LABEL_TOOLS_ANNOTATIONS -#: po/tmp/ap_String_Id.h.h:97 -#, fuzzy -msgid "&Annotations" -msgstr "Odsadenie" +msgstr "&Vetko" #. DLG_ApplyButton -#: po/tmp/ap_String_Id.h.h:99 +#: po/tmp/ap_String_Id.h.h:95 msgid "&Apply" -msgstr "&Poui" +msgstr "&Poui" #. DLG_Para_LabelAt -#: po/tmp/ap_String_Id.h.h:101 +#: po/tmp/ap_String_Id.h.h:97 msgid "&At:" msgstr "&Na:" #. MENU_LABEL_TOOLS_AUTOSPELL -#: po/tmp/ap_String_Id.h.h:103 +#: po/tmp/ap_String_Id.h.h:99 msgid "&Auto Spellcheck" -msgstr "&Automaticky kontrolova pravopis" +msgstr "&Automaticky kontrolova preklepy" #. MENU_LABEL_TABLE_AUTOFIT -#: po/tmp/ap_String_Id.h.h:105 +#: po/tmp/ap_String_Id.h.h:101 msgid "&Autofit Table" -msgstr "&Automaticky prispsobi tabuku" +msgstr "&Automaticky prispsobi tabuku" #. DLG_Options_Label_PrefsAutoSave -#: po/tmp/ap_String_Id.h.h:107 +#: po/tmp/ap_String_Id.h.h:103 msgid "&Automatically save this Scheme" -msgstr "&Automaticky uklada tto schmu" +msgstr "&Automaticky uklada tto schmu" #. DLG_DateTime_AvailableFormats -#: po/tmp/ap_String_Id.h.h:109 +#: po/tmp/ap_String_Id.h.h:105 msgid "&Available formats:" msgstr "&Dostupn spsoby zpisu:" #. DLG_Para_LabelBefore -#: po/tmp/ap_String_Id.h.h:111 +#: po/tmp/ap_String_Id.h.h:107 msgid "&Before:" msgstr "&Pred:" #. MENU_LABEL_FMT_BOLD -#: po/tmp/ap_String_Id.h.h:113 +#: po/tmp/ap_String_Id.h.h:109 msgid "&Bold" -msgstr "&Tun" +msgstr "&tun" #. DLG_PageSetup_Bottom -#: po/tmp/ap_String_Id.h.h:115 +#: po/tmp/ap_String_Id.h.h:111 msgid "&Bottom:" -msgstr "&Dolny okraj:" +msgstr "&Doln okraj:" #. MENU_LABEL_INSERT_BREAK -#: po/tmp/ap_String_Id.h.h:117 +#: po/tmp/ap_String_Id.h.h:113 msgid "&Break" msgstr "&Zlom" #. MENU_LABEL_TABLE_SELECT_CELL -#: po/tmp/ap_String_Id.h.h:119 +#: po/tmp/ap_String_Id.h.h:115 msgid "&Cell" -msgstr "&Bunka" +msgstr "&bunku" #. MENU_LABEL_TABLE_INSERT_CELLS #. MENU_LABEL_TABLE_DELETE_CELLS -#: po/tmp/ap_String_Id.h.h:122 +#: po/tmp/ap_String_Id.h.h:118 msgid "&Cells" -msgstr "B&unky" +msgstr "b&unky" #. MENU_LABEL_ALIGN_CENTER -#: po/tmp/ap_String_Id.h.h:124 +#: po/tmp/ap_String_Id.h.h:120 msgid "&Center" -msgstr "&Na stred" +msgstr "&na stred" #. DLG_Spell_Change -#: po/tmp/ap_String_Id.h.h:126 +#: po/tmp/ap_String_Id.h.h:122 msgid "&Change" -msgstr "&Zameni" +msgstr "Na&hradi" #. MENU_LABEL_INSERT_CLIPART -#: po/tmp/ap_String_Id.h.h:128 +#: po/tmp/ap_String_Id.h.h:124 msgid "&Clip Art" msgstr "&Clip Art" #. DLG_CloseButton #. MENU_LABEL_FILE_CLOSE -#: po/tmp/ap_String_Id.h.h:131 +#: po/tmp/ap_String_Id.h.h:127 msgid "&Close" -msgstr "&Zavrie" +msgstr "&Zatvori" #. MENU_LABEL_TABLE_DELETE_COLUMNS -#: po/tmp/ap_String_Id.h.h:133 +#: po/tmp/ap_String_Id.h.h:129 msgid "&Column" -msgstr "&Stpec" +msgstr "&stpec" #. DLG_Break_ColumnBreak -#: po/tmp/ap_String_Id.h.h:135 +#: po/tmp/ap_String_Id.h.h:131 msgid "&Column break" msgstr "Z&lom stpca" #. MENU_LABEL_FMT_COLUMNS -#: po/tmp/ap_String_Id.h.h:137 +#: po/tmp/ap_String_Id.h.h:133 msgid "&Columns" msgstr "&Stpce" #. MENU_LABEL_TOOLS_REVISIONS_COMPARE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:139 +#: po/tmp/ap_String_Id.h.h:135 msgid "&Compare documents" -msgstr "Po&rovna dokumenty" +msgstr "po&rovna dokumenty" #. MENU_LABEL_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:141 +#: po/tmp/ap_String_Id.h.h:137 msgid "&Copy" -msgstr "&Koprova" +msgstr "&Koprova" #. MENU_LABEL_FMT_STYLE_DEFINE -#: po/tmp/ap_String_Id.h.h:143 +#: po/tmp/ap_String_Id.h.h:139 msgid "&Create and Modify Styles" -msgstr "&Vytvori a upravova tly" +msgstr "&Vytvori a upravova tly" #. DLG_Options_Label_PrefsCurrentScheme -#: po/tmp/ap_String_Id.h.h:145 +#: po/tmp/ap_String_Id.h.h:141 msgid "&Current Preferences Scheme" -msgstr "S&asn nastavenia pre schmu" +msgstr "S&asn nastavenia schmy" #. MENU_LABEL_TABLE_DELETE -#: po/tmp/ap_String_Id.h.h:147 +#: po/tmp/ap_String_Id.h.h:143 msgid "&Delete" -msgstr "Z&maza" - -#. MENU_LABEL_DELETE_ANNOTATION -#: po/tmp/ap_String_Id.h.h:149 -#, fuzzy -msgid "&Delete annotation" -msgstr "&Zmaza oznaen text" +msgstr "Z&maza" #. MENU_LABEL_INSERT_DELETE_HYPERLINK -#: po/tmp/ap_String_Id.h.h:151 +#: po/tmp/ap_String_Id.h.h:145 msgid "&Delete hyperlink" -msgstr "Z&mazat odkaz" +msgstr "Z&maza odkaz" #. DLG_Options_Btn_CustomDict -#: po/tmp/ap_String_Id.h.h:153 +#: po/tmp/ap_String_Id.h.h:147 msgid "&Dictionary..." msgstr "&Slovnk..." #. MENU_LABEL_INSERT_DIRECTIONMARKER -#: po/tmp/ap_String_Id.h.h:155 +#: po/tmp/ap_String_Id.h.h:149 msgid "&Direction Marker" -msgstr "&Smerov znaka" +msgstr "Znaku &pre smer textu" #. MENU_LABEL_FMT_DOCUMENT -#: po/tmp/ap_String_Id.h.h:157 +#: po/tmp/ap_String_Id.h.h:151 msgid "&Document" msgstr "&Dokument" #. MENU_LABEL_TOOLS_HISTORY -#: po/tmp/ap_String_Id.h.h:159 +#: po/tmp/ap_String_Id.h.h:153 msgid "&Document History" msgstr "&Histria dokumentu" #. MENU_LABEL_WINDOW -#: po/tmp/ap_String_Id.h.h:161 +#: po/tmp/ap_String_Id.h.h:155 msgid "&Documents" msgstr "&Dokumenty" #. DLG_Para_PushNoHyphenate -#: po/tmp/ap_String_Id.h.h:163 +#: po/tmp/ap_String_Id.h.h:157 msgid "&Don't hyphenate" -msgstr "&Nerozdeova slov" +msgstr "&Nerozdeova slov" #. DLG_Options_Btn_IgnoreEdit #. MENU_LABEL_EDIT -#: po/tmp/ap_String_Id.h.h:166 +#: po/tmp/ap_String_Id.h.h:160 msgid "&Edit" -msgstr "&Upravi" - -#. MENU_LABEL_EDIT_ANNOTATION -#: po/tmp/ap_String_Id.h.h:168 -msgid "&Edit annotation" -msgstr "Upr&avi poznmku/vysvetlvku" +msgstr "&Upravi" #. MENU_LABEL_INSERT_EDIT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:170 +#: po/tmp/ap_String_Id.h.h:162 msgid "&Edit hyperlink" -msgstr "U&pravi hypertextov odkaz" +msgstr "U&pravi hypertextov odkaz" #. DLG_Options_Label_SmartQuotesEnable -#: po/tmp/ap_String_Id.h.h:172 +#: po/tmp/ap_String_Id.h.h:164 msgid "&Enable smart quotes" -msgstr "P&ovoli okrhle vodzovky" +msgstr "P&ovoli okrhle vodzovky" #. MENU_LABEL_INSERT_ENDNOTE -#: po/tmp/ap_String_Id.h.h:174 +#: po/tmp/ap_String_Id.h.h:166 msgid "&Endnote" msgstr "&Koncov poznmka" #. DLG_Break_EvenPage -#: po/tmp/ap_String_Id.h.h:176 +#: po/tmp/ap_String_Id.h.h:168 msgid "&Even page" msgstr "P&rne strany" #. MENU_LABEL_INSERT_FIELD -#: po/tmp/ap_String_Id.h.h:178 +#: po/tmp/ap_String_Id.h.h:170 msgid "&Field" msgstr "&Pole" #. DLG_Field_Fields_No_Colon -#: po/tmp/ap_String_Id.h.h:180 +#: po/tmp/ap_String_Id.h.h:172 msgid "&Fields" -msgstr "&Polia(-)" +msgstr "&Polia" #. DLG_Field_Fields -#: po/tmp/ap_String_Id.h.h:182 +#: po/tmp/ap_String_Id.h.h:174 msgid "&Fields:" msgstr "&Polia:" #. MENU_LABEL_FILE -#: po/tmp/ap_String_Id.h.h:184 +#: po/tmp/ap_String_Id.h.h:176 msgid "&File" msgstr "&Sbor" #. DLG_Options_Label_FileExtension -#: po/tmp/ap_String_Id.h.h:186 +#: po/tmp/ap_String_Id.h.h:178 msgid "&File extension:" msgstr "&Prpona sboru:" #. MENU_LABEL_EDIT_FIND -#: po/tmp/ap_String_Id.h.h:188 +#: po/tmp/ap_String_Id.h.h:180 msgid "&Find" -msgstr "Nj&s" +msgstr "Nj&s" #. DLG_FR_FindNextButton -#: po/tmp/ap_String_Id.h.h:190 +#: po/tmp/ap_String_Id.h.h:182 msgid "&Find Next" -msgstr "&Hada alej" +msgstr "&Hada alej" #. MENU_LABEL_FMT_FONT -#: po/tmp/ap_String_Id.h.h:192 +#: po/tmp/ap_String_Id.h.h:184 msgid "&Font" msgstr "&Psmo" #. DLG_PageSetup_Footer -#: po/tmp/ap_String_Id.h.h:194 +#: po/tmp/ap_String_Id.h.h:186 msgid "&Footer:" msgstr "&Pta:" #. MENU_LABEL_TABLE_FORMAT -#: po/tmp/ap_String_Id.h.h:196 +#: po/tmp/ap_String_Id.h.h:188 msgid "&Format Table" -msgstr "&Formt tabuky" +msgstr "&Formt tabuky" #. MENU_LABEL_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:198 +#: po/tmp/ap_String_Id.h.h:190 msgid "&Go To" msgstr "&Cho na" #. DLG_FormatTOC_HasHeading -#: po/tmp/ap_String_Id.h.h:200 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:192 msgid "&Has Heading" msgstr "&Nadpis 3" #. MENU_LABEL_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:202 +#: po/tmp/ap_String_Id.h.h:194 msgid "&Header and Footer" msgstr "&Zhlavie a pta" #. DLG_PageSetup_Header -#: po/tmp/ap_String_Id.h.h:204 +#: po/tmp/ap_String_Id.h.h:196 msgid "&Header:" msgstr "&Zhlavie:" #. DLG_PageSetup_Height -#: po/tmp/ap_String_Id.h.h:206 +#: po/tmp/ap_String_Id.h.h:198 msgid "&Height:" -msgstr "&Vka:" +msgstr "&Vka:" #. DLG_HelpButton #. MENU_LABEL_HELP -#: po/tmp/ap_String_Id.h.h:209 +#: po/tmp/ap_String_Id.h.h:201 msgid "&Help" msgstr "&Npoveda" #. DLG_Options_Label_ViewHiddenText -#: po/tmp/ap_String_Id.h.h:211 +#: po/tmp/ap_String_Id.h.h:203 msgid "&Hidden Text" msgstr "&Skryt text" #. DLG_Options_Label_SpellHighlightMisspelledWords -#: po/tmp/ap_String_Id.h.h:213 +#: po/tmp/ap_String_Id.h.h:205 msgid "&Highlight misspelled words" -msgstr "&Zvrazni preklepy" +msgstr "&Zvrazni preklepy" #. MENU_LABEL_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:215 +#: po/tmp/ap_String_Id.h.h:207 msgid "&Hyperlink" msgstr "Hypertextov &odkaz" #. DLG_Spell_Ignore -#: po/tmp/ap_String_Id.h.h:217 +#: po/tmp/ap_String_Id.h.h:209 msgid "&Ignore" -msgstr "&Ignorova" +msgstr "&Preskoi vdy" #. MENU_LABEL_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:219 +#: po/tmp/ap_String_Id.h.h:211 msgid "&Ignore All" -msgstr "&Ignorovat vetko" +msgstr "Pr&eskoi vdy" #. MENU_LABEL_FMT_IMAGE #. MENU_LABEL_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:222 +#: po/tmp/ap_String_Id.h.h:214 msgid "&Image" -msgstr "&Obrzok" +msgstr "O&brzok" #. MENU_LABEL_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:224 +#: po/tmp/ap_String_Id.h.h:216 msgid "&Import Styles" -msgstr "&Importovat tly" +msgstr "&Importova tly" #. MENU_LABEL_WEB_WEBPREVIEW -#: po/tmp/ap_String_Id.h.h:226 +#: po/tmp/ap_String_Id.h.h:218 msgid "&In web browser" -msgstr "V okne &webovho prehliadaa" +msgstr "V okne &webovho prehadvaa" #. DLG_FormatTOC_InheritLabel -#: po/tmp/ap_String_Id.h.h:228 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:220 msgid "&Inherit label" -msgstr "&Vloi tabuku" +msgstr "&Vloi tabuku" #. DLG_InsertButton #. MENU_LABEL_INSERT #. MENU_LABEL_TABLE_INSERT #. DLG_Insert -#: po/tmp/ap_String_Id.h.h:232 po/tmp/xap_String_Id.h.h:15 +#: po/tmp/ap_String_Id.h.h:224 +#: po/tmp/xap_String_Id.h.h:15 msgid "&Insert" -msgstr "&Vloi" +msgstr "&Vloi" #. DLG_Options_Label_AutoSaveInterval -#: po/tmp/ap_String_Id.h.h:234 +#: po/tmp/ap_String_Id.h.h:226 msgid "&Interval:" msgstr "&Interval:" #. MENU_LABEL_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:236 +#: po/tmp/ap_String_Id.h.h:228 msgid "&Italic" -msgstr "&Kurzva" - -#. MENU_LABEL_GOTO_ANNOTATION -#: po/tmp/ap_String_Id.h.h:238 -msgid "&Jump to annotation" -msgstr "&Cho na anotciu" +msgstr "&kurzva" #. MENU_LABEL_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:240 +#: po/tmp/ap_String_Id.h.h:230 msgid "&Jump to hyperlink" -msgstr "P&rejs na odkaz" +msgstr "P&rejs na odkaz" #. MENU_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:242 +#: po/tmp/ap_String_Id.h.h:232 msgid "&Justify" -msgstr "&Do bloku" +msgstr "&do bloku" #. DLG_Para_PushKeepLinesTogether -#: po/tmp/ap_String_Id.h.h:244 +#: po/tmp/ap_String_Id.h.h:234 msgid "&Keep lines together" -msgstr "U&dra riadky spolu" +msgstr "U&dra riadky spolu" #. MENU_LABEL_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:246 +#: po/tmp/ap_String_Id.h.h:236 msgid "&LRM" -msgstr "&LRM" +msgstr "&zava doprava" #. DLG_PageSetup_Landscape -#: po/tmp/ap_String_Id.h.h:248 +#: po/tmp/ap_String_Id.h.h:238 msgid "&Landscape" -msgstr "Na r&ku" +msgstr "Na r&ku" #. MENU_LABEL_TOOLS_LANGUAGE -#: po/tmp/ap_String_Id.h.h:250 +#: po/tmp/ap_String_Id.h.h:240 msgid "&Language" msgstr "&Jazyk" #. MENU_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:252 +#: po/tmp/ap_String_Id.h.h:242 msgid "&Left" -msgstr "&Vavo" +msgstr "&vavo" #. MENU_LABEL_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:254 +#: po/tmp/ap_String_Id.h.h:244 msgid "&Left-to-right text" -msgstr "Text z zava doprava" +msgstr "text &zava doprava" #. DLG_Para_LabelLeft #. DLG_PageSetup_Left -#: po/tmp/ap_String_Id.h.h:257 +#: po/tmp/ap_String_Id.h.h:247 msgid "&Left:" -msgstr "&Vavo:" +msgstr "&Vavo:" #. MENU_LABEL_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:259 +#: po/tmp/ap_String_Id.h.h:249 msgid "&Lock layout" -msgstr "Zamkn &rozmiestnenie" +msgstr "Zamkn &rozmiestnenie" #. MENU_LABEL_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:261 +#: po/tmp/ap_String_Id.h.h:251 msgid "&Mail Merge" -msgstr "&Hromadn korepondencia" +msgstr "&Hromadn korepondencia" #. MENU_LABEL_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:263 +#: po/tmp/ap_String_Id.h.h:253 msgid "&Mail Merge Field" -msgstr "Pole &hromadnej korepondencie" +msgstr "Pole &hromadnej korepondencie" #. MENU_LABEL_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:265 +#: po/tmp/ap_String_Id.h.h:255 msgid "&Maintain Full History" -msgstr "Spravova &cel histriu" +msgstr "uklada &cel histriu" #. MENU_LABEL_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:267 +#: po/tmp/ap_String_Id.h.h:257 msgid "&Mark revisions while typing" -msgstr "&Oznaova zmeny v texte poas psania" +msgstr "&oznaova zmeny v texte poas psania" #. DLG_FR_MatchCase -#: po/tmp/ap_String_Id.h.h:269 +#: po/tmp/ap_String_Id.h.h:259 msgid "&Match case" -msgstr "&Rozliova mal a vek psmen" +msgstr "&Rozliova mal a vek psmen" #. MENU_LABEL_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:271 +#: po/tmp/ap_String_Id.h.h:261 msgid "&Merge Cells" -msgstr "S&poji bunky" +msgstr "S&poji bunky" #. MENU_LABEL_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:273 +#: po/tmp/ap_String_Id.h.h:263 msgid "&More Documents" msgstr "&Viac dokumentov" #. DLG_Goto_Label_Name -#: po/tmp/ap_String_Id.h.h:275 +#: po/tmp/ap_String_Id.h.h:265 msgid "&Name:" msgstr "&Nzov:" #. MENU_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:277 +#: po/tmp/ap_String_Id.h.h:267 msgid "&New" msgstr "&Nov" #. MENU_LABEL_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:279 +#: po/tmp/ap_String_Id.h.h:269 msgid "&New Window" msgstr "&Nov okno" #. MENU_LABEL_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:281 +#: po/tmp/ap_String_Id.h.h:271 msgid "&New using Template" -msgstr "Nov pomocou a&blny" +msgstr "Vytvori nov pomocou a&blny" #. DLG_Break_NextPage -#: po/tmp/ap_String_Id.h.h:283 +#: po/tmp/ap_String_Id.h.h:273 msgid "&Next page" -msgstr "alia &strana" +msgstr "alia &strana" #. MENU_LABEL_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:285 +#: po/tmp/ap_String_Id.h.h:275 msgid "&Normal Layout" msgstr "&Normlne rozmiestnenie" #. DLG_Goto_Label_Number -#: po/tmp/ap_String_Id.h.h:287 +#: po/tmp/ap_String_Id.h.h:277 msgid "&Number:" msgstr "&slo:" #. DLG_FormatTOC_NumberingType -#: po/tmp/ap_String_Id.h.h:289 +#: po/tmp/ap_String_Id.h.h:279 msgid "&Numbering type:" -msgstr "&Typ slovnia:" +msgstr "&Typ slovania:" #. DLG_Break_OddPage -#: po/tmp/ap_String_Id.h.h:291 +#: po/tmp/ap_String_Id.h.h:281 msgid "&Odd page" msgstr "&Neprne strany" #. MENU_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:293 +#: po/tmp/ap_String_Id.h.h:283 msgid "&Open" -msgstr "&Otvori" +msgstr "&Otvori" #. DLG_MailMerge_OpenFile -#: po/tmp/ap_String_Id.h.h:295 +#: po/tmp/ap_String_Id.h.h:285 msgid "&Open File" -msgstr "&Otvori sbor" +msgstr "&Otvori sbor" #. MENU_LABEL_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:297 +#: po/tmp/ap_String_Id.h.h:287 msgid "&Overline" -msgstr "P&od iarou" +msgstr "i&ara nad" #. MENU_LABEL_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:299 +#: po/tmp/ap_String_Id.h.h:289 msgid "&Page Width" -msgstr "rku s&trany" +msgstr "Na rku o&brazovky" #. DLG_Break_PageBreak -#: po/tmp/ap_String_Id.h.h:301 +#: po/tmp/ap_String_Id.h.h:291 msgid "&Page break" msgstr "&Zlom strany" #. DLG_FormatTOC_PageNumbering -#: po/tmp/ap_String_Id.h.h:303 +#: po/tmp/ap_String_Id.h.h:293 msgid "&Page numbering:" msgstr "s&lovanie strn:" #. MENU_LABEL_FMT_PARAGRAPH -#: po/tmp/ap_String_Id.h.h:305 +#: po/tmp/ap_String_Id.h.h:295 msgid "&Paragraph" -msgstr "&Odsek" +msgstr "Od&sek" #. MENU_LABEL_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:307 +#: po/tmp/ap_String_Id.h.h:297 msgid "&Paste" -msgstr "V&loi" +msgstr "V&loi" #. MENU_LABEL_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:309 +#: po/tmp/ap_String_Id.h.h:299 msgid "&Picture" msgstr "O&brzok" #. MENU_LABEL_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:311 +#: po/tmp/ap_String_Id.h.h:301 msgid "&Plugins" msgstr "&Moduly" #. DLG_PageSetup_Portrait -#: po/tmp/ap_String_Id.h.h:313 +#: po/tmp/ap_String_Id.h.h:303 msgid "&Portrait" -msgstr "Na &vku" +msgstr "Na &vku" #. MENU_LABEL_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:315 +#: po/tmp/ap_String_Id.h.h:305 msgid "&Print" msgstr "&Tla" #. MENU_LABEL_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:317 +#: po/tmp/ap_String_Id.h.h:307 msgid "&Print Layout" -msgstr "&Rozmiestnenie pre tla" +msgstr "Zob&razenie pre tla" #. MENU_LABEL_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:319 +#: po/tmp/ap_String_Id.h.h:309 msgid "&Purge History" -msgstr "&Vyma histriu" +msgstr "&vyma histriu" #. MENU_LABEL_FILE_EXIT -#: po/tmp/ap_String_Id.h.h:321 +#: po/tmp/ap_String_Id.h.h:311 msgid "&Quit" msgstr "&Koniec" #. MENU_LABEL_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:323 +#: po/tmp/ap_String_Id.h.h:313 msgid "&RLM" -msgstr "&RLM" +msgstr "&sprava doava" #. MENU_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:325 +#: po/tmp/ap_String_Id.h.h:315 msgid "&Redo" msgstr "Z&nova" #. MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:327 +#: po/tmp/ap_String_Id.h.h:317 msgid "&Reject revision" -msgstr "&Odmietnu zmenu v texte" +msgstr "&odmietnu zmenu v texte" #. DLG_FR_ReplaceButton -#: po/tmp/ap_String_Id.h.h:329 +#: po/tmp/ap_String_Id.h.h:319 msgid "&Replace" -msgstr "Nah&radi" +msgstr "Nah&radi" #. DLG_Options_Btn_IgnoreReset -#: po/tmp/ap_String_Id.h.h:331 +#: po/tmp/ap_String_Id.h.h:321 msgid "&Reset" -msgstr "&Obnovi" +msgstr "&Obnovi" #. MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:333 +#: po/tmp/ap_String_Id.h.h:323 msgid "&Reset to default layout" -msgstr "Zm&eni na pvodn rozmiestnenie" +msgstr "Zm&eni na pvodn rozmiestnenie" #. MENU_LABEL_TOOLS_REVISIONS -#: po/tmp/ap_String_Id.h.h:335 +#: po/tmp/ap_String_Id.h.h:325 msgid "&Revisions" -msgstr "&Zmeny v texte" +msgstr "Z&meny v texte (revzie)" #. MENU_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:337 +#: po/tmp/ap_String_Id.h.h:327 msgid "&Right" -msgstr "V&pravo" +msgstr "v&pravo" #. MENU_LABEL_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:339 +#: po/tmp/ap_String_Id.h.h:329 msgid "&Right-to-left text" -msgstr "Text sp&rava doava" +msgstr "text sp&rava doava" #. DLG_Para_LabelRight #. DLG_PageSetup_Right -#: po/tmp/ap_String_Id.h.h:342 +#: po/tmp/ap_String_Id.h.h:332 msgid "&Right:" msgstr "V&pravo:" #. MENU_LABEL_TABLE_DELETE_ROWS #. MENU_LABEL_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:345 +#: po/tmp/ap_String_Id.h.h:335 msgid "&Row" -msgstr "R&iadok" +msgstr "r&iadok" #. DLG_Options_Label_ViewRuler -#: po/tmp/ap_String_Id.h.h:347 +#: po/tmp/ap_String_Id.h.h:337 msgid "&Ruler" msgstr "&Pravtko" #. MENU_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:349 +#: po/tmp/ap_String_Id.h.h:339 msgid "&Save" -msgstr "&Uloi" +msgstr "&Uloi" #. MENU_LABEL_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:351 +#: po/tmp/ap_String_Id.h.h:341 msgid "&Save Image As" -msgstr "Uloi obrzok &ako" +msgstr "Uloi obrzok &ako" #. MENU_LABEL_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:353 +#: po/tmp/ap_String_Id.h.h:343 msgid "&Save web page" -msgstr "Uloi &webov strnku" +msgstr "Uloi &webov strnku" #. MENU_LABEL_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:355 +#: po/tmp/ap_String_Id.h.h:345 msgid "&Search for Help" -msgstr "&Hada v npovede" +msgstr "&Hada v npovede" #. MENU_LABEL_TABLE_SELECT -#: po/tmp/ap_String_Id.h.h:357 +#: po/tmp/ap_String_Id.h.h:347 msgid "&Select" msgstr "&Ozna" #. MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL -#: po/tmp/ap_String_Id.h.h:359 +#: po/tmp/ap_String_Id.h.h:349 msgid "&Select revision" -msgstr "Vybra &zmenu v texte zo zoznamu" +msgstr "Vybra &zmenu v texte zo zoznamu" #. MENU_LABEL_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:361 +#: po/tmp/ap_String_Id.h.h:351 msgid "&Show History" -msgstr "Zobrazi &histriu" +msgstr "zobrazi &histriu" #. MENU_LABEL_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:363 +#: po/tmp/ap_String_Id.h.h:353 msgid "&Show Status Bar" -msgstr "&Zobrazi stavov litu" - -#. MENU_LABEL_TOOLS_ANNOTATIONS_TOGGLE_DISPLAY -#: po/tmp/ap_String_Id.h.h:365 -#, fuzzy -msgid "&Show annotations" -msgstr "&Zobrazi stavov litu" +msgstr "&Zobrazi stavov panel" #. DLG_Para_LabelSpecial -#: po/tmp/ap_String_Id.h.h:367 +#: po/tmp/ap_String_Id.h.h:355 msgid "&Special:" -msgstr "V&lastn:" +msgstr "V&lastn tl:" #. MENU_LABEL_TOOLS_SPELLING -#: po/tmp/ap_String_Id.h.h:369 +#: po/tmp/ap_String_Id.h.h:357 msgid "&Spelling" msgstr "&Kontrola preklepov" #. DLG_FormatTOC_StartAt -#: po/tmp/ap_String_Id.h.h:371 +#: po/tmp/ap_String_Id.h.h:359 msgid "&Start at:" -msgstr "&Zaa na:" +msgstr "&Zaa na:" #. DLG_Options_Label_ViewStatusBar -#: po/tmp/ap_String_Id.h.h:373 +#: po/tmp/ap_String_Id.h.h:361 msgid "&Status bar" -msgstr "&Stavov panel" +msgstr "&Stavov panel" #. MENU_LABEL_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:375 +#: po/tmp/ap_String_Id.h.h:363 msgid "&Subscript" -msgstr "&Doln index" +msgstr "&doln index" #. DLG_Para_PushSuppressLineNumbers -#: po/tmp/ap_String_Id.h.h:377 +#: po/tmp/ap_String_Id.h.h:365 msgid "&Suppress line numbers" -msgstr "Po&tlai slovanie riadkov" +msgstr "Po&tlai slovanie riadkov" #. DLG_FormatTOC_TabLeader -#: po/tmp/ap_String_Id.h.h:379 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:367 msgid "&Tab leader:" -msgstr "Z&hlavie:" +msgstr "&Vodiaci znak:" #. MENU_LABEL_TABLE_INSERT_TABLE #. MENU_LABEL_TABLE_DELETE_TABLE #. MENU_LABEL_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:383 +#: po/tmp/ap_String_Id.h.h:371 msgid "&Table" -msgstr "&Tabuka" +msgstr "&tabuku" #. MENU_LABEL_FMT_TABS -#: po/tmp/ap_String_Id.h.h:385 +#: po/tmp/ap_String_Id.h.h:373 msgid "&Tabs" msgstr "&Tabultory" #. DLG_Para_ButtonTabs -#: po/tmp/ap_String_Id.h.h:387 +#: po/tmp/ap_String_Id.h.h:375 msgid "&Tabs..." msgstr "&Tabultory..." #. MENU_LABEL_VIEW_TOOLBARS -#: po/tmp/ap_String_Id.h.h:389 +#: po/tmp/ap_String_Id.h.h:377 msgid "&Toolbars" msgstr "Z&oznam nstrojov" #. MENU_LABEL_TOOLS -#: po/tmp/ap_String_Id.h.h:391 +#: po/tmp/ap_String_Id.h.h:379 msgid "&Tools" msgstr "&Nstroje" #. DLG_PageSetup_Top -#: po/tmp/ap_String_Id.h.h:393 +#: po/tmp/ap_String_Id.h.h:381 msgid "&Top:" msgstr "&Horn okraj:" #. DLG_Field_Types_No_Colon -#: po/tmp/ap_String_Id.h.h:395 +#: po/tmp/ap_String_Id.h.h:383 msgid "&Types" msgstr "&Typy" #. DLG_Field_Types -#: po/tmp/ap_String_Id.h.h:397 +#: po/tmp/ap_String_Id.h.h:385 msgid "&Types:" msgstr "&Typy:" #. MENU_LABEL_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:399 +#: po/tmp/ap_String_Id.h.h:387 msgid "&Underline" -msgstr "&Podtiarknutie" +msgstr "&podiarknut" #. MENU_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:401 +#: po/tmp/ap_String_Id.h.h:389 msgid "&Undo" -msgstr "&Sp" +msgstr "&Sp" #. DLG_Options_Label_ViewUnits #. DLG_PageSetup_Units -#: po/tmp/ap_String_Id.h.h:404 +#: po/tmp/ap_String_Id.h.h:392 msgid "&Units:" -msgstr "&Jednotky:" +msgstr "&Jedn.:" #. MENU_LABEL_VIEW #. DLG_MW_ViewButton -#: po/tmp/ap_String_Id.h.h:406 po/tmp/xap_String_Id.h.h:21 +#: po/tmp/ap_String_Id.h.h:394 +#: po/tmp/xap_String_Id.h.h:21 msgid "&View" -msgstr "&Zobrazi" +msgstr "&Zobrazi" #. MENU_LABEL_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:408 +#: po/tmp/ap_String_Id.h.h:396 msgid "&Web Layout" -msgstr "Roz&miestnenie pre web" +msgstr "Zobrazenie pre &web" #. MENU_LABEL_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:410 +#: po/tmp/ap_String_Id.h.h:398 msgid "&Whole Page" -msgstr "&Cel strana" +msgstr "&Cel strana/1 okno" #. DLG_FR_WholeWord -#: po/tmp/ap_String_Id.h.h:412 +#: po/tmp/ap_String_Id.h.h:400 msgid "&Whole word" msgstr "&Cel slovo" #. DLG_Para_PushWidowOrphanControl -#: po/tmp/ap_String_Id.h.h:414 +#: po/tmp/ap_String_Id.h.h:402 msgid "&Widow/Orphan control" msgstr "&Ovldanie okien/tzv. sirt" #. DLG_PageSetup_Width -#: po/tmp/ap_String_Id.h.h:416 +#: po/tmp/ap_String_Id.h.h:404 msgid "&Width:" -msgstr "&rka:" +msgstr "&rka:" #. MENU_LABEL_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:418 +#: po/tmp/ap_String_Id.h.h:406 msgid "&Word Count" msgstr "Poet &slov" #. MENU_LABEL_VIEW_ZOOM_MENU #. MENU_LABEL_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:421 +#: po/tmp/ap_String_Id.h.h:409 msgid "&Zoom" msgstr "&Lupa" #. DLG_ListRevisions_LevelZero -#: po/tmp/ap_String_Id.h.h:423 +#: po/tmp/ap_String_Id.h.h:411 msgid "(All revisions visible)" -msgstr "(Vetky zmeny v texte s zobrazen)" +msgstr "(Vetky zmeny v texte s zobrazen)" #. DLG_Spell_NoSuggestions -#: po/tmp/ap_String_Id.h.h:425 +#: po/tmp/ap_String_Id.h.h:413 msgid "(no spelling suggestions)" -msgstr "(iadne nvrhy)" +msgstr "(iadne nvrhy)" #. DLG_Para_SpecialNone -#: po/tmp/ap_String_Id.h.h:427 +#: po/tmp/ap_String_Id.h.h:415 msgid "(none)" -msgstr "(iadne)" +msgstr "(iadny)" #. TOOLBAR_LABEL_1COLUMN #. TOOLBAR_STATUSLINE_1COLUMN #. TOOLBAR_TOOLTIP_1COLUMN -#: po/tmp/ap_String_Id.h.h:431 +#: po/tmp/ap_String_Id.h.h:419 msgid "1 Column" msgstr "1 stpec" #. TOOLBAR_LABEL_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:433 +#: po/tmp/ap_String_Id.h.h:421 msgid "1.5 Spacing" -msgstr "Riadkovanie 1.5" +msgstr "Riadkovanie 1,5" #. DLG_Para_SpacingHalf -#: po/tmp/ap_String_Id.h.h:435 +#: po/tmp/ap_String_Id.h.h:423 msgid "1.5 lines" -msgstr "1.5 riadku" +msgstr "1,5 riadka" #. TOOLBAR_STATUSLINE_MIDDLE_SPACE #. TOOLBAR_TOOLTIP_MIDDLE_SPACE -#: po/tmp/ap_String_Id.h.h:438 +#: po/tmp/ap_String_Id.h.h:426 msgid "1.5 spacing" -msgstr "1.5 medzery" +msgstr "riadkovanie 1,5" #. TOOLBAR_LABEL_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:440 +#: po/tmp/ap_String_Id.h.h:428 msgid "12 pt before" msgstr "12 bodov pred" #. TOOLBAR_LABEL_2COLUMN #. TOOLBAR_STATUSLINE_2COLUMN #. TOOLBAR_TOOLTIP_2COLUMN -#: po/tmp/ap_String_Id.h.h:444 +#: po/tmp/ap_String_Id.h.h:432 msgid "2 Columns" msgstr "2 stpce" #. TOOLBAR_LABEL_3COLUMN #. TOOLBAR_STATUSLINE_3COLUMN #. TOOLBAR_TOOLTIP_3COLUMN -#: po/tmp/ap_String_Id.h.h:448 +#: po/tmp/ap_String_Id.h.h:436 msgid "3 Columns" msgstr "3 stpce" #. DLG_Goto_Btn_Prev -#: po/tmp/ap_String_Id.h.h:450 +#: po/tmp/ap_String_Id.h.h:438 msgid "<< Prev" -msgstr "<< Predchdzajci" +msgstr "<< Predchdzaj." #. MSG_Exception -#: po/tmp/ap_String_Id.h.h:452 +#: po/tmp/ap_String_Id.h.h:440 msgid "" -"A fatal error has just occurred. Abiword is going to shutdown.\n" +"A fatal error has just occurred. AbiWord is going to shutdown.\n" "The current document has been saved to disc with a \".saved\" extension." msgstr "" "Vyskytla sa kritick chyba. Abiword sa zatvor.\n" "Aktulny dokument bol uloen na disk s prponou \".saved\"." #. DLG_Options_Label_SpellSuggest -#: po/tmp/ap_String_Id.h.h:454 +#: po/tmp/ap_String_Id.h.h:442 msgid "A&lways suggest corrections" -msgstr "Vdy nav&rhova opravy" +msgstr "Vdy nav&rhova opravy" #. FIELD_DateTime_AMPM -#: po/tmp/ap_String_Id.h.h:456 +#: po/tmp/ap_String_Id.h.h:444 msgid "AM/PM" msgstr "AM/PM" #. MSG_IE_BogusDocument -#: po/tmp/ap_String_Id.h.h:458 +#: po/tmp/ap_String_Id.h.h:446 #, c-format msgid "AbiWord cannot open %s. It appears to be an invalid document" -msgstr "Abiword neme otvori sbor %s. Asi je to neplatn dokument" +msgstr "Abiword neme otvori sbor %s. Asi ide o neplatn dokument" #. MSG_SpellSelectionDone -#: po/tmp/ap_String_Id.h.h:460 +#: po/tmp/ap_String_Id.h.h:448 msgid "AbiWord finished checking the selection." -msgstr "Abiword dokonil kontrolu vybranho textu." +msgstr "Abiword dokonil kontrolu vo vybranej asti textu." #. DLG_FR_FinishedReplace -#: po/tmp/ap_String_Id.h.h:462 +#: po/tmp/ap_String_Id.h.h:450 #, c-format -msgid "" -"AbiWord has finished its search of the document and has made %d replacements." -msgstr "Abiword dokonil prehadvanie dokumentu a urobil %d prav(-y)." +msgid "AbiWord has finished its search of the document and has made %d replacements." +msgstr "Abiword dokonil prehadvanie dokumentu a urobil %d prav(-u/-y)." #. DLG_FR_FinishedFind -#: po/tmp/ap_String_Id.h.h:464 +#: po/tmp/ap_String_Id.h.h:452 msgid "AbiWord has finished searching the document." -msgstr "Abiword dokonil prehadvanie dokumentu." +msgstr "Abiword dokonil prehadvanie dokumentu." #. WINDOWS_COMCTL_WARNING -#: po/tmp/ap_String_Id.h.h:466 +#: po/tmp/ap_String_Id.h.h:454 msgid "" "AbiWord is designed for a newer version of the system file COMCTL32.DLL\n" "than the one currently on your system. (COMCTL32.DLL version 4.72 or newer)\n" -"A solution to this problem is explained in the FAQ on the AbiSource web " -"site\n" +"A solution to this problem is explained in the FAQ on the AbiSource web site\n" "\n" "\thttp://www.abisource.com\n" "\n" "You can use the program, but the toolbar may be missing." msgstr "" "AbiWord je vyroben pre nov verziu systmovho sboru COMCTL32.DLL,\n" -"ktor nemte (COMCTL32.DLL verzia 4.72 alebo nov).\n" -"Ako vyriei tento problm, vysvetuje rubrika FAQ na webovej strnke AbiSource.\n" +"ktor nemte (COMCTL32.DLL, verzia 4.72 alebo nov).\n" +"Ako vyriei tento problm, vysvetuje rubrika FAQ na strnke AbiSource.\n" "\n" "\thttp://www.abisource.com\n" "\n" -"Program pouva mete, ale niektor nstroje vm mu chba." +"Program pouva mete, ale niektor nstroje vm mu chba." #. WINDOWS_NEED_UNICOWS -#: po/tmp/ap_String_Id.h.h:468 +#: po/tmp/ap_String_Id.h.h:456 #, c-format msgid "" "AbiWord needs the file %s.dll\n" -"Please download and install it from http://www.microsoft.com/msdownload/" -"platformsdk/sdkupdate/psdkredist.htm" +"Please download and install it from http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdkredist.htm" msgstr "" "Program AbiWord potrebuje sbor %s.dll\n" -"Prosm, navtvte strnku http://www.microsoft.com/msdownload/platformsdk/" -"sdkupdate/psdkredist.htm a naintalujte ho." +"Prosm, navtvte strnku http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdkredist.htm a naintalujte si ho." #. MENU_LABEL_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:470 +#: po/tmp/ap_String_Id.h.h:458 msgid "About G&NOME Office" msgstr "O G&NOME Office" #. MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE -#: po/tmp/ap_String_Id.h.h:472 +#: po/tmp/ap_String_Id.h.h:460 msgid "About the GNOME Office project" msgstr "O projekte GNOME Office" #. MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION -#: po/tmp/ap_String_Id.h.h:474 +#: po/tmp/ap_String_Id.h.h:462 msgid "Accept the suggested change" -msgstr "Prija navrhovan zmenu" +msgstr "Prjme navrhovan zmenu" #. TOOLBAR_STATUSLINE_ADD_COLUMN #. TOOLBAR_TOOLTIP_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:477 +#: po/tmp/ap_String_Id.h.h:465 msgid "Add a column to this table after the current column" -msgstr "Prida stpec do tabuky za aktulny" +msgstr "Pridajte stpec za aktulny" #. TOOLBAR_STATUSLINE_ADD_ROW #. TOOLBAR_TOOLTIP_ADD_ROW -#: po/tmp/ap_String_Id.h.h:480 +#: po/tmp/ap_String_Id.h.h:468 msgid "Add a row to this table after the current row" -msgstr "Prida riadok do tabuky za aktulny" +msgstr "Pridajte riadok za aktulny" #. MENU_STATUSLINE_FMT_BORDERS -#: po/tmp/ap_String_Id.h.h:482 +#: po/tmp/ap_String_Id.h.h:470 msgid "Add borders and shading to the selection" -msgstr "Nastavi okraje a tienovanie oznaenmu textu" +msgstr "Nastavte okraje a tieovanie oznaenmu textu" #. TOOLBAR_LABEL_ADD_COLUMN -#: po/tmp/ap_String_Id.h.h:484 +#: po/tmp/ap_String_Id.h.h:472 msgid "Add column after" -msgstr "Prida stpec za" +msgstr "Pridajte stpec za" #. MENU_STATUSLINE_FMT_BULLETS -#: po/tmp/ap_String_Id.h.h:486 +#: po/tmp/ap_String_Id.h.h:474 msgid "Add or modify bullets and numbering for selected paragraphs" -msgstr "Prida nebo zmeni odrky a slovanie vybranho odseku" +msgstr "Pridajte alebo upravte odrky a slovanie odseku" #. TOOLBAR_LABEL_ADD_ROW -#: po/tmp/ap_String_Id.h.h:488 +#: po/tmp/ap_String_Id.h.h:476 msgid "Add row after" -msgstr "Prida riadok za" +msgstr "Prida riadok za" #. MENU_STATUSLINE_SPELL_ADD -#: po/tmp/ap_String_Id.h.h:490 +#: po/tmp/ap_String_Id.h.h:478 msgid "Add this word to the custom dictionary" -msgstr "Prida toto slovo do uivateskho slovnka" +msgstr "Prid toto slovo do uvateskho slovnka" #. DLG_Styles_ModifyTemplate -#: po/tmp/ap_String_Id.h.h:492 +#: po/tmp/ap_String_Id.h.h:480 msgid "Add to template" -msgstr "Prida do ablny" +msgstr "Prida do ablny" #. DLG_Para_LabelAfter -#: po/tmp/ap_String_Id.h.h:494 +#: po/tmp/ap_String_Id.h.h:482 msgid "Aft&er:" msgstr "&Za:" #. DLG_Para_LabelAlignment -#: po/tmp/ap_String_Id.h.h:496 +#: po/tmp/ap_String_Id.h.h:484 msgid "Ali&gnment:" msgstr "Za&rovnanie:" #. DLG_Tab_Label_Alignment #. DLG_PageNumbers_Alignment_No_Colon -#: po/tmp/ap_String_Id.h.h:499 +#: po/tmp/ap_String_Id.h.h:487 msgid "Alignment" msgstr "Zarovnanie" #. DLG_PageNumbers_Alignment -#: po/tmp/ap_String_Id.h.h:501 +#: po/tmp/ap_String_Id.h.h:489 msgid "Alignment:" -msgstr "Zarovnanie" +msgstr "Zarovnanie:" #. DLG_Styles_LBL_All #. DLG_UP_All -#: po/tmp/ap_String_Id.h.h:503 po/tmp/xap_String_Id.h.h:51 +#: po/tmp/ap_String_Id.h.h:491 +#: po/tmp/xap_String_Id.h.h:51 msgid "All" -msgstr "Vetko" +msgstr "Vetko" #. DLG_Options_Label_CheckAllowCustomToolbars -#: po/tmp/ap_String_Id.h.h:505 +#: po/tmp/ap_String_Id.h.h:493 msgid "Allow Custom Toolbars" -msgstr "Dovoli vlastn nstrojovo litu" +msgstr "Dovoli vlastn panel s nstrojmi" #. MENU_STATUSLINE_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:507 +#: po/tmp/ap_String_Id.h.h:495 msgid "Allow formatting using styles only" -msgstr "Dovoli formtovanie len pomocou tlov" +msgstr "Dovol formtovanie len pomocou tlov" #. DLG_Options_Label_CheckWhiteForTransparent -#: po/tmp/ap_String_Id.h.h:509 +#: po/tmp/ap_String_Id.h.h:497 msgid "Allow screen colors other than white" -msgstr "Dovoli in farbu obrazovku ako bielu" +msgstr "Dovol in farbu obrazovku ako bielu" + +#. MENU_LABEL_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:499 +msgid "Annotation" +msgstr "Odsadenie" #. FIELD_Application -#: po/tmp/ap_String_Id.h.h:511 +#: po/tmp/ap_String_Id.h.h:501 msgid "Application" msgstr "Aplikcia" #. DLG_Options_Label_AppStartup -#: po/tmp/ap_String_Id.h.h:513 +#: po/tmp/ap_String_Id.h.h:503 msgid "Application Startup" -msgstr "Spustenie aplikcie" +msgstr "Spustenie programu" #. DLG_Options_Btn_Apply #. DLG_Apply -#: po/tmp/ap_String_Id.h.h:515 po/tmp/xap_String_Id.h.h:63 +#: po/tmp/ap_String_Id.h.h:505 +#: po/tmp/xap_String_Id.h.h:63 msgid "Apply" -msgstr "Poui" +msgstr "&Poui" #. TOOLBAR_STATUSLINE_FMTPAINTER #. TOOLBAR_TOOLTIP_FMTPAINTER -#: po/tmp/ap_String_Id.h.h:518 +#: po/tmp/ap_String_Id.h.h:508 msgid "Apply the previously copied paragraph formatting onto the selected text" -msgstr "Poui na vybran text formtovn zkoprovan z pedchadzajceho odseku" +msgstr "Na vybran text poui formtovanie skoprovan z predchdzajceho odseku" #. DLG_Lists_Apply_Current -#: po/tmp/ap_String_Id.h.h:520 +#: po/tmp/ap_String_Id.h.h:510 msgid "Apply to Current List" -msgstr "Poui na sasn zoznam" +msgstr "Poui na sasn zoznam" #. DLG_FormatTable_Apply_To -#: po/tmp/ap_String_Id.h.h:522 +#: po/tmp/ap_String_Id.h.h:512 msgid "Apply to:" -msgstr "Poui na:" +msgstr "Poui na:" #. DLG_Lists_Arabic_List -#: po/tmp/ap_String_Id.h.h:524 +#: po/tmp/ap_String_Id.h.h:514 msgid "Arabic List" -msgstr "Odrky arabskmi slicami" +msgstr "Odrky arabskmi slicami" #. MSG_AutoRevisionOffWarning -#: po/tmp/ap_String_Id.h.h:526 -msgid "" -"Are you sure you do not want to maintain full history record? If you " -"proceed, you will not be able to restore earlier versions of this document." -msgstr "" -"Ste si ist, e nechcete spravova cel histriu? Ak budete pokraova, nebudete " -"sa mc vrti k predchdzajcim verzim dokumentu." +#: po/tmp/ap_String_Id.h.h:516 +msgid "Are you sure you do not want to maintain full history record? If you proceed, you will not be able to restore earlier versions of this document." +msgstr "Ste si ist, e si nechcete uklada cel histriu? Ak budete pokraova, nebudete sa mc vrti k predchdzajcim verzim dokumentu." #. DLG_Para_SpacingAtLeast -#: po/tmp/ap_String_Id.h.h:528 +#: po/tmp/ap_String_Id.h.h:518 msgid "At least" -msgstr "Na konci" +msgstr "Aspo" #. DLG_Lists_Resume -#: po/tmp/ap_String_Id.h.h:530 +#: po/tmp/ap_String_Id.h.h:520 msgid "Attach to Previous List" -msgstr "Pripoji k prechdzajcemu zoznamu" +msgstr "Prida k prechdzajcemu zoznamu" #. DLG_MetaData_Author_LBL -#. DLG_Annotation_Author_LBL #. DLG_PLUGIN_MANAGER_AUTHOR -#: po/tmp/ap_String_Id.h.h:533 po/tmp/xap_String_Id.h.h:85 +#: po/tmp/ap_String_Id.h.h:522 +#: po/tmp/xap_String_Id.h.h:85 msgid "Author:" msgstr "Autor:" #. DLG_Options_Label_AutoSaveUnderline -#: po/tmp/ap_String_Id.h.h:535 +#: po/tmp/ap_String_Id.h.h:524 msgid "Auto &Save" msgstr "Automatick &ukladanie" #. DLG_Options_Label_AutoSaveCurrent -#: po/tmp/ap_String_Id.h.h:537 +#: po/tmp/ap_String_Id.h.h:526 msgid "Auto &save current file every" -msgstr "Automaticky &uloi sbor kadch" +msgstr "Automaticky &uloi sbor kadch" #. DLG_Options_Label_AutoSave -#: po/tmp/ap_String_Id.h.h:539 +#: po/tmp/ap_String_Id.h.h:528 msgid "Auto Save" msgstr "Automatick ukladanie" #. DLG_Options_Label_SpellAutoReplace -#: po/tmp/ap_String_Id.h.h:541 +#: po/tmp/ap_String_Id.h.h:530 msgid "Auto replace misspelled words" -msgstr "Automaticky nahradi preklepy" +msgstr "Automaticky nahradi preklepy" #. DLG_InsertTable_AutoFit_Capital -#: po/tmp/ap_String_Id.h.h:543 +#: po/tmp/ap_String_Id.h.h:532 msgid "AutoFit Behavior" -msgstr "Sprvanie automatickho dopania" +msgstr "Vlastnosti automatickej tabuky" #. DLG_InsertTable_AutoFit -#: po/tmp/ap_String_Id.h.h:545 +#: po/tmp/ap_String_Id.h.h:534 msgid "AutoFit behavior" -msgstr "Sprvanie automatickho dopania" +msgstr "Vlastnosti automatickej tabuky" #. MENU_STATUSLINE_TABLE_AUTOFIT -#: po/tmp/ap_String_Id.h.h:547 +#: po/tmp/ap_String_Id.h.h:536 msgid "Autofit Table" -msgstr "Automatick vypanie tabuky" +msgstr "Automatick tabuka" #. DLG_Options_Label_Grammar -#: po/tmp/ap_String_Id.h.h:549 +#: po/tmp/ap_String_Id.h.h:538 msgid "Automatic Grammar Checking" msgstr "Automatick kontrola gramatiky" #. DLG_InsertTable_AutoColSize -#: po/tmp/ap_String_Id.h.h:551 +#: po/tmp/ap_String_Id.h.h:540 msgid "Automatic column size" -msgstr "Automatick vekos stpca" +msgstr "Automatick vekos stpca" #. DLG_Options_Label_CheckAutoLoadPlugins -#: po/tmp/ap_String_Id.h.h:553 +#: po/tmp/ap_String_Id.h.h:542 msgid "Automatically load all plugins found" -msgstr "Automaticky nahra vetky njden moduly" +msgstr "Automaticky nahra vetky njden moduly" #. MENU_STATUSLINE_TOOLS_AUTOSPELL -#: po/tmp/ap_String_Id.h.h:555 +#: po/tmp/ap_String_Id.h.h:544 msgid "Automatically spell-check the document" -msgstr "Automaticky kontrolova preklepy v dokumente" +msgstr "Automaticky kontrolova preklepy v dokumente" #. DLG_Styles_ModifyAutomatic -#: po/tmp/ap_String_Id.h.h:557 +#: po/tmp/ap_String_Id.h.h:546 msgid "Automatically update" -msgstr "Automatick aktualizcia" +msgstr "Automaticky aktualizova" #. MSG_AutoMerge -#: po/tmp/ap_String_Id.h.h:559 +#: po/tmp/ap_String_Id.h.h:548 msgid "Automerge" msgstr "Automatick zlenie" #. DLG_MailMerge_AvailableFields -#: po/tmp/ap_String_Id.h.h:561 +#: po/tmp/ap_String_Id.h.h:550 msgid "Available Fields" msgstr "Dostupn polia" #. DLG_DateTime_AvailableFormats_Capital -#: po/tmp/ap_String_Id.h.h:563 +#: po/tmp/ap_String_Id.h.h:552 msgid "Available Formats" msgstr "Dostupn spsoby zpisu" #. DLG_Styles_Available -#: po/tmp/ap_String_Id.h.h:565 +#: po/tmp/ap_String_Id.h.h:554 msgid "Available Styles" -msgstr "Dostupn tly" +msgstr "Dostupn tly" #. DLG_Para_LabelBy -#: po/tmp/ap_String_Id.h.h:567 +#: po/tmp/ap_String_Id.h.h:556 msgid "B&y:" msgstr "&Od:" #. DLG_FormatFrame_Background #. DLG_FormatTable_Background -#: po/tmp/ap_String_Id.h.h:570 +#: po/tmp/ap_String_Id.h.h:559 msgid "Background" msgstr "Pozadie" #. DLG_FormatFrame_Background_Color #. DLG_FormatTable_Background_Color -#: po/tmp/ap_String_Id.h.h:573 +#: po/tmp/ap_String_Id.h.h:562 msgid "Background color:" msgstr "Farba pozadia:" #. DLG_Tab_Radio_Bar -#: po/tmp/ap_String_Id.h.h:575 +#: po/tmp/ap_String_Id.h.h:564 msgid "Bar" msgstr "S iarou" #. TabToggleBarTab -#: po/tmp/ap_String_Id.h.h:577 +#: po/tmp/ap_String_Id.h.h:566 msgid "Bar Tab" msgstr "Panel s tabultormi" #. DLG_Styles_ModifyBasedOn -#: po/tmp/ap_String_Id.h.h:579 +#: po/tmp/ap_String_Id.h.h:568 msgid "Based On:" -msgstr "Zaloen na:" +msgstr "Zaloen na:" #. DLG_Options_Label_BiDiOptions -#: po/tmp/ap_String_Id.h.h:581 +#: po/tmp/ap_String_Id.h.h:570 msgid "Bi-Directional Options" -msgstr "Voby pre obojsmernos" +msgstr "Nastavenie smeru textu" #. TOOLBAR_LABEL_FMT_BOLD #. TOOLBAR_STATUSLINE_FMT_BOLD #. TOOLBAR_TOOLTIP_FMT_BOLD #. DLG_UFS_StyleBold -#: po/tmp/ap_String_Id.h.h:585 po/tmp/xap_String_Id.h.h:117 +#: po/tmp/ap_String_Id.h.h:574 +#: po/tmp/xap_String_Id.h.h:119 msgid "Bold" msgstr "Tun" #. MENU_LABEL_INSERT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:587 +#: po/tmp/ap_String_Id.h.h:576 msgid "Boo&kmark" -msgstr "Zlo&ka" +msgstr "Zlo&ka" #. DLG_Goto_Target_Bookmark -#: po/tmp/ap_String_Id.h.h:589 +#: po/tmp/ap_String_Id.h.h:578 msgid "Bookmark" -msgstr "Zloka" +msgstr "zloku" #. MSG_BookmarkNotFound -#: po/tmp/ap_String_Id.h.h:591 +#: po/tmp/ap_String_Id.h.h:580 #, c-format msgid "Bookmark \"%s\" was not found in this document." -msgstr "Zloka \"%s\" nebola v tomto dokumente njden." +msgstr "Zloka \"%s\" sa v tomto dokumente nenala." #. DLG_FormatFrame_Border_Color #. DLG_FormatTable_Border_Color -#: po/tmp/ap_String_Id.h.h:594 +#: po/tmp/ap_String_Id.h.h:583 msgid "Border color:" msgstr "Farba okraja:" #. DLG_FormatFrame_Borders #. DLG_FormatTable_Borders -#: po/tmp/ap_String_Id.h.h:597 +#: po/tmp/ap_String_Id.h.h:586 msgid "Borders" msgstr "Okraje" #. MENU_LABEL_FMT_BORDERS -#: po/tmp/ap_String_Id.h.h:599 +#: po/tmp/ap_String_Id.h.h:588 msgid "Borders and Shading" -msgstr "Okraje a tienovanie" +msgstr "Okraje a tieovanie" #. BottomMarginStatus -#: po/tmp/ap_String_Id.h.h:601 +#: po/tmp/ap_String_Id.h.h:590 #, c-format msgid "Bottom Margin [%s]" msgstr "Doln okraje [%s]" @@ -1479,220 +1455,223 @@ #. TOOLBAR_STATUSLINE_FMT_BOTTOMLINE #. TOOLBAR_TOOLTIP_FMT_BOTTOMLINE #. DLG_UFS_BottomlineCheck -#: po/tmp/ap_String_Id.h.h:606 po/tmp/xap_String_Id.h.h:121 +#: po/tmp/ap_String_Id.h.h:595 +#: po/tmp/xap_String_Id.h.h:123 msgid "Bottomline" msgstr "Spodn iara" #. DLG_Lists_Box_List #. STYLE_BOXLIST -#: po/tmp/ap_String_Id.h.h:608 po/tmp/xap_String_Id.h.h:123 +#: po/tmp/ap_String_Id.h.h:597 +#: po/tmp/xap_String_Id.h.h:125 msgid "Box List" -msgstr "Odrky v tvare tvorca" +msgstr "Odrky v tvare tvorca" #. FIELD_Application_BuildId -#: po/tmp/ap_String_Id.h.h:610 +#: po/tmp/ap_String_Id.h.h:599 msgid "Build Id." msgstr "Id vytvorenia" #. FIELD_Application_Options -#: po/tmp/ap_String_Id.h.h:612 +#: po/tmp/ap_String_Id.h.h:601 msgid "Build Options" -msgstr "Voby pre tvorbu" +msgstr "Voby pre tvorbu" #. FIELD_Application_Target -#: po/tmp/ap_String_Id.h.h:614 +#: po/tmp/ap_String_Id.h.h:603 msgid "Build Target" -msgstr "Cie pre tvorbu" +msgstr "Cie pre tvorbu" #. DLG_Lists_Type_bullet -#: po/tmp/ap_String_Id.h.h:616 +#: po/tmp/ap_String_Id.h.h:605 msgid "Bullet" -msgstr "Grafick" +msgstr "grafick" #. DLG_Lists_Bullet_List #. STYLE_BULLETLIST -#: po/tmp/ap_String_Id.h.h:618 po/tmp/xap_String_Id.h.h:131 +#: po/tmp/ap_String_Id.h.h:607 +#: po/tmp/xap_String_Id.h.h:133 msgid "Bullet List" -msgstr "Odrky v tvare guliiek" +msgstr "Odrky v tvare guliiek" #. TOOLBAR_LABEL_LISTS_BULLETS #. TOOLBAR_STATUSLINE_LISTS_BULLETS #. TOOLBAR_TOOLTIP_LISTS_BULLETS -#: po/tmp/ap_String_Id.h.h:622 +#: po/tmp/ap_String_Id.h.h:611 msgid "Bullets" -msgstr "Odrky" +msgstr "Odrky" #. MENU_LABEL_FMT_BULLETS -#: po/tmp/ap_String_Id.h.h:624 +#: po/tmp/ap_String_Id.h.h:613 msgid "Bullets and &Numbering" -msgstr "O&drky a slovanie" +msgstr "O&drky a slovanie" #. DLG_Options_Label_Look -#: po/tmp/ap_String_Id.h.h:626 +#: po/tmp/ap_String_Id.h.h:615 msgid "Button Style" -msgstr "tl tlaidiel" +msgstr "tl tlaidiel" #. MENU_LABEL_FMT_TOGGLECASE -#: po/tmp/ap_String_Id.h.h:628 +#: po/tmp/ap_String_Id.h.h:617 msgid "C&hange Case" -msgstr "Z&meni mal/vek psmen" +msgstr "Z&meni mal/vek psmen" #. MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION -#: po/tmp/ap_String_Id.h.h:630 +#: po/tmp/ap_String_Id.h.h:619 msgid "C&opy hyperlink location" -msgstr "Koprova u&miestnenie odkazu" +msgstr "Koprova u&miestnenie odkazu" #. MENU_LABEL_HELP_CREDITS -#: po/tmp/ap_String_Id.h.h:632 +#: po/tmp/ap_String_Id.h.h:621 msgid "C&redits" -msgstr "Spo&lupracovali" +msgstr "Spo&lupracoval(-i)" #. MSG_NoBreakInsideTable -#: po/tmp/ap_String_Id.h.h:634 +#: po/tmp/ap_String_Id.h.h:623 msgid "Can not insert a Break inside a table" -msgstr "Do tabuky sa ned vloi zlom" +msgstr "Do tabuky sa ned vloi zlom" #. MSG_NoBreakInsideFrame -#: po/tmp/ap_String_Id.h.h:636 +#: po/tmp/ap_String_Id.h.h:625 msgid "Can not insert a Break inside a text box" -msgstr "Do textovho rmu sa ned vloi zlom" +msgstr "Do textovho rmu sa ned vloi zlom" #. DLG_Styles_ErrStyleCantDelete -#: po/tmp/ap_String_Id.h.h:638 +#: po/tmp/ap_String_Id.h.h:627 msgid "Cannot delete this style" -msgstr "Tento tl sa ned zmaza" +msgstr "Tento tl sa ned zmaza" #. DLG_Styles_ErrStyleBuiltin -#: po/tmp/ap_String_Id.h.h:640 +#: po/tmp/ap_String_Id.h.h:629 msgid "Cannot modify a builtin style" -msgstr "Zabudovan tl sa ned upravi" +msgstr "Zabudovan tl sa ned upravi" #. PRINT_CANNOTSTARTPRINTJOB -#: po/tmp/ap_String_Id.h.h:642 +#: po/tmp/ap_String_Id.h.h:631 msgid "Cannot start print job" -msgstr "Nemono spusti tlaov lohu" +msgstr "Nemono spusti tlaov lohu" #. DLG_MetaData_Category_LBL -#: po/tmp/ap_String_Id.h.h:644 +#: po/tmp/ap_String_Id.h.h:633 msgid "Category:" msgstr "Kategria:" #. DLG_Tab_Radio_Center #. DLG_PageNumbers_Center #. TOOLBAR_LABEL_ALIGN_CENTER -#: po/tmp/ap_String_Id.h.h:648 +#: po/tmp/ap_String_Id.h.h:637 msgid "Center" msgstr "Na stred" #. TabToggleCenterTab -#: po/tmp/ap_String_Id.h.h:650 +#: po/tmp/ap_String_Id.h.h:639 msgid "Center Tab" -msgstr "Centrovac tabultor" +msgstr "Stredov tabultor" #. TOOLBAR_STATUSLINE_ALIGN_CENTER #. TOOLBAR_TOOLTIP_ALIGN_CENTER -#: po/tmp/ap_String_Id.h.h:653 +#: po/tmp/ap_String_Id.h.h:642 msgid "Center alignment" msgstr "Zarovnanie na stred" #. MENU_STATUSLINE_ALIGN_CENTER -#: po/tmp/ap_String_Id.h.h:655 +#: po/tmp/ap_String_Id.h.h:644 msgid "Center-align the paragraph" -msgstr "Zarovnanie odseku na stred" +msgstr "Zarovn odsek na stred" #. DLG_Para_AlignCentered -#: po/tmp/ap_String_Id.h.h:657 +#: po/tmp/ap_String_Id.h.h:646 msgid "Centered" msgstr "Na stred" #. DLG_Spell_ChangeTo -#: po/tmp/ap_String_Id.h.h:659 +#: po/tmp/ap_String_Id.h.h:648 msgid "Change &to:" -msgstr "Za&meni za:" +msgstr "Z&meni na:" #. DLG_Spell_ChangeAll -#: po/tmp/ap_String_Id.h.h:661 +#: po/tmp/ap_String_Id.h.h:650 msgid "Change A&ll" -msgstr "Zmeni &vetko" +msgstr "Nahradi &vdy" #. DLG_Background_Title -#: po/tmp/ap_String_Id.h.h:663 +#: po/tmp/ap_String_Id.h.h:652 msgid "Change Background Color" -msgstr "Zmeni farby pozadia" +msgstr "Zmeni farbu pozadia" #. DLG_ToggleCase_Title -#: po/tmp/ap_String_Id.h.h:665 +#: po/tmp/ap_String_Id.h.h:654 msgid "Change Case" -msgstr "Zmeni mal/velk psmen" +msgstr "Zmeni mal/vek psmen" #. DLG_Lists_Cur_Change_Start -#: po/tmp/ap_String_Id.h.h:667 +#: po/tmp/ap_String_Id.h.h:656 msgid "" "Change Current \n" "List" msgstr "" -"Zmeni aktulny \n" +"Zmeni aktulny \n" "zoznam" #. DLG_Background_TitleHighlight -#: po/tmp/ap_String_Id.h.h:669 +#: po/tmp/ap_String_Id.h.h:658 msgid "Change Highlight Color" -msgstr "Zmeni farbu zvraznenia" +msgstr "Zmeni farbu zvraznenia" #. DLG_FormatTOC_ChangeStyle -#: po/tmp/ap_String_Id.h.h:671 +#: po/tmp/ap_String_Id.h.h:660 msgid "Change Style" -msgstr "Zmeni tl" +msgstr "Zmeni tl" #. DLG_Background_TitleFore -#: po/tmp/ap_String_Id.h.h:673 +#: po/tmp/ap_String_Id.h.h:662 msgid "Change Text Color" -msgstr "Zmeni farbu textu" +msgstr "Zmeni farbu textu" #. MENU_STATUSLINE_FMT_DIRECTION -#: po/tmp/ap_String_Id.h.h:675 +#: po/tmp/ap_String_Id.h.h:664 msgid "Change directional properties of text" msgstr "Zmen vlastnosti smeru textu" #. TOOLBAR_STATUSLINE_FMT_DOM_DIRECTION #. TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION -#: po/tmp/ap_String_Id.h.h:678 +#: po/tmp/ap_String_Id.h.h:667 msgid "Change dominant direction of paragraph" -msgstr "Zmen prevldajc smer odseku" +msgstr "Zmen prevldajci smer odseku" #. MENU_STATUSLINE_FMT_TOGGLECASE -#: po/tmp/ap_String_Id.h.h:680 +#: po/tmp/ap_String_Id.h.h:669 msgid "Change the case of the selected text" -msgstr "Zmen vekos psma vybranho textu" +msgstr "Zmen znaky vo vybranom texte na mal/vek" #. MENU_STATUSLINE_FMT_FONT -#: po/tmp/ap_String_Id.h.h:682 +#: po/tmp/ap_String_Id.h.h:671 msgid "Change the font of the selected text" msgstr "Zmen psmo vybranho textu" #. MENU_STATUSLINE_FMT_PARAGRAPH -#: po/tmp/ap_String_Id.h.h:684 +#: po/tmp/ap_String_Id.h.h:673 msgid "Change the format of the selected paragraph" -msgstr "Zmen formt vybranho odseku" +msgstr "Zmen vlastnosti vybranho odseku" #. MENU_STATUSLINE_FMT_LANGUAGE #. MENU_STATUSLINE_TOOLS_LANGUAGE -#: po/tmp/ap_String_Id.h.h:687 +#: po/tmp/ap_String_Id.h.h:676 msgid "Change the language of the selected text" -msgstr "Zmen jazyk vybranho textu" +msgstr "Zmete jazyk vybranho textu" #. MENU_STATUSLINE_FMT_COLUMNS -#: po/tmp/ap_String_Id.h.h:689 +#: po/tmp/ap_String_Id.h.h:678 msgid "Change the number of columns" msgstr "Zmen poet stpcov" #. MENU_STATUSLINE_FILE_PAGESETUP -#: po/tmp/ap_String_Id.h.h:691 +#: po/tmp/ap_String_Id.h.h:680 msgid "Change the printing options" msgstr "Zmen nastavenie tlae" #. MENU_STATUSLINE_FMT_FRAME -#: po/tmp/ap_String_Id.h.h:693 +#: po/tmp/ap_String_Id.h.h:682 msgid "Change the properties of the Text Box" msgstr "Zmen vlastnosti textovho rmu" @@ -1705,837 +1684,809 @@ #. MENU_STATUSLINE_SPELL_SUGGEST_7 #. MENU_STATUSLINE_SPELL_SUGGEST_8 #. MENU_STATUSLINE_SPELL_SUGGEST_9 -#: po/tmp/ap_String_Id.h.h:703 +#: po/tmp/ap_String_Id.h.h:692 msgid "Change to this suggested spelling" -msgstr "Zmen na toto navrhovan slovo" +msgstr "Zmen na toto slovo" #. MENU_STATUSLINE_FMT_BACKGROUND -#: po/tmp/ap_String_Id.h.h:705 +#: po/tmp/ap_String_Id.h.h:694 msgid "Change your document's page background" msgstr "Zmen farbu pozadia v dokumente" #. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_COLOR -#: po/tmp/ap_String_Id.h.h:707 +#: po/tmp/ap_String_Id.h.h:696 msgid "Change your document's page color" msgstr "Zmen farbu strany v dokumente" #. DLG_Styles_ModifyCharacter -#: po/tmp/ap_String_Id.h.h:709 +#: po/tmp/ap_String_Id.h.h:698 msgid "Character" msgstr "Znak" #. FIELD_Numbers_CharCount -#: po/tmp/ap_String_Id.h.h:711 +#: po/tmp/ap_String_Id.h.h:700 msgid "Character Count" msgstr "Poet znakov" #. FIELD_Numbers_NbspCount -#: po/tmp/ap_String_Id.h.h:713 +#: po/tmp/ap_String_Id.h.h:702 msgid "Character Count (w/o spaces)" -msgstr "Poet znakov (bez medzier)" +msgstr "Poet znakov bez medzier" #. DLG_Styles_CharPrev -#: po/tmp/ap_String_Id.h.h:715 +#: po/tmp/ap_String_Id.h.h:704 msgid "Character Preview" -msgstr "Nhad na znak" +msgstr "Ukka znaku" #. DLG_WordCount_Characters_No -#: po/tmp/ap_String_Id.h.h:717 +#: po/tmp/ap_String_Id.h.h:706 msgid "Characters (no spaces):" -msgstr "Znakov (bez medzier):" +msgstr "Znakov bez medzier:" #. DLG_WordCount_Characters_Sp -#: po/tmp/ap_String_Id.h.h:719 +#: po/tmp/ap_String_Id.h.h:708 msgid "Characters (with spaces):" -msgstr "Znakov (vrtane medzier):" +msgstr "Znakov s medzerami:" #. MENU_LABEL_TOOLS_SPELL -#: po/tmp/ap_String_Id.h.h:721 +#: po/tmp/ap_String_Id.h.h:710 msgid "Check &Spelling" -msgstr "&Skontrolova preklepy" +msgstr "&Skontrolova preklepy" #. DLG_Options_Label_GrammarCheck -#: po/tmp/ap_String_Id.h.h:723 +#: po/tmp/ap_String_Id.h.h:712 msgid "Check &grammar as you type" -msgstr "&Kontrolovat gramatiku poas psania" +msgstr "&Kontrolova gramatiku poas psania" #. MENU_LABEL_HELP_CHECKVER -#: po/tmp/ap_String_Id.h.h:725 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:714 msgid "Check for &Updates" -msgstr "&Vyhada akutualizcie" +msgstr "&Vyhada akutualizcie" #. MENU_STATUSLINE_HELP_CHECKVER -#: po/tmp/ap_String_Id.h.h:727 +#: po/tmp/ap_String_Id.h.h:716 msgid "Check online for newer versions of AbiWord" -msgstr "Vyhada na internete noviu verziu AbiWordu" +msgstr "Vyhad na internete novie verzie AbiWordu" #. DLG_Options_Label_SpellCheckAsType -#: po/tmp/ap_String_Id.h.h:729 +#: po/tmp/ap_String_Id.h.h:718 msgid "Check s&pelling as you type" -msgstr "&Kontrolovat preklepy poas psania" +msgstr "&Kontrolova preklepy poas psania" #. MENU_STATUSLINE_TOOLS_SPELL -#: po/tmp/ap_String_Id.h.h:731 +#: po/tmp/ap_String_Id.h.h:720 msgid "Check the document for incorrect spelling" msgstr "Zist, i v dokumente nie s preklepy" #. DLG_NEW_Choose -#: po/tmp/ap_String_Id.h.h:733 +#: po/tmp/ap_String_Id.h.h:722 msgid "Choose" -msgstr "Vybra" +msgstr "Vybra" #. DLG_Options_Label_ChooseForTransparent -#: po/tmp/ap_String_Id.h.h:735 +#: po/tmp/ap_String_Id.h.h:724 msgid "Choose Screen Color" -msgstr "Vybrat farbu obrazovky" +msgstr "Vybra farbu obrazovky" #. DLG_Options_Label_ColorChooserLabel -#: po/tmp/ap_String_Id.h.h:737 +#: po/tmp/ap_String_Id.h.h:726 msgid "Choose screen color for AbiWord" -msgstr "Vybrat farbu obrazovky pre AbiWord" +msgstr "Vybra farbu obrazovky AbiWordu" #. MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL -#: po/tmp/ap_String_Id.h.h:739 +#: po/tmp/ap_String_Id.h.h:728 msgid "Choose which revision you wish to view" -msgstr "Vyberte zmenu v texte, ktor chcete zobrazi" +msgstr "Vyberte zmenu v texte, ktor chcete zobrazi" #. DLG_Goto_Label_Help -#: po/tmp/ap_String_Id.h.h:741 +#: po/tmp/ap_String_Id.h.h:730 msgid "" "Choose your target in the left side.\n" -"If you want to use the \"Go To\" button, just fill the Number Entry with the " -"desired number. You can use + and - to perform relative movement.\tI.e., if " -"you write \"+2\" and you select \"Line\", the \"Go To\" will go 2 lines " -"below your current position." +"If you want to use the \"Go To\" button, just fill the Number Entry with the desired number. You can use + and - to perform relative movement.\tI.e., if you write \"+2\" and you select \"Line\", the \"Go To\" will go 2 lines below your current position." msgstr "" -"Vyberte cie v avej asti.\n" -"Ak chcete poui tlaidlo \"Cho na\", zadajte len slo " -"strany. Mete tie prida + a - pre relatvny posun.\tNapr. ak zadte " -"\"+2\" a vyberete \"Riadky\" a potom \"Cho na\", posuniete sa o 2 riadky niie." - +"Vyberte cie v avej asti.\n" +"Ak chcete poui tlaidlo \"Cho na\", zadajte len slo strany. Mete tie prida +/- pre posun o urit poet str., riad., zlo.\tNapr. ak zadte \"+2\" a vyberiete \"riadky\" a potom \"Cho na\", posuniete sa o 2 riadky niie." #. MENU_LABEL_EDIT_CLEAR -#: po/tmp/ap_String_Id.h.h:743 +#: po/tmp/ap_String_Id.h.h:732 msgid "Cle&ar" -msgstr "Od&strni" +msgstr "Od&strni" #. DLG_Tab_Button_Clear -#: po/tmp/ap_String_Id.h.h:745 +#: po/tmp/ap_String_Id.h.h:734 msgid "Clear" -msgstr "Zmaza" +msgstr "Zmaza" #. DLG_Tab_Button_ClearAll -#: po/tmp/ap_String_Id.h.h:747 +#: po/tmp/ap_String_Id.h.h:736 msgid "Clear &All" -msgstr "Zmaza &vetko" +msgstr "Zmaza &vetko" #. DLG_Background_ClearClr -#: po/tmp/ap_String_Id.h.h:749 +#: po/tmp/ap_String_Id.h.h:738 msgid "Clear Background Color" -msgstr "Zmaza farbu pozadia" +msgstr "Zmaza farbu pozadia" #. DLG_Background_ClearHighlight -#: po/tmp/ap_String_Id.h.h:751 +#: po/tmp/ap_String_Id.h.h:740 msgid "Clear Highlight Color" -msgstr "Zmaza farbu pre zvrazovanie" +msgstr "Vyisti farbu zvraznenia" #. MSG_QueryExit -#: po/tmp/ap_String_Id.h.h:753 +#: po/tmp/ap_String_Id.h.h:742 msgid "Close all windows and exit?" -msgstr "Zavrie vetky okna a skoni?" +msgstr "Mm zatvori vetky okna a skoni?" #. MENU_STATUSLINE_FILE_EXIT -#: po/tmp/ap_String_Id.h.h:755 +#: po/tmp/ap_String_Id.h.h:744 msgid "Close all windows in the application and exit" -msgstr "Zavre vetky okna a ukon aplikciu" +msgstr "Zatvor vetky okna a ukon program" #. MENU_STATUSLINE_FILE_CLOSE -#: po/tmp/ap_String_Id.h.h:757 +#: po/tmp/ap_String_Id.h.h:746 msgid "Close the document" -msgstr "Zavrie dokument" +msgstr "Zatvor tento dokument" #. MENU_LABEL_TABLE_SELECT_COLUMN -#: po/tmp/ap_String_Id.h.h:759 +#: po/tmp/ap_String_Id.h.h:748 msgid "Co&lumn" -msgstr "S&tpcov" +msgstr "s&tpec" #. DLG_FormatFrame_Color #. DLG_FormatTable_Color #. DLG_UFS_ColorLabel -#: po/tmp/ap_String_Id.h.h:762 po/tmp/xap_String_Id.h.h:189 +#: po/tmp/ap_String_Id.h.h:751 +#: po/tmp/xap_String_Id.h.h:191 msgid "Color:" msgstr "Farba:" #. DLG_FormatTable_Apply_To_Column -#: po/tmp/ap_String_Id.h.h:764 +#: po/tmp/ap_String_Id.h.h:753 msgid "Column" -msgstr "Stpec" +msgstr "stpec" #. ColumnGapStatus -#: po/tmp/ap_String_Id.h.h:766 +#: po/tmp/ap_String_Id.h.h:755 #, c-format msgid "Column Gap [%s]" msgstr "Medzera medzi stpcami [%s]" #. ColumnStatus -#: po/tmp/ap_String_Id.h.h:768 +#: po/tmp/ap_String_Id.h.h:757 #, c-format msgid "Column [%d]" msgstr "Stpec [%d]" #. DLG_Column_ColumnTitle -#: po/tmp/ap_String_Id.h.h:770 +#: po/tmp/ap_String_Id.h.h:759 msgid "Columns" -msgstr "Stpcov" +msgstr "Stpce" #. MENU_LABEL_TABLE_INSERT_COLUMNS_BEFORE -#: po/tmp/ap_String_Id.h.h:772 +#: po/tmp/ap_String_Id.h.h:761 msgid "Columns &Left" -msgstr "Stpcov do&ava" +msgstr "stpce v&avo" #. MENU_LABEL_TABLE_INSERT_COLUMNS_AFTER -#: po/tmp/ap_String_Id.h.h:774 +#: po/tmp/ap_String_Id.h.h:763 msgid "Columns &Right" -msgstr "Stpcov do&prava" +msgstr "stpce v&pravo" #. DLG_ListRevisions_Column3Label -#: po/tmp/ap_String_Id.h.h:776 +#: po/tmp/ap_String_Id.h.h:765 msgid "Comment" msgstr "Komentr" #. DLG_MarkRevisions_Comment2Label -#: po/tmp/ap_String_Id.h.h:778 +#: po/tmp/ap_String_Id.h.h:767 msgid "Comment to be associated with the revision:" -msgstr "Komentr, ktor pripojen ku zmene:" +msgstr "Komentr, ktor bude pripojen k zmene:" #. MENU_STATUSLINE_TOOLS_REVISIONS_COMPARE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:780 +#: po/tmp/ap_String_Id.h.h:769 msgid "Compare active document to another document" -msgstr "Porovn aktulny dokument s inm dokumentom" +msgstr "Porovn tento dokument s inm" #. FIELD_Application_CompileDate -#: po/tmp/ap_String_Id.h.h:782 +#: po/tmp/ap_String_Id.h.h:771 msgid "Compile Date" -msgstr "Datum kompilcie" +msgstr "Dtum kompilcie" #. FIELD_Application_CompileTime -#: po/tmp/ap_String_Id.h.h:784 +#: po/tmp/ap_String_Id.h.h:773 msgid "Compile Time" msgstr "as kompilcie" #. DLG_Break_Continuous -#: po/tmp/ap_String_Id.h.h:786 +#: po/tmp/ap_String_Id.h.h:775 msgid "Con&tinuous" -msgstr "P&rieben" +msgstr "P&rieben" #. TOC_TocHeading -#: po/tmp/ap_String_Id.h.h:788 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:777 msgid "Contents" msgstr "Obsah" #. DLG_MarkRevisions_Check1Label -#: po/tmp/ap_String_Id.h.h:790 +#: po/tmp/ap_String_Id.h.h:779 #, c-format msgid "Continue previous revision (number %d)" -msgstr "Pokraovat v predchdzajcej zmene textu (slo %d)" +msgstr "Pokraova v predchdzajcej zmene textu (slo %d)" #. FIELD_Document_Contributor -#: po/tmp/ap_String_Id.h.h:792 +#: po/tmp/ap_String_Id.h.h:781 msgid "Contributor" -msgstr "Prispievate" +msgstr "Prispel(-a)" #. DLG_MetaData_CoAuthor_LBL -#: po/tmp/ap_String_Id.h.h:794 +#: po/tmp/ap_String_Id.h.h:783 msgid "Contributor(s):" -msgstr "Prispievate(-lia):" +msgstr "Prispel(-i):" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:796 +#: po/tmp/ap_String_Id.h.h:785 msgid "Convert Selected Text to a Table" -msgstr "Zmen vybran text na tabuku" +msgstr "Zmen vybran text na tabuku" #. MENU_LABEL_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:798 +#: po/tmp/ap_String_Id.h.h:787 msgid "Convert Table to Text" -msgstr "Zmeni tabuku na text" +msgstr "Zmeni tabuku na text" #. MENU_LABEL_TABLE_TEXTTOTABLE -#: po/tmp/ap_String_Id.h.h:800 +#: po/tmp/ap_String_Id.h.h:789 msgid "Convert Text to Table" -msgstr "Zmeni text na tabuku" +msgstr "Zmeni text na tabuku" #. MENU_STATUSLINE_TABLE_TABLETOTEXT -#: po/tmp/ap_String_Id.h.h:802 +#: po/tmp/ap_String_Id.h.h:791 msgid "Convert from a Table to Text" -msgstr "Zmen tabuku na text" +msgstr "Zmen tabuku na text" #. TOOLBAR_LABEL_EDIT_COPY #. TOOLBAR_STATUSLINE_EDIT_COPY #. TOOLBAR_TOOLTIP_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:806 +#: po/tmp/ap_String_Id.h.h:795 msgid "Copy" -msgstr "Koprova" +msgstr "Koprova" #. MENU_STATUSLINE_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:808 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:797 msgid "Copy Embedded Object" -msgstr "Vloit zabudovan objekt" +msgstr "Skopruje objekt vloen z inho programu do schrnky" #. MENU_LABEL_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:810 +#: po/tmp/ap_String_Id.h.h:799 msgid "Copy Image" -msgstr "Koprova obrzok" +msgstr "Koprova obrzok" #. MENU_LABEL_EDIT_COPYEMBED -#: po/tmp/ap_String_Id.h.h:812 +#: po/tmp/ap_String_Id.h.h:801 msgid "Copy Object" -msgstr "Koprova objekt" +msgstr "Koprova objekt" #. MENU_LABEL_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:814 +#: po/tmp/ap_String_Id.h.h:803 msgid "Copy Text Box" -msgstr "Koprova textov rm" +msgstr "Koprova textov rm" #. MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION -#: po/tmp/ap_String_Id.h.h:816 +#: po/tmp/ap_String_Id.h.h:805 msgid "Copy hyperlink location" -msgstr "Koprova hypertextov odkaz" +msgstr "Skopruje hypertextov odkaz" #. MENU_STATUSLINE_EDIT_COPY_FRAME -#: po/tmp/ap_String_Id.h.h:818 +#: po/tmp/ap_String_Id.h.h:807 msgid "Copy the Text Box to the clipboard" -msgstr "Zkopruje textov rm do schrnky" +msgstr "Skopruje textov rm do schrnky" #. MENU_STATUSLINE_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:820 +#: po/tmp/ap_String_Id.h.h:809 msgid "Copy the Text Box to the clipboard then remove it" msgstr "Skopruje textov rm do schrnky a odstrni ho z dokumentu" #. MENU_STATUSLINE_EDIT_COPY -#: po/tmp/ap_String_Id.h.h:822 +#: po/tmp/ap_String_Id.h.h:811 msgid "Copy the selection and put it on the Clipboard" -msgstr "Skopruje oznaen asti do schrnky" +msgstr "Skopruje oznaen text do schrnky" #. MSG_IE_CouldNotOpen -#: po/tmp/ap_String_Id.h.h:824 +#: po/tmp/ap_String_Id.h.h:813 #, c-format msgid "Could not open file %s for writing" -msgstr "Sbor %s sa ned otvori na zpis" +msgstr "Sbor %s sa ned otvori na psanie" #. MSG_OpenFailed -#: po/tmp/ap_String_Id.h.h:826 +#: po/tmp/ap_String_Id.h.h:815 #, c-format msgid "Could not open file %s." -msgstr "Sbor %s sa nepodarilo uloi." +msgstr "Sbor %s sa nepodarilo uloi." #. MSG_IE_CouldNotWrite -#: po/tmp/ap_String_Id.h.h:828 +#: po/tmp/ap_String_Id.h.h:817 #, c-format msgid "Could not write to file %s" -msgstr "Do sboru %s sa ned zapisova" +msgstr "Do sboru %s sa ned psa" #. MSG_SaveFailed -#: po/tmp/ap_String_Id.h.h:830 +#: po/tmp/ap_String_Id.h.h:819 #, c-format msgid "Could not write to the file %s." -msgstr "Sbor %s sa nepodarilo uloi." +msgstr "Sbor %s sa nepodarilo uloi." #. MENU_STATUSLINE_TOOLS_WORDCOUNT -#: po/tmp/ap_String_Id.h.h:832 +#: po/tmp/ap_String_Id.h.h:821 msgid "Count the number of words in the document" msgstr "Zist poet slov v dokumente" #. FIELD_Document_Coverage -#: po/tmp/ap_String_Id.h.h:834 +#: po/tmp/ap_String_Id.h.h:823 msgid "Coverage" msgstr "Dosah" #. DLG_MetaData_Coverage_LBL -#: po/tmp/ap_String_Id.h.h:836 +#: po/tmp/ap_String_Id.h.h:825 msgid "Coverage:" msgstr "Dosah:" #. DLG_NEW_Tab1_FAX1 -#: po/tmp/ap_String_Id.h.h:838 +#: po/tmp/ap_String_Id.h.h:827 msgid "Create a fax" -msgstr "Vytvori fax" +msgstr "Vytvori fax" #. DLG_NEW_Tab1_WP1 -#: po/tmp/ap_String_Id.h.h:840 +#: po/tmp/ap_String_Id.h.h:829 msgid "Create a new blank document" -msgstr "Vytvori nov przdny dokument" +msgstr "Vytvori nov przdny dokument" #. MENU_STATUSLINE_FILE_NEW #. TOOLBAR_STATUSLINE_FILE_NEW #. TOOLBAR_TOOLTIP_FILE_NEW -#: po/tmp/ap_String_Id.h.h:844 +#: po/tmp/ap_String_Id.h.h:833 msgid "Create a new document" -msgstr "Vytvor nov dokument" +msgstr "Vytvorte nov dokument" #. DLG_NEW_Create -#: po/tmp/ap_String_Id.h.h:846 +#: po/tmp/ap_String_Id.h.h:835 msgid "Create a new document from a template" -msgstr "Vytvori nov dokument zo ablny" +msgstr "Vytvori nov dokument zo ablny" #. MENU_STATUSLINE_FILE_NEW_USING_TEMPLATE -#: po/tmp/ap_String_Id.h.h:848 +#: po/tmp/ap_String_Id.h.h:837 msgid "Create a new document using a template" msgstr "Vytvor nov dokument zo ablny" #. DLG_NEW_StartEmpty -#: po/tmp/ap_String_Id.h.h:850 +#: po/tmp/ap_String_Id.h.h:839 msgid "Create an empty document" -msgstr "Vytvori nov dokument" - -#. MENU_LABEL_TOOLS_ANNOTATIONS_INSERT_FROMSEL -#: po/tmp/ap_String_Id.h.h:852 -#, fuzzy -msgid "Create from &selection" -msgstr "Odstrni oznaen as" +msgstr "Vytvori przdny dokument" #. FIELD_Document_Creator -#: po/tmp/ap_String_Id.h.h:854 +#: po/tmp/ap_String_Id.h.h:841 msgid "Creator" msgstr "Vytvoril" #. MENU_LABEL_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:856 +#: po/tmp/ap_String_Id.h.h:843 msgid "Cu&t" -msgstr "&Vybra" +msgstr "&Vybra" #. FIELD_Datetime_CurrentDate -#: po/tmp/ap_String_Id.h.h:858 +#: po/tmp/ap_String_Id.h.h:845 msgid "Current Date" msgstr "Aktulny dtum" #. DLG_Lists_Current_Font -#: po/tmp/ap_String_Id.h.h:860 +#: po/tmp/ap_String_Id.h.h:847 msgid "Current Font" msgstr "Aktulne psmo" #. DLG_Lists_Current_List_Label -#: po/tmp/ap_String_Id.h.h:862 +#: po/tmp/ap_String_Id.h.h:849 msgid "Current List Label" msgstr "Aktulny nzov zoznamu" #. DLG_Lists_Current_List_Type -#: po/tmp/ap_String_Id.h.h:864 +#: po/tmp/ap_String_Id.h.h:851 msgid "Current List Type" msgstr "Aktulny typ zoznamu" #. MSG_EmptySelection -#: po/tmp/ap_String_Id.h.h:866 +#: po/tmp/ap_String_Id.h.h:853 msgid "Current Selection is Empty" msgstr "Aktulny vber je przdny" #. DLG_Styles_DefCurrent -#: po/tmp/ap_String_Id.h.h:868 +#: po/tmp/ap_String_Id.h.h:855 msgid "Current Settings" msgstr "Aktulne nastavenia" #. FIELD_Datetime_CurrentTime -#: po/tmp/ap_String_Id.h.h:870 +#: po/tmp/ap_String_Id.h.h:857 msgid "Current Time" msgstr "Aktulny as" #. DLG_Options_Label_ViewCursorBlink -#: po/tmp/ap_String_Id.h.h:872 +#: po/tmp/ap_String_Id.h.h:859 msgid "Cursor &blink" msgstr "&Blikajci kurzor" #. DLG_Options_Label_SpellCustomDict -#: po/tmp/ap_String_Id.h.h:874 +#: po/tmp/ap_String_Id.h.h:861 msgid "Custom Dictionary:" -msgstr "Uvatesk slovnk:" +msgstr "Uvatesk slovnk:" #. FIELD_DateTime_Custom -#: po/tmp/ap_String_Id.h.h:876 +#: po/tmp/ap_String_Id.h.h:863 msgid "Customizable date/time" msgstr "Vlastn as/dtum" #. DLG_Lists_Customize -#: po/tmp/ap_String_Id.h.h:878 +#: po/tmp/ap_String_Id.h.h:865 msgid "Customized List" -msgstr "Vlastn zoznam" +msgstr "Vlastn zoznam" #. TOOLBAR_LABEL_EDIT_CUT #. TOOLBAR_STATUSLINE_EDIT_CUT #. TOOLBAR_TOOLTIP_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:882 +#: po/tmp/ap_String_Id.h.h:869 msgid "Cut" -msgstr "Vystrihn" +msgstr "Vystrihn" #. MENU_STATUSLINE_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:884 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:871 msgid "Cut Embedded Object" -msgstr "Vloi zabudovan objekt" +msgstr "Skopruje objekt vloen z inho programu a odstrni ho z dokumentu" #. MENU_LABEL_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:886 +#: po/tmp/ap_String_Id.h.h:873 msgid "Cut Image" -msgstr "Vystrihn obrzok" +msgstr "Vystrihn obrzok" #. MENU_LABEL_EDIT_CUTEMBED -#: po/tmp/ap_String_Id.h.h:888 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:875 msgid "Cut Object" -msgstr "Predmet" +msgstr "Vystrihn objekt" #. MENU_LABEL_EDIT_CUT_FRAME -#: po/tmp/ap_String_Id.h.h:890 +#: po/tmp/ap_String_Id.h.h:877 msgid "Cut Text Box" -msgstr "Vystrihn textov rm" +msgstr "Vystrihn textov rm" #. MENU_STATUSLINE_EDIT_CUT -#: po/tmp/ap_String_Id.h.h:892 +#: po/tmp/ap_String_Id.h.h:879 msgid "Cut the selection and put it on the Clipboard" -msgstr "Presunie oznaen asti do schrnky" +msgstr "Presunie oznaen text do schrnky" #. MENU_LABEL_FMT_DIRECTION -#: po/tmp/ap_String_Id.h.h:894 +#: po/tmp/ap_String_Id.h.h:881 msgid "D&irectional" -msgstr "&Obojsmernos" +msgstr "&Smer textu" #. DLG_Lists_Dashed_List #. STYLE_DASHEDLIST -#: po/tmp/ap_String_Id.h.h:896 po/tmp/xap_String_Id.h.h:239 +#: po/tmp/ap_String_Id.h.h:883 +#: po/tmp/xap_String_Id.h.h:241 msgid "Dashed List" -msgstr "Odrky v tvare pomlky" +msgstr "Odrky v tvare pomlky" #. FIELD_Document_Date #. DLG_ListRevisions_Column2Label -#: po/tmp/ap_String_Id.h.h:899 +#: po/tmp/ap_String_Id.h.h:886 msgid "Date" msgstr "Dtum" #. MENU_LABEL_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:901 +#: po/tmp/ap_String_Id.h.h:888 msgid "Date and &Time" msgstr "&Dtum a as" #. FIELD_Type_Datetime -#: po/tmp/ap_String_Id.h.h:903 +#: po/tmp/ap_String_Id.h.h:890 msgid "Date and Time" msgstr "Dtum a as" #. FIELD_DateTime_DOY -#: po/tmp/ap_String_Id.h.h:905 +#: po/tmp/ap_String_Id.h.h:892 msgid "Day # in the year" msgstr "slo da v roku" #. DLG_Options_Btn_Default -#: po/tmp/ap_String_Id.h.h:907 +#: po/tmp/ap_String_Id.h.h:894 msgid "De&faults" -msgstr "&Prednastaven" +msgstr "&Predvolen" #. DLG_Tab_Radio_Decimal -#: po/tmp/ap_String_Id.h.h:909 +#: po/tmp/ap_String_Id.h.h:896 msgid "Decimal" -msgstr "Desatinn" +msgstr "des. iarka" #. TabToggleDecimalTab -#: po/tmp/ap_String_Id.h.h:911 +#: po/tmp/ap_String_Id.h.h:898 msgid "Decimal Tab" -msgstr "Tabultor pre desatinn sla" +msgstr "Tabultor na desatinn sla" #. TOOLBAR_LABEL_UNINDENT #. TOOLBAR_STATUSLINE_UNINDENT #. TOOLBAR_TOOLTIP_UNINDENT -#: po/tmp/ap_String_Id.h.h:915 +#: po/tmp/ap_String_Id.h.h:902 msgid "Decrease indent" -msgstr "Zmeni odsadenie" +msgstr "Zmeni odsadenie" #. FIELD_DateTime_DefaultDateNoTime -#: po/tmp/ap_String_Id.h.h:917 +#: po/tmp/ap_String_Id.h.h:904 msgid "Default date (w/o time)" msgstr "Nastaven dtum (bez asu)" #. FIELD_DateTime_DefaultDate -#: po/tmp/ap_String_Id.h.h:919 +#: po/tmp/ap_String_Id.h.h:906 msgid "Default date representation" msgstr "Nastaven formt dtumu" #. DLG_Options_Label_DefaultPageSize -#: po/tmp/ap_String_Id.h.h:921 +#: po/tmp/ap_String_Id.h.h:908 msgid "Default page size" -msgstr "Nastaven vekos strany" +msgstr "Nastaven vekos strany" #. DLG_Tab_Label_DefaultTS -#: po/tmp/ap_String_Id.h.h:923 +#: po/tmp/ap_String_Id.h.h:910 msgid "Default tab stops:" -msgstr "Nastaven vzdialenos tabultorov:" +msgstr "Vzdialenos tab.:" #. DLG_Options_Label_DirectionRtl -#: po/tmp/ap_String_Id.h.h:925 +#: po/tmp/ap_String_Id.h.h:912 msgid "Default to right-to-left direction of text" -msgstr "Pvodn smer textu sprava doava" +msgstr "Pvodn smer textu sprava doava" #. DLG_FormatTOC_LevelDefs -#: po/tmp/ap_String_Id.h.h:927 +#: po/tmp/ap_String_Id.h.h:914 msgid "Define Main Properties" -msgstr "Definova hlavn vlastnosti" +msgstr "Definova hlavn vlastnosti" #. MENU_STATUSLINE_FMT_STYLE #. MENU_STATUSLINE_FMT_STYLE_DEFINE -#: po/tmp/ap_String_Id.h.h:930 +#: po/tmp/ap_String_Id.h.h:917 msgid "Define or apply style for the selection" -msgstr "Definuje alebo aplikuje tl na vber" +msgstr "Vyberte alebo upravte tl pre oznaen text" #. DLG_Styles_Delete #. MENU_STATUSLINE_TABLE_DELETE #. DLG_Delete -#: po/tmp/ap_String_Id.h.h:933 po/tmp/xap_String_Id.h.h:253 +#: po/tmp/ap_String_Id.h.h:920 +#: po/tmp/xap_String_Id.h.h:255 msgid "Delete" -msgstr "Odstrni" +msgstr "Zmaza" #. MENU_STATUSLINE_TABLE_DELETE_CELLS -#: po/tmp/ap_String_Id.h.h:935 +#: po/tmp/ap_String_Id.h.h:922 msgid "Delete Cells" msgstr "Odstrni bunky" #. MENU_LABEL_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:937 +#: po/tmp/ap_String_Id.h.h:924 msgid "Delete Co&lumn" -msgstr "Odstrni &stpec" +msgstr "Odstrni &stpec" #. MENU_STATUSLINE_TABLE_DELETE_COLUMNS #. MENU_STATUSLINE_TABLE_DELETECOLUMN -#: po/tmp/ap_String_Id.h.h:940 +#: po/tmp/ap_String_Id.h.h:927 msgid "Delete Column" msgstr "Odstrni stpec" #. MENU_STATUSLINE_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:942 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:929 msgid "Delete Embedded Object" -msgstr "Vloi zabudovan objekt" +msgstr "Odstrni objekt z inho programu" #. MENU_LABEL_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:944 +#: po/tmp/ap_String_Id.h.h:931 msgid "Delete Image" -msgstr "Odstrni obrzok" +msgstr "Odstrni obrzok" #. MENU_LABEL_EDIT_DELETEEMBED -#: po/tmp/ap_String_Id.h.h:946 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:933 msgid "Delete Object" -msgstr "Odstrni objekt" +msgstr "Odstrni objekt" #. MENU_LABEL_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:948 +#: po/tmp/ap_String_Id.h.h:935 msgid "Delete Ro&w" -msgstr "Odstrni ria&dok" +msgstr "Odstrni ria&dok" #. MENU_STATUSLINE_TABLE_DELETE_ROWS #. MENU_STATUSLINE_TABLE_DELETEROW -#: po/tmp/ap_String_Id.h.h:951 +#: po/tmp/ap_String_Id.h.h:938 msgid "Delete Row" msgstr "Odstrni riadok" #. MENU_LABEL_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:953 +#: po/tmp/ap_String_Id.h.h:940 msgid "Delete Tabl&e" -msgstr "Odstrni ta&buku" +msgstr "Odstrni ta&buku" #. MENU_STATUSLINE_TABLE_DELETE_TABLE #. MENU_STATUSLINE_TABLE_DELETETABLE -#: po/tmp/ap_String_Id.h.h:956 +#: po/tmp/ap_String_Id.h.h:943 msgid "Delete Table" -msgstr "Odstrni tabuku" +msgstr "Odstrni tabuku" #. MENU_LABEL_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:958 +#: po/tmp/ap_String_Id.h.h:945 msgid "Delete Text Box" -msgstr "Odstrni textov rmec" - -#. MENU_STATUSLINE_DELETE_ANNOTATION -#: po/tmp/ap_String_Id.h.h:960 -#, fuzzy -msgid "Delete annotation" -msgstr "Odstrni oznaenou oblast" +msgstr "Odstrni textov rm" #. TOOLBAR_LABEL_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:962 +#: po/tmp/ap_String_Id.h.h:947 msgid "Delete column" -msgstr "Odstrni stpec" +msgstr "Odstrni stpec" #. MENU_STATUSLINE_INSERT_DELETE_HYPERLINK -#: po/tmp/ap_String_Id.h.h:964 +#: po/tmp/ap_String_Id.h.h:949 msgid "Delete hyperlink" msgstr "Odstrni hypertextov odkaz" #. TOOLBAR_LABEL_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:966 +#: po/tmp/ap_String_Id.h.h:951 msgid "Delete row" -msgstr "Odstrni riadok" +msgstr "Odstrni riadok" #. MENU_STATUSLINE_EDIT_CLEAR -#: po/tmp/ap_String_Id.h.h:968 +#: po/tmp/ap_String_Id.h.h:953 msgid "Delete the selection" -msgstr "Odstrni oznaen as" +msgstr "Odstrni oznaen text" #. TOOLBAR_STATUSLINE_DELETE_COLUMN #. TOOLBAR_TOOLTIP_DELETE_COLUMN -#: po/tmp/ap_String_Id.h.h:971 +#: po/tmp/ap_String_Id.h.h:956 msgid "Delete this column from its table" -msgstr "Odstrni tento stpec z tabuky" +msgstr "Odstrni tento stpec z tabuky" #. TOOLBAR_STATUSLINE_DELETE_ROW #. TOOLBAR_TOOLTIP_DELETE_ROW -#: po/tmp/ap_String_Id.h.h:974 +#: po/tmp/ap_String_Id.h.h:959 msgid "Delete this row from its table" -msgstr "Odstrni tento riadok z tabuky" +msgstr "Odstrni tento riadok z tabuky" #. DLG_Styles_Description #. DLG_Styles_ModifyDescription #. FIELD_Document_Description -#: po/tmp/ap_String_Id.h.h:978 +#: po/tmp/ap_String_Id.h.h:963 msgid "Description" -msgstr "Popis" +msgstr "Vlastnosti" #. DLG_MetaData_Description_LBL -#. DLG_Annotation_Description_LBL #. DLG_PLUGIN_MANAGER_DESC #. DLG_Image_LblDescription -#: po/tmp/ap_String_Id.h.h:981 po/tmp/xap_String_Id.h.h:256 +#: po/tmp/ap_String_Id.h.h:965 +#: po/tmp/xap_String_Id.h.h:258 msgid "Description:" msgstr "Popis:" #. DLG_Lists_Diamond_List #. STYLE_DIAMONLIST -#: po/tmp/ap_String_Id.h.h:983 po/tmp/xap_String_Id.h.h:258 +#: po/tmp/ap_String_Id.h.h:967 +#: po/tmp/xap_String_Id.h.h:260 msgid "Diamond List" -msgstr "Odrky v tvare kosotvorca" +msgstr "Odrky v tvare kosotvorca" #. DLG_Options_Label_SpellDictionaries -#: po/tmp/ap_String_Id.h.h:985 +#: po/tmp/ap_String_Id.h.h:969 msgid "Dictionaries" msgstr "Slovnky" #. DLG_HdrFtr_FooterEven -#: po/tmp/ap_String_Id.h.h:987 +#: po/tmp/ap_String_Id.h.h:971 msgid "Different footer on facing pages" -msgstr "In pta na protiahlch stranch" +msgstr "in pta na protiahlch stranch" #. DLG_HdrFtr_FooterFirst -#: po/tmp/ap_String_Id.h.h:989 +#: po/tmp/ap_String_Id.h.h:973 msgid "Different footer on first page" -msgstr "In pta na prvej strane" +msgstr "in pta na prvej strane" #. DLG_HdrFtr_FooterLast -#: po/tmp/ap_String_Id.h.h:991 +#: po/tmp/ap_String_Id.h.h:975 msgid "Different footer on last page" -msgstr "In pta na poslednej strane" +msgstr "in pta na poslednej strane" #. DLG_HdrFtr_HeaderEven -#: po/tmp/ap_String_Id.h.h:993 +#: po/tmp/ap_String_Id.h.h:977 msgid "Different header on facing pages" -msgstr "In zhlavie na protiahlch stranch" +msgstr "in zhlavie na protiahlch stranch" #. DLG_HdrFtr_HeaderFirst -#: po/tmp/ap_String_Id.h.h:995 +#: po/tmp/ap_String_Id.h.h:979 msgid "Different header on first page" -msgstr "In zhlavie na prvej strane" +msgstr "in zhlavie na prvej strane" #. DLG_HdrFtr_HeaderLast -#: po/tmp/ap_String_Id.h.h:997 +#: po/tmp/ap_String_Id.h.h:981 msgid "Different header on last page" -msgstr "In zhlavie na poslednej strane" +msgstr "in zhlavie na poslednej strane" #. DLG_Styles_StylesLocked -#: po/tmp/ap_String_Id.h.h:999 +#: po/tmp/ap_String_Id.h.h:983 msgid "Disable all formatting commands, except styles" -msgstr "Vypn vetky formtovacie prkazy okrem tlov" +msgstr "Vypn vetky formtovacie prkazy okrem tlov" #. MENU_STATUSLINE_HELP_CREDITS -#: po/tmp/ap_String_Id.h.h:1001 +#: po/tmp/ap_String_Id.h.h:985 msgid "Display Credits" msgstr "Zobraz zoznam spolupracovnkov" #. MENU_STATUSLINE_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:1003 +#: po/tmp/ap_String_Id.h.h:987 msgid "Display Help Contents" msgstr "Zobraz obsah npovedy" #. MENU_STATUSLINE_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:1005 +#: po/tmp/ap_String_Id.h.h:989 msgid "Display Help Index" msgstr "Zobraz register npovedy" #. MENU_STATUSLINE_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:1007 +#: po/tmp/ap_String_Id.h.h:991 msgid "Display non-printing characters" -msgstr "Zobraz znaky, ktor sa nedaj vytlai" +msgstr "Zobraz znaky, ktor sa nedaj vytlai" #. MENU_STATUSLINE_HELP_ABOUT -#: po/tmp/ap_String_Id.h.h:1009 +#: po/tmp/ap_String_Id.h.h:993 msgid "Display program information, version number, and copyright" msgstr "Zobraz informcie o programe, slo verzie a autorsk prva" #. DLG_FormatTOC_DispStyle -#: po/tmp/ap_String_Id.h.h:1011 +#: po/tmp/ap_String_Id.h.h:995 msgid "Display style:" -msgstr "Zobrazi tl:" +msgstr "Zobrazi tl:" #. DLG_Options_Prompt_IgnoreResetAll -#: po/tmp/ap_String_Id.h.h:1013 +#: po/tmp/ap_String_Id.h.h:997 msgid "Do you want to reset ignored words in all the documents?" -msgstr "Chcete zmaza zoznam ignorovanch slov vo vetkch dokumentoch?" +msgstr "Chcete zmaza zoznam ignorovanch slov vo vetkch dokumentoch?" #. DLG_Options_Prompt_IgnoreResetCurrent -#: po/tmp/ap_String_Id.h.h:1015 +#: po/tmp/ap_String_Id.h.h:999 msgid "Do you want to reset ignored words in the current document?" -msgstr "Chcete zmaza zoznam ignorovanch slov v tomto dokumente?" +msgstr "Chcete zmaza zoznam ignorovanch slov v tomto dokumente?" #. FIELD_Type_Document -#: po/tmp/ap_String_Id.h.h:1017 +#: po/tmp/ap_String_Id.h.h:1001 msgid "Document" msgstr "Dokument" #. DLG_MetaData_Title -#: po/tmp/ap_String_Id.h.h:1019 +#: po/tmp/ap_String_Id.h.h:1003 msgid "Document Properties" msgstr "Vlastnosti dokumentu" #. DLG_Options_Label_Documents -#: po/tmp/ap_String_Id.h.h:1021 +#: po/tmp/ap_String_Id.h.h:1005 msgid "Documents" msgstr "Dokumenty" #. DLG_FormatFootnotes_FootRestartNone -#: po/tmp/ap_String_Id.h.h:1023 +#: po/tmp/ap_String_Id.h.h:1007 msgid "Don't restart" -msgstr "Neobnovova" +msgstr "Neobnovova" #. DLG_Para_SpacingDouble -#: po/tmp/ap_String_Id.h.h:1025 +#: po/tmp/ap_String_Id.h.h:1009 msgid "Double" msgstr "Dvojit" #. TOOLBAR_LABEL_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1027 +#: po/tmp/ap_String_Id.h.h:1011 msgid "Double Spacing" -msgstr "Dvojit medzery" +msgstr "Dvojit riadkovanie" #. TOOLBAR_STATUSLINE_DOUBLE_SPACE #. TOOLBAR_TOOLTIP_DOUBLE_SPACE -#: po/tmp/ap_String_Id.h.h:1030 +#: po/tmp/ap_String_Id.h.h:1014 msgid "Double spacing" -msgstr "Dvojit medzery" - -#. DLG_Annotation_Title -#: po/tmp/ap_String_Id.h.h:1032 -#, fuzzy -msgid "Edit Annotation" -msgstr "Upravi odsadenie" +msgstr "Dvojit riadkovanie" #. MENU_LABEL_EDIT_LATEXEQUATION -#: po/tmp/ap_String_Id.h.h:1034 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1016 msgid "Edit Equation" msgstr "Uprav matematick vraz" @@ -2543,305 +2494,294 @@ #. TOOLBAR_LABEL_EDIT_FOOTER #. TOOLBAR_STATUSLINE_EDIT_FOOTER #. TOOLBAR_TOOLTIP_EDIT_FOOTER -#: po/tmp/ap_String_Id.h.h:1039 +#: po/tmp/ap_String_Id.h.h:1021 msgid "Edit Footer" -msgstr "Upravi ptu" +msgstr "Upravi ptu" #. MENU_LABEL_EDIT_EDITHEADER #. TOOLBAR_LABEL_EDIT_HEADER #. TOOLBAR_STATUSLINE_EDIT_HEADER #. TOOLBAR_TOOLTIP_EDIT_HEADER -#: po/tmp/ap_String_Id.h.h:1044 +#: po/tmp/ap_String_Id.h.h:1026 msgid "Edit Header" -msgstr "Upravit zhlavie" +msgstr "Upravi zhlavie" #. MENU_STATUSLINE_EDIT_LATEXEQUATION -#: po/tmp/ap_String_Id.h.h:1046 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1028 msgid "Edit Latex Equation" msgstr "Matematick vraz programu Latex" -#. MENU_STATUSLINE_EDIT_ANNOTATION -#: po/tmp/ap_String_Id.h.h:1048 -#, fuzzy -msgid "Edit annotation" -msgstr "Uprav odsadenie" - #. MENU_STATUSLINE_INSERT_EDIT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1050 +#: po/tmp/ap_String_Id.h.h:1030 msgid "Edit hyperlink" msgstr "Uprav hypertextov odkaz" #. MENU_STATUSLINE_VIEW_HEADFOOT -#: po/tmp/ap_String_Id.h.h:1052 +#: po/tmp/ap_String_Id.h.h:1032 msgid "Edit text at the top or bottom of every page" -msgstr "Uprav text v zhlav a pte na kadej strane" +msgstr "Uprav text v zhlav a pte na kadej strane" #. MENU_STATUSLINE_EDIT_EDITFOOTER -#: po/tmp/ap_String_Id.h.h:1054 +#: po/tmp/ap_String_Id.h.h:1034 msgid "Edit the Footer on the current page" -msgstr "Uprav ptu na aktulnej strane" +msgstr "Uprav ptu na tejto strane" #. MENU_STATUSLINE_EDIT_EDITHEADER -#: po/tmp/ap_String_Id.h.h:1056 +#: po/tmp/ap_String_Id.h.h:1036 msgid "Edit the Header on the current page" -msgstr "Uprav zhlavie na aktulnej strane" +msgstr "Uprav zhlavie na tento strane" #. TB_Embedded -#: po/tmp/ap_String_Id.h.h:1058 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1038 msgid "Embedded" msgstr "slovan" #. MENU_LABEL_VIEW_LOCKSTYLES -#: po/tmp/ap_String_Id.h.h:1060 +#: po/tmp/ap_String_Id.h.h:1040 msgid "Enable F&ormatting Tools" -msgstr "Do&voli nstroje na pravu textu" +msgstr "Do&voli nstroje na pravu textu" #. DLG_Options_Label_CheckEnableSmoothScrolling -#: po/tmp/ap_String_Id.h.h:1062 +#: po/tmp/ap_String_Id.h.h:1042 msgid "Enable Smooth Scrolling" -msgstr "Dovoli jemn rolovanie" +msgstr "Dovoli jemn rolovanie" #. FIELD_Numbers_EndnoteAnchor -#: po/tmp/ap_String_Id.h.h:1064 +#: po/tmp/ap_String_Id.h.h:1044 msgid "Endnote anchor" msgstr "Odkaz na koncov poznmku" #. FIELD_Numbers_EndnoteReference -#: po/tmp/ap_String_Id.h.h:1066 +#: po/tmp/ap_String_Id.h.h:1046 msgid "Endnote reference" msgstr "Odkaz na koncov poznmku" #. DLG_FormatFootnotes_EndStyle -#: po/tmp/ap_String_Id.h.h:1068 +#: po/tmp/ap_String_Id.h.h:1048 msgid "Endnote style" -msgstr "tl koncovch poznmok" +msgstr "tl koncovch poznmok" #. MENU_LABEL_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1070 +#: po/tmp/ap_String_Id.h.h:1050 msgid "Equation" msgstr "Matematick vraz" #. FIELD_Error -#: po/tmp/ap_String_Id.h.h:1072 +#: po/tmp/ap_String_Id.h.h:1052 msgid "Error calculating value!" msgstr "Chyba pri vpote hodnoty!" #. SCRIPT_CANTRUN -#: po/tmp/ap_String_Id.h.h:1074 +#: po/tmp/ap_String_Id.h.h:1054 #, c-format msgid "Error executing script %s" -msgstr "Chyba pri span skriptu %s" +msgstr "Chyba pri span skriptu %s" #. MSG_ImportError -#: po/tmp/ap_String_Id.h.h:1076 +#: po/tmp/ap_String_Id.h.h:1056 #, c-format msgid "Error importing file %s." msgstr "Chyba pri importe sboru %s." #. MSG_SaveFailedExport -#: po/tmp/ap_String_Id.h.h:1078 +#: po/tmp/ap_String_Id.h.h:1058 #, c-format msgid "Error while attempting to save %s: could not construct exporter" -msgstr "Sbor %s sa nepodarilo uloi." +msgstr "Chyba pri pokuse uloi sbor %s." #. MSG_SaveFailedName -#: po/tmp/ap_String_Id.h.h:1080 +#: po/tmp/ap_String_Id.h.h:1060 #, c-format msgid "Error while attempting to save %s: invalid name" -msgstr "Sbor %s sa nepodarilo uloi: nesprvne meno" +msgstr "Sbor %s sa nepodarilo uloi: nesprvne meno" #. TOOLBAR_LABEL_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1082 +#: po/tmp/ap_String_Id.h.h:1062 msgid "Ex. script" -msgstr "Spustit skript" +msgstr "Spusti skript" #. DLG_Para_SpacingExactly -#: po/tmp/ap_String_Id.h.h:1084 +#: po/tmp/ap_String_Id.h.h:1064 msgid "Exactly" msgstr "Presne" #. DLG_Latex_Example -#: po/tmp/ap_String_Id.h.h:1086 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1066 msgid "Example:" -msgstr "Vzorka:" +msgstr "Ukka:" #. MENU_STATUSLINE_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:1088 +#: po/tmp/ap_String_Id.h.h:1068 msgid "Execute helper scripts" msgstr "Spust pomocn skripty" #. TOOLBAR_STATUSLINE_SCRIPT_PLAY #. TOOLBAR_TOOLTIP_SCRIPT_PLAY -#: po/tmp/ap_String_Id.h.h:1091 +#: po/tmp/ap_String_Id.h.h:1071 msgid "Execute script" msgstr "Spust pomocn skripty" #. DLG_ListRevisions_Label1 -#: po/tmp/ap_String_Id.h.h:1093 +#: po/tmp/ap_String_Id.h.h:1073 msgid "Existing revisions:" msgstr "Existujce zmeny textu:" #. TB_Extra -#: po/tmp/ap_String_Id.h.h:1095 +#: po/tmp/ap_String_Id.h.h:1075 msgid "Extra" -msgstr "Extra" +msgstr "al" #. DLG_Field_Parameters_Capital -#: po/tmp/ap_String_Id.h.h:1097 +#: po/tmp/ap_String_Id.h.h:1077 msgid "Extra Parameters" -msgstr "Dalie parametre" +msgstr "alie parametre" #. DLG_Options_Label_ViewExtraTB -#: po/tmp/ap_String_Id.h.h:1099 +#: po/tmp/ap_String_Id.h.h:1079 msgid "Extra Toolbar" -msgstr "al panel s nstrojmi" +msgstr "al panel s nstrojmi" #. DLG_Field_Parameters -#: po/tmp/ap_String_Id.h.h:1101 +#: po/tmp/ap_String_Id.h.h:1081 msgid "Extra parameters:" -msgstr "Dalie parametre:" +msgstr "alie parametre:" #. MENU_LABEL_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1103 +#: po/tmp/ap_String_Id.h.h:1083 msgid "F&ile" msgstr "&Sbor" #. MENU_LABEL_FORMAT -#: po/tmp/ap_String_Id.h.h:1105 +#: po/tmp/ap_String_Id.h.h:1085 msgid "F&ormat" msgstr "F&ormt" #. MENU_LABEL_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:1107 +#: po/tmp/ap_String_Id.h.h:1087 msgid "F&ull Screen" msgstr "&Cel obrazovka" #. DLG_FR_FindLabel -#: po/tmp/ap_String_Id.h.h:1109 +#: po/tmp/ap_String_Id.h.h:1089 msgid "Fi&nd what:" -msgstr "&o hada:" +msgstr "&o hada:" #. DLG_MailMerge_Insert_No_Colon -#: po/tmp/ap_String_Id.h.h:1111 +#: po/tmp/ap_String_Id.h.h:1091 msgid "Field Name" -msgstr "Nzov poa" +msgstr "Nzov poa" #. DLG_MailMerge_Insert -#: po/tmp/ap_String_Id.h.h:1113 +#: po/tmp/ap_String_Id.h.h:1093 msgid "Field Name:" -msgstr "Nzov poa:" +msgstr "Nzov poa:" #. MSG_IE_UnsupportedType -#: po/tmp/ap_String_Id.h.h:1115 +#: po/tmp/ap_String_Id.h.h:1095 #, c-format msgid "File %s is not of a currently supported file type" -msgstr "Sbor %s nie je podporovanm typem sboru" +msgstr "Sbor %s nie je podporovanm typom sboru" #. MSG_IE_FakeType -#: po/tmp/ap_String_Id.h.h:1117 +#: po/tmp/ap_String_Id.h.h:1097 #, c-format msgid "File %s is not of the type it claims to be" -msgstr "Sbor %s nie je typom sboru, akm by mal by" +msgstr "Sbor %s nie je typom sboru, akm by mal by" #. MSG_IE_UnknownType -#: po/tmp/ap_String_Id.h.h:1119 +#: po/tmp/ap_String_Id.h.h:1099 #, c-format msgid "File %s is of unknown type" msgstr "Sbor %s je neznmym typom sboru" #. MSG_IE_FileNotFound -#: po/tmp/ap_String_Id.h.h:1121 +#: po/tmp/ap_String_Id.h.h:1101 #, c-format msgid "File %s not found" -msgstr "Sbor %s sa nenaiel" +msgstr "Sbor %s sa nenaiel" #. FIELD_Application_Filename -#: po/tmp/ap_String_Id.h.h:1123 +#: po/tmp/ap_String_Id.h.h:1103 msgid "File Name" -msgstr "Nzov souboru" +msgstr "Nzov sboru" #. DLG_FormatTOC_FillStyle -#: po/tmp/ap_String_Id.h.h:1125 +#: po/tmp/ap_String_Id.h.h:1105 msgid "Fill style:" -msgstr "tl vplne:" +msgstr "tl vplne:" #. DLG_FR_FindTitle -#: po/tmp/ap_String_Id.h.h:1127 +#: po/tmp/ap_String_Id.h.h:1107 msgid "Find" -msgstr "Hada" +msgstr "Hada" #. MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1129 +#: po/tmp/ap_String_Id.h.h:1109 msgid "Find &next revision" -msgstr "Njs &aliu zmenu" +msgstr "njs &aliu zmenu" #. MENU_LABEL_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1131 +#: po/tmp/ap_String_Id.h.h:1111 msgid "Find &previous revision" -msgstr "Njs &predchdzajcu zmenu" +msgstr "njs &predchdzajcu zmenu" #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT -#: po/tmp/ap_String_Id.h.h:1133 +#: po/tmp/ap_String_Id.h.h:1113 msgid "Find next visible revision in the document" -msgstr "Njs daliu viditen zmenu dokumentu" +msgstr "Njde aliu viditen zmenu dokumentu" #. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV -#: po/tmp/ap_String_Id.h.h:1135 +#: po/tmp/ap_String_Id.h.h:1115 msgid "Find previous visible revision in the document" -msgstr "Njs predchdzajcu viditen zmenu dokumentu" +msgstr "Njde predchdzajcu viditen zmenu dokumentu" #. MENU_STATUSLINE_EDIT_FIND -#: po/tmp/ap_String_Id.h.h:1137 +#: po/tmp/ap_String_Id.h.h:1117 msgid "Find the specified text" -msgstr "Njs urit text" +msgstr "Njs urit text" #. FirstLineIndentStatus -#: po/tmp/ap_String_Id.h.h:1139 +#: po/tmp/ap_String_Id.h.h:1119 #, c-format msgid "First Line Indent [%s]" -msgstr "Odsadenie prvho iadka [%s]" +msgstr "Odsadenie prvho riadka [%s]" #. DLG_Para_SpecialFirstLine -#: po/tmp/ap_String_Id.h.h:1141 +#: po/tmp/ap_String_Id.h.h:1121 msgid "First line" msgstr "Prv riadok" #. DLG_InsertTable_FixedColSize -#: po/tmp/ap_String_Id.h.h:1143 +#: po/tmp/ap_String_Id.h.h:1123 msgid "Fixed column size:" -msgstr "Presn vekos stpca:" +msgstr "Presn vekos stpca:" #. DLG_Lists_FoldingLevel1 -#: po/tmp/ap_String_Id.h.h:1145 +#: po/tmp/ap_String_Id.h.h:1125 +#, fuzzy msgid "Fold below level 1" -msgstr "Fold below level 1" +msgstr "Skry text pod Nadpisom 2" #. DLG_Lists_FoldingLevel2 -#: po/tmp/ap_String_Id.h.h:1147 +#: po/tmp/ap_String_Id.h.h:1127 msgid "Fold below level 2" -msgstr "Fold below level 2" +msgstr "Skry text pod Nadpisom 2" #. DLG_Lists_FoldingLevel3 -#: po/tmp/ap_String_Id.h.h:1149 +#: po/tmp/ap_String_Id.h.h:1129 +#, fuzzy msgid "Fold below level 3" -msgstr "Fold below level 3" +msgstr "Skry text pod Nadpisom 2" #. DLG_Lists_FoldingLevel4 -#: po/tmp/ap_String_Id.h.h:1151 +#: po/tmp/ap_String_Id.h.h:1131 msgid "Fold below level 4" -msgstr "Fold below level 4" +msgstr "Skry text pod Nadpisom 4" #. DLG_Para_PreviewFollowParagraph -#: po/tmp/ap_String_Id.h.h:1153 -msgid "" -"Following Paragraph Following Paragraph Following Paragraph Following " -"Paragraph Following Paragraph Following Paragraph Following Paragraph" -msgstr "" -"Nasledujci odsek Nasledujci odsek Nasledujci odsek Nasledujci " -"odsek Nsledujc odsek Nsledujc odsek Nsledujc odsek" +#: po/tmp/ap_String_Id.h.h:1133 +msgid "Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph Following Paragraph" +msgstr "al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek" #. DLG_Styles_ModifyFont #. TOOLBAR_LABEL_FMT_FONT @@ -2849,1229 +2789,1211 @@ #. TOOLBAR_TOOLTIP_FMT_FONT #. DLG_UFS_FontTitle #. DLG_UFS_FontTab -#: po/tmp/ap_String_Id.h.h:1158 po/tmp/xap_String_Id.h.h:333 +#: po/tmp/ap_String_Id.h.h:1138 +#: po/tmp/xap_String_Id.h.h:335 msgid "Font" msgstr "Psmo" #. TOOLBAR_STATUSLINE_FMT_CHOOSE -#: po/tmp/ap_String_Id.h.h:1160 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1140 msgid "Font Choose" -msgstr "Vybrat psmo" +msgstr "Vyberte psmo" #. TOOLBAR_LABEL_FMT_SIZE #. TOOLBAR_STATUSLINE_FMT_SIZE #. TOOLBAR_TOOLTIP_FMT_SIZE -#: po/tmp/ap_String_Id.h.h:1164 +#: po/tmp/ap_String_Id.h.h:1144 msgid "Font Size" -msgstr "Vekos psma" +msgstr "Vekos psma" #. TOOLBAR_LABEL_FMT_CHOOSE -#: po/tmp/ap_String_Id.h.h:1166 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1146 msgid "Font choose" -msgstr "Farba psma" +msgstr "Vybra psmo" #. TOOLBAR_LABEL_COLOR_FORE #. TOOLBAR_STATUSLINE_COLOR_FORE #. TOOLBAR_TOOLTIP_COLOR_FORE -#: po/tmp/ap_String_Id.h.h:1170 +#: po/tmp/ap_String_Id.h.h:1150 msgid "Font color" msgstr "Farba psma" #. DLG_Lists_ButtonFont -#: po/tmp/ap_String_Id.h.h:1172 +#: po/tmp/ap_String_Id.h.h:1152 msgid "Font..." msgstr "Psmo..." #. DLG_Lists_Font #. DLG_UFS_FontLabel -#: po/tmp/ap_String_Id.h.h:1174 po/tmp/xap_String_Id.h.h:335 +#: po/tmp/ap_String_Id.h.h:1154 +#: po/tmp/xap_String_Id.h.h:337 msgid "Font:" msgstr "Psmo:" #. MENU_LABEL_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1176 +#: po/tmp/ap_String_Id.h.h:1156 msgid "Foot¬e" msgstr "&Poznmka pod iarou" #. DLG_PageNumbers_Footer #. MENU_LABEL_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1179 +#: po/tmp/ap_String_Id.h.h:1159 msgid "Footer" msgstr "Pta" #. DLG_HdrFtr_FooterFrame -#: po/tmp/ap_String_Id.h.h:1181 +#: po/tmp/ap_String_Id.h.h:1161 msgid "Footer Properties" msgstr "Vlastnosti pty" #. FooterStatus -#: po/tmp/ap_String_Id.h.h:1183 +#: po/tmp/ap_String_Id.h.h:1163 #, c-format msgid "Footer [%s]" msgstr "Pta [%s]" #. FIELD_Numbers_FootnoteAnchor -#: po/tmp/ap_String_Id.h.h:1185 +#: po/tmp/ap_String_Id.h.h:1165 msgid "Footnote anchor" msgstr "Odkaz na poznmku pod iarou" #. FIELD_Numbers_FootnoteReference -#: po/tmp/ap_String_Id.h.h:1187 +#: po/tmp/ap_String_Id.h.h:1167 msgid "Footnote reference" msgstr "Odkaz na poznmku pod iarou" #. DLG_FormatFootnotes_FootStyle -#: po/tmp/ap_String_Id.h.h:1189 +#: po/tmp/ap_String_Id.h.h:1169 msgid "Footnote style" -msgstr "tl poznmky pod iarou" +msgstr "tl poznmky pod iarou" #. MENU_LABEL_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:1191 +#: po/tmp/ap_String_Id.h.h:1171 msgid "Footnotes and Endnotes" -msgstr "Poznmka pod iarou a koncov poznmka" +msgstr "Poznmky pod iarou a koncov poznmky" #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1194 +#: po/tmp/ap_String_Id.h.h:1174 msgid "Force LTR direction of text" -msgstr "Nastav smer textu zava doprava" +msgstr "Nastav smer textu na zava doprava" #. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_RTL #. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1197 +#: po/tmp/ap_String_Id.h.h:1177 msgid "Force RTL direction of text" -msgstr "Nastav smer textu sprava doava" +msgstr "Nastav smer textu na sprava doava" #. MENU_STATUSLINE_FMT_DIRECTION_DO_LTR -#: po/tmp/ap_String_Id.h.h:1199 +#: po/tmp/ap_String_Id.h.h:1179 msgid "Force left-to-right direction of text" -msgstr "Prednastav smer textu zava doprava" +msgstr "Nastav smer textu zava doprava" #. MENU_STATUSLINE_FMT_DIRECTION_DO_RTL -#: po/tmp/ap_String_Id.h.h:1201 +#: po/tmp/ap_String_Id.h.h:1181 msgid "Force right-to-left direction of text" -msgstr "Prednastav smer textu sprava doava" +msgstr "Pouije smer textu sprava doava" #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_LTR -#: po/tmp/ap_String_Id.h.h:1203 +#: po/tmp/ap_String_Id.h.h:1183 msgid "Force text LTR" -msgstr "Poui smer textu zava doprava" +msgstr "Poui smer textu zava doprava" #. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_RTL -#: po/tmp/ap_String_Id.h.h:1205 +#: po/tmp/ap_String_Id.h.h:1185 msgid "Force text RTL" -msgstr "Poui smer textu sprava doava" +msgstr "Poui smer textu sprava doava" #. DLG_Styles_ModifyFormat #. TB_Format -#: po/tmp/ap_String_Id.h.h:1208 +#: po/tmp/ap_String_Id.h.h:1188 msgid "Format" msgstr "Formt" #. MENU_STATUSLINE_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1210 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1190 msgid "Format Embedded Object" -msgstr "Vloi zabudovan objekt" +msgstr "Vlote objekt z inho programu" #. DLG_FormatFootnotes_Endnotes -#: po/tmp/ap_String_Id.h.h:1212 +#: po/tmp/ap_String_Id.h.h:1192 msgid "Format Endnotes" msgstr "Formt poznmky pod iarou" #. DLG_FormatFootnotes_Footnotes -#: po/tmp/ap_String_Id.h.h:1214 +#: po/tmp/ap_String_Id.h.h:1194 msgid "Format Footnotes" -msgstr "Formt poznmky pod arou:" +msgstr "Formt poznmky pod iarou:" #. DLG_FormatFootnotes_Title -#: po/tmp/ap_String_Id.h.h:1216 +#: po/tmp/ap_String_Id.h.h:1196 msgid "Format Footnotes and Endnotes" msgstr "Formt poznmky pod iarou a koncovej poznmky" #. DLG_HdrFtr_Title -#: po/tmp/ap_String_Id.h.h:1218 +#: po/tmp/ap_String_Id.h.h:1198 msgid "Format Header/Footers" msgstr "Formt zhlavia/pty" #. MENU_LABEL_FMT_EMBED -#: po/tmp/ap_String_Id.h.h:1220 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1200 msgid "Format Object" -msgstr "Formt tabuky" +msgstr "Formt tabuky" #. TOOLBAR_LABEL_FMTPAINTER -#: po/tmp/ap_String_Id.h.h:1222 +#: po/tmp/ap_String_Id.h.h:1202 msgid "Format Painter" msgstr "Formt kresby" #. DLG_FormatTableTitle #. MENU_STATUSLINE_TABLE_FORMAT -#: po/tmp/ap_String_Id.h.h:1225 +#: po/tmp/ap_String_Id.h.h:1205 msgid "Format Table" -msgstr "Formt tabuky" +msgstr "Formt tabuky" #. DLG_FormatTOC_Title -#: po/tmp/ap_String_Id.h.h:1227 +#: po/tmp/ap_String_Id.h.h:1207 msgid "Format Table of Contents" msgstr "Formt obsahu" #. DLG_FormatFrameTitle -#: po/tmp/ap_String_Id.h.h:1229 +#: po/tmp/ap_String_Id.h.h:1209 msgid "Format Text Box" msgstr "Formt textovho rmu" #. DLG_Options_Label_ViewFormatTB -#: po/tmp/ap_String_Id.h.h:1231 +#: po/tmp/ap_String_Id.h.h:1211 msgid "Format Toolbar" msgstr "Formt panelu s nstrojmi" #. MENU_STATUSLINE_FMT_POSIMAGE -#: po/tmp/ap_String_Id.h.h:1233 +#: po/tmp/ap_String_Id.h.h:1213 msgid "Format this image" -msgstr "Zmen formt obrzku" +msgstr "Zmen formt obrzka" #. MENU_STATUSLINE_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:1235 +#: po/tmp/ap_String_Id.h.h:1215 msgid "Format your document using styles" -msgstr "Zmen psmo dokumentu pomocou tlu" +msgstr "Zmen psmo dokumentu pomocou tlu" #. DLG_Lists_Format #. DLG_DocComparison_Fmt -#: po/tmp/ap_String_Id.h.h:1237 po/tmp/xap_String_Id.h.h:341 +#: po/tmp/ap_String_Id.h.h:1217 +#: po/tmp/xap_String_Id.h.h:343 msgid "Format:" msgstr "Formt:" #. MENU_LABEL_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1239 +#: po/tmp/ap_String_Id.h.h:1219 msgid "From File" msgstr "Zo sboru" #. MENU_LABEL_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1241 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1221 msgid "From LaTeX" msgstr "Z programu Latex" #. TOOLBAR_LABEL_VIEW_FULL_SCREEN #. TOOLBAR_STATUSLINE_VIEW_FULL_SCREEN #. TOOLBAR_TOOLTIP_VIEW_FULL_SCREEN -#: po/tmp/ap_String_Id.h.h:1245 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1225 msgid "Full Screen" msgstr "&Cel obrazovka" #. DLG_FormatTOC_General #. DLG_Options_Label_General #. DLG_MetaData_TAB_General -#: po/tmp/ap_String_Id.h.h:1249 +#: po/tmp/ap_String_Id.h.h:1229 msgid "General" -msgstr "Veobecn" +msgstr "Veobecn" #. DLG_Goto_Btn_Goto -#: po/tmp/ap_String_Id.h.h:1251 +#: po/tmp/ap_String_Id.h.h:1231 msgid "Go To" msgstr "Cho na" #. DLG_Goto_Label_What -#: po/tmp/ap_String_Id.h.h:1253 +#: po/tmp/ap_String_Id.h.h:1233 msgid "Go To &What:" -msgstr "Cho na &o:" +msgstr "Cho &na:" #. DLG_Goto_Title -#: po/tmp/ap_String_Id.h.h:1255 +#: po/tmp/ap_String_Id.h.h:1235 msgid "Go to..." msgstr "Cho na..." #. DLG_FormatTOC_HasLabel -#: po/tmp/ap_String_Id.h.h:1257 +#: po/tmp/ap_String_Id.h.h:1237 msgid "H&as label" msgstr "&Obsahuje nadpis" #. DLG_FormatTOC_HeadingText -#: po/tmp/ap_String_Id.h.h:1259 +#: po/tmp/ap_String_Id.h.h:1239 msgid "H&eading text:" msgstr "T&ext nadpisu:" #. DLG_Lists_Hand_List #. STYLE_HANDLIST -#: po/tmp/ap_String_Id.h.h:1261 po/tmp/xap_String_Id.h.h:381 +#: po/tmp/ap_String_Id.h.h:1241 +#: po/tmp/xap_String_Id.h.h:383 msgid "Hand List" -msgstr "Odrky v tvare ruky" +msgstr "Odrky v tvare ruky" #. DLG_Para_SpecialHanging -#: po/tmp/ap_String_Id.h.h:1263 +#: po/tmp/ap_String_Id.h.h:1243 msgid "Hanging" msgstr "Zavesenie" #. DLG_PageNumbers_Header #. MENU_LABEL_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1266 +#: po/tmp/ap_String_Id.h.h:1246 msgid "Header" msgstr "Zhlavie" #. DLG_HdrFtr_HeaderFrame -#: po/tmp/ap_String_Id.h.h:1268 +#: po/tmp/ap_String_Id.h.h:1248 msgid "Header Properties" msgstr "Vlastnosti zhlavia" #. HeaderStatus -#: po/tmp/ap_String_Id.h.h:1270 +#: po/tmp/ap_String_Id.h.h:1250 #, c-format msgid "Header [%s]" msgstr "Zhlavie [%s]" #. MENU_LABEL_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:1272 +#: po/tmp/ap_String_Id.h.h:1252 msgid "Header/Footers" msgstr "Zhlavie/pta" #. MSG_CHECK_PRINT_MODE -#: po/tmp/ap_String_Id.h.h:1274 +#: po/tmp/ap_String_Id.h.h:1254 msgid "" -"Headers and Footers can only be created and edited while in Print View " -"Mode. \n" +"Headers and Footers can only be created and edited while in Print View Mode. \n" " To enter this mode choose View then Print Layout from the Menus. \n" " Would you like to enter Print Layout mode right now?" msgstr "" -"Zhlavia a pty mono vytvra a upravova len v reime zobrazenia pre tla. \n" -"Aby sa vm dokument takto zobrazil, chote do menu Zobrazi a Tiskov nhled. \n" -" Chcete teraz vstoupit do reimu Nhledu na tisk?" +"Zhlavia a pty mono vytvra a upravova len v zobrazeni pre tla. \n" +"Aby sa vm dokument takto zobrazil, chote do menu Zobrazi a Ukka pred tlaou. \n" +"Chcete prejs do zobrazenia ukky pred tlaou teraz?" #. DLG_Stylist_HeadingStyles -#: po/tmp/ap_String_Id.h.h:1276 +#: po/tmp/ap_String_Id.h.h:1256 msgid "Heading Styles" -msgstr "tly nadpisov" +msgstr "tly nadpisov" #. DLG_FormatTOC_HeadingStyle -#: po/tmp/ap_String_Id.h.h:1278 +#: po/tmp/ap_String_Id.h.h:1258 msgid "Heading style:" -msgstr "tly nadpisov:" +msgstr "tly nadpisov:" #. DLG_Lists_Heart_List #. STYLE_HEARTLIST -#: po/tmp/ap_String_Id.h.h:1280 po/tmp/xap_String_Id.h.h:397 +#: po/tmp/ap_String_Id.h.h:1260 +#: po/tmp/xap_String_Id.h.h:399 msgid "Heart List" msgstr "Odrky v tvare srdca" #. DLG_Lists_Hebrew_List -#: po/tmp/ap_String_Id.h.h:1282 +#: po/tmp/ap_String_Id.h.h:1262 msgid "Hebrew List" msgstr "Zoznam pre hebrejinu" #. TOOLBAR_LABEL_HELP #. TOOLBAR_STATUSLINE_HELP #. TOOLBAR_TOOLTIP_HELP -#: po/tmp/ap_String_Id.h.h:1286 +#: po/tmp/ap_String_Id.h.h:1266 msgid "Help" msgstr "Npoveda" #. MENU_LABEL_HELP_CONTENTS -#: po/tmp/ap_String_Id.h.h:1288 +#: po/tmp/ap_String_Id.h.h:1268 msgid "Help &Contents" msgstr "&Obsah npovedy" #. MENU_LABEL_HELP_INDEX -#: po/tmp/ap_String_Id.h.h:1290 +#: po/tmp/ap_String_Id.h.h:1270 msgid "Help &Introduction" -msgstr "&vod npovedy" +msgstr "&vod k npovede" #. DLG_Options_Label_Hide -#: po/tmp/ap_String_Id.h.h:1292 +#: po/tmp/ap_String_Id.h.h:1272 msgid "Hide" -msgstr "Skry" +msgstr "Skry" #. DLG_Options_Label_SpellHideErrors -#: po/tmp/ap_String_Id.h.h:1294 +#: po/tmp/ap_String_Id.h.h:1274 msgid "Hide &spelling errors in the document" -msgstr "&Nepodiarkova chyby v dokumente" +msgstr "&Skry chyby v dokumente" #. DLG_Lists_FoldingLevelexp -#: po/tmp/ap_String_Id.h.h:1296 +#: po/tmp/ap_String_Id.h.h:1276 msgid "Hide text below List Levels" -msgstr "Skry text pod rovou zoznamu" +msgstr "Skry text pod rovou zoznamu" #. TOOLBAR_LABEL_COLOR_BACK #. TOOLBAR_STATUSLINE_COLOR_BACK #. TOOLBAR_TOOLTIP_COLOR_BACK -#: po/tmp/ap_String_Id.h.h:1300 +#: po/tmp/ap_String_Id.h.h:1280 msgid "Highlight" msgstr "Zvraznenie" #. DLG_Spell_IgnoreAll -#: po/tmp/ap_String_Id.h.h:1302 +#: po/tmp/ap_String_Id.h.h:1282 msgid "I&gnore All" -msgstr "I&gnorova vetky" +msgstr "Pr&eskoi vdy" #. DLG_FormatTOC_Indent -#: po/tmp/ap_String_Id.h.h:1304 +#: po/tmp/ap_String_Id.h.h:1284 msgid "I&ndent:" msgstr "O&dsadenie:" #. InsertModeFieldINS -#: po/tmp/ap_String_Id.h.h:1306 +#: po/tmp/ap_String_Id.h.h:1286 msgid "INS" msgstr "INS" #. DLG_Options_Label_Icons -#: po/tmp/ap_String_Id.h.h:1308 +#: po/tmp/ap_String_Id.h.h:1288 msgid "Icons" msgstr "Ikony" #. DLG_Options_Label_Ignore -#: po/tmp/ap_String_Id.h.h:1310 +#: po/tmp/ap_String_Id.h.h:1290 msgid "Ignore" -msgstr "Ignorova" +msgstr "Ignorova" #. DLG_Options_Label_SpellIgnoreWords -#: po/tmp/ap_String_Id.h.h:1312 +#: po/tmp/ap_String_Id.h.h:1292 msgid "Ignore Words" -msgstr "Ignorovan slov" +msgstr "Preskakovan slov" #. MENU_STATUSLINE_SPELL_IGNOREALL -#: po/tmp/ap_String_Id.h.h:1314 +#: po/tmp/ap_String_Id.h.h:1294 msgid "Ignore all occurrences of this word in the document" -msgstr "Ignorova vetky vskyty tohto slova v dokumente" +msgstr "Vdy presko toto slovo v dokumente" #. DLG_Options_Label_SpellIgnoredWord -#: po/tmp/ap_String_Id.h.h:1316 +#: po/tmp/ap_String_Id.h.h:1296 msgid "Ignored words:" msgstr "Ignorovan slov:" #. DLG_FormatFrame_SetImageBackground #. DLG_FormatTable_SetImageBackground -#: po/tmp/ap_String_Id.h.h:1319 +#: po/tmp/ap_String_Id.h.h:1299 msgid "Image For Background" msgstr "Obrzok pozadia" #. DLG_Lists_Implies_List #. STYLE_IMPLIES_LIST -#: po/tmp/ap_String_Id.h.h:1321 po/tmp/xap_String_Id.h.h:431 +#: po/tmp/ap_String_Id.h.h:1301 +#: po/tmp/xap_String_Id.h.h:433 msgid "Implies List" -msgstr "Odrky v tvare ipky" +msgstr "Odrky v tvare pky" #. MENU_STATUSLINE_FILE_IMPORTSTYLES -#: po/tmp/ap_String_Id.h.h:1323 +#: po/tmp/ap_String_Id.h.h:1303 msgid "Import style definitions from a document" -msgstr "Vykon prevod definci tlov z dokumentu" +msgstr "Vykon prevod definci tlov z dokumentu" #. DLG_Styles_LBL_InUse -#: po/tmp/ap_String_Id.h.h:1325 +#: po/tmp/ap_String_Id.h.h:1305 msgid "In Use" -msgstr "Pouva se" +msgstr "Pouva sa" #. WORD_PassInvalid -#: po/tmp/ap_String_Id.h.h:1327 +#: po/tmp/ap_String_Id.h.h:1307 msgid "Incorrect Password" msgstr "Nesprvne heslo" #. TOOLBAR_LABEL_INDENT #. TOOLBAR_STATUSLINE_INDENT #. TOOLBAR_TOOLTIP_INDENT -#: po/tmp/ap_String_Id.h.h:1331 +#: po/tmp/ap_String_Id.h.h:1311 msgid "Increase indent" -msgstr "Zvit odsadenie" +msgstr "Zvi odsadenie" #. DLG_Para_LabelIndentation -#: po/tmp/ap_String_Id.h.h:1333 +#: po/tmp/ap_String_Id.h.h:1313 msgid "Indentation" -msgstr "Medzera od okraja" +msgstr "Odsadenie" #. DLG_Para_TabLabelIndentsAndSpacing -#: po/tmp/ap_String_Id.h.h:1335 +#: po/tmp/ap_String_Id.h.h:1315 msgid "Indents and Spacing" -msgstr "Odsadenie a medzery" +msgstr "Odsadenie a riadkovanie" #. DLG_ToggleCase_FirstUpperCase -#: po/tmp/ap_String_Id.h.h:1337 +#: po/tmp/ap_String_Id.h.h:1317 msgid "Initial Caps" -msgstr "Prv psmeno vek" +msgstr "Zaiaton psmen vek" #. DLG_FormatFootnotes_EndInitialVal -#: po/tmp/ap_String_Id.h.h:1339 +#: po/tmp/ap_String_Id.h.h:1319 msgid "Initial Endnote value" -msgstr "Poiaton hodnota koncovej poznmky" +msgstr "Zaiaton hodnota koncovej poznmky" #. DLG_FormatFootnotes_FootInitialVal -#: po/tmp/ap_String_Id.h.h:1341 +#: po/tmp/ap_String_Id.h.h:1321 msgid "Initial Footnote value" -msgstr "Poiaton hodnota poznmky pod iarou" +msgstr "Zaiaton hodnota poznmky pod iarou" #. DLG_Break_Insert #. MENU_STATUSLINE_TABLE_INSERT #. DLG_IP_Button_Label -#: po/tmp/ap_String_Id.h.h:1344 po/tmp/xap_String_Id.h.h:441 +#: po/tmp/ap_String_Id.h.h:1324 +#: po/tmp/xap_String_Id.h.h:443 msgid "Insert" -msgstr "Vloi" +msgstr "Vloi" #. MENU_LABEL_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1346 +#: po/tmp/ap_String_Id.h.h:1326 msgid "Insert &Columns" -msgstr "Vloi st&pce" +msgstr "Vloi st&pce" #. MENU_LABEL_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1348 +#: po/tmp/ap_String_Id.h.h:1328 msgid "Insert &Rows" -msgstr "Vloi ria&dky" +msgstr "Vloi ria&dky" #. MENU_LABEL_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1350 +#: po/tmp/ap_String_Id.h.h:1330 msgid "Insert &Table" -msgstr "Vloi &tabuku" +msgstr "Vloi &tabuku" #. DLG_InsertBookmark_Title #. TOOLBAR_LABEL_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1353 +#: po/tmp/ap_String_Id.h.h:1333 msgid "Insert Bookmark" -msgstr "Vloi zloku" +msgstr "Vloi zloku" #. DLG_Break_BreakTitle_Capital -#: po/tmp/ap_String_Id.h.h:1355 +#: po/tmp/ap_String_Id.h.h:1335 msgid "Insert Break" -msgstr "Vloi zlom" +msgstr "Vloi zlom" #. MENU_STATUSLINE_TABLE_INSERT_CELLS -#: po/tmp/ap_String_Id.h.h:1357 +#: po/tmp/ap_String_Id.h.h:1337 msgid "Insert Cells" -msgstr "Vlo bunky" +msgstr "Vlo bunky" #. MENU_STATUSLINE_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1359 +#: po/tmp/ap_String_Id.h.h:1339 msgid "Insert Clipboard contents" -msgstr "Vlo obsah schrnky" +msgstr "Vlo obsah schrnky" #. DLG_DateTime_DateTimeTitle -#: po/tmp/ap_String_Id.h.h:1361 +#: po/tmp/ap_String_Id.h.h:1341 msgid "Insert Date and Time" -msgstr "Vloi dtum a as" +msgstr "Vloi dtum a as" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION -#: po/tmp/ap_String_Id.h.h:1363 +#: po/tmp/ap_String_Id.h.h:1343 msgid "Insert Equation" -msgstr "Vloi matematick vraz" +msgstr "Vloi matematick vraz" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX -#: po/tmp/ap_String_Id.h.h:1365 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1345 msgid "Insert Equation from a LaTeX expression" -msgstr "Vloi matematick vraz z vrazu programu Latex" +msgstr "Vloi matematick vraz z vrazu programu Latex" #. DLG_Field_FieldTitle_Capital -#: po/tmp/ap_String_Id.h.h:1367 +#: po/tmp/ap_String_Id.h.h:1347 msgid "Insert Field" -msgstr "Vloi pole" +msgstr "Vloi pole" #. DLG_InsertHyperlink_Title #. TOOLBAR_LABEL_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1370 +#: po/tmp/ap_String_Id.h.h:1350 msgid "Insert Hyperlink" -msgstr "Vloi hypertextov odkaz" +msgstr "Vloi hypertextov odkaz" #. TOOLBAR_LABEL_IMG -#: po/tmp/ap_String_Id.h.h:1372 +#: po/tmp/ap_String_Id.h.h:1352 msgid "Insert Image" -msgstr "Vloi obrzok" +msgstr "Vloi obrzok" #. DLG_MailMerge_MailMergeTitle -#: po/tmp/ap_String_Id.h.h:1374 +#: po/tmp/ap_String_Id.h.h:1354 msgid "Insert Mail Merge Field" -msgstr "Vloenie poa hromadnej korepondencie" +msgstr "Vloenie poa hromadnej korepondencie" #. MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE -#: po/tmp/ap_String_Id.h.h:1376 +#: po/tmp/ap_String_Id.h.h:1356 msgid "Insert MathML from a file" -msgstr "Vlo MathML zo sboru" +msgstr "Vlo MathML zo sboru" #. DLG_InsertTable_TableTitle #. MENU_STATUSLINE_TABLE_INSERT_TABLE #. MENU_STATUSLINE_TABLE_INSERTTABLE -#: po/tmp/ap_String_Id.h.h:1380 +#: po/tmp/ap_String_Id.h.h:1360 msgid "Insert Table" -msgstr "Vlo tabuku" +msgstr "Vlo tabuku" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER -#: po/tmp/ap_String_Id.h.h:1382 +#: po/tmp/ap_String_Id.h.h:1362 msgid "Insert Unicode direction marker into the document" -msgstr "Do dokumentu vlo znaku smru Unicode" +msgstr "Vlo znaku zmeny smeru Unicode" #. MENU_STATUSLINE_INSERT_FOOTER -#: po/tmp/ap_String_Id.h.h:1384 +#: po/tmp/ap_String_Id.h.h:1364 msgid "Insert a Footer" -msgstr "Vlo ptu" +msgstr "Vlo ptu" #. MENU_STATUSLINE_INSERT_HEADER -#: po/tmp/ap_String_Id.h.h:1386 +#: po/tmp/ap_String_Id.h.h:1366 msgid "Insert a Header" -msgstr "Vlo zhlavie" +msgstr "Vlo zhlavie" #. MENU_STATUSLINE_INSERT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:1388 +#: po/tmp/ap_String_Id.h.h:1368 msgid "Insert a Table of Contents based on Headings" -msgstr "Vloi obsah vytvoren z nadpisov" +msgstr "Vloi obsah vytvoren z nadpisov" #. MENU_STATUSLINE_INSERT_TEXTBOX -#: po/tmp/ap_String_Id.h.h:1390 +#: po/tmp/ap_String_Id.h.h:1370 msgid "Insert a Text Box" -msgstr "Vlo textov rm" +msgstr "Vlo textov rm" #. TOOLBAR_STATUSLINE_FMT_BOOKMARK #. TOOLBAR_TOOLTIP_FMT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1393 +#: po/tmp/ap_String_Id.h.h:1373 msgid "Insert a bookmark into the document" -msgstr "Vlo zloku" +msgstr "Vlo zloku" #. MENU_STATUSLINE_INSERT_FIELD -#: po/tmp/ap_String_Id.h.h:1395 +#: po/tmp/ap_String_Id.h.h:1375 msgid "Insert a calculated field" -msgstr "Vlo potan pole" +msgstr "Vlo potan pole" #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_BEFORE -#: po/tmp/ap_String_Id.h.h:1397 +#: po/tmp/ap_String_Id.h.h:1377 msgid "Insert a column to the left" -msgstr "Vlo stpec naavo" +msgstr "Vlo stpec naavo" #. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_AFTER #. MENU_STATUSLINE_TABLE_INSERTCOLUMN -#: po/tmp/ap_String_Id.h.h:1400 +#: po/tmp/ap_String_Id.h.h:1380 msgid "Insert a column to the right" -msgstr "Vlo stpec napravo" +msgstr "Vlo stpec napravo" #. MENU_STATUSLINE_INSERT_FOOTNOTE -#: po/tmp/ap_String_Id.h.h:1402 +#: po/tmp/ap_String_Id.h.h:1382 msgid "Insert a footnote" -msgstr "Vlo koncov poznmku" +msgstr "Vlo koncov poznmku" #. TOOLBAR_STATUSLINE_FMT_HYPERLINK #. TOOLBAR_TOOLTIP_FMT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1405 +#: po/tmp/ap_String_Id.h.h:1385 msgid "Insert a hyperlink into the document" -msgstr "Vlo hypertextov odkaz" +msgstr "Vlo hypertextov odkaz" #. MENU_STATUSLINE_INSERT_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1407 +#: po/tmp/ap_String_Id.h.h:1387 msgid "Insert a mail merge field" -msgstr "Vlo pole hromadnej korepondencie" +msgstr "Vlo pole hromadnej korepondencie" #. TOOLBAR_STATUSLINE_INSERT_TABLE #. TOOLBAR_TOOLTIP_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1410 +#: po/tmp/ap_String_Id.h.h:1390 msgid "Insert a new table into your document" -msgstr "Vlo nov tabuku" +msgstr "Vlo nov tabuku" #. MENU_STATUSLINE_INSERT_BREAK -#: po/tmp/ap_String_Id.h.h:1412 +#: po/tmp/ap_String_Id.h.h:1392 msgid "Insert a page, column, or section break" -msgstr "Vlo zlom strnky, stpca alebo sekcie" +msgstr "Vlo zlom strnky, stpca alebo sekcie" #. MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:1414 +#: po/tmp/ap_String_Id.h.h:1394 msgid "Insert a row above" -msgstr "Vlo riadok nad aktulny" +msgstr "Vlo riadok nad aktulny" #. MENU_STATUSLINE_TABLE_INSERT_ROWS_AFTER #. MENU_STATUSLINE_TABLE_INSERTROW -#: po/tmp/ap_String_Id.h.h:1417 +#: po/tmp/ap_String_Id.h.h:1397 msgid "Insert a row below" -msgstr "Vlo riadok pod aktulny" +msgstr "Vlo riadok pod aktulny" #. MENU_STATUSLINE_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1419 +#: po/tmp/ap_String_Id.h.h:1399 msgid "Insert a symbol or other special character" -msgstr "Vlo symbol alebo in pecilny znak" +msgstr "Vlo symbol alebo in pecilny znak" -#. MENU_STATUSLINE_TOOLS_ANNOTATIONS_INSERT -#: po/tmp/ap_String_Id.h.h:1421 -#, fuzzy -msgid "Insert an annotation" -msgstr "Vlo poznmku na koniec" +#. MENU_STATUSLINE_INSERT_ANNOTATION +#: po/tmp/ap_String_Id.h.h:1401 +msgid "Insert an Annotation" +msgstr "Vlo poznmku na koniec" #. MENU_STATUSLINE_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1423 +#: po/tmp/ap_String_Id.h.h:1403 msgid "Insert an automatically-updated page number" -msgstr "Vlo automatick slovan strn" +msgstr "Vlo automatick slovanie strn" #. MENU_STATUSLINE_INSERT_ENDNOTE -#: po/tmp/ap_String_Id.h.h:1425 +#: po/tmp/ap_String_Id.h.h:1405 msgid "Insert an endnote" -msgstr "Vlo koncov poznmku" +msgstr "Vlo koncov poznmku" #. MENU_STATUSLINE_INSERT_GRAPHIC -#: po/tmp/ap_String_Id.h.h:1427 +#: po/tmp/ap_String_Id.h.h:1407 msgid "Insert an existing picture from another file" msgstr "Vlo existujci obrzok z inho sboru" #. TOOLBAR_STATUSLINE_IMG #. TOOLBAR_TOOLTIP_IMG -#: po/tmp/ap_String_Id.h.h:1430 +#: po/tmp/ap_String_Id.h.h:1410 msgid "Insert an image into the document" -msgstr "Do dokumentu vlo obrzok" +msgstr "Do dokumentu vlo obrzok" #. MENU_STATUSLINE_INSERT_BOOKMARK -#: po/tmp/ap_String_Id.h.h:1432 +#: po/tmp/ap_String_Id.h.h:1412 msgid "Insert bookmark" -msgstr "Vlo zloku" +msgstr "Vlo zloku" #. DLG_Break_BreakTitle -#: po/tmp/ap_String_Id.h.h:1434 +#: po/tmp/ap_String_Id.h.h:1414 msgid "Insert break" -msgstr "Vloi zlom" +msgstr "Vloi zlom" #. MENU_STATUSLINE_INSERT_CLIPART -#: po/tmp/ap_String_Id.h.h:1436 +#: po/tmp/ap_String_Id.h.h:1416 msgid "Insert clipart" -msgstr "Vlo obrzok prvok Clipart" +msgstr "Vlo obrzok prvok Clipart" #. DLG_Field_FieldTitle -#: po/tmp/ap_String_Id.h.h:1438 +#: po/tmp/ap_String_Id.h.h:1418 msgid "Insert field" -msgstr "Vloi pole" +msgstr "Vloi pole" #. MENU_STATUSLINE_INSERT_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1440 +#: po/tmp/ap_String_Id.h.h:1420 msgid "Insert hyperlink" -msgstr "Vlo hypertextov odkaz" +msgstr "Vlo hypertextov odkaz" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM -#: po/tmp/ap_String_Id.h.h:1442 +#: po/tmp/ap_String_Id.h.h:1422 msgid "Insert left-to-right direction marker (LRM)" -msgstr "Vlo znaku pre smer textu zava doprava (LRM)" +msgstr "Vlo znaku pre smer textu zava doprava (LRM)" #. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM -#: po/tmp/ap_String_Id.h.h:1444 +#: po/tmp/ap_String_Id.h.h:1424 msgid "Insert right-to-left direction marker (RLM)" -msgstr "Vlo znaku pre smer textu sprava doava (RLM)" - -#. MENU_STATUSLINE_TOOLS_ANNOTATIONS_INSERT_FROMSEL -#: po/tmp/ap_String_Id.h.h:1446 -#, fuzzy -msgid "Insert selected text into a new annotation" -msgstr "Zmen vybran text na tabulku" +msgstr "Vlo znaku pre smer textu sprava doava (RLM)" #. TOOLBAR_STATUSLINE_INSERT_SYMBOL #. TOOLBAR_TOOLTIP_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:1449 +#: po/tmp/ap_String_Id.h.h:1427 msgid "Insert symbol" -msgstr "Vlo symbol" +msgstr "Vlo symbol" #. TOOLBAR_LABEL_INSERT_TABLE -#: po/tmp/ap_String_Id.h.h:1451 +#: po/tmp/ap_String_Id.h.h:1429 msgid "Insert table" -msgstr "Vloi tabuku" +msgstr "Vloi tabuku" #. MENU_STATUSLINE_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:1453 +#: po/tmp/ap_String_Id.h.h:1431 msgid "Insert the Sum of a Table Column" -msgstr "Vlo set stpca v tabuke" +msgstr "Vlo set stpca v tabuke" #. MENU_STATUSLINE_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:1455 +#: po/tmp/ap_String_Id.h.h:1433 msgid "Insert the Sum of a Table Row" -msgstr "Vlo set dka v tabuke" +msgstr "Vlo set riadka v tabuke" #. MENU_STATUSLINE_INSERT_FILE -#: po/tmp/ap_String_Id.h.h:1457 +#: po/tmp/ap_String_Id.h.h:1435 msgid "Insert the contents of another file" -msgstr "Vlo obsah inho sboru" +msgstr "Vlo obsah inho sboru" #. MENU_STATUSLINE_INSERT_DATETIME -#: po/tmp/ap_String_Id.h.h:1459 +#: po/tmp/ap_String_Id.h.h:1437 msgid "Insert the date and/or time" -msgstr "Vlo as a(-lebo) dtum" +msgstr "Vlo as a/lebo dtum" #. MENU_STATUSLINE_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1461 +#: po/tmp/ap_String_Id.h.h:1439 msgid "Insert unformatted clipboard contents" -msgstr "Vlo neupraven obsah schrnky" +msgstr "Vlo neupraven obsah schrnky" #. DLG_Options_Label_ViewUnprintable -#: po/tmp/ap_String_Id.h.h:1463 +#: po/tmp/ap_String_Id.h.h:1441 msgid "Invisible &Layout Marks" -msgstr "Neviditen pomo&cn iary" +msgstr "Neviditen pomo&cn iary" #. TOOLBAR_LABEL_FMT_ITALIC #. TOOLBAR_STATUSLINE_FMT_ITALIC #. TOOLBAR_TOOLTIP_FMT_ITALIC #. DLG_UFS_StyleItalic -#: po/tmp/ap_String_Id.h.h:1467 po/tmp/xap_String_Id.h.h:471 +#: po/tmp/ap_String_Id.h.h:1445 +#: po/tmp/xap_String_Id.h.h:473 msgid "Italic" msgstr "Kurzva" -#. MENU_STATUSLINE_GOTO_ANNOTATION -#: po/tmp/ap_String_Id.h.h:1469 -msgid "Jump to annotation" -msgstr "Cho na anotciu" - #. MENU_STATUSLINE_INSERT_GOTO_HYPERLINK -#: po/tmp/ap_String_Id.h.h:1471 +#: po/tmp/ap_String_Id.h.h:1447 msgid "Jump to hyperlink" msgstr "Prejde na hypertextov odkaz" #. DLG_Para_AlignJustified -#: po/tmp/ap_String_Id.h.h:1473 +#: po/tmp/ap_String_Id.h.h:1449 msgid "Justified" msgstr "Do bloku" #. TOOLBAR_LABEL_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1475 +#: po/tmp/ap_String_Id.h.h:1451 msgid "Justify" msgstr "Do bloku" #. TOOLBAR_STATUSLINE_ALIGN_JUSTIFY #. TOOLBAR_TOOLTIP_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1478 +#: po/tmp/ap_String_Id.h.h:1454 msgid "Justify paragraph" -msgstr "Zarovnnie odseku do bloku" +msgstr "Zarovn odsek do bloku" #. MENU_STATUSLINE_ALIGN_JUSTIFY -#: po/tmp/ap_String_Id.h.h:1480 +#: po/tmp/ap_String_Id.h.h:1456 msgid "Justify the paragraph" -msgstr "Zarovnn odseku do bloku" +msgstr "Zarovn odseku do bloku" #. DLG_Para_PushKeepWithNext -#: po/tmp/ap_String_Id.h.h:1482 +#: po/tmp/ap_String_Id.h.h:1458 msgid "Keep with ne&xt" -msgstr "Ud&ra s alm" +msgstr "Ud&ra odsek s alm" #. FIELD_PieceTable_Test -#: po/tmp/ap_String_Id.h.h:1484 +#: po/tmp/ap_String_Id.h.h:1460 msgid "Kevins Test" msgstr "Kevinov test" #. FIELD_Document_Keywords -#: po/tmp/ap_String_Id.h.h:1486 +#: po/tmp/ap_String_Id.h.h:1462 msgid "Keywords" -msgstr "Kov slov" +msgstr "Kov slov" #. DLG_MetaData_Keywords_LBL -#: po/tmp/ap_String_Id.h.h:1488 +#: po/tmp/ap_String_Id.h.h:1464 msgid "Keywords:" -msgstr "Kov slov:" +msgstr "Kov slov:" #. DLG_Latex_LatexTitle #. DLG_Latex_LatexEquation -#: po/tmp/ap_String_Id.h.h:1491 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1467 msgid "LaTeX Equation" msgstr "Matematick vraz programu Latex" #. DLG_Lists_Indent -#: po/tmp/ap_String_Id.h.h:1493 +#: po/tmp/ap_String_Id.h.h:1469 msgid "Label Align:" msgstr "Zarovnanie nzvu:" #. DLG_FormatTOC_DetailsTop -#: po/tmp/ap_String_Id.h.h:1495 +#: po/tmp/ap_String_Id.h.h:1471 msgid "Label Definitions" -msgstr "Defincie nadpisov" +msgstr "Vlastnosti nadpisov" #. DLG_Styles_ModifyLanguage #. DLG_Options_Label_Language #. FIELD_Document_Language -#: po/tmp/ap_String_Id.h.h:1499 +#: po/tmp/ap_String_Id.h.h:1475 msgid "Language" msgstr "Jazyk" #. DLG_Options_Label_LangSettings -#: po/tmp/ap_String_Id.h.h:1501 +#: po/tmp/ap_String_Id.h.h:1477 msgid "Language settings" msgstr "Nastavenia jazyka" #. DLG_MetaData_Languages_LBL -#: po/tmp/ap_String_Id.h.h:1503 +#: po/tmp/ap_String_Id.h.h:1479 msgid "Language(s):" -msgstr "Jazyk(y):" +msgstr "Jazyk(-y):" #. DLG_Options_Label_Layout -#: po/tmp/ap_String_Id.h.h:1505 +#: po/tmp/ap_String_Id.h.h:1481 msgid "Layout" msgstr "Rozmiestnenie" #. DLG_FormatTOC_LayoutDetails -#: po/tmp/ap_String_Id.h.h:1507 +#: po/tmp/ap_String_Id.h.h:1483 msgid "Layout Details" msgstr "Podrobnosti rozmiestnenia" #. DLG_Tab_Label_Leader -#: po/tmp/ap_String_Id.h.h:1509 +#: po/tmp/ap_String_Id.h.h:1485 msgid "Leader" -msgstr "Zhlavie tabuky" +msgstr "Vodiace znaky" #. DLG_Para_AlignLeft #. DLG_Tab_Radio_Left #. DLG_PageNumbers_Left #. TOOLBAR_LABEL_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1514 +#: po/tmp/ap_String_Id.h.h:1490 msgid "Left" -msgstr "av" +msgstr "vavo" #. LeftIndentStatus -#: po/tmp/ap_String_Id.h.h:1516 +#: po/tmp/ap_String_Id.h.h:1492 #, c-format msgid "Left Indent [%s]" -msgstr "av odsadenie [%s]" +msgstr "av odsadenie [%s]" #. LeftIndentTextIndentStatus -#: po/tmp/ap_String_Id.h.h:1518 +#: po/tmp/ap_String_Id.h.h:1494 #, c-format msgid "Left Indent [%s] First Line Indent [%s]" -msgstr "av odsadenie [%s] Odsadenie prvho iadku [%s]" +msgstr "av odsadenie [%s] Odsadenie prvho riadka [%s]" #. LeftMarginStatus -#: po/tmp/ap_String_Id.h.h:1520 +#: po/tmp/ap_String_Id.h.h:1496 #, c-format msgid "Left Margin [%s]" -msgstr "av okraj [%s]" +msgstr "av okraj [%s]" #. TabToggleLeftTab -#: po/tmp/ap_String_Id.h.h:1522 +#: po/tmp/ap_String_Id.h.h:1498 msgid "Left Tab" -msgstr "av tabultor" +msgstr "av tabultor" #. TOOLBAR_STATUSLINE_ALIGN_LEFT #. TOOLBAR_TOOLTIP_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1525 +#: po/tmp/ap_String_Id.h.h:1501 msgid "Left alignment" -msgstr "av zarovnanie" +msgstr "Zarovnanie doava" #. MENU_STATUSLINE_ALIGN_LEFT -#: po/tmp/ap_String_Id.h.h:1527 +#: po/tmp/ap_String_Id.h.h:1503 msgid "Left-align the paragraph" -msgstr "Zarovnanie odseku doava" +msgstr "Zarovnan odsek doava" #. DLG_FormatTOC_Level1 -#: po/tmp/ap_String_Id.h.h:1529 +#: po/tmp/ap_String_Id.h.h:1505 msgid "Level 1" msgstr "rove 1" #. DLG_FormatTOC_Level2 -#: po/tmp/ap_String_Id.h.h:1531 +#: po/tmp/ap_String_Id.h.h:1507 msgid "Level 2" msgstr "rove 2" #. DLG_FormatTOC_Level3 -#: po/tmp/ap_String_Id.h.h:1533 +#: po/tmp/ap_String_Id.h.h:1509 msgid "Level 3" msgstr "rove 3" #. DLG_FormatTOC_Level4 -#: po/tmp/ap_String_Id.h.h:1535 +#: po/tmp/ap_String_Id.h.h:1511 msgid "Level 4" msgstr "rove 4" #. DLG_Lists_DelimiterString -#: po/tmp/ap_String_Id.h.h:1537 +#: po/tmp/ap_String_Id.h.h:1513 msgid "Level Delimiter:" -msgstr "Oddeova rovn:" +msgstr "Oddeova rovn:" #. DLG_Lists_Level -#: po/tmp/ap_String_Id.h.h:1539 +#: po/tmp/ap_String_Id.h.h:1515 msgid "Level:" msgstr "rove:" #. DLG_Para_LabelLineSpacing -#: po/tmp/ap_String_Id.h.h:1541 +#: po/tmp/ap_String_Id.h.h:1517 msgid "Li&ne spacing:" msgstr "Ria&dkovanie:" #. DLG_Goto_Target_Line -#: po/tmp/ap_String_Id.h.h:1543 +#: po/tmp/ap_String_Id.h.h:1519 msgid "Line" -msgstr "Riadku" +msgstr "riadok" #. FIELD_Numbers_LineCount -#: po/tmp/ap_String_Id.h.h:1545 +#: po/tmp/ap_String_Id.h.h:1521 msgid "Line Count" msgstr "Poet riadkov" #. MENU_STATUSLINE_FMT_TOPLINE -#: po/tmp/ap_String_Id.h.h:1547 +#: po/tmp/ap_String_Id.h.h:1523 msgid "Line above the selection (toggle)" -msgstr "iara nad textom (zmena)" +msgstr "Vo vybratej asti sa nad textom zobraz/zmizne iara" #. DLG_Para_TabLabelLineAndPageBreaks -#: po/tmp/ap_String_Id.h.h:1549 +#: po/tmp/ap_String_Id.h.h:1525 msgid "Line and Page Breaks" msgstr "Zlomy riadkov a strn" #. MENU_STATUSLINE_FMT_BOTTOMLINE -#: po/tmp/ap_String_Id.h.h:1551 +#: po/tmp/ap_String_Id.h.h:1527 msgid "Line below the selection (toggle)" -msgstr "iara pod textom (zmena)" +msgstr "Zobraz/zmae iaru pod textom" #. DLG_Column_Line_Between -#: po/tmp/ap_String_Id.h.h:1553 +#: po/tmp/ap_String_Id.h.h:1529 msgid "Line between" msgstr "Medzi riadkami" #. DLG_WordCount_Lines -#: po/tmp/ap_String_Id.h.h:1555 +#: po/tmp/ap_String_Id.h.h:1531 msgid "Lines:" msgstr "Riadkov:" #. DLG_Styles_List -#: po/tmp/ap_String_Id.h.h:1557 +#: po/tmp/ap_String_Id.h.h:1533 msgid "List" msgstr "Zoznam" #. FIELD_Numbers_ListLabel -#: po/tmp/ap_String_Id.h.h:1559 +#: po/tmp/ap_String_Id.h.h:1535 msgid "List Label" msgstr "Nzov zoznamu" #. DLG_Lists_PageProperties -#: po/tmp/ap_String_Id.h.h:1561 +#: po/tmp/ap_String_Id.h.h:1537 msgid "List Properties" msgstr "Vlastnosti zoznamu" #. DLG_Stylist_ListStyles -#: po/tmp/ap_String_Id.h.h:1563 +#: po/tmp/ap_String_Id.h.h:1539 msgid "List Styles" -msgstr "tly pre zoznam" +msgstr "tly pre zoznam" #. DLG_Lists_Title -#: po/tmp/ap_String_Id.h.h:1565 +#: po/tmp/ap_String_Id.h.h:1541 msgid "Lists for " -msgstr "Seznamy pre/na " +msgstr "Zoznamy" #. MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1567 +#: po/tmp/ap_String_Id.h.h:1543 msgid "Lock the layout of the current toolbars" -msgstr "Zamkne rozmiestnenie panelov s nstrojmi" +msgstr "Zamkne zobrazenie panelov s nstrojmi" #. DLG_Lists_Lower_Case_List #. STYLE_LOWERCASELIST -#: po/tmp/ap_String_Id.h.h:1569 po/tmp/xap_String_Id.h.h:510 +#: po/tmp/ap_String_Id.h.h:1545 +#: po/tmp/xap_String_Id.h.h:512 msgid "Lower Case List" msgstr "Abecedn zoznam psan malmi psmenami" #. DLG_Lists_Lower_Roman_List #. STYLE_LOWERROMANLIST -#: po/tmp/ap_String_Id.h.h:1571 po/tmp/xap_String_Id.h.h:512 +#: po/tmp/ap_String_Id.h.h:1547 +#: po/tmp/xap_String_Id.h.h:514 msgid "Lower Roman List" -msgstr "Rmske slice (mal)" +msgstr "Mal rmske slice" #. FIELD_Application_MailMerge #. MENU_STATUSLINE_TOOLS_MAILMERGE -#: po/tmp/ap_String_Id.h.h:1574 +#: po/tmp/ap_String_Id.h.h:1550 msgid "Mail Merge" -msgstr "Hromadn korepondencia" +msgstr "Hromadn korepondencia" #. MENU_STATUSLINE_FMT_BOLD -#: po/tmp/ap_String_Id.h.h:1576 +#: po/tmp/ap_String_Id.h.h:1552 msgid "Make the selection bold (toggle)" -msgstr "Nastavenie tunho psma pre vybran as" +msgstr "Zmen psmo vybranej asti na tun" #. MENU_STATUSLINE_FMT_ITALIC -#: po/tmp/ap_String_Id.h.h:1578 +#: po/tmp/ap_String_Id.h.h:1554 msgid "Make the selection italic (toggle)" -msgstr "Nastavenie kurzvy pre vybran as" +msgstr "Zmen psmo vo vybranej asti textu na kurzvu" #. MENU_STATUSLINE_FMT_SUBSCRIPT -#: po/tmp/ap_String_Id.h.h:1580 +#: po/tmp/ap_String_Id.h.h:1556 msgid "Make the selection subscript (toggle)" -msgstr "Zmen psmo v oznaenej asti na doln index (zmena)" +msgstr "Zmen psmo v oznaenej asti na doln index" #. MENU_STATUSLINE_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:1582 +#: po/tmp/ap_String_Id.h.h:1558 msgid "Make the selection superscript (toggle)" -msgstr "Zmen psmo v oznaenej asti na horn index (zmena)" +msgstr "Zmen psmo v oznaenej asti na horn index" -#. MENU_STATUSLINE_TOOLS_ANNOTATIONS -#: po/tmp/ap_String_Id.h.h:1584 -#, fuzzy -msgid "Manage annotations in document" +#. MENU_STATUSLINE_TOOLS_REVISIONS +#: po/tmp/ap_String_Id.h.h:1560 +msgid "Manage changes in document" msgstr "Sprva zmien v dokumente" #. MENU_STATUSLINE_TOOLS_PLUGINS -#: po/tmp/ap_String_Id.h.h:1586 +#: po/tmp/ap_String_Id.h.h:1562 msgid "Manage plugins" msgstr "Sprva modulov" #. DLG_PageSetup_Margin -#: po/tmp/ap_String_Id.h.h:1588 +#: po/tmp/ap_String_Id.h.h:1564 msgid "Margin" msgstr "Okraje" #. DLG_MarkRevisions_Title -#: po/tmp/ap_String_Id.h.h:1590 +#: po/tmp/ap_String_Id.h.h:1566 msgid "Mark Revisions" -msgstr "Oznaeni zmeny textu" +msgstr "Oznai zmeny textu" #. MENU_STATUSLINE_TOOLS_REVISIONS_MARK -#: po/tmp/ap_String_Id.h.h:1592 +#: po/tmp/ap_String_Id.h.h:1568 msgid "Mark changes as you type" -msgstr "Oznaova zmeny poas psania" +msgstr "Oznaova zmeny poas psania" #. FIELD_PieceTable_MartinTest -#: po/tmp/ap_String_Id.h.h:1594 +#: po/tmp/ap_String_Id.h.h:1570 msgid "Martins Test" msgstr "Martinov test" #. DLG_Column_Size -#: po/tmp/ap_String_Id.h.h:1596 +#: po/tmp/ap_String_Id.h.h:1572 msgid "Max Column size" -msgstr "Maximlna vekos stpca" +msgstr "Maximlna vekos stpca" #. TOOLBAR_LABEL_MENU #. TOOLBAR_STATUSLINE_MENU #. TOOLBAR_TOOLTIP_MENU -#: po/tmp/ap_String_Id.h.h:1600 +#: po/tmp/ap_String_Id.h.h:1576 msgid "Menu" -msgstr "" +msgstr "Ponuka" #. DLG_MergeCells_Above -#: po/tmp/ap_String_Id.h.h:1602 +#: po/tmp/ap_String_Id.h.h:1578 msgid "Merge Above" -msgstr "Slouit nad" +msgstr "Zli nad" #. DLG_MergeCells_Below -#: po/tmp/ap_String_Id.h.h:1604 +#: po/tmp/ap_String_Id.h.h:1580 msgid "Merge Below" -msgstr "Zli pod" +msgstr "Zli pod" #. DLG_MergeCellsTitle #. DLG_MergeCells_Frame #. MENU_STATUSLINE_TABLE_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1608 +#: po/tmp/ap_String_Id.h.h:1584 msgid "Merge Cells" msgstr "Zlenie buniek" #. DLG_MergeCells_Left -#: po/tmp/ap_String_Id.h.h:1610 +#: po/tmp/ap_String_Id.h.h:1586 msgid "Merge Left" -msgstr "Zli vavo" +msgstr "Zli vavo" #. DLG_MergeCells_Right -#: po/tmp/ap_String_Id.h.h:1612 +#: po/tmp/ap_String_Id.h.h:1588 msgid "Merge Right" -msgstr "Zli vpravo" +msgstr "Zli vpravo" #. TOOLBAR_LABEL_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1614 +#: po/tmp/ap_String_Id.h.h:1590 msgid "Merge above" msgstr "Zli nad" #. MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS -#: po/tmp/ap_String_Id.h.h:1616 +#: po/tmp/ap_String_Id.h.h:1592 msgid "Merge another document into the active document using revision marks" -msgstr "Zli in dokument s aktulnym pomocou znaiek zmien textu" +msgstr "Zli in dokument s aktulnym pomocou znaiek zmeny textu" #. TOOLBAR_LABEL_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1618 +#: po/tmp/ap_String_Id.h.h:1594 msgid "Merge below" msgstr "Zli pod" #. TOOLBAR_LABEL_MERGE_CELLS #. TOOLBAR_STATUSLINE_MERGE_CELLS #. TOOLBAR_TOOLTIP_MERGE_CELLS -#: po/tmp/ap_String_Id.h.h:1622 +#: po/tmp/ap_String_Id.h.h:1598 msgid "Merge cells" msgstr "Zli bunky" #. TOOLBAR_LABEL_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1624 +#: po/tmp/ap_String_Id.h.h:1600 msgid "Merge left" -msgstr "Zli vlevo" +msgstr "Zli vavo" #. TOOLBAR_LABEL_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1626 +#: po/tmp/ap_String_Id.h.h:1602 msgid "Merge right" -msgstr "Zli vpravo" +msgstr "Zli vpravo" #. TOOLBAR_STATUSLINE_MERGEABOVE #. TOOLBAR_TOOLTIP_MERGEABOVE -#: po/tmp/ap_String_Id.h.h:1629 +#: po/tmp/ap_String_Id.h.h:1605 msgid "Merge with cell above" msgstr "Spoj s bunkou nad" #. TOOLBAR_STATUSLINE_MERGEBELOW #. TOOLBAR_TOOLTIP_MERGEBELOW -#: po/tmp/ap_String_Id.h.h:1632 +#: po/tmp/ap_String_Id.h.h:1608 msgid "Merge with cell below" msgstr "Spoj s bunkou pod" #. TOOLBAR_STATUSLINE_MERGELEFT #. TOOLBAR_TOOLTIP_MERGELEFT -#: po/tmp/ap_String_Id.h.h:1635 +#: po/tmp/ap_String_Id.h.h:1611 msgid "Merge with left cell" -msgstr "Spoj s bunkou naavo" +msgstr "Spoj s bunkou naavo" #. TOOLBAR_STATUSLINE_MERGERIGHT #. TOOLBAR_TOOLTIP_MERGERIGHT -#: po/tmp/ap_String_Id.h.h:1638 +#: po/tmp/ap_String_Id.h.h:1614 msgid "Merge with right cell" msgstr "Spoj s bunkou napravo" #. FIELD_DateTime_MilTime -#: po/tmp/ap_String_Id.h.h:1640 +#: po/tmp/ap_String_Id.h.h:1616 msgid "Military Time" msgstr "Vojensk as" #. DLG_Options_TabLabel_Misc -#: po/tmp/ap_String_Id.h.h:1642 +#: po/tmp/ap_String_Id.h.h:1618 msgid "Misc." msgstr "Rzne" #. DLG_Stylist_MiscStyles -#: po/tmp/ap_String_Id.h.h:1644 +#: po/tmp/ap_String_Id.h.h:1620 msgid "Miscellaneous Styles" -msgstr "alie tly" +msgstr "alie tly" #. DLG_Styles_ModifyTitle -#: po/tmp/ap_String_Id.h.h:1646 +#: po/tmp/ap_String_Id.h.h:1622 msgid "Modify Styles" -msgstr "Zmena tlov" +msgstr "Zmena tlov" #. DLG_Styles_Modify -#: po/tmp/ap_String_Id.h.h:1648 +#: po/tmp/ap_String_Id.h.h:1624 msgid "Modify..." -msgstr "Zmeni..." +msgstr "Upravi..." #. FIELD_DateTime_MonthDayYear -#: po/tmp/ap_String_Id.h.h:1650 +#: po/tmp/ap_String_Id.h.h:1626 msgid "Month Day, Year" msgstr "Mesiac De, Rok" #. MENU_STATUSLINE_EDIT_GOTO -#: po/tmp/ap_String_Id.h.h:1652 +#: po/tmp/ap_String_Id.h.h:1628 msgid "Move the insertion point to a specific location" -msgstr "Presun kurzoru na poadovan stranu" +msgstr "Presun kurzoru na poadovan stranu" #. FIELD_DateTime_MthDayYear -#: po/tmp/ap_String_Id.h.h:1654 +#: po/tmp/ap_String_Id.h.h:1630 msgid "Mth. Day, Year" msgstr "Mes. De, Rok" #. DLG_Para_SpacingMultiple -#: po/tmp/ap_String_Id.h.h:1656 +#: po/tmp/ap_String_Id.h.h:1632 msgid "Multiple" msgstr "Nsobky" #. TOOLBAR_LABEL_FILE_NEW -#: po/tmp/ap_String_Id.h.h:1658 +#: po/tmp/ap_String_Id.h.h:1634 msgid "New" msgstr "Nov" -#. MENU_LABEL_TOOLS_ANNOTATIONS_INSERT -#: po/tmp/ap_String_Id.h.h:1660 -#, fuzzy -msgid "New &annotation" -msgstr "Odsadenie" - #. DLG_NEW_Title -#: po/tmp/ap_String_Id.h.h:1662 +#: po/tmp/ap_String_Id.h.h:1636 msgid "New Document" msgstr "Nov dokument" #. DLG_Lists_New_List_Label -#: po/tmp/ap_String_Id.h.h:1664 +#: po/tmp/ap_String_Id.h.h:1638 msgid "New List Label" msgstr "Nov nzov zoznamu" #. DLG_Lists_New_List_Type -#: po/tmp/ap_String_Id.h.h:1666 +#: po/tmp/ap_String_Id.h.h:1640 msgid "" "New List \n" "Type" @@ -4080,114 +4002,115 @@ "zoznamu" #. DLG_Lists_Starting_Value -#: po/tmp/ap_String_Id.h.h:1668 +#: po/tmp/ap_String_Id.h.h:1642 msgid "" "New Starting \n" "Value" msgstr "" -"Nov poiaton \n" +"Nov zaiaton \n" "hodnota" #. DLG_Styles_NewTitle -#: po/tmp/ap_String_Id.h.h:1670 +#: po/tmp/ap_String_Id.h.h:1644 msgid "New Style" -msgstr "Nov tl" +msgstr "Nov tl" #. DLG_Styles_New -#: po/tmp/ap_String_Id.h.h:1672 +#: po/tmp/ap_String_Id.h.h:1646 msgid "New..." msgstr "Nov..." #. DLG_Goto_Btn_Next -#: po/tmp/ap_String_Id.h.h:1674 +#: po/tmp/ap_String_Id.h.h:1648 msgid "Next >>" -msgstr "al >>" +msgstr "al >>" #. DLG_NEW_NoFile -#: po/tmp/ap_String_Id.h.h:1676 +#: po/tmp/ap_String_Id.h.h:1650 msgid "No File" -msgstr "iadny sbor" +msgstr "iadny sbor" #. DLG_Lists_FoldingLevel0 -#: po/tmp/ap_String_Id.h.h:1678 +#: po/tmp/ap_String_Id.h.h:1652 msgid "No Folding" -msgstr "No Folding" +msgstr "Neskrva text" #. DLG_Styles_ErrNoStyle -#: po/tmp/ap_String_Id.h.h:1680 +#: po/tmp/ap_String_Id.h.h:1654 msgid "" "No Style selected \n" " so it cannot be modified" msgstr "" -"Nie je vybran iadny tl \n" -" take ani nemono iadny upravi" +"Nevybrali ste iadny tl, \n" +"take nemono ani iadny upravi" #. SCRIPT_NOSCRIPTS -#: po/tmp/ap_String_Id.h.h:1682 +#: po/tmp/ap_String_Id.h.h:1656 msgid "No scripts found" -msgstr "Nenali sa iadne skripty" +msgstr "Nenali sa iadne skripty" #. DLG_FormatTOC_None #. DLG_Styles_DefNone #. DLG_Tab_Radio_NoAlign #. DLG_Lists_Type_none -#: po/tmp/ap_String_Id.h.h:1687 +#: po/tmp/ap_String_Id.h.h:1661 msgid "None" -msgstr "Ni" +msgstr "iadny" #. TOOLBAR_LABEL_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:1689 +#: po/tmp/ap_String_Id.h.h:1663 msgid "None before" -msgstr "Ni pred" +msgstr "iadny pred" #. MENU_STATUSLINE_VIEW_NORMAL -#: po/tmp/ap_String_Id.h.h:1691 +#: po/tmp/ap_String_Id.h.h:1665 msgid "Normal View" msgstr "Normlne zobrazenie" #. DLG_Spell_UnknownWord -#: po/tmp/ap_String_Id.h.h:1693 +#: po/tmp/ap_String_Id.h.h:1667 msgid "Not in dictionary&:" -msgstr "Nie je v &slovnku:" +msgstr "Slovo nie je v &slovnku:" #. DLG_Stylist_FootnoteStyles -#: po/tmp/ap_String_Id.h.h:1695 +#: po/tmp/ap_String_Id.h.h:1669 msgid "Note Styles" -msgstr "tly poznmky" +msgstr "tly poznmky" #. DLG_Column_Number_Cols -#: po/tmp/ap_String_Id.h.h:1697 +#: po/tmp/ap_String_Id.h.h:1671 msgid "Number of Columns" msgstr "Poet stpcov" #. FIELD_Numbers_PagesCount -#: po/tmp/ap_String_Id.h.h:1699 +#: po/tmp/ap_String_Id.h.h:1673 msgid "Number of Pages" msgstr "Poet strn" #. DLG_Column_Number -#: po/tmp/ap_String_Id.h.h:1701 +#: po/tmp/ap_String_Id.h.h:1675 msgid "Number of columns" msgstr "Poet stpcov" #. DLG_InsertTable_NumCols -#: po/tmp/ap_String_Id.h.h:1703 +#: po/tmp/ap_String_Id.h.h:1677 msgid "Number of columns:" msgstr "Poet stpcov:" #. DLG_InsertTable_NumRows -#: po/tmp/ap_String_Id.h.h:1705 +#: po/tmp/ap_String_Id.h.h:1679 msgid "Number of rows:" msgstr "Poet riadkov:" #. DLG_Lists_Type_numbered -#: po/tmp/ap_String_Id.h.h:1707 +#: po/tmp/ap_String_Id.h.h:1681 msgid "Numbered" -msgstr "slovan" +msgstr "slovan" #. DLG_Lists_Numbered_List #. STYLE_NUMBER_LIST -#: po/tmp/ap_String_Id.h.h:1709 po/tmp/xap_String_Id.h.h:556 +#: po/tmp/ap_String_Id.h.h:1683 +#: po/tmp/xap_String_Id.h.h:558 msgid "Numbered List" msgstr "slovan zoznam" @@ -4196,47 +4119,47 @@ #. TOOLBAR_LABEL_LISTS_NUMBERS #. TOOLBAR_STATUSLINE_LISTS_NUMBERS #. TOOLBAR_TOOLTIP_LISTS_NUMBERS -#: po/tmp/ap_String_Id.h.h:1715 +#: po/tmp/ap_String_Id.h.h:1689 msgid "Numbering" msgstr "slovanie" #. FIELD_Type_Numbers -#: po/tmp/ap_String_Id.h.h:1717 +#: po/tmp/ap_String_Id.h.h:1691 msgid "Numbers" msgstr "sla" #. InsertModeFieldOVR -#: po/tmp/ap_String_Id.h.h:1719 +#: po/tmp/ap_String_Id.h.h:1693 msgid "OVR" msgstr "OVR" #. DLG_Column_One -#: po/tmp/ap_String_Id.h.h:1721 +#: po/tmp/ap_String_Id.h.h:1695 msgid "One" msgstr "Jeden" #. MENU_LABEL_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1723 +#: po/tmp/ap_String_Id.h.h:1697 msgid "Op&en Copy" -msgstr "Otvori kp&iu" +msgstr "Otvori kp&iu" #. TOOLBAR_LABEL_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1725 +#: po/tmp/ap_String_Id.h.h:1699 msgid "Open" -msgstr "Otvori" +msgstr "Otvori" #. MENU_LABEL_OPEN_TEMPLATE -#: po/tmp/ap_String_Id.h.h:1727 +#: po/tmp/ap_String_Id.h.h:1701 msgid "Open Template" -msgstr "Otvori ablnu" +msgstr "Otvori ablnu" #. MENU_STATUSLINE_FILE_IMPORT -#: po/tmp/ap_String_Id.h.h:1729 +#: po/tmp/ap_String_Id.h.h:1703 msgid "Open a document by making a copy" -msgstr "Otvore dokument vytvorenm kpie" +msgstr "Otvor dokument vytvorenm kpie" #. MENU_STATUSLINE_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1731 +#: po/tmp/ap_String_Id.h.h:1705 msgid "Open a recently used document" msgstr "Otvorte naposledy otvoren dokument" @@ -4244,14 +4167,14 @@ #. MENU_STATUSLINE_FILE_OPEN #. TOOLBAR_STATUSLINE_FILE_OPEN #. TOOLBAR_TOOLTIP_FILE_OPEN -#: po/tmp/ap_String_Id.h.h:1736 +#: po/tmp/ap_String_Id.h.h:1710 msgid "Open an existing document" -msgstr "Otvori existujc dokument" +msgstr "Otvori existujci dokument" #. MENU_STATUSLINE_WINDOW_NEW -#: po/tmp/ap_String_Id.h.h:1738 +#: po/tmp/ap_String_Id.h.h:1712 msgid "Open another window for the document" -msgstr "Otvor dalie okno pre dokument" +msgstr "Otvor alie okno pre dokument" #. MENU_STATUSLINE_FILE_RECENT_1 #. MENU_STATUSLINE_FILE_RECENT_2 @@ -4262,255 +4185,256 @@ #. MENU_STATUSLINE_FILE_RECENT_7 #. MENU_STATUSLINE_FILE_RECENT_8 #. MENU_STATUSLINE_FILE_RECENT_9 -#: po/tmp/ap_String_Id.h.h:1748 +#: po/tmp/ap_String_Id.h.h:1722 msgid "Open this document" msgstr "Otvor tento dokument" #. DLG_PageSetup_Orient -#: po/tmp/ap_String_Id.h.h:1750 +#: po/tmp/ap_String_Id.h.h:1724 msgid "Orientation..." msgstr "Orientcia..." #. DLG_Options_TabLabel_Other -#: po/tmp/ap_String_Id.h.h:1752 +#: po/tmp/ap_String_Id.h.h:1726 msgid "Other" msgstr "In" #. MSG_IE_NoMemory -#: po/tmp/ap_String_Id.h.h:1754 +#: po/tmp/ap_String_Id.h.h:1728 #, c-format msgid "Out of memory attempting to open %s" -msgstr "Na otvorenie sboru %s nie je dos pamte" +msgstr "Na otvorenie sboru %s nie je dos pamte" #. TOOLBAR_LABEL_FMT_OVERLINE #. TOOLBAR_STATUSLINE_FMT_OVERLINE #. TOOLBAR_TOOLTIP_FMT_OVERLINE #. DLG_UFS_OverlineCheck -#: po/tmp/ap_String_Id.h.h:1758 po/tmp/xap_String_Id.h.h:570 +#: po/tmp/ap_String_Id.h.h:1732 +#: po/tmp/xap_String_Id.h.h:572 msgid "Overline" msgstr "iara nad text" #. MENU_STATUSLINE_FMT_OVERLINE -#: po/tmp/ap_String_Id.h.h:1760 +#: po/tmp/ap_String_Id.h.h:1734 msgid "Overline the selection (toggle)" -msgstr "Nastavenie iary nad textom (zmena)" +msgstr "Nad oznaenm textom sa zobraz/zmizne iara" #. MENU_LABEL_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:1762 +#: po/tmp/ap_String_Id.h.h:1736 msgid "P&roperties" msgstr "&Vlastnosti" #. MENU_LABEL_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1764 +#: po/tmp/ap_String_Id.h.h:1738 msgid "P&urge revisions" -msgstr "Vy&maza zmeny textu" +msgstr "Vy&maza zmeny textu" #. MENU_LABEL_EDIT_PASTE_SPECIAL -#: po/tmp/ap_String_Id.h.h:1766 +#: po/tmp/ap_String_Id.h.h:1740 msgid "Pa&ste Unformatted" -msgstr "Vloi ne&formtovan" +msgstr "Vloi ne&formtovan" #. DLG_Goto_Target_Page #. DLG_PageSetup_Page -#: po/tmp/ap_String_Id.h.h:1769 +#: po/tmp/ap_String_Id.h.h:1743 msgid "Page" msgstr "Strana" #. DLG_Para_PushPageBreakBefore -#: po/tmp/ap_String_Id.h.h:1771 +#: po/tmp/ap_String_Id.h.h:1745 msgid "Page &break before" -msgstr "Zalo&mi stranu pred" +msgstr "Zalo&mi stranu pred" #. MENU_LABEL_FMT_BACKGROUND -#: po/tmp/ap_String_Id.h.h:1773 +#: po/tmp/ap_String_Id.h.h:1747 msgid "Page Background" msgstr "Pozadie strany" #. MENU_LABEL_FMT_BACKGROUND_PAGE_COLOR -#: po/tmp/ap_String_Id.h.h:1775 +#: po/tmp/ap_String_Id.h.h:1749 msgid "Page C&olor" msgstr "Fa&rba strany" #. MENU_LABEL_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:1777 +#: po/tmp/ap_String_Id.h.h:1751 msgid "Page Image" -msgstr "Obrzok pre stranu" +msgstr "vybra obrzok ako pozadie strany" #. MENU_LABEL_INSERT_PAGENO -#: po/tmp/ap_String_Id.h.h:1779 +#: po/tmp/ap_String_Id.h.h:1753 msgid "Page N&umbers" msgstr "s&la strn" #. FIELD_Numbers_PageNumber -#: po/tmp/ap_String_Id.h.h:1781 +#: po/tmp/ap_String_Id.h.h:1755 msgid "Page Number" msgstr "slo strany" #. DLG_HdrFtr_PageNumberProperties -#: po/tmp/ap_String_Id.h.h:1783 +#: po/tmp/ap_String_Id.h.h:1757 msgid "Page Number Properties" -msgstr "Vlastnosti slovnia strn" +msgstr "Vlastnosti slovania strn" #. DLG_PageNumbers_Title -#: po/tmp/ap_String_Id.h.h:1785 +#: po/tmp/ap_String_Id.h.h:1759 msgid "Page Numbers" -msgstr "sla stn" +msgstr "sla strn" #. FIELD_Numbers_PageReference -#: po/tmp/ap_String_Id.h.h:1787 +#: po/tmp/ap_String_Id.h.h:1761 msgid "Page Reference" msgstr "Odkaz na stranu" #. MENU_LABEL_FILE_PAGESETUP -#: po/tmp/ap_String_Id.h.h:1789 +#: po/tmp/ap_String_Id.h.h:1763 msgid "Page Set&up" msgstr "Na&stavenia strany" #. DLG_PageSetup_Title -#: po/tmp/ap_String_Id.h.h:1791 +#: po/tmp/ap_String_Id.h.h:1765 msgid "Page Setup" msgstr "Nastavenia strany" #. PageInfoField -#: po/tmp/ap_String_Id.h.h:1793 +#: po/tmp/ap_String_Id.h.h:1767 #, c-format msgid "Page: %d/%d" -msgstr "Strana: %d/%d" +msgstr "Strana: %d z/o %d" #. DLG_WordCount_Pages -#: po/tmp/ap_String_Id.h.h:1795 +#: po/tmp/ap_String_Id.h.h:1769 msgid "Pages:" msgstr "Strn:" #. DLG_Para_LabelPagination -#: po/tmp/ap_String_Id.h.h:1797 +#: po/tmp/ap_String_Id.h.h:1771 msgid "Pagination" msgstr "Strnkovanie" #. DLG_PageSetup_Paper_Size -#: po/tmp/ap_String_Id.h.h:1799 +#: po/tmp/ap_String_Id.h.h:1773 msgid "Paper Si&ze:" -msgstr "Veko&s strany:" +msgstr "Veko&s strany:" #. DLG_PageSetup_Paper -#: po/tmp/ap_String_Id.h.h:1801 +#: po/tmp/ap_String_Id.h.h:1775 msgid "Paper..." msgstr "Papier..." #. DLG_Styles_ModifyParagraph #. DLG_Para_ParaTitle -#: po/tmp/ap_String_Id.h.h:1804 +#: po/tmp/ap_String_Id.h.h:1778 msgid "Paragraph" msgstr "Odsek" #. FIELD_Numbers_ParaCount -#: po/tmp/ap_String_Id.h.h:1806 +#: po/tmp/ap_String_Id.h.h:1780 msgid "Paragraph Count" msgstr "Poet odsekov" #. TOOLBAR_LABEL_FMT_DOM_DIRECTION -#: po/tmp/ap_String_Id.h.h:1808 +#: po/tmp/ap_String_Id.h.h:1782 msgid "Paragraph Direction" msgstr "Smer odseku" #. DLG_Styles_ParaPrev -#: po/tmp/ap_String_Id.h.h:1810 +#: po/tmp/ap_String_Id.h.h:1784 msgid "Paragraph Preview" -msgstr "Nhad na odsek" +msgstr "Ukka odseku" #. DLG_WordCount_Paragraphs -#: po/tmp/ap_String_Id.h.h:1812 +#: po/tmp/ap_String_Id.h.h:1786 msgid "Paragraphs:" msgstr "Odsekov:" #. WORD_PassRequired -#: po/tmp/ap_String_Id.h.h:1814 +#: po/tmp/ap_String_Id.h.h:1788 msgid "Password required, this is an encrypted document" -msgstr "Treba zada heslo, toto je chrnenn dokument" +msgstr "Treba zada heslo, toto je chrnenn dokument" #. TOOLBAR_LABEL_EDIT_PASTE #. TOOLBAR_STATUSLINE_EDIT_PASTE #. TOOLBAR_TOOLTIP_EDIT_PASTE -#: po/tmp/ap_String_Id.h.h:1818 +#: po/tmp/ap_String_Id.h.h:1792 msgid "Paste" -msgstr "Vloi" +msgstr "Vloi" #. DLG_MetaData_TAB_Permission -#: po/tmp/ap_String_Id.h.h:1820 +#: po/tmp/ap_String_Id.h.h:1794 msgid "Permissions" msgstr "Prva" #. DLG_Goto_Target_Picture -#: po/tmp/ap_String_Id.h.h:1822 +#: po/tmp/ap_String_Id.h.h:1796 msgid "Picture" msgstr "Obrzok" #. FIELD_Type_PieceTable -#: po/tmp/ap_String_Id.h.h:1824 +#: po/tmp/ap_String_Id.h.h:1798 msgid "Piece Table" -msgstr "Tabuka" +msgstr "Tabuka" #. DLG_FormatFootnotes_EndPlaceEndDoc -#: po/tmp/ap_String_Id.h.h:1826 +#: po/tmp/ap_String_Id.h.h:1800 msgid "Place at end of document" -msgstr "Umiestni na koniec dokumentu" +msgstr "Umiestni na koniec dokumentu" #. DLG_FormatFootnotes_EndPlaceEndSec -#: po/tmp/ap_String_Id.h.h:1828 +#: po/tmp/ap_String_Id.h.h:1802 msgid "Place at end of section" -msgstr "Umiestni na koniec kapitoly" +msgstr "Umiestni na koniec kapitoly" #. DLG_FormatFootnotes_EndPlacement -#: po/tmp/ap_String_Id.h.h:1830 +#: po/tmp/ap_String_Id.h.h:1804 msgid "Placement" msgstr "Umiestnenie" #. DLG_Tab_Label_Position #. DLG_PageNumbers_Position_No_Colon -#: po/tmp/ap_String_Id.h.h:1833 +#: po/tmp/ap_String_Id.h.h:1807 msgid "Position" msgstr "Pozcia" #. DLG_FormatFrame_PositionTo -#: po/tmp/ap_String_Id.h.h:1835 +#: po/tmp/ap_String_Id.h.h:1809 msgid "Position Text Box" msgstr "Pozcia textovho rmu" #. DLG_FormatFrame_SetToColumn -#: po/tmp/ap_String_Id.h.h:1837 +#: po/tmp/ap_String_Id.h.h:1811 msgid "Position to Column" msgstr "Pozcia v stpci" #. DLG_FormatFrame_SetToPage -#: po/tmp/ap_String_Id.h.h:1839 +#: po/tmp/ap_String_Id.h.h:1813 msgid "Position to Page" msgstr "Pozcia na strane" #. DLG_FormatFrame_SetToParagraph -#: po/tmp/ap_String_Id.h.h:1841 +#: po/tmp/ap_String_Id.h.h:1815 msgid "Position to Paragraph" msgstr "Pozcia v odseku" #. DLG_PageNumbers_Position -#: po/tmp/ap_String_Id.h.h:1843 +#: po/tmp/ap_String_Id.h.h:1817 msgid "Position:" msgstr "Pozcia:" #. MENU_LABEL_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:1845 +#: po/tmp/ap_String_Id.h.h:1819 msgid "Pr&eferences" -msgstr "Pred&voby" +msgstr "Na&stavenia" #. DLG_Options_TabLabel_Preferences #. DLG_Options_Label_Schemes -#: po/tmp/ap_String_Id.h.h:1848 +#: po/tmp/ap_String_Id.h.h:1822 msgid "Preference Schemes" -msgstr "Monosti schm" +msgstr "Monosti schm" #. DLG_Options_OptionsTitle -#: po/tmp/ap_String_Id.h.h:1850 +#: po/tmp/ap_String_Id.h.h:1824 msgid "Preferences" -msgstr "Monosti" +msgstr "Monosti" #. DLG_Styles_ModifyPreview #. DLG_Para_LabelPreview @@ -4520,335 +4444,331 @@ #. DLG_Lists_Preview #. DLG_PageNumbers_Preview #. DLG_Zoom_PreviewFrame -#: po/tmp/ap_String_Id.h.h:1858 po/tmp/xap_String_Id.h.h:600 +#: po/tmp/ap_String_Id.h.h:1832 +#: po/tmp/xap_String_Id.h.h:604 msgid "Preview" -msgstr "Nhad" +msgstr "Ukka" #. MENU_STATUSLINE_WEB_WEBPREVIEW #. MENU_STATUSLINE_WEB_SAVEASWEB -#: po/tmp/ap_String_Id.h.h:1861 +#: po/tmp/ap_String_Id.h.h:1835 msgid "Preview the document as a web page" -msgstr "Zobraz dokument ako webovou strnku" +msgstr "Uke dokument ako webovou strnku" #. MENU_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW #. TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1865 +#: po/tmp/ap_String_Id.h.h:1839 msgid "Preview the document before printing" -msgstr "Nhad na dokument pred tlaou" +msgstr "Uke dokument pred tlaou" #. DLG_Para_PreviewPrevParagraph -#: po/tmp/ap_String_Id.h.h:1867 -msgid "" -"Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph " -"Previous Paragraph Previous Paragraph Previous Paragraph" -msgstr "" -"Predchdzajci odsek Predchdzajci odsek Predchdzajci odsek " -"Predchdzajci odsek Predchdzajci odsek Predchdzajci odsek" +#: po/tmp/ap_String_Id.h.h:1841 +msgid "Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph" +msgstr "Predchdzajci odsek Predchdzajci odsek Predchdzajci odsek Predchdzajci odsek Predchdzajci odsek Predchdzajci odsek" #. TOOLBAR_LABEL_FILE_PRINT #. DLG_UP_PrintTitle #. DLG_UP_PrintButton -#: po/tmp/ap_String_Id.h.h:1869 po/tmp/xap_String_Id.h.h:605 +#: po/tmp/ap_String_Id.h.h:1843 +#: po/tmp/xap_String_Id.h.h:609 msgid "Print" msgstr "Tla" #. MENU_LABEL_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1871 +#: po/tmp/ap_String_Id.h.h:1845 msgid "Print &directly" -msgstr "&Tlai hne" +msgstr "&Tlai ihne" #. MENU_STATUSLINE_VIEW_PRINT -#: po/tmp/ap_String_Id.h.h:1873 +#: po/tmp/ap_String_Id.h.h:1847 msgid "Print Layout" -msgstr "Rozmestnenie pri tlai" +msgstr "Rozmiestnenie pri tlai" #. MENU_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1875 +#: po/tmp/ap_String_Id.h.h:1849 msgid "Print P&review" -msgstr "Nhad pre &tla" +msgstr "Ukka pre &tla" #. TOOLBAR_LABEL_FILE_PRINT_PREVIEW -#: po/tmp/ap_String_Id.h.h:1877 +#: po/tmp/ap_String_Id.h.h:1851 msgid "Print Preview" -msgstr "Nhad pre tla" +msgstr "Ukka pre tla" #. MENU_STATUSLINE_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1879 +#: po/tmp/ap_String_Id.h.h:1853 msgid "Print all or part of the document" msgstr "Vytla cel dokument" #. TOOLBAR_STATUSLINE_FILE_PRINT #. TOOLBAR_TOOLTIP_FILE_PRINT -#: po/tmp/ap_String_Id.h.h:1882 +#: po/tmp/ap_String_Id.h.h:1856 msgid "Print the document" -msgstr "Vytla dokument" +msgstr "Vytla cel dokument" #. MENU_STATUSLINE_FILE_PRINT_DIRECTLY -#: po/tmp/ap_String_Id.h.h:1884 +#: po/tmp/ap_String_Id.h.h:1858 msgid "Print using the internal PS driver" msgstr "Vytla cez vntorn PS ovlada" #. MSG_PrintingDoc -#: po/tmp/ap_String_Id.h.h:1886 +#: po/tmp/ap_String_Id.h.h:1860 msgid "Printing Document.." msgstr "Tlam dokument..." #. MSG_PrintStatus -#: po/tmp/ap_String_Id.h.h:1888 +#: po/tmp/ap_String_Id.h.h:1862 #, c-format msgid "Printing page %d of %d" -msgstr "Tlam stranu %d z %d" +msgstr "Tlam stranu %d z(o) %d" #. FIELD_Document_Publisher -#: po/tmp/ap_String_Id.h.h:1890 +#: po/tmp/ap_String_Id.h.h:1864 msgid "Publisher" -msgstr "Vydavate" +msgstr "Vydavate" #. DLG_MetaData_Publisher_LBL -#: po/tmp/ap_String_Id.h.h:1892 +#: po/tmp/ap_String_Id.h.h:1866 msgid "Publisher:" -msgstr "Vydavate:" +msgstr "Vydavate:" #. MENU_LABEL_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1894 +#: po/tmp/ap_String_Id.h.h:1868 msgid "R&eplace" -msgstr "Nah&radi" +msgstr "Nah&radi" #. MENU_LABEL_FMT_DIRECTION_DOCD_RTL -#: po/tmp/ap_String_Id.h.h:1896 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1870 msgid "RTL &Document" -msgstr "&Dokument" +msgstr "&dokument" #. MENU_LABEL_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:1898 +#: po/tmp/ap_String_Id.h.h:1872 msgid "RTL &Paragraph" -msgstr "RTL &Odsek" +msgstr "&odsek sprava doava" #. MENU_LABEL_FMT_DIRECTION_SD_RTL -#: po/tmp/ap_String_Id.h.h:1900 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:1874 msgid "RTL &Section" -msgstr "Vber" +msgstr "&Vber" #. DLG_FR_ReplaceWithLabel -#: po/tmp/ap_String_Id.h.h:1902 +#: po/tmp/ap_String_Id.h.h:1876 msgid "Re&place with:" -msgstr "m na&hradi:" +msgstr "Na&hradi za:" #. DLG_FR_ReverseFind -#: po/tmp/ap_String_Id.h.h:1904 +#: po/tmp/ap_String_Id.h.h:1878 msgid "Re&verse find" -msgstr "Hada &od zaiatku" +msgstr "Hada &od zaiatku" #. MENU_LABEL_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1906 +#: po/tmp/ap_String_Id.h.h:1880 msgid "Re&vert" -msgstr "&Vrti se nasp" +msgstr "&Vrti sa sp" #. MENU_LABEL_FILE_RECENT -#: po/tmp/ap_String_Id.h.h:1908 +#: po/tmp/ap_String_Id.h.h:1882 msgid "Recent &Files" msgstr "Pos&ledn sbory" #. TOOLBAR_LABEL_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1910 +#: po/tmp/ap_String_Id.h.h:1884 msgid "Redo" msgstr "Znovu" #. TOOLBAR_STATUSLINE_EDIT_REDO #. TOOLBAR_TOOLTIP_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1913 +#: po/tmp/ap_String_Id.h.h:1887 msgid "Redo editing" -msgstr "Sp pravy" +msgstr "Sp pravy" #. MENU_STATUSLINE_EDIT_REDO -#: po/tmp/ap_String_Id.h.h:1915 +#: po/tmp/ap_String_Id.h.h:1889 msgid "Redo previously undone editing" msgstr "Znovu vykon odvolan pravu" #. MENU_STATUSLINE_VIEW_ZOOM_MENU #. MENU_STATUSLINE_VIEW_ZOOM -#: po/tmp/ap_String_Id.h.h:1918 +#: po/tmp/ap_String_Id.h.h:1892 msgid "Reduce or enlarge the document display" -msgstr "Zmenenie alebo zvenie zobrazenia dokumentu" +msgstr "Zmen alebo zv zobrazenia dokumentu" #. DLG_MetaData_Relation_LBL -#: po/tmp/ap_String_Id.h.h:1920 +#: po/tmp/ap_String_Id.h.h:1894 msgid "Relation:" -msgstr "Vzah:" +msgstr "Vzah:" #. DLG_Styles_RemoveButton -#: po/tmp/ap_String_Id.h.h:1922 +#: po/tmp/ap_String_Id.h.h:1896 msgid "Remove" -msgstr "Odstrni" +msgstr "Odstrni" #. MENU_LABEL_EDIT_REMOVEFOOTER #. TOOLBAR_LABEL_EDIT_REMOVEFOOTER #. TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER #. TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1927 +#: po/tmp/ap_String_Id.h.h:1901 msgid "Remove Footer" -msgstr "Odstrni ptu" +msgstr "Odstrni ptu" #. MENU_LABEL_EDIT_REMOVEHEADER #. TOOLBAR_LABEL_EDIT_REMOVEHEADER #. TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER #. TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1932 +#: po/tmp/ap_String_Id.h.h:1906 msgid "Remove Header" -msgstr "Odstrni zhlavie" +msgstr "Odstrni zhlavie" #. DLG_Styles_RemoveLab -#: po/tmp/ap_String_Id.h.h:1934 +#: po/tmp/ap_String_Id.h.h:1908 msgid "Remove Property from Style" -msgstr "Odstrni vlastnos zo tlu" +msgstr "Odstrni vlastnos zo tlu" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1936 +#: po/tmp/ap_String_Id.h.h:1910 msgid "Remove Row as Heading" -msgstr "Odstrni riadok ako nadpis" +msgstr "Odstrni riadok ako nadpis" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE -#: po/tmp/ap_String_Id.h.h:1938 +#: po/tmp/ap_String_Id.h.h:1912 msgid "Remove Row as the page Heading" msgstr "Odstrni riadok ako nadpis strany" #. MENU_STATUSLINE_TOOLS_REVISIONS_PURGE -#: po/tmp/ap_String_Id.h.h:1940 +#: po/tmp/ap_String_Id.h.h:1914 msgid "Remove all revision information from the document" -msgstr "Z dokumentu odstrni vetky informcie o zmench v texte" +msgstr "Z dokumentu odstrni vetky informcie o zmench v texte" #. MENU_STATUSLINE_TOOLS_HISTORY_PURGE -#: po/tmp/ap_String_Id.h.h:1942 +#: po/tmp/ap_String_Id.h.h:1916 msgid "Remove full document history from the document" -msgstr "Odstrni z dokumentu cel jeho histriu" +msgstr "Z dokumentu odstrni cel jeho histriu" #. MENU_STATUSLINE_EDIT_REMOVEFOOTER -#: po/tmp/ap_String_Id.h.h:1944 +#: po/tmp/ap_String_Id.h.h:1918 msgid "Remove the Footer on this page from the Document" msgstr "Odstrni ptu na tejto strane " #. MENU_STATUSLINE_EDIT_REMOVEHEADER -#: po/tmp/ap_String_Id.h.h:1946 +#: po/tmp/ap_String_Id.h.h:1920 msgid "Remove the Header on this page from the Document" msgstr "Odstrni z dokumentu zhlavie na tejto strane" #. MENU_STATUSLINE_EDIT_CUTIMAGE -#: po/tmp/ap_String_Id.h.h:1948 +#: po/tmp/ap_String_Id.h.h:1922 msgid "Remove the Image and save a copy on the clipboard" -msgstr "Odstrni obrzok a ulo ho do schrnky" +msgstr "Odstrni obrzok a ulo ho do schrnky" #. MENU_STATUSLINE_EDIT_DELETEIMAGE -#: po/tmp/ap_String_Id.h.h:1950 +#: po/tmp/ap_String_Id.h.h:1924 msgid "Remove the Image from the Document" msgstr "Odstrni obrzok z dokumentu" #. MENU_STATUSLINE_EDIT_DELETEFRAME -#: po/tmp/ap_String_Id.h.h:1952 +#: po/tmp/ap_String_Id.h.h:1926 msgid "Remove the Text Box from the Document" msgstr "Odstrni textov rm z dokumentu" #. MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION -#: po/tmp/ap_String_Id.h.h:1954 +#: po/tmp/ap_String_Id.h.h:1928 msgid "Remove the suggested change" msgstr "Odstrni navrhovan zmenu" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1956 +#: po/tmp/ap_String_Id.h.h:1930 msgid "Repeat Row as Heading" -msgstr "Opakovat riadok ako nadpis" +msgstr "Opakova riadok ako nadpis" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT -#: po/tmp/ap_String_Id.h.h:1958 +#: po/tmp/ap_String_Id.h.h:1932 msgid "Repeat Row as Heading on each new page" -msgstr "Opakuje riadok ako nadpis na kadej strane" +msgstr "Zopakuje riadok ako nadpis na kadej strane" #. DLG_FR_ReplaceTitle -#: po/tmp/ap_String_Id.h.h:1960 +#: po/tmp/ap_String_Id.h.h:1934 msgid "Replace" -msgstr "Nahradi" +msgstr "Nahradi" #. DLG_FR_ReplaceAllButton -#: po/tmp/ap_String_Id.h.h:1962 +#: po/tmp/ap_String_Id.h.h:1936 msgid "Replace &All" -msgstr "Nahradi &vetko" +msgstr "Nahradi &vetko" #. MENU_STATUSLINE_EDIT_REPLACE -#: po/tmp/ap_String_Id.h.h:1964 +#: po/tmp/ap_String_Id.h.h:1938 msgid "Replace the specified text with different text" msgstr "Nahrad urit text inm" #. MENU_LABEL_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1966 +#: po/tmp/ap_String_Id.h.h:1940 msgid "Report a &Bug" -msgstr "Nahlsi &chybu" +msgstr "Nahlsi &chybu" #. MENU_STATUSLINE_HELP_REPORT_BUG -#: po/tmp/ap_String_Id.h.h:1968 +#: po/tmp/ap_String_Id.h.h:1942 msgid "Report a bug and help AbiWord become a better product" -msgstr "Nahlste chybu a pomte Abiwordu, aby sa stal ete lepm programom" +msgstr "Nahlste chybu v programe a pomte Abiwordu, aby sa stal ete lepm" #. MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT -#: po/tmp/ap_String_Id.h.h:1970 +#: po/tmp/ap_String_Id.h.h:1944 msgid "Reset the current toolbar layout to its defaults" msgstr "Vrti rozmiestnenie panelov s nstrojmi do pvodnho stavu" #. MENU_STATUSLINE_FMT_IMAGE -#: po/tmp/ap_String_Id.h.h:1972 +#: po/tmp/ap_String_Id.h.h:1946 msgid "Resize this image" -msgstr "Zmen vekos obrzku" +msgstr "Zmen vekos obrzka" #. DLG_HdrFtr_RestartNumbers -#: po/tmp/ap_String_Id.h.h:1974 +#: po/tmp/ap_String_Id.h.h:1948 msgid "Restart numbering at:" -msgstr "Obnovi slovanie od:" +msgstr "Obnovi slovanie od:" #. DLG_FormatFootnotes_FootRestartPage -#: po/tmp/ap_String_Id.h.h:1976 +#: po/tmp/ap_String_Id.h.h:1950 msgid "Restart on each page" -msgstr "Odznova na kadej strane" +msgstr "Odznova na kadej strane" #. DLG_FormatFootnotes_FootRestartSec #. DLG_FormatFootnotes_EndRestartSec -#: po/tmp/ap_String_Id.h.h:1979 +#: po/tmp/ap_String_Id.h.h:1953 msgid "Restart on each section" -msgstr "Odznova v kadej kapitole" +msgstr "Odznova v kadej kapitole" #. DLG_HdrFtr_RestartCheck -#: po/tmp/ap_String_Id.h.h:1981 +#: po/tmp/ap_String_Id.h.h:1955 msgid "Restart page numbers on new sections" -msgstr "Kad kapitolu slova osobitne" +msgstr "Kad kapitolu slova osobitne" #. DLG_Lists_Resume_Previous_List -#: po/tmp/ap_String_Id.h.h:1983 +#: po/tmp/ap_String_Id.h.h:1957 msgid "Resume Previous List" -msgstr "Obnovi predchdzajci zoznam" +msgstr "Obnovi predchdzajci zoznam" #. MENU_STATUSLINE_TOOLS_REVISIONS_AUTO -#: po/tmp/ap_String_Id.h.h:1985 +#: po/tmp/ap_String_Id.h.h:1959 msgid "Retain all document changes" -msgstr "Nech vetky zmeny v dokumente" +msgstr "Ponech vetky zmeny v dokumente" #. MSG_RevertFile -#: po/tmp/ap_String_Id.h.h:1987 +#: po/tmp/ap_String_Id.h.h:1961 msgid "Revert file to last saved state?" -msgstr "Vrti sbor do stavu pred poslednm uloenm?" +msgstr "Vrti sbor do stavu pred poslednm uloenm?" #. MENU_STATUSLINE_FILE_REVERT -#: po/tmp/ap_String_Id.h.h:1989 +#: po/tmp/ap_String_Id.h.h:1963 msgid "Revert the document to the last saved state" -msgstr "Vrti sbor do stavu po poslednom uloen" +msgstr "Vrti sbor do stavu po poslednom uloen" #. MSG_RevertBuffer -#: po/tmp/ap_String_Id.h.h:1991 +#: po/tmp/ap_String_Id.h.h:1965 #, c-format msgid "Revert to saved copy of %s?" -msgstr "Vrti sa k uloenmu sboru %s?" +msgstr "Vrti sa k uloenmu sboru %s?" #. DLG_ListRevisions_Column1Label -#: po/tmp/ap_String_Id.h.h:1993 +#: po/tmp/ap_String_Id.h.h:1967 msgid "Revision ID" msgstr "ID zmeny textu" @@ -4856,1185 +4776,1159 @@ #. DLG_Tab_Radio_Right #. DLG_PageNumbers_Right #. TOOLBAR_LABEL_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:1998 +#: po/tmp/ap_String_Id.h.h:1972 msgid "Right" -msgstr "Prav" +msgstr "vpravo" #. RightIndentStatus -#: po/tmp/ap_String_Id.h.h:2000 +#: po/tmp/ap_String_Id.h.h:1974 #, c-format msgid "Right Indent [%s]" msgstr "Prav odsadenie [%s]" #. RightMarginStatus -#: po/tmp/ap_String_Id.h.h:2002 +#: po/tmp/ap_String_Id.h.h:1976 #, c-format msgid "Right Margin [%s]" msgstr "Prav okraj [%s]" #. TabToggleRightTab -#: po/tmp/ap_String_Id.h.h:2004 +#: po/tmp/ap_String_Id.h.h:1978 msgid "Right Tab" msgstr "Prav tabultor" #. TOOLBAR_STATUSLINE_ALIGN_RIGHT #. TOOLBAR_TOOLTIP_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:2007 +#: po/tmp/ap_String_Id.h.h:1981 msgid "Right alignment" -msgstr "Zarovnanie vpravo" +msgstr "Zarovn text doprava" #. MENU_STATUSLINE_ALIGN_RIGHT -#: po/tmp/ap_String_Id.h.h:2009 +#: po/tmp/ap_String_Id.h.h:1983 msgid "Right-align the paragraph" -msgstr "Zarovnn odseku napravo" +msgstr "Zarovn odsek doprava" #. DLG_Para_DomDirection -#: po/tmp/ap_String_Id.h.h:2011 +#: po/tmp/ap_String_Id.h.h:1985 msgid "Right-to-left &dominant" -msgstr "Pre&vld zprava do leva" +msgstr "Pre&vlda text sprava doava" #. FIELD_Document_Rights -#: po/tmp/ap_String_Id.h.h:2013 +#: po/tmp/ap_String_Id.h.h:1987 msgid "Rights" msgstr "Prva" #. DLG_MetaData_Rights_LBL -#: po/tmp/ap_String_Id.h.h:2015 +#: po/tmp/ap_String_Id.h.h:1989 msgid "Rights:" msgstr "Prva:" #. DLG_FormatTable_Apply_To_Row -#: po/tmp/ap_String_Id.h.h:2017 +#: po/tmp/ap_String_Id.h.h:1991 msgid "Row" msgstr "Riadok" #. MENU_LABEL_TABLE_INSERT_ROWS_BEFORE -#: po/tmp/ap_String_Id.h.h:2019 +#: po/tmp/ap_String_Id.h.h:1993 msgid "Rows &Above" -msgstr "dky &pred" +msgstr "Riadky &nad" #. MENU_LABEL_TABLE_INSERT_ROWS_AFTER -#: po/tmp/ap_String_Id.h.h:2021 +#: po/tmp/ap_String_Id.h.h:1995 msgid "Rows &Below" -msgstr "Riadky &za" +msgstr "Riadky &pod" #. MENU_LABEL_TOOLS_SCRIPTS -#: po/tmp/ap_String_Id.h.h:2023 +#: po/tmp/ap_String_Id.h.h:1997 msgid "S&cripts" msgstr "S&kripty" #. MENU_LABEL_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:2025 +#: po/tmp/ap_String_Id.h.h:1999 msgid "S&how revisions" -msgstr "Zobrazi &revzie" +msgstr "zobrazi &zmeny textu" #. MENU_LABEL_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2027 +#: po/tmp/ap_String_Id.h.h:2001 msgid "S&plit Cells" -msgstr "S&poji bunky" +msgstr "R&ozdeli bunky" #. DLG_Options_Btn_Save -#: po/tmp/ap_String_Id.h.h:2029 +#: po/tmp/ap_String_Id.h.h:2003 msgid "Sa&ve" -msgstr "&Uloi" +msgstr "&Uloi" #. MENU_LABEL_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:2031 +#: po/tmp/ap_String_Id.h.h:2005 msgid "Sav&e Copy" -msgstr "&Uloi kpiu" +msgstr "&Uloi kpiu" #. TOOLBAR_LABEL_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:2033 +#: po/tmp/ap_String_Id.h.h:2007 msgid "Save" -msgstr "Uloi" +msgstr "Uloi" #. MENU_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:2035 +#: po/tmp/ap_String_Id.h.h:2009 msgid "Save &As" -msgstr "Uloi &ako" +msgstr "Uloi &ako" #. MENU_LABEL_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:2037 +#: po/tmp/ap_String_Id.h.h:2011 msgid "Save &Template" -msgstr "Uloi a&blnu" +msgstr "Uloi a&blnu" #. TOOLBAR_LABEL_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:2039 +#: po/tmp/ap_String_Id.h.h:2013 msgid "Save As" -msgstr "Uloi ako" +msgstr "Uloi ako" #. MENU_STATUSLINE_EDIT_COPYIMAGE -#: po/tmp/ap_String_Id.h.h:2041 +#: po/tmp/ap_String_Id.h.h:2015 msgid "Save a copy of the image on the clipboard" -msgstr "Ulo kpiu obrzku do schrnky" +msgstr "Ulo kpiu obrzka do schrnky" #. MSG_ConfirmSave -#: po/tmp/ap_String_Id.h.h:2043 +#: po/tmp/ap_String_Id.h.h:2017 #, c-format msgid "Save changes to document %s before closing?" -msgstr "Uloi zmeny do dokumentu %s pred ukonenm?" +msgstr "Mm pred ukonenm uloi zmeny do dokumentu %s?" #. MENU_STATUSLINE_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:2045 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2019 msgid "Save the Embedded Object" -msgstr "Vloi zabudovan objekt" +msgstr "Ulo objekt z inho programu" #. MENU_STATUSLINE_FILE_SAVE #. TOOLBAR_STATUSLINE_FILE_SAVE #. TOOLBAR_TOOLTIP_FILE_SAVE -#: po/tmp/ap_String_Id.h.h:2049 +#: po/tmp/ap_String_Id.h.h:2023 msgid "Save the document" -msgstr "Ulo dokument" +msgstr "Ulo dokument" #. MENU_STATUSLINE_FILE_SAVE_TEMPLATE -#: po/tmp/ap_String_Id.h.h:2051 +#: po/tmp/ap_String_Id.h.h:2025 msgid "Save the document as a template" -msgstr "Ulo dokument ako ablnu" +msgstr "Ulo dokument ako ablnu" #. MENU_STATUSLINE_FILE_SAVEAS #. TOOLBAR_STATUSLINE_FILE_SAVEAS #. TOOLBAR_TOOLTIP_FILE_SAVEAS -#: po/tmp/ap_String_Id.h.h:2055 +#: po/tmp/ap_String_Id.h.h:2029 msgid "Save the document under a different name" -msgstr "Uloi dokument pod inm nzvom" +msgstr "Ulo dokument pod inm nzvom" #. MENU_STATUSLINE_FILE_EXPORT -#: po/tmp/ap_String_Id.h.h:2057 +#: po/tmp/ap_String_Id.h.h:2031 msgid "Save the document without changing the current name" -msgstr "Ulo dokument bezo zmeny nzvu" +msgstr "Ulo dokument bezo zmeny nzvu" #. MENU_STATUSLINE_FILE_SAVEIMAGE -#: po/tmp/ap_String_Id.h.h:2059 +#: po/tmp/ap_String_Id.h.h:2033 msgid "Save the selected image to a file" -msgstr "Ulo vybran obrzok do sboru" +msgstr "Ulo vybran obrzok do sboru" #. MENU_LABEL_FILE_SAVEEMBED -#: po/tmp/ap_String_Id.h.h:2061 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2035 msgid "Save to file" -msgstr "Uloi sbor ako" +msgstr "Uloi sbor ako" #. DLG_PageSetup_Scale -#: po/tmp/ap_String_Id.h.h:2063 +#: po/tmp/ap_String_Id.h.h:2037 msgid "Scale..." msgstr "Mierka..." #. MENU_STATUSLINE_HELP_SEARCH -#: po/tmp/ap_String_Id.h.h:2065 +#: po/tmp/ap_String_Id.h.h:2039 msgid "Search for help about..." -msgstr "Vyhad npovedu k slovu..." +msgstr "Vyhad npovedu k slovu..." #. DLG_WordCount_Update_Rate -#: po/tmp/ap_String_Id.h.h:2067 +#: po/tmp/ap_String_Id.h.h:2041 msgid "Seconds between updates" msgstr "Seknd medzi aktualizciami" #. FIELD_DateTime_Epoch -#: po/tmp/ap_String_Id.h.h:2069 +#: po/tmp/ap_String_Id.h.h:2043 msgid "Seconds since the epoch" msgstr "Seknd od zaiatku letopotu" #. DLG_Break_SectionBreaks_Capital -#: po/tmp/ap_String_Id.h.h:2071 +#: po/tmp/ap_String_Id.h.h:2045 msgid "Section Breaks" msgstr "Zlomy v kapitole" #. DLG_Break_SectionBreaks -#: po/tmp/ap_String_Id.h.h:2073 +#: po/tmp/ap_String_Id.h.h:2047 msgid "Section breaks" msgstr "Zlomy v kapitole" #. MENU_STATUSLINE_TOOLS_HISTORY -#: po/tmp/ap_String_Id.h.h:2075 +#: po/tmp/ap_String_Id.h.h:2049 msgid "See history of the current document" msgstr "Zobraz histriu aktulneho dokumentu" #. MENU_STATUSLINE_TABLE_SELECT #. DLG_Select -#: po/tmp/ap_String_Id.h.h:2077 po/tmp/xap_String_Id.h.h:663 +#: po/tmp/ap_String_Id.h.h:2051 +#: po/tmp/xap_String_Id.h.h:667 msgid "Select" msgstr "Vber" #. MENU_LABEL_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2079 +#: po/tmp/ap_String_Id.h.h:2053 msgid "Select A&ll" -msgstr "Vybr&a vetko" +msgstr "Vybr&a vetko" #. MENU_STATUSLINE_TABLE_SELECT_CELL -#: po/tmp/ap_String_Id.h.h:2081 +#: po/tmp/ap_String_Id.h.h:2055 msgid "Select Cell" -msgstr "Vybere bunku" +msgstr "Vyberie bunku" #. MENU_STATUSLINE_TABLE_SELECT_COLUMN -#: po/tmp/ap_String_Id.h.h:2083 +#: po/tmp/ap_String_Id.h.h:2057 msgid "Select Column" -msgstr "Vybere stpec" +msgstr "Vyberie stpec" #. TOOLBAR_TOOLTIP_FMT_CHOOSE -#: po/tmp/ap_String_Id.h.h:2085 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2059 msgid "Select Font" msgstr "Vber psma" #. DLG_ListRevisions_Title -#: po/tmp/ap_String_Id.h.h:2087 +#: po/tmp/ap_String_Id.h.h:2061 msgid "Select Revision" msgstr "Vber zmeny textu" #. MENU_STATUSLINE_TABLE_SELECT_ROW -#: po/tmp/ap_String_Id.h.h:2089 +#: po/tmp/ap_String_Id.h.h:2063 msgid "Select Row" -msgstr "Vybere riadok" +msgstr "Vyberie riadok" #. MENU_STATUSLINE_TABLE_SELECT_TABLE -#: po/tmp/ap_String_Id.h.h:2091 +#: po/tmp/ap_String_Id.h.h:2065 msgid "Select Table" -msgstr "Vybere tabuku" +msgstr "Vyberie tabuku" #. MENU_LABEL_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2093 +#: po/tmp/ap_String_Id.h.h:2067 msgid "Select Text Box" -msgstr "Vybra textov rm" +msgstr "Vybra textov rm" #. DLG_InsertHyperlink_Msg -#: po/tmp/ap_String_Id.h.h:2095 +#: po/tmp/ap_String_Id.h.h:2069 msgid "Select a target bookmark from the list." -msgstr "Vyberte cieov zloku zo zoznamu." +msgstr "Vyberte cieov zloku zo zoznamu." #. DLG_FormatFrame_SelectImage #. DLG_FormatTable_SelectImage -#: po/tmp/ap_String_Id.h.h:2098 +#: po/tmp/ap_String_Id.h.h:2072 msgid "Select image from File" -msgstr "Vybra obrzok zo sboru" +msgstr "Vybra obrzok zo sboru" #. MENU_STATUSLINE_EDIT_SELECT_FRAME -#: po/tmp/ap_String_Id.h.h:2100 +#: po/tmp/ap_String_Id.h.h:2074 msgid "Select the Text Box" -msgstr "Vybere textov rm" +msgstr "Vyberie textov rm" #. MENU_STATUSLINE_EDIT_SELECTALL -#: po/tmp/ap_String_Id.h.h:2102 +#: po/tmp/ap_String_Id.h.h:2076 msgid "Select the entire document" -msgstr "Vybere cel dokument" +msgstr "Vyberie cel dokument" #. DLG_FormatTable_Apply_To_Selection #. DLG_UP_Selection -#: po/tmp/ap_String_Id.h.h:2104 po/tmp/xap_String_Id.h.h:671 +#: po/tmp/ap_String_Id.h.h:2078 +#: po/tmp/xap_String_Id.h.h:675 msgid "Selection" -msgstr "Vber" +msgstr "vber" #. DLG_ToggleCase_SentenceCase -#: po/tmp/ap_String_Id.h.h:2106 +#: po/tmp/ap_String_Id.h.h:2080 msgid "Sentence case" -msgstr "Vek/mal psmen vo vete" +msgstr "Vek psmen vo na zaiatku vety" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2108 +#: po/tmp/ap_String_Id.h.h:2082 msgid "Separate table items with commas" -msgstr "Oddel poloky v tabuke iarkou" +msgstr "Oddel text v tabuke iarkami" #. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2110 +#: po/tmp/ap_String_Id.h.h:2084 msgid "Separate table items with commas and tabs" -msgstr "Oddel poloky v tabuke iarkou a tabultormi" +msgstr "Oddel text v tabuke iarkami a tabultormi" #. MENU_STATUSLINE_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2112 +#: po/tmp/ap_String_Id.h.h:2086 msgid "Separate table items with tabs" -msgstr "Oddel poloky v tabuke tabultormi" +msgstr "Oddel text v tabuke tabultormi" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMAS -#: po/tmp/ap_String_Id.h.h:2114 +#: po/tmp/ap_String_Id.h.h:2088 msgid "Separate with commas" -msgstr "Oddeli iarkou" +msgstr "oddeli iarkami" #. MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS -#: po/tmp/ap_String_Id.h.h:2116 +#: po/tmp/ap_String_Id.h.h:2090 msgid "Separate with commas and tabs" -msgstr "Oddeli iarkou a tabultormi" +msgstr "oddeli iarkami a tabultormi" #. MENU_LABEL_TABLE_TABLETOTEXTTABS -#: po/tmp/ap_String_Id.h.h:2118 +#: po/tmp/ap_String_Id.h.h:2092 msgid "Separate with tabs" -msgstr "Oddeli tabultormi" +msgstr "oddeli tabultormi" #. DLG_Tab_Button_Set -#: po/tmp/ap_String_Id.h.h:2120 +#: po/tmp/ap_String_Id.h.h:2094 msgid "Set" -msgstr "Nastavi" +msgstr "Nastavi" #. MENU_LABEL_FMT_LANGUAGE -#: po/tmp/ap_String_Id.h.h:2122 +#: po/tmp/ap_String_Id.h.h:2096 msgid "Set &Language" -msgstr "Nastavi &jazyk" +msgstr "Nastavi &jazyk" #. DLG_Lists_SetDefault -#: po/tmp/ap_String_Id.h.h:2124 +#: po/tmp/ap_String_Id.h.h:2098 msgid "Set Default Values" -msgstr "Prednastavi hodnoty" +msgstr "Prednastavi hodnoty" #. DLG_FormatFrame_SetImage #. DLG_FormatTable_SetImage -#: po/tmp/ap_String_Id.h.h:2127 +#: po/tmp/ap_String_Id.h.h:2101 msgid "Set Image" -msgstr "Nastavi obrzok" +msgstr "Nastavi obrzok" #. MENU_LABEL_FMT_SETPOSIMAGE -#: po/tmp/ap_String_Id.h.h:2129 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2103 msgid "Set Positioned Image" -msgstr "Automaticky umiestni obrzok na stranu" +msgstr "Automaticky vloi obrzok" #. DLG_FormatFrame_SetTextWrapping -#: po/tmp/ap_String_Id.h.h:2131 +#: po/tmp/ap_String_Id.h.h:2105 msgid "Set Text Wrapping" -msgstr "Nastavenia zalamovania textu" +msgstr "Nastavenie zalamovania textu" #. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_IMAGE -#: po/tmp/ap_String_Id.h.h:2133 +#: po/tmp/ap_String_Id.h.h:2107 msgid "Set an image as a background for your page" msgstr "Nastav obrzok ako pozadie strany" #. MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL -#: po/tmp/ap_String_Id.h.h:2135 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2109 msgid "Set dominant direction of document to RTL" -msgstr "Zmen prevldajc smer psma v dokumente na sprava doava" +msgstr "Zmen prevldajci smer psma v dokumente na sprava doava" #. MENU_STATUSLINE_FMT_DIRECTION_DD_RTL -#: po/tmp/ap_String_Id.h.h:2137 +#: po/tmp/ap_String_Id.h.h:2111 msgid "Set dominant direction of paragraph to RTL" -msgstr "Zmen prevldajc smer psma odseku na sprava doava" +msgstr "Zmen prevldajci smer psma odseku na sprava doava" #. MENU_STATUSLINE_FMT_DIRECTION_SD_RTL -#: po/tmp/ap_String_Id.h.h:2139 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2113 msgid "Set dominant direction of section to RTL" -msgstr "Zmen prevldajc smer psma kapitoly na sprava doava" +msgstr "Zmen prevldajci smer psma kapitoly na sprava doava" #. MENU_STATUSLINE_FILE_PROPERTIES -#: po/tmp/ap_String_Id.h.h:2141 +#: po/tmp/ap_String_Id.h.h:2115 msgid "Set meta-data properties" msgstr "Nastav vlastnosti pre meta-data" #. DLG_Tab_Label_New -#: po/tmp/ap_String_Id.h.h:2143 +#: po/tmp/ap_String_Id.h.h:2117 msgid "Set new Tab" -msgstr "Vloenie novho tabultora" +msgstr "Nastavenie novho tabultora" #. DLG_FormatFrame_NoImageBackground #. DLG_FormatTable_NoImageBackground -#: po/tmp/ap_String_Id.h.h:2146 +#: po/tmp/ap_String_Id.h.h:2120 msgid "Set no image" msgstr "Bez obrzka" #. MENU_STATUSLINE_TOOLS_OPTIONS -#: po/tmp/ap_String_Id.h.h:2148 +#: po/tmp/ap_String_Id.h.h:2122 msgid "Set preferences" -msgstr "Nastavenie monost" +msgstr "Nastavenia" #. MENU_STATUSLINE_FMT_TABS -#: po/tmp/ap_String_Id.h.h:2150 +#: po/tmp/ap_String_Id.h.h:2124 msgid "Set tab stops" msgstr "Nastavenie tabultorov" #. MENU_STATUSLINE_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2152 +#: po/tmp/ap_String_Id.h.h:2126 msgid "Set the type and styles of the Table of Contents" -msgstr "Nastav typy a tly pre obsah" +msgstr "Nastav typy a tly obsahu" #. MENU_STATUSLINE_FMT_FOOTNOTES -#: po/tmp/ap_String_Id.h.h:2154 +#: po/tmp/ap_String_Id.h.h:2128 msgid "Set the types of Footnotes and Endnotes" -msgstr "Nastav typy poznmok pod arou a koncovch poznmok" +msgstr "Nastav typy poznmok pod iarou a koncovch poznmok" #. MENU_STATUSLINE_FMT_HDRFTR -#: po/tmp/ap_String_Id.h.h:2156 +#: po/tmp/ap_String_Id.h.h:2130 msgid "Set the types of Headers and Footers" msgstr "Nastav typy zhlav a piat" #. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2158 +#: po/tmp/ap_String_Id.h.h:2132 msgid "Set this Row as Heading" -msgstr "Nastavi riadok ako nadpis" +msgstr "Nastavi riadok ako nadpis" #. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS -#: po/tmp/ap_String_Id.h.h:2160 +#: po/tmp/ap_String_Id.h.h:2134 msgid "Set this Row as the Heading on each page" -msgstr "Nastav riadok ako nadpis na kadej strane" +msgstr "Nastav riadok ako nadpis na kadej strane" #. MENU_STATUSLINE_FMT_SETPOSIMAGE -#: po/tmp/ap_String_Id.h.h:2162 +#: po/tmp/ap_String_Id.h.h:2136 msgid "Set this image to be positioned" msgstr "Nastavte presn pozciu pre tento obrzok" #. MENU_STATUSLINE_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2164 +#: po/tmp/ap_String_Id.h.h:2138 msgid "Set your spelling preferences" msgstr "Nastavenie vlastnost kontroly preklepov" #. MENU_STATUSLINE_FMT_DOCUMENT -#: po/tmp/ap_String_Id.h.h:2166 +#: po/tmp/ap_String_Id.h.h:2140 msgid "Setup your document's page properties such as page size and margins" -msgstr "Nastav vlastnosti dokumentu, ako vekos strany a okraja" +msgstr "Nastav vlastnosti dokumentu ako vekos strany a okraja" #. DLG_Styles_ModifyShortCut -#: po/tmp/ap_String_Id.h.h:2168 +#: po/tmp/ap_String_Id.h.h:2142 msgid "Shortcut Key" msgstr "Klvesov skratka" #. DLG_Options_Label_Show #. DLG_Show -#: po/tmp/ap_String_Id.h.h:2170 po/tmp/xap_String_Id.h.h:683 +#: po/tmp/ap_String_Id.h.h:2144 +#: po/tmp/xap_String_Id.h.h:687 msgid "Show" -msgstr "Zobrazi" +msgstr "Zobrazi" #. MENU_LABEL_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2172 +#: po/tmp/ap_String_Id.h.h:2146 msgid "Show &Ruler" -msgstr "Zobrazi &pravtko" +msgstr "Zobrazi &pravtko" #. TOOLBAR_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2174 +#: po/tmp/ap_String_Id.h.h:2148 msgid "Show All" -msgstr "Zobrazi vetko" +msgstr "Zobrazi vetko" #. MENU_LABEL_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2176 +#: po/tmp/ap_String_Id.h.h:2150 msgid "Show For&matting Marks" -msgstr "Zobrazi for&mtovacie znaky" +msgstr "Zobrazi for&mtovacie znaky" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2178 +#: po/tmp/ap_String_Id.h.h:2152 msgid "Show document &before revisions" -msgstr "Zobrazi dokument &pred zmenami v texte" +msgstr "zobrazi dokument &pred zmenami v texte" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2180 +#: po/tmp/ap_String_Id.h.h:2154 msgid "Show document a&fter revisions" -msgstr "Zobrazi dokument p&o zmench v texte" +msgstr "zobrazi dokument &po zmench v texte" #. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2182 +#: po/tmp/ap_String_Id.h.h:2156 msgid "Show document after &previous revisions" -msgstr "Zobrazi dokument po pre&dchdzajcich zmench textu" +msgstr "zobrazi dokument po pre&dchdzajcich zmench textu" #. MENU_STATUSLINE_WINDOW_MORE -#: po/tmp/ap_String_Id.h.h:2184 +#: po/tmp/ap_String_Id.h.h:2158 msgid "Show full list of documents" -msgstr "Zobraz zoznam vetkch dokumentov" +msgstr "Zobraz zoznam vetkch dokumentov" #. MENU_STATUSLINE_VIEW_RULER -#: po/tmp/ap_String_Id.h.h:2186 +#: po/tmp/ap_String_Id.h.h:2160 msgid "Show or hide the rulers" -msgstr "Zobraz alebo skryje pravtko" +msgstr "Zobraz/skryje pravtko" #. MENU_STATUSLINE_VIEW_STATUSBAR -#: po/tmp/ap_String_Id.h.h:2188 +#: po/tmp/ap_String_Id.h.h:2162 msgid "Show or hide the status bar" -msgstr "Zobraz alebo skryje stavov panel" +msgstr "Zobraz/skryje stavov panel" #. MENU_STATUSLINE_VIEW_TB_1 #. MENU_STATUSLINE_VIEW_TB_2 #. MENU_STATUSLINE_VIEW_TB_3 #. MENU_STATUSLINE_VIEW_TB_4 -#: po/tmp/ap_String_Id.h.h:2193 +#: po/tmp/ap_String_Id.h.h:2167 msgid "Show or hide the toolbar" -msgstr "Zobraz alebo skryje panel s nstrojmi" +msgstr "Zobraz/skryje panel s nstrojmi" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW -#: po/tmp/ap_String_Id.h.h:2195 +#: po/tmp/ap_String_Id.h.h:2169 msgid "Show revisions that are present in document" msgstr "Zobraz zmeny v texte aktulneho dokumentu" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTERPREV -#: po/tmp/ap_String_Id.h.h:2197 +#: po/tmp/ap_String_Id.h.h:2171 msgid "Show what the document looks like after previous revisions" msgstr "Zobraz dokument po predchdzajcich zmench v texte" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER -#: po/tmp/ap_String_Id.h.h:2199 +#: po/tmp/ap_String_Id.h.h:2173 msgid "Show what the document looks like after revisions" -msgstr "Zobraz dokument po zmench textu" +msgstr "Zobraz dokument po zmench v texte" #. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_BEFORE -#: po/tmp/ap_String_Id.h.h:2201 +#: po/tmp/ap_String_Id.h.h:2175 msgid "Show what the document looks like before revisions" msgstr "Zobraz dokument pred zmenami v texte" #. DLG_Options_Label_ViewShowHide -#: po/tmp/ap_String_Id.h.h:2203 +#: po/tmp/ap_String_Id.h.h:2177 msgid "Show..." -msgstr "Zobrazi..." - -#. MENU_STATUSLINE_TOOLS_ANNOTATIONS_TOGGLE_DISPLAY -#: po/tmp/ap_String_Id.h.h:2205 -#, fuzzy -msgid "Show/hide annotations" -msgstr "Zobraz/skryje formtovacie znaky" +msgstr "Zobrazi..." #. TOOLBAR_STATUSLINE_VIEW_SHOWPARA #. TOOLBAR_TOOLTIP_VIEW_SHOWPARA -#: po/tmp/ap_String_Id.h.h:2208 +#: po/tmp/ap_String_Id.h.h:2180 msgid "Show/hide formatting marks" msgstr "Zobraz/skryje formtovacie znaky" #. TB_Simple -#: po/tmp/ap_String_Id.h.h:2210 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2182 msgid "Simple" -msgstr "Vzorka" +msgstr "Jednoduch" #. DLG_Options_Label_ViewSimpleTB -#: po/tmp/ap_String_Id.h.h:2212 -#, fuzzy +#: po/tmp/ap_String_Id.h.h:2184 msgid "Simple Toolbar" -msgstr "Nstroje tabuky" +msgstr "Jednoduch nstroje" #. DLG_Para_SpacingSingle -#: po/tmp/ap_String_Id.h.h:2214 +#: po/tmp/ap_String_Id.h.h:2186 msgid "Single" msgstr "Jednoduch" #. TOOLBAR_LABEL_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2216 +#: po/tmp/ap_String_Id.h.h:2188 msgid "Single Spacing" msgstr "Jednoduch riadkovanie" #. TOOLBAR_STATUSLINE_SINGLE_SPACE #. TOOLBAR_TOOLTIP_SINGLE_SPACE -#: po/tmp/ap_String_Id.h.h:2219 +#: po/tmp/ap_String_Id.h.h:2191 msgid "Single spacing" msgstr "Jednoduch riadkovanie" #. MENU_LABEL_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2221 +#: po/tmp/ap_String_Id.h.h:2193 msgid "So&rt Table" -msgstr "&Zoradi tabulku" +msgstr "&Zoradi tabuku" #. MENU_LABEL_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2223 +#: po/tmp/ap_String_Id.h.h:2195 msgid "Sort Columns in Ascending Order" -msgstr "Zoradi stpce vzostupne" +msgstr "Zoradi stpce vzostupne" #. MENU_STATUSLINE_TABLE_SORTCOLSASCEND -#: po/tmp/ap_String_Id.h.h:2225 +#: po/tmp/ap_String_Id.h.h:2197 msgid "Sort Columns in Ascending Order based on Selected Row" -msgstr "Zorad stpce vzostupne poda vybranho riadka" +msgstr "Zorad stpce vzostupne poda vybranho riadka" #. MENU_LABEL_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2227 +#: po/tmp/ap_String_Id.h.h:2199 msgid "Sort Columns in Descending Order" -msgstr "Zoradi stpce zostupne" +msgstr "Zoradi stpce zostupne" #. MENU_STATUSLINE_TABLE_SORTCOLSDESCEND -#: po/tmp/ap_String_Id.h.h:2229 +#: po/tmp/ap_String_Id.h.h:2201 msgid "Sort Columns in Descending Order based on Selected Row" -msgstr "Zorad stpce zotupne poda vybranho riadka" +msgstr "Zorad stpce zostupne poda vybranho riadka" #. MENU_LABEL_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2231 +#: po/tmp/ap_String_Id.h.h:2203 msgid "Sort Rows in Ascending Order" -msgstr "Zoradi riadky vzostupne" +msgstr "Zoradi riadky vzostupne" #. MENU_STATUSLINE_TABLE_SORTROWSASCEND -#: po/tmp/ap_String_Id.h.h:2233 +#: po/tmp/ap_String_Id.h.h:2205 msgid "Sort Rows in Ascending Order based on selected Column" -msgstr "Zorad riadky vzostupne poda vybranho stpca" +msgstr "Zorad riadky vzostupne poda vybranho stpca" #. MENU_LABEL_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2235 +#: po/tmp/ap_String_Id.h.h:2207 msgid "Sort Rows in Descending Order" -msgstr "Zoradi riadky zostupne" +msgstr "Zoradi riadky zostupne" #. MENU_STATUSLINE_TABLE_SORTROWSDESCEND -#: po/tmp/ap_String_Id.h.h:2237 +#: po/tmp/ap_String_Id.h.h:2209 msgid "Sort Rows in Descending Order based on Selected Column" -msgstr "Zorad riadky zostupne poda vybranho stpca" +msgstr "Zorad riadky zostupne poda vybranho stpca" #. MENU_STATUSLINE_TABLE_SORT -#: po/tmp/ap_String_Id.h.h:2239 +#: po/tmp/ap_String_Id.h.h:2211 msgid "Sort Table" -msgstr "Zorad tabuku" +msgstr "Zorad tabuku" #. DLG_MetaData_Source_LBL -#: po/tmp/ap_String_Id.h.h:2241 +#: po/tmp/ap_String_Id.h.h:2213 msgid "Source:" msgstr "Zdroj:" #. DLG_Column_Space_After -#: po/tmp/ap_String_Id.h.h:2243 +#: po/tmp/ap_String_Id.h.h:2215 msgid "Space after Column" msgstr "Medzera za stpcom" #. TOOLBAR_STATUSLINE_PARA_12BEFORE #. TOOLBAR_TOOLTIP_PARA_12BEFORE -#: po/tmp/ap_String_Id.h.h:2246 +#: po/tmp/ap_String_Id.h.h:2218 msgid "Space before: 12 pt" -msgstr "Medzera pred: 12 bod" +msgstr "Medzera pred: 12 bodov" #. TOOLBAR_STATUSLINE_PARA_0BEFORE #. TOOLBAR_TOOLTIP_PARA_0BEFORE -#: po/tmp/ap_String_Id.h.h:2249 +#: po/tmp/ap_String_Id.h.h:2221 msgid "Space before: None" -msgstr "Medzera pred: iadna" +msgstr "Medzera pred: iadna" #. DLG_Para_LabelSpacing -#: po/tmp/ap_String_Id.h.h:2251 +#: po/tmp/ap_String_Id.h.h:2223 msgid "Spacing" -msgstr "Medzery" +msgstr "Riadkovanie" #. DLG_Options_SpellCheckingTitle -#: po/tmp/ap_String_Id.h.h:2253 +#: po/tmp/ap_String_Id.h.h:2225 msgid "Spell Checking" msgstr "Kontrola preklepov" #. TOOLBAR_LABEL_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2255 +#: po/tmp/ap_String_Id.h.h:2227 msgid "Spellcheck" msgstr "Kontrola preklepov" #. TOOLBAR_STATUSLINE_SPELLCHECK #. TOOLBAR_TOOLTIP_SPELLCHECK -#: po/tmp/ap_String_Id.h.h:2258 +#: po/tmp/ap_String_Id.h.h:2230 msgid "Spellcheck the document" -msgstr "Zkontroluje preklepy v dokumente" +msgstr "Skontroluje preklepy v dokumente" #. DLG_Spell_SpellTitle #. DLG_Options_TabLabel_Spelling -#: po/tmp/ap_String_Id.h.h:2261 +#: po/tmp/ap_String_Id.h.h:2233 msgid "Spelling" msgstr "Preklepy" #. MENU_LABEL_TOOLS_SPELLPREFS -#: po/tmp/ap_String_Id.h.h:2263 +#: po/tmp/ap_String_Id.h.h:2235 msgid "Spelling &Options" -msgstr "V&oby kontroly preklepov" +msgstr "V&oby kontroly preklepov" #. MENU_LABEL_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2265 +#: po/tmp/ap_String_Id.h.h:2237 msgid "Spli&t Table" -msgstr "Rozdel&i tabuku" +msgstr "Rozdel&i tabuku" #. DLG_SplitCellsTitle #. DLG_SplitCells_Frame #. MENU_STATUSLINE_TABLE_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2269 +#: po/tmp/ap_String_Id.h.h:2241 msgid "Split Cells" msgstr "Rozdel bunky" #. MENU_STATUSLINE_TABLE_SPLIT_TABLE -#: po/tmp/ap_String_Id.h.h:2271 +#: po/tmp/ap_String_Id.h.h:2243 msgid "Split Table" -msgstr "Rozdel tabuku" +msgstr "Rozdel tabuku" #. TOOLBAR_LABEL_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2273 +#: po/tmp/ap_String_Id.h.h:2245 msgid "Split cells" -msgstr "Rozdeli bunky" +msgstr "Rozdeli bunky" #. DLG_SplitCells_HoriMid #. DLG_SplitCells_VertMid -#: po/tmp/ap_String_Id.h.h:2276 +#: po/tmp/ap_String_Id.h.h:2248 msgid "Split in Middle" -msgstr "Rozdeli v strede" +msgstr "Rozdeli v strede" #. DLG_SplitCells_Below -#: po/tmp/ap_String_Id.h.h:2278 +#: po/tmp/ap_String_Id.h.h:2250 msgid "Split on Bottom Side" -msgstr "Rozdeli na dolnej strane" +msgstr "Rozdeli na dolnej strane" #. DLG_SplitCells_Left -#: po/tmp/ap_String_Id.h.h:2280 +#: po/tmp/ap_String_Id.h.h:2252 msgid "Split on Left Side" -msgstr "Rozdeli na avej strane" +msgstr "Rozdeli na avej strane" #. DLG_SplitCells_Right -#: po/tmp/ap_String_Id.h.h:2282 +#: po/tmp/ap_String_Id.h.h:2254 msgid "Split on Right Side" -msgstr "Rozdeli na pravej strane" +msgstr "Rozdeli na pravej strane" #. DLG_SplitCells_Above -#: po/tmp/ap_String_Id.h.h:2284 +#: po/tmp/ap_String_Id.h.h:2256 msgid "Split on Top Side" -msgstr "Rozdeli na hornej strane" +msgstr "Rozdeli na hornej strane" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2286 +#: po/tmp/ap_String_Id.h.h:2258 msgid "Split on all delimiters except spaces" -msgstr "Rozdelenie oddeovami okrem medzier" +msgstr "Rozdelenie pri oddeovaoch okrem medzier" #. MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2288 +#: po/tmp/ap_String_Id.h.h:2260 msgid "Split on all word delimiters including spaces" -msgstr "Rozdelenie oddeovami vrtane medzier" +msgstr "Rozdelenie pri oddeovaoch vrtane medzier" #. MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES -#: po/tmp/ap_String_Id.h.h:2290 +#: po/tmp/ap_String_Id.h.h:2262 msgid "Split text at commas or tabs" -msgstr "Rozdeli text na iarky alebo tabultory" +msgstr "Rozdeli text na iarkami alebo tabultory" #. MENU_LABEL_TABLE_TEXTTOTABLE_ALL -#: po/tmp/ap_String_Id.h.h:2292 +#: po/tmp/ap_String_Id.h.h:2264 msgid "Split text at spaces, commas, or tabs" -msgstr "Rozdli text na medzery, iarky alebo tabultory." +msgstr "Rozdeli text pri medzerch, iarkch alebo tabultoroch." #. TOOLBAR_STATUSLINE_SPLIT_CELLS #. TOOLBAR_TOOLTIP_SPLIT_CELLS -#: po/tmp/ap_String_Id.h.h:2295 +#: po/tmp/ap_String_Id.h.h:2267 msgid "Split this cell" msgstr "Rozdel tto bunku" #. DLG_Lists_Square_List #. STYLE_SQUARELIST -#: po/tmp/ap_String_Id.h.h:2297 po/tmp/xap_String_Id.h.h:695 +#: po/tmp/ap_String_Id.h.h:2269 +#: po/tmp/xap_String_Id.h.h:699 msgid "Square List" -msgstr "Odrky v tvare tvorca" +msgstr "Odrky v tvare tvorca" #. MENU_LABEL_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2299 +#: po/tmp/ap_String_Id.h.h:2271 msgid "St&yle" -msgstr "t&l" +msgstr "t&l" #. TB_Standard -#: po/tmp/ap_String_Id.h.h:2301 +#: po/tmp/ap_String_Id.h.h:2273 msgid "Standard" -msgstr "tandardn" +msgstr "tandardn" #. DLG_Options_Label_ViewStandardTB -#: po/tmp/ap_String_Id.h.h:2303 +#: po/tmp/ap_String_Id.h.h:2275 msgid "Standard Toolbar" msgstr "Standardn panel s nstrojmi" #. DLG_Lists_Star_List #. STYLE_STARLIST -#: po/tmp/ap_String_Id.h.h:2305 po/tmp/xap_String_Id.h.h:699 +#: po/tmp/ap_String_Id.h.h:2277 +#: po/tmp/xap_String_Id.h.h:703 msgid "Star List" -msgstr "Odrky v tvare hviezdiiek" +msgstr "Odrky v tvare hviezdiiek" #. DLG_Lists_Start -#: po/tmp/ap_String_Id.h.h:2307 +#: po/tmp/ap_String_Id.h.h:2279 msgid "Start At:" -msgstr "Zaa na:" +msgstr "Zaa na:" #. DLG_Lists_Start_New_List #. DLG_Lists_Start_New -#: po/tmp/ap_String_Id.h.h:2310 +#: po/tmp/ap_String_Id.h.h:2282 msgid "Start New List" -msgstr "Zaa nov zoznam" +msgstr "Zaa nov zoznam" #. DLG_Lists_Start_Sub -#: po/tmp/ap_String_Id.h.h:2312 +#: po/tmp/ap_String_Id.h.h:2284 msgid "Start Sublist" -msgstr "Zaa podzoznam" +msgstr "Zaa podzoznam" #. DLG_MarkRevisions_Check2Label -#: po/tmp/ap_String_Id.h.h:2314 +#: po/tmp/ap_String_Id.h.h:2286 msgid "Start a new revision" -msgstr "Zaznamena nov zmenu v texte" +msgstr "Zaznamena nov zmenu v texte" #. MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2316 +#: po/tmp/ap_String_Id.h.h:2288 msgid "Start ne&w revision" -msgstr "Zaznamena n&ov zmenu v texte" - +msgstr "Zaznamena n&ov zmenu v texte" #. MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION -#: po/tmp/ap_String_Id.h.h:2318 +#: po/tmp/ap_String_Id.h.h:2290 msgid "Start revision distinct from the current one" -msgstr "Zaa iniu zmenu od aktulnej" +msgstr "Zaa odlin zmenu od aktulnej" #. DLG_WordCount_Statistics -#: po/tmp/ap_String_Id.h.h:2320 +#: po/tmp/ap_String_Id.h.h:2292 msgid "Statistics:" -msgstr "tatistika:" +msgstr "tatistika:" #. DLG_Lists_Stop_Current_List -#: po/tmp/ap_String_Id.h.h:2322 +#: po/tmp/ap_String_Id.h.h:2294 msgid "Stop Current List" -msgstr "Ukoni sasn zoznam" +msgstr "Ukoni sasn zoznam" #. MENU_LABEL_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2324 +#: po/tmp/ap_String_Id.h.h:2296 msgid "Stri&ke" -msgstr "Prekrt&nutie" +msgstr "Prekrt&nut" #. TOOLBAR_LABEL_FMT_STRIKE #. TOOLBAR_STATUSLINE_FMT_STRIKE #. TOOLBAR_TOOLTIP_FMT_STRIKE #. DLG_UFS_StrikeoutCheck -#: po/tmp/ap_String_Id.h.h:2328 po/tmp/xap_String_Id.h.h:701 +#: po/tmp/ap_String_Id.h.h:2300 +#: po/tmp/xap_String_Id.h.h:705 msgid "Strike" -msgstr "Prekrtnutie" +msgstr "Prekrtnut" #. MENU_STATUSLINE_FMT_STRIKE -#: po/tmp/ap_String_Id.h.h:2330 +#: po/tmp/ap_String_Id.h.h:2302 msgid "Strikeout the selection (toggle)" -msgstr "Prekrtnutie psma vo vybranej asti" +msgstr "Prekrtne text vo vybranej asti" #. MENU_LABEL_FMT_STYLIST -#: po/tmp/ap_String_Id.h.h:2332 +#: po/tmp/ap_String_Id.h.h:2304 msgid "Sty&list" -msgstr "ty&lista" +msgstr "&Zoznam tlov" #. TOOLBAR_LABEL_FMT_STYLE #. TOOLBAR_STATUSLINE_FMT_STYLE #. TOOLBAR_TOOLTIP_FMT_STYLE -#: po/tmp/ap_String_Id.h.h:2336 +#: po/tmp/ap_String_Id.h.h:2308 msgid "Style" -msgstr "tl" +msgstr "tl" #. DLG_Styles_ErrNotTitle1 -#: po/tmp/ap_String_Id.h.h:2338 +#: po/tmp/ap_String_Id.h.h:2310 msgid "Style Name - " -msgstr "Nzov tlu - " +msgstr "Nzov tlu - " #. DLG_Styles_ModifyName -#: po/tmp/ap_String_Id.h.h:2340 +#: po/tmp/ap_String_Id.h.h:2312 msgid "Style Name:" -msgstr "Nzov tlu:" +msgstr "Nzov tlu:" #. DLG_Styles_ModifyType -#: po/tmp/ap_String_Id.h.h:2342 +#: po/tmp/ap_String_Id.h.h:2314 msgid "Style Type" -msgstr "Typ tlu" +msgstr "Typ tlu" #. DLG_Styles_ModifyFollowing -#: po/tmp/ap_String_Id.h.h:2344 +#: po/tmp/ap_String_Id.h.h:2316 msgid "Style for following paragraph" -msgstr "tl nsledujceho odseku" +msgstr "tl alieho odseku" #. DLG_Styles_ErrBlankName -#: po/tmp/ap_String_Id.h.h:2346 +#: po/tmp/ap_String_Id.h.h:2318 msgid "Style name cannot be left blank" -msgstr "Nzov stylu neme obsahova przdny znak vavo" +msgstr "Nzov tlu neme osta nevyplnen" #. DLG_Lists_Style #. DLG_UFS_StyleLabel -#: po/tmp/ap_String_Id.h.h:2348 po/tmp/xap_String_Id.h.h:703 +#: po/tmp/ap_String_Id.h.h:2320 +#: po/tmp/xap_String_Id.h.h:707 msgid "Style:" -msgstr "tl:" +msgstr "tl:" #. DLG_Styles_StylesTitle #. DLG_Stylist_Styles -#: po/tmp/ap_String_Id.h.h:2351 +#: po/tmp/ap_String_Id.h.h:2323 msgid "Styles" -msgstr "tly" +msgstr "tly" #. DLG_Stylist_Title -#: po/tmp/ap_String_Id.h.h:2353 +#: po/tmp/ap_String_Id.h.h:2325 msgid "Stylist" -msgstr "Zoznam tlov" +msgstr "Zoznam tlov" #. FIELD_Document_Subject -#: po/tmp/ap_String_Id.h.h:2355 +#: po/tmp/ap_String_Id.h.h:2327 msgid "Subject" msgstr "Predmet" #. DLG_MetaData_Subject_LBL -#: po/tmp/ap_String_Id.h.h:2357 +#: po/tmp/ap_String_Id.h.h:2329 msgid "Subject:" -msgstr "Predmet:" +msgstr "Predmet (Vec):" #. TOOLBAR_LABEL_FMT_SUBSCRIPT #. TOOLBAR_STATUSLINE_FMT_SUBSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUBSCRIPT #. DLG_UFS_SubScript -#: po/tmp/ap_String_Id.h.h:2361 po/tmp/xap_String_Id.h.h:707 +#: po/tmp/ap_String_Id.h.h:2333 +#: po/tmp/xap_String_Id.h.h:711 msgid "Subscript" msgstr "Doln index" #. DLG_Spell_Suggestions -#: po/tmp/ap_String_Id.h.h:2363 +#: po/tmp/ap_String_Id.h.h:2335 msgid "Sugg&estions:" msgstr "Nvr&hy:" #. DLG_Options_Label_SpellMainOnly -#: po/tmp/ap_String_Id.h.h:2365 +#: po/tmp/ap_String_Id.h.h:2337 msgid "Suggest from &main dictionary only" -msgstr "Ukza nvrhy len z &hlavnho slovnka" +msgstr "Ukazova nvrhy len z &hlavnho slovnka" #. MENU_LABEL_TABLE_INSERT_SUMROWS -#: po/tmp/ap_String_Id.h.h:2367 +#: po/tmp/ap_String_Id.h.h:2339 msgid "Sum a Column" -msgstr "Set stpca" +msgstr "Sta stpec" #. MENU_LABEL_TABLE_INSERT_SUMCOLS -#: po/tmp/ap_String_Id.h.h:2369 +#: po/tmp/ap_String_Id.h.h:2341 msgid "Sum a Row" -msgstr "Set riadka" +msgstr "Sta riadok" #. FIELD_Numbers_TableSumRows -#: po/tmp/ap_String_Id.h.h:2371 +#: po/tmp/ap_String_Id.h.h:2343 msgid "Sum a Table Column" -msgstr "Sta stpec tabuky" +msgstr "Sta stpec tabuky" #. FIELD_Numbers_TableSumCols -#: po/tmp/ap_String_Id.h.h:2373 +#: po/tmp/ap_String_Id.h.h:2345 msgid "Sum a Table Row" -msgstr "Sta riadok tabuky" +msgstr "Sta riadok tabuky" #. DLG_MetaData_TAB_Summary -#: po/tmp/ap_String_Id.h.h:2375 +#: po/tmp/ap_String_Id.h.h:2347 msgid "Summary" msgstr "Shrn" #. MENU_LABEL_FMT_SUPERSCRIPT -#: po/tmp/ap_String_Id.h.h:2377 +#: po/tmp/ap_String_Id.h.h:2349 msgid "Supe&rscript" -msgstr "Ho&rn index" +msgstr "ho&rn index" #. TOOLBAR_LABEL_FMT_SUPERSCRIPT #. TOOLBAR_STATUSLINE_FMT_SUPERSCRIPT #. TOOLBAR_TOOLTIP_FMT_SUPERSCRIPT #. DLG_UFS_SuperScript -#: po/tmp/ap_String_Id.h.h:2381 po/tmp/xap_String_Id.h.h:709 +#: po/tmp/ap_String_Id.h.h:2353 +#: po/tmp/xap_String_Id.h.h:713 msgid "Superscript" msgstr "Horn index" #. MENU_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2383 +#: po/tmp/ap_String_Id.h.h:2355 msgid "Sy&mbol" msgstr "&Symbol" #. TOOLBAR_LABEL_INSERT_SYMBOL -#: po/tmp/ap_String_Id.h.h:2385 +#: po/tmp/ap_String_Id.h.h:2357 msgid "Symbol" msgstr "Symbol" #. MENU_LABEL_TABLE -#: po/tmp/ap_String_Id.h.h:2387 +#: po/tmp/ap_String_Id.h.h:2359 msgid "T&able" -msgstr "T&abuka" +msgstr "T&abuka" #. TabStopStatus -#: po/tmp/ap_String_Id.h.h:2389 +#: po/tmp/ap_String_Id.h.h:2361 #, c-format msgid "Tab Stop [%s]" msgstr "Rozmiestnenie tabultorov [%s]" #. DLG_Tab_Label_TabPosition -#: po/tmp/ap_String_Id.h.h:2391 +#: po/tmp/ap_String_Id.h.h:2363 msgid "Tab stop position:" msgstr "Pozcia tabultora:" #. DLG_Tab_Label_TabToClear -#: po/tmp/ap_String_Id.h.h:2393 +#: po/tmp/ap_String_Id.h.h:2365 msgid "Tab stops to be cleared:" -msgstr "Tabultory na odstrnenie:" +msgstr "Odstrni tabultory:" #. DLG_FormatTable_Apply_To_Table #. MENU_STATUSLINE_TABLE #. TB_Table -#: po/tmp/ap_String_Id.h.h:2397 po/tmp/xap_String_Id.h.h:719 +#: po/tmp/ap_String_Id.h.h:2369 +#: po/tmp/xap_String_Id.h.h:723 msgid "Table" -msgstr "Tabuka" +msgstr "Tabuka" #. DLG_InsertTable_TableSize_Capital -#: po/tmp/ap_String_Id.h.h:2399 +#: po/tmp/ap_String_Id.h.h:2371 msgid "Table Size" -msgstr "Vekos tabuky" +msgstr "Vekos tabuky" #. DLG_Options_Label_ViewTableTB -#: po/tmp/ap_String_Id.h.h:2401 +#: po/tmp/ap_String_Id.h.h:2373 msgid "Table Toolbar" -msgstr "Nstroje tabuky" +msgstr "Nstroje tabuky" #. MENU_LABEL_INSERT_TABLEOFCONTENTS #. MENU_LABEL_FMT_TABLEOFCONTENTS -#: po/tmp/ap_String_Id.h.h:2404 +#: po/tmp/ap_String_Id.h.h:2376 msgid "Table of Contents" msgstr "Obsah" #. FIELD_Numbers_TOCListLabel -#: po/tmp/ap_String_Id.h.h:2406 +#: po/tmp/ap_String_Id.h.h:2378 msgid "Table of Contents List Label" msgstr "Nadpis obsahu" #. FIELD_Numbers_TOCPageNumber -#: po/tmp/ap_String_Id.h.h:2408 +#: po/tmp/ap_String_Id.h.h:2380 msgid "Table of Contents Page" msgstr "Strana s obsahom" #. DLG_InsertTable_TableSize -#: po/tmp/ap_String_Id.h.h:2410 +#: po/tmp/ap_String_Id.h.h:2382 msgid "Table size" -msgstr "Vekos tabuky" +msgstr "Vekos tabuky" #. DLG_Styles_ModifyTabs #. DLG_Tab_TabTitle -#: po/tmp/ap_String_Id.h.h:2413 +#: po/tmp/ap_String_Id.h.h:2385 msgid "Tabs" msgstr "Tabultory" #. DLG_FormatTOC_DetailsTabPage -#: po/tmp/ap_String_Id.h.h:2415 +#: po/tmp/ap_String_Id.h.h:2387 msgid "Tabs and Page Numbering" msgstr "Tabultory a slovanie" #. MENU_LABEL_FMT -#: po/tmp/ap_String_Id.h.h:2417 +#: po/tmp/ap_String_Id.h.h:2389 msgid "Te&xt Formatting" msgstr "Formtovanie te&xtu" #. DLG_Options_Label_Text -#: po/tmp/ap_String_Id.h.h:2419 +#: po/tmp/ap_String_Id.h.h:2391 msgid "Text" msgstr "Text" #. DLG_FormatTOC_TextAfter -#: po/tmp/ap_String_Id.h.h:2421 +#: po/tmp/ap_String_Id.h.h:2393 msgid "Text &after:" msgstr "Text &za:" #. DLG_FormatTOC_TextBefore -#: po/tmp/ap_String_Id.h.h:2423 +#: po/tmp/ap_String_Id.h.h:2395 msgid "Text &before:" msgstr "Text &pred:" #. DLG_Lists_Align -#: po/tmp/ap_String_Id.h.h:2425 +#: po/tmp/ap_String_Id.h.h:2397 msgid "Text Align:" msgstr "Zarovnanie textu:" #. MENU_LABEL_INSERT_TEXTBOX #. MENU_LABEL_FMT_FRAME -#: po/tmp/ap_String_Id.h.h:2428 +#: po/tmp/ap_String_Id.h.h:2400 msgid "Text Box" msgstr "Textov rm" #. DLG_Lists_PageFolding -#: po/tmp/ap_String_Id.h.h:2430 +#: po/tmp/ap_String_Id.h.h:2402 msgid "Text Folding" -msgstr "Text Folding" +msgstr "Skrvanie textu" #. DLG_FormatFrame_TextWrapping -#: po/tmp/ap_String_Id.h.h:2432 +#: po/tmp/ap_String_Id.h.h:2404 msgid "Text Wrapping" msgstr "Zalomenie textu" #. DLG_Options_Label_Both -#: po/tmp/ap_String_Id.h.h:2434 +#: po/tmp/ap_String_Id.h.h:2406 msgid "Text and Icon" msgstr "Text a ikona" #. DLG_PageSetup_ErrBigMargins -#: po/tmp/ap_String_Id.h.h:2436 +#: po/tmp/ap_String_Id.h.h:2408 msgid "The margins selected are too large to fit on the page." -msgstr "Vybran okraje s prli vek." +msgstr "Vybran okraje s prli vek." #. DLG_Options_Prompt_YouMustRestart -#: po/tmp/ap_String_Id.h.h:2438 -msgid "" -"The new user interface language will take effect the next time that you " -"start the application" -msgstr "" -"Nov jazyk uvateskho rozhrania sa prejav a po alom spusten " -"programu." +#: po/tmp/ap_String_Id.h.h:2410 +msgid "The new user interface language will take effect the next time that you start the application" +msgstr "Uvatesk rozhranie sa zobraz v novom jazyku a po optovnom spusten programu." #. MSG_SpellDone -#: po/tmp/ap_String_Id.h.h:2440 +#: po/tmp/ap_String_Id.h.h:2412 msgid "The spelling check is complete." msgstr "Kontrola preklepov je dokonen." #. MSG_HyperlinkCrossesBoundaries -#: po/tmp/ap_String_Id.h.h:2442 -msgid "" -"The text to which the hyperlink is to be attached must be within a single " -"paragraph." -msgstr "" -"Text, ku ktormu m by pripojen hypertextov odkaz, mus by napsan " -"v jednom odseku." +#: po/tmp/ap_String_Id.h.h:2414 +msgid "The text to which the hyperlink is to be attached must be within a single paragraph." +msgstr "Text, ku ktormu m by pripojen hypertextov odkaz, mus by napsan v jednom odseku." #. FIELD_DateTime_Wkday -#: po/tmp/ap_String_Id.h.h:2444 +#: po/tmp/ap_String_Id.h.h:2416 msgid "The weekday" msgstr "Pracovn de" #. DLG_FormatTable_Thickness -#: po/tmp/ap_String_Id.h.h:2446 +#: po/tmp/ap_String_Id.h.h:2418 msgid "Thickness:" msgstr "Hrbka:" #. MSG_AfterRestartNew -#: po/tmp/ap_String_Id.h.h:2448 -msgid "" -"This change will only take effect when you restart AbiWord or create a new " -"document." -msgstr "" -"Zmeny sa prejavia len ak znova spustte AbiWord alebo vytvorte nov " -"dokument." +#: po/tmp/ap_String_Id.h.h:2420 +msgid "This change will only take effect when you restart AbiWord or create a new document." +msgstr "Zmeny sa prejavia len ak znova spustte AbiWord alebo vytvorte nov dokument." #. MSG_HiddenRevisions -#: po/tmp/ap_String_Id.h.h:2450 -msgid "" -"This document contains revisions which are currently hidden from view. " -"Please see AbiWord documentation for information on working with revisions." -msgstr "" -"V dokumente boli uroben zmeny, ktor teraz nevidno. Viac o prci so zmenami " -"v texte njdete v dokumentcii k programu AbiWord." +#: po/tmp/ap_String_Id.h.h:2422 +msgid "This document contains revisions which are currently hidden from view. Please see AbiWord documentation for information on working with revisions." +msgstr "V dokumente boli uroben zmeny, ktor teraz nevidno. Viac o prci so zmenami v texte njdete v dokumentcii k programu AbiWord." #. DLG_Para_PreviewSampleFallback -#: po/tmp/ap_String_Id.h.h:2452 -msgid "" -"This paragraph represents words as they might appear in your document. To " -"see text from your document used in this preview, position your cursor in a " -"document paragraph with some text in it and open this dialog." -msgstr "" -"Tento odsek predstavuje slova tak, ako sa mu objavi vo vaom " -"dokumente. Ak chcete vidie text vho dokumentu v tomto zobrazen, " -"nastavte kurzor na niektor odsek textu a otvorte toto okno." +#: po/tmp/ap_String_Id.h.h:2424 +msgid "This paragraph represents words as they might appear in your document. To see text from your document used in this preview, position your cursor in a document paragraph with some text in it and open this dialog." +msgstr "Tento odsek ukazuje slov tak, ako sa mu objavi vo vaom dokumente. Ak chcete vidie text vho dokumentu v tomto zobrazen, nastavte kurzor na niektor odsek a otvorte toto okno." #. DLG_Styles_ErrStyleNot -#: po/tmp/ap_String_Id.h.h:2454 +#: po/tmp/ap_String_Id.h.h:2426 msgid "" "This style does not exist \n" " so it cannot be modified" msgstr "" -"Tento tl neexistuje \n" -" take sa ned upravi" +"Tento tl neexistuje, \n" +"take sa ned upravi" #. DLG_Column_Three -#: po/tmp/ap_String_Id.h.h:2456 +#: po/tmp/ap_String_Id.h.h:2428 msgid "Three" msgstr "Tri" #. DLG_Lists_Tick_List #. STYLE_TICKLIST -#: po/tmp/ap_String_Id.h.h:2458 po/tmp/xap_String_Id.h.h:751 +#: po/tmp/ap_String_Id.h.h:2430 +#: po/tmp/xap_String_Id.h.h:757 msgid "Tick List" -msgstr "Odrky v tvare bodiek" +msgstr "Odrky v tvare bodiek" #. FIELD_DateTime_TimeZone -#: po/tmp/ap_String_Id.h.h:2460 +#: po/tmp/ap_String_Id.h.h:2432 msgid "Time Zone" msgstr "asov psmo" #. FIELD_Document_Title -#: po/tmp/ap_String_Id.h.h:2462 +#: po/tmp/ap_String_Id.h.h:2434 msgid "Title" msgstr "Nzov" #. DLG_ToggleCase_TitleCase -#: po/tmp/ap_String_Id.h.h:2464 +#: po/tmp/ap_String_Id.h.h:2436 msgid "Title Case" -msgstr "Mal/Vek psmen v nadpise" +msgstr "Vek psmen" #. DLG_MetaData_Title_LBL -#. DLG_Annotation_Title_LBL #. DLG_Image_LblTitle -#: po/tmp/ap_String_Id.h.h:2467 po/tmp/xap_String_Id.h.h:755 +#: po/tmp/ap_String_Id.h.h:2438 +#: po/tmp/xap_String_Id.h.h:761 msgid "Title:" msgstr "Nzov:" #. DLG_Options_Label_Toolbars -#: po/tmp/ap_String_Id.h.h:2469 +#: po/tmp/ap_String_Id.h.h:2440 msgid "Toolbars" msgstr "Panely s nstrojmi" #. TopMarginStatus -#: po/tmp/ap_String_Id.h.h:2471 +#: po/tmp/ap_String_Id.h.h:2442 #, c-format msgid "Top Margin [%s]" msgstr "Horn okraj [%s]" @@ -6044,133 +5938,139 @@ #. TOOLBAR_STATUSLINE_FMT_TOPLINE #. TOOLBAR_TOOLTIP_FMT_TOPLINE #. DLG_UFS_ToplineCheck -#: po/tmp/ap_String_Id.h.h:2476 po/tmp/xap_String_Id.h.h:761 +#: po/tmp/ap_String_Id.h.h:2447 +#: po/tmp/xap_String_Id.h.h:767 msgid "Topline" msgstr "Horn riadok" #. DLG_Lists_Triangle_List #. STYLE_TRIANGLELIST -#: po/tmp/ap_String_Id.h.h:2478 po/tmp/xap_String_Id.h.h:763 +#: po/tmp/ap_String_Id.h.h:2449 +#: po/tmp/xap_String_Id.h.h:769 msgid "Triangle List" -msgstr "Odrky v tvare trojuholnka" +msgstr "Odrky v tvare trojuholnka" #. DLG_Column_Two -#: po/tmp/ap_String_Id.h.h:2480 +#: po/tmp/ap_String_Id.h.h:2451 msgid "Two" msgstr "Dva" #. FIELD_Document_Type -#: po/tmp/ap_String_Id.h.h:2482 +#: po/tmp/ap_String_Id.h.h:2453 msgid "Type" msgstr "Typ" #. DLG_InsertBookmark_Msg -#: po/tmp/ap_String_Id.h.h:2484 +#: po/tmp/ap_String_Id.h.h:2455 msgid "Type a name for the bookmark, or select an existing from the list." -msgstr "Zadejte nzov pre zloku, alebo vyberte existujci zo seznamu." +msgstr "Zadajte nzov pre nov zloku, alebo nejak vyberte zo zoznamu." #. DLG_Lists_Type -#: po/tmp/ap_String_Id.h.h:2486 +#: po/tmp/ap_String_Id.h.h:2457 msgid "Type:" msgstr "Typ:" #. DLG_ToggleCase_UpperCase -#: po/tmp/ap_String_Id.h.h:2488 +#: po/tmp/ap_String_Id.h.h:2459 msgid "UPPERCASE" -msgstr "VEK PSMEN" +msgstr "VEK PSMEN" #. TOOLBAR_LABEL_FMT_UNDERLINE #. TOOLBAR_STATUSLINE_FMT_UNDERLINE #. TOOLBAR_TOOLTIP_FMT_UNDERLINE #. DLG_UFS_UnderlineCheck -#: po/tmp/ap_String_Id.h.h:2492 po/tmp/xap_String_Id.h.h:783 +#: po/tmp/ap_String_Id.h.h:2463 +#: po/tmp/xap_String_Id.h.h:789 msgid "Underline" -msgstr "Podtiarknut" +msgstr "Podiarknut" #. MENU_STATUSLINE_FMT_UNDERLINE -#: po/tmp/ap_String_Id.h.h:2494 +#: po/tmp/ap_String_Id.h.h:2465 msgid "Underline the selection (toggle)" -msgstr "Podiarknutie psma vo vybranej asti" +msgstr "Psmo vo vybranej asti sa podiarkne" #. TOOLBAR_LABEL_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2496 +#: po/tmp/ap_String_Id.h.h:2467 msgid "Undo" -msgstr "Sp" +msgstr "Sp" #. MENU_STATUSLINE_EDIT_UNDO #. TOOLBAR_STATUSLINE_EDIT_UNDO #. TOOLBAR_TOOLTIP_EDIT_UNDO -#: po/tmp/ap_String_Id.h.h:2500 +#: po/tmp/ap_String_Id.h.h:2471 msgid "Undo editing" -msgstr "Sp pravy" +msgstr "Sp pravy" #. DLG_Lists_Upper_Case_List #. STYLE_UPPERCASTELIST -#: po/tmp/ap_String_Id.h.h:2502 po/tmp/xap_String_Id.h.h:817 +#: po/tmp/ap_String_Id.h.h:2473 +#: po/tmp/xap_String_Id.h.h:823 msgid "Upper Case List" -msgstr "Abecedn zoznam (vek psmen)" +msgstr "Abecedn zoznam (vek psmen)" #. DLG_Lists_Upper_Roman_List #. STYLE_UPPERROMANLIST -#: po/tmp/ap_String_Id.h.h:2504 po/tmp/xap_String_Id.h.h:819 +#: po/tmp/ap_String_Id.h.h:2475 +#: po/tmp/xap_String_Id.h.h:825 msgid "Upper Roman List" -msgstr "mske slice (vek)" +msgstr "Vek rmske slice" #. DLG_Column_RtlOrder -#: po/tmp/ap_String_Id.h.h:2506 +#: po/tmp/ap_String_Id.h.h:2477 msgid "Use RTL Order" -msgstr "Poui RTL poradie" +msgstr "Poui poradie sprava doava" #. DLG_Options_Label_HebrewContextGlyphs -#: po/tmp/ap_String_Id.h.h:2508 +#: po/tmp/ap_String_Id.h.h:2479 msgid "Use glyph shaping for Hebrew" -msgstr "Poui ozdobn tvary pre hebrejinu" +msgstr "Poui ozdobn tvary pre hebrejinu" #. DLG_Options_Label_UI -#: po/tmp/ap_String_Id.h.h:2510 +#: po/tmp/ap_String_Id.h.h:2481 msgid "User Interface" -msgstr "Uivatesk rozhranie" +msgstr "Uvatesk rozhranie" #. DLG_Options_Label_UILang -#: po/tmp/ap_String_Id.h.h:2512 +#: po/tmp/ap_String_Id.h.h:2483 msgid "User Interface Language" msgstr "Vyberte jazyk pre rozhranie" #. DLG_Stylist_UserStyles -#: po/tmp/ap_String_Id.h.h:2514 +#: po/tmp/ap_String_Id.h.h:2485 msgid "User defined Styles" -msgstr "Uvatemi definovan tly" +msgstr "tly vytvoren uvatemi" #. DLG_Tab_Label_Existing -#: po/tmp/ap_String_Id.h.h:2516 +#: po/tmp/ap_String_Id.h.h:2487 msgid "User-defined Tabs" -msgstr "Uvatemi definovan tabultory" +msgstr "Tabultory zadan uvateom" #. DLG_Styles_LBL_UserDefined -#: po/tmp/ap_String_Id.h.h:2518 +#: po/tmp/ap_String_Id.h.h:2489 msgid "User-defined styles" -msgstr "Uvatemi definovan tly" +msgstr "tly vytvoren uvatemi" #. FIELD_Application_Version #. DLG_History_Version_Version -#: po/tmp/ap_String_Id.h.h:2520 po/tmp/xap_String_Id.h.h:827 +#: po/tmp/ap_String_Id.h.h:2491 +#: po/tmp/xap_String_Id.h.h:833 msgid "Version" msgstr "Verzia" #. DLG_Options_TabLabel_View -#: po/tmp/ap_String_Id.h.h:2522 +#: po/tmp/ap_String_Id.h.h:2493 msgid "View" -msgstr "Zobrazi" +msgstr "Zobrazi" #. MENU_STATUSLINE_TOOLS_HISTORY_SHOW -#: po/tmp/ap_String_Id.h.h:2524 +#: po/tmp/ap_String_Id.h.h:2495 msgid "View document history" msgstr "Zobraz histriu dokumentu" #. MENU_STATUSLINE_VIEW_FULLSCREEN -#: po/tmp/ap_String_Id.h.h:2526 +#: po/tmp/ap_String_Id.h.h:2497 msgid "View the document in full screen mode" -msgstr "Zobraz dokument na cel obrazovku" +msgstr "Cel stranu zobraz v jednom okne" #. MENU_STATUSLINE_WINDOW_1 #. MENU_STATUSLINE_WINDOW_2 @@ -6181,195 +6081,196 @@ #. MENU_STATUSLINE_WINDOW_7 #. MENU_STATUSLINE_WINDOW_8 #. MENU_STATUSLINE_WINDOW_9 -#: po/tmp/ap_String_Id.h.h:2536 +#: po/tmp/ap_String_Id.h.h:2507 msgid "View this document" msgstr "Zobraz tento dokument" #. DLG_Options_Label_ViewTooltips -#: po/tmp/ap_String_Id.h.h:2538 +#: po/tmp/ap_String_Id.h.h:2509 msgid "View tooltips" -msgstr "Zobrazi tipy v paneli" +msgstr "Zobrazi tipy v paneli" #. DLG_Options_Label_ViewViewFrame -#: po/tmp/ap_String_Id.h.h:2540 +#: po/tmp/ap_String_Id.h.h:2511 msgid "View..." -msgstr "Zobrazi..." +msgstr "Zobrazi..." #. DLG_Options_Label_Visible -#: po/tmp/ap_String_Id.h.h:2542 +#: po/tmp/ap_String_Id.h.h:2513 msgid "Visible" -msgstr "Viditenos" +msgstr "Viditenos" #. MSG_HyperlinkNoBookmark -#: po/tmp/ap_String_Id.h.h:2544 +#: po/tmp/ap_String_Id.h.h:2515 #, c-format msgid "Warning: the bookmark you provided [%s] does not exist." -msgstr "Varovanie: zadan zloka [%s] neexistuje." +msgstr "Varovanie: zadan zloka [%s] neexistuje." #. MENU_STATUSLINE_VIEW_WEB -#: po/tmp/ap_String_Id.h.h:2546 +#: po/tmp/ap_String_Id.h.h:2517 msgid "Web Layout" -msgstr "Umiestnenie webu" +msgstr "Webov zobrazenie" #. DLG_Styles_LBL_TxtMsg -#: po/tmp/ap_String_Id.h.h:2548 +#: po/tmp/ap_String_Id.h.h:2519 msgid "What Hath God Wrought" msgstr "o Boh stvoril" #. DLG_Options_Label_WithExtension -#: po/tmp/ap_String_Id.h.h:2550 +#: po/tmp/ap_String_Id.h.h:2521 msgid "With extension:" msgstr "Prpona:" #. DLG_WordCount_WordCountTitle #. FIELD_Numbers_WordCount -#: po/tmp/ap_String_Id.h.h:2553 +#: po/tmp/ap_String_Id.h.h:2524 msgid "Word Count" msgstr "Poet slov" #. DLG_NEW_Tab1 -#: po/tmp/ap_String_Id.h.h:2555 +#: po/tmp/ap_String_Id.h.h:2526 msgid "Wordprocessing" msgstr "Sprva slov" #. DLG_WordCount_Words_No_Notes -#: po/tmp/ap_String_Id.h.h:2557 +#: po/tmp/ap_String_Id.h.h:2528 msgid "Words (no footnotes/endnotes):" -msgstr "Poet slov (bez poznmky pod iarou a koncovej poznmky):" +msgstr "Slov bez pozn. pod . a konc. p.:" #. DLG_Options_Label_SpellUppercase -#: po/tmp/ap_String_Id.h.h:2559 +#: po/tmp/ap_String_Id.h.h:2530 msgid "Words in &UPPERCASE" -msgstr "Slova &VEKMI psmenami" +msgstr "slov s &VEKMI psmenami" #. DLG_Options_Label_SpellNumbers -#: po/tmp/ap_String_Id.h.h:2561 +#: po/tmp/ap_String_Id.h.h:2532 msgid "Words with num&bers" -msgstr "Slova s s&lami" +msgstr "slov s s&lami" #. DLG_WordCount_Words -#: po/tmp/ap_String_Id.h.h:2563 +#: po/tmp/ap_String_Id.h.h:2534 msgid "Words:" msgstr "Poet slov:" #. MSG_SaveFailedWrite -#: po/tmp/ap_String_Id.h.h:2565 +#: po/tmp/ap_String_Id.h.h:2536 #, c-format msgid "Writing error when attempting to save %s" -msgstr "Sbor %s se nepodarilo uloi." +msgstr "Pri pokuse uloi sbor %s sa vyskytla chyba zpisu." #. MSG_DefaultDirectionChg -#: po/tmp/ap_String_Id.h.h:2567 +#: po/tmp/ap_String_Id.h.h:2538 msgid "You have changed the default direction." -msgstr "Zmenili ste pvodn smer." +msgstr "Zmenili ste pvodn smer textu." #. MSG_DirectionModeChg -#: po/tmp/ap_String_Id.h.h:2569 +#: po/tmp/ap_String_Id.h.h:2540 msgid "You have changed the direction mode." -msgstr "Zmenili ste smer." +msgstr "Zmenili ste reim smeru textu." #. MSG_HyperlinkNoSelection -#: po/tmp/ap_String_Id.h.h:2571 +#: po/tmp/ap_String_Id.h.h:2542 msgid "You must select a portion of the document before inserting a hyperlink." -msgstr "Pred vloenm hypertextovho odkazu muste najprv oznai as textu." +msgstr "Pred vloenm hypertextovho odkazu muste oznai as textu." #. DLG_Options_Label_InvalidRangeForAutoSave -#: po/tmp/ap_String_Id.h.h:2573 +#: po/tmp/ap_String_Id.h.h:2544 msgid "You should choose a range from 1 to 120 for the auto save frequency" -msgstr "Rozsah asu pre automatick ukladanie treba zvoli od 1 do 120" +msgstr "Ako as automatickho ukladania treba zvoli slo od 1 do 120" #. MSG_ConfirmSaveSecondary -#: po/tmp/ap_String_Id.h.h:2575 +#: po/tmp/ap_String_Id.h.h:2546 msgid "Your changes will be lost if you don't save them." -msgstr "Ak neulote zmeny, stratia sa." +msgstr "Ak neulote zmeny, stratia sa." #. TOOLBAR_LABEL_ZOOM #. TOOLBAR_STATUSLINE_ZOOM #. TOOLBAR_TOOLTIP_ZOOM #. DLG_Zoom_ZoomTitle -#: po/tmp/ap_String_Id.h.h:2579 po/tmp/xap_String_Id.h.h:876 +#: po/tmp/ap_String_Id.h.h:2550 +#: po/tmp/xap_String_Id.h.h:882 msgid "Zoom" -msgstr "Zvenie" +msgstr "Zvenie" #. MENU_LABEL_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2581 +#: po/tmp/ap_String_Id.h.h:2552 msgid "Zoom to &100%" -msgstr "Zvi na &100%" +msgstr "zvi na &100%" #. MENU_LABEL_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2583 +#: po/tmp/ap_String_Id.h.h:2554 msgid "Zoom to &200%" -msgstr "Zvi na &200%" +msgstr "zvi na &200%" #. MENU_LABEL_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2585 +#: po/tmp/ap_String_Id.h.h:2556 msgid "Zoom to &50%" -msgstr "Zvi na &50%" +msgstr "zvi na &50%" #. MENU_LABEL_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2587 +#: po/tmp/ap_String_Id.h.h:2558 msgid "Zoom to &75%" -msgstr "Zvi na &75%" +msgstr "zvi na &75%" #. MENU_STATUSLINE_VIEW_ZOOM_100 -#: po/tmp/ap_String_Id.h.h:2589 +#: po/tmp/ap_String_Id.h.h:2560 msgid "Zoom to 100%" -msgstr "Zv na 100%" +msgstr "Zv na 100%" #. MENU_STATUSLINE_VIEW_ZOOM_200 -#: po/tmp/ap_String_Id.h.h:2591 +#: po/tmp/ap_String_Id.h.h:2562 msgid "Zoom to 200%" -msgstr "Zv na 200%" +msgstr "Zv na 200%" #. MENU_STATUSLINE_VIEW_ZOOM_50 -#: po/tmp/ap_String_Id.h.h:2593 +#: po/tmp/ap_String_Id.h.h:2564 msgid "Zoom to 50%" -msgstr "Zv na 50%" +msgstr "Zv na 50%" #. MENU_STATUSLINE_VIEW_ZOOM_75 -#: po/tmp/ap_String_Id.h.h:2595 +#: po/tmp/ap_String_Id.h.h:2566 msgid "Zoom to 75%" -msgstr "Zv na 75%" +msgstr "Zv na 75%" #. MENU_STATUSLINE_VIEW_ZOOM_WIDTH -#: po/tmp/ap_String_Id.h.h:2597 +#: po/tmp/ap_String_Id.h.h:2568 msgid "Zoom to page width" -msgstr "Zv na rku strany" +msgstr "Zv na rku strany" #. MENU_STATUSLINE_VIEW_ZOOM_WHOLE -#: po/tmp/ap_String_Id.h.h:2599 +#: po/tmp/ap_String_Id.h.h:2570 msgid "Zoom to whole page" -msgstr "Zv na cel stranu" +msgstr "Cel stranu zobraz v jednom okne" #. DLG_Options_Label_CustomDict -#: po/tmp/ap_String_Id.h.h:2601 +#: po/tmp/ap_String_Id.h.h:2572 msgid "custom.dic" msgstr "custom.dic" #. FIELD_DateTime_DDMMYY -#: po/tmp/ap_String_Id.h.h:2603 +#: po/tmp/ap_String_Id.h.h:2574 msgid "dd/mm/yy" msgstr "dd/mm/yy" #. DLG_ToggleCase_LowerCase -#: po/tmp/ap_String_Id.h.h:2605 +#: po/tmp/ap_String_Id.h.h:2576 msgid "lowercase" msgstr "mal psmen" #. DLG_Options_Label_Minutes -#: po/tmp/ap_String_Id.h.h:2607 +#: po/tmp/ap_String_Id.h.h:2578 msgid "minutes" msgstr "minty" #. FIELD_DateTime_MMDDYY -#: po/tmp/ap_String_Id.h.h:2609 +#: po/tmp/ap_String_Id.h.h:2580 msgid "mm/dd/yy" msgstr "mm/dd/yy" #. DLG_ToggleCase_ToggleCase -#: po/tmp/ap_String_Id.h.h:2611 +#: po/tmp/ap_String_Id.h.h:2582 msgid "tOGGLE cASE" -msgstr "zmeni vekos" +msgstr "zmeni mal/vek psmen" #. #. * Translatable strings file generated by extract-ui. @@ -6398,12 +6299,12 @@ #. DLG_Zoom_PageWidth #: po/tmp/xap_String_Id.h.h:17 msgid "&Page width" -msgstr "rka s&trany" +msgstr "rka s&trany" #. DLG_ULANG_SetLangButton #: po/tmp/xap_String_Id.h.h:19 msgid "&Set Language" -msgstr "Nastavi &jazyk" +msgstr "Nastavi &jazyk" #. DLG_Zoom_WholePage #: po/tmp/xap_String_Id.h.h:23 @@ -6413,7 +6314,7 @@ #. LANG_0 #: po/tmp/xap_String_Id.h.h:25 msgid "(no proofing)" -msgstr "(bez kontroly)" +msgstr "(nekontrolova)" #. DLG_DocComparison_TestSkipped #: po/tmp/xap_String_Id.h.h:27 @@ -6428,7 +6329,7 @@ #. DLG_PLUGIN_MANAGER_TITLE #: po/tmp/xap_String_Id.h.h:31 msgid "AbiWord Plugin Manager" -msgstr "Sprvca modulov pre Abiword" +msgstr "Sprvca modulov Abiwordu" #. SPELL_CANTLOAD_DLL #: po/tmp/xap_String_Id.h.h:33 @@ -6437,32 +6338,25 @@ "AbiWord cannot find the spelling file %s.dll\n" "Please download and install Aspell from http://aspell.net/win32/" msgstr "" -"AbiWord nemohol njs sbor pre kontrolu preklepov %s.dll\n" -"Prosm stiahnite a naintalujte si Aspell z http://aspell.net/win32/" +"AbiWord nemohol njs sbor pre kontrolu preklepov %s.dll\n" +"Prosm, stiahnite a naintalujte si Aspell z http://aspell.net/win32/" #. MSG_HistoryPartRestore1 #: po/tmp/xap_String_Id.h.h:35 #, c-format -msgid "" -"AbiWord cannot fully restore version %d of the document because the version " -"information is incomplete." -msgstr "" -"AboWord nemohol plne obnovi verziu %d dokumentu, pretoe informcie o verzii " -"nie s kompletn." +msgid "AbiWord cannot fully restore version %d of the document because the version information is incomplete." +msgstr "AbiWord nemohol plne obnovi verziu dokumentu %d, pretoe informcie o verzii nie s pln." #. MSG_HistoryNoRestore #: po/tmp/xap_String_Id.h.h:37 #, c-format -msgid "" -"AbiWord cannot restore version %d of the document because the version " -"information is missing." -msgstr "" -"AboWord nemohol obnovi verziu %d dokumentu, pretoe informcie o verzii chbaj." +msgid "AbiWord cannot restore version %d of the document because the version information is missing." +msgstr "AbiWord nemohol obnovi verziu dokumentu %d, pretoe informcie o verzii chbaj." #. DLG_UP_PrintPreviewTitle #: po/tmp/xap_String_Id.h.h:39 msgid "AbiWord: Print Preview" -msgstr "AbiWord: Nhad pred tlaou" +msgstr "AbiWord: Ukka pred tlaou" #. DLG_ABOUT_Title #: po/tmp/xap_String_Id.h.h:41 @@ -6473,7 +6367,7 @@ #. DLG_PLUGIN_MANAGER_ACTIVE #: po/tmp/xap_String_Id.h.h:43 msgid "Active Plugins" -msgstr "Aktivova modul" +msgstr "Zapn modul" #. LANG_AF_ZA #: po/tmp/xap_String_Id.h.h:45 @@ -6482,9 +6376,8 @@ #. LANG_AK_GH #: po/tmp/xap_String_Id.h.h:47 -#, fuzzy msgid "Akan" -msgstr "Afriknina" +msgstr "Aknina" #. LANG_SQ_AL #: po/tmp/xap_String_Id.h.h:49 @@ -6494,33 +6387,32 @@ #. DLG_FOSA_ALL #: po/tmp/xap_String_Id.h.h:53 msgid "All (*.*)" -msgstr "Vetko (*.*)" +msgstr "Vetky typy sborov (*.*)" #. DLG_FOSA_ALLDOCS #: po/tmp/xap_String_Id.h.h:55 msgid "All Documents" -msgstr "Vetky dokumenty" +msgstr "Vetky dokumenty" #. DLG_FOSA_ALLIMAGES #: po/tmp/xap_String_Id.h.h:57 msgid "All Image Files" -msgstr "Vetky obrzky" +msgstr "Vetky obrzky" #. DLG_HTMLOPT_ExpAllowAWML #: po/tmp/xap_String_Id.h.h:59 msgid "Allow extra markup in AWML namespace" -msgstr "Dovoli pecilne znaky pre AWML" +msgstr "Dovoli pecilne znaky pre AWML" #. LANG_AM_ET #: po/tmp/xap_String_Id.h.h:61 msgid "Amharic (Ethiopia)" -msgstr "Amharia (Etipia)" +msgstr "Amharina (Etipia)" #. LANG_AR #: po/tmp/xap_String_Id.h.h:65 -#, fuzzy msgid "Arabic" -msgstr "Odrky arabskmi slicami" +msgstr "Arabina" #. LANG_AR_EG #: po/tmp/xap_String_Id.h.h:67 @@ -6530,7 +6422,7 @@ #. LANG_AR_SA #: po/tmp/xap_String_Id.h.h:69 msgid "Arabic (Saudi Arabia)" -msgstr "Arabina (Sadsk Arbia)" +msgstr "Arabina (Saudsk Arbia)" #. ENC_ARAB_ISO #: po/tmp/xap_String_Id.h.h:71 @@ -6565,12 +6457,12 @@ #. LANG_AST_ES #: po/tmp/xap_String_Id.h.h:83 msgid "Asturian (Spain)" -msgstr "Astrina (panielsko)" +msgstr "Astrina (panielsko)" #. DLG_Options_Label_DirMarkerAfterClosingParenthesis #: po/tmp/xap_String_Id.h.h:87 msgid "Auto-insert direction markers" -msgstr "Automaticky vloi znaky pre smer" +msgstr "Automaticky vloi znaky pre smer textu" #. DLG_History_Version_AutoRevisioned #: po/tmp/xap_String_Id.h.h:89 @@ -6580,12 +6472,12 @@ #. DLG_FOSA_FileTypeAutoDetect #: po/tmp/xap_String_Id.h.h:91 msgid "Automatically Detected" -msgstr "Automaticky ziti" +msgstr "Automaticky zisten" #. MSG_AutoRevision #: po/tmp/xap_String_Id.h.h:93 msgid "Autorevision" -msgstr "Automatick zmena textu" +msgstr "Automatick zmeny textu" #. DLG_MW_AvailableDocuments #: po/tmp/xap_String_Id.h.h:95 @@ -6600,12 +6492,12 @@ #. LANG_AYM_BO #: po/tmp/xap_String_Id.h.h:99 msgid "Aymara (La Paz)" -msgstr "Aymara (La Paz)" +msgstr "Ajmarina (La Paz)" #. LANG_AYC_BO #: po/tmp/xap_String_Id.h.h:101 msgid "Aymara (Oruro)" -msgstr "Aymara (Oruro)" +msgstr "Ajmarina (Oruro)" #. ENC_BALT_ISO #: po/tmp/xap_String_Id.h.h:103 @@ -6614,1957 +6506,1959 @@ #. ENC_BALT_WIN #: po/tmp/xap_String_Id.h.h:105 -msgid "Pobaltsk jazyky, Windows Code Page 1257" -msgstr "Pobaltsk jazyky, kdov strnka 1257" +msgid "Baltic, Windows Code Page 1257" +msgstr "Pobaltsk jazyky, kdov strnka Windows 1256" #. LANG_EU_ES #: po/tmp/xap_String_Id.h.h:107 msgid "Basque" -msgstr "Baskittina" +msgstr "Baskitina" #. LANG_BE_BY #: po/tmp/xap_String_Id.h.h:109 msgid "Belarusian" -msgstr "Bielorutina" +msgstr "Bielorutina" -#. LANG_BN_IN +#. LANG_BE_LATIN #: po/tmp/xap_String_Id.h.h:111 +msgid "Belarusian, Latin" +msgstr "Bielorutina, latinka" + +#. LANG_BN_IN +#: po/tmp/xap_String_Id.h.h:113 msgid "Bengali" msgstr "Benglina" #. DLG_UP_BlackWhite -#: po/tmp/xap_String_Id.h.h:113 +#: po/tmp/xap_String_Id.h.h:115 msgid "Black & White" msgstr "iernobiele" #. STYLE_BLOCKTEXT -#: po/tmp/xap_String_Id.h.h:115 +#: po/tmp/xap_String_Id.h.h:117 msgid "Block Text" msgstr "Blok textu" #. DLG_UFS_StyleBoldItalic -#: po/tmp/xap_String_Id.h.h:119 +#: po/tmp/xap_String_Id.h.h:121 msgid "Bold Italic" msgstr "Tun kurzva" #. LANG_BR_FR -#: po/tmp/xap_String_Id.h.h:125 +#: po/tmp/xap_String_Id.h.h:127 msgid "Breton" msgstr "Bretnina" #. MSG_BuildingDoc -#: po/tmp/xap_String_Id.h.h:127 +#: po/tmp/xap_String_Id.h.h:129 msgid "Building Document:" msgstr "Vytvram dokument:" #. LANG_BG_BG -#: po/tmp/xap_String_Id.h.h:129 +#: po/tmp/xap_String_Id.h.h:131 msgid "Bulgarian" msgstr "Bulharina" #. DLG_Cancel -#: po/tmp/xap_String_Id.h.h:133 +#: po/tmp/xap_String_Id.h.h:135 msgid "Cancel" -msgstr "Zrui" +msgstr "Zrui" #. LANG_CA_ES -#: po/tmp/xap_String_Id.h.h:135 +#: po/tmp/xap_String_Id.h.h:137 msgid "Catalan" msgstr "Katalnina" #. LANG_AYR -#: po/tmp/xap_String_Id.h.h:137 +#: po/tmp/xap_String_Id.h.h:139 msgid "Central Aymara" -msgstr "" +msgstr "Stredn Ajmarina" #. ENC_CENT_ISO -#: po/tmp/xap_String_Id.h.h:139 +#: po/tmp/xap_String_Id.h.h:141 msgid "Central European, ISO-8859-2" msgstr "Stredoeurpske, ISO-8859-2" #. ENC_CENT_MAC -#: po/tmp/xap_String_Id.h.h:141 +#: po/tmp/xap_String_Id.h.h:143 msgid "Central European, Macintosh" msgstr "Stredoeurpske, Macintosh" #. ENC_CENT_WIN -#: po/tmp/xap_String_Id.h.h:143 +#: po/tmp/xap_String_Id.h.h:145 msgid "Central European, Windows Code Page 1250" msgstr "Stredoeurpske, kdov strnka Windows 1250" #. DLG_Options_Label_LangWithKeyboard -#: po/tmp/xap_String_Id.h.h:145 +#: po/tmp/xap_String_Id.h.h:147 msgid "Change Language when changing keyboard" -msgstr "Zmeni jazyk pri zmene klvesnice" +msgstr "Pri zmene klvesnice zmeni jazyk" #. STYLE_CHAPHEADING -#: po/tmp/xap_String_Id.h.h:147 +#: po/tmp/xap_String_Id.h.h:149 msgid "Chapter Heading" -msgstr "Nadpisy kapitol" +msgstr "Nadpis kapitoly" #. LANG_ZH_HK -#: po/tmp/xap_String_Id.h.h:149 +#: po/tmp/xap_String_Id.h.h:151 msgid "Chinese (Hong Kong)" -msgstr "ntina (Hong Kong)" +msgstr "ntina (Hong Kong)" #. LANG_ZH_CN -#: po/tmp/xap_String_Id.h.h:151 +#: po/tmp/xap_String_Id.h.h:153 msgid "Chinese (PRC)" -msgstr "ntina (PRC)" +msgstr "ntina (ȥR)" #. LANG_ZH_SG -#: po/tmp/xap_String_Id.h.h:153 +#: po/tmp/xap_String_Id.h.h:155 msgid "Chinese (Singapore)" -msgstr "ntina (Singapore)" +msgstr "ntina (Singapr)" #. LANG_ZH_TW -#: po/tmp/xap_String_Id.h.h:155 +#: po/tmp/xap_String_Id.h.h:157 msgid "Chinese (Taiwan)" -msgstr "ntina (Taiwan)" +msgstr "ntina (Taiwan)" #. ENC_CHSI_EUC -#: po/tmp/xap_String_Id.h.h:157 +#: po/tmp/xap_String_Id.h.h:159 msgid "Chinese Simplified, EUC-CN (GB2312)" -msgstr "Zjednoduen ntina, EUC-CN (GB2312)" +msgstr "Zjednoduen ntina, EUC-CN (GB2312)" #. ENC_CHSI_GB -#: po/tmp/xap_String_Id.h.h:159 +#: po/tmp/xap_String_Id.h.h:161 msgid "Chinese Simplified, GB_2312-80" -msgstr "Zjednoduen ntina, GB_2312-80" +msgstr "Zjednoduen ntina, GB_2312-80" #. ENC_CHSI_HZ -#: po/tmp/xap_String_Id.h.h:161 +#: po/tmp/xap_String_Id.h.h:163 msgid "Chinese Simplified, HZ" -msgstr "Zjednoduen ntina, HZ" +msgstr "Zjednoduen ntina, HZ" #. ENC_CHSI_WIN -#: po/tmp/xap_String_Id.h.h:163 +#: po/tmp/xap_String_Id.h.h:165 msgid "Chinese Simplified, Windows Code Page 936" -msgstr "Zjednoduen ntina, kdov strnka Windows 936" +msgstr "Zjednoduen ntina, kdov strnka Windows 936" #. ENC_CHTR_BIG5 -#: po/tmp/xap_String_Id.h.h:165 +#: po/tmp/xap_String_Id.h.h:167 msgid "Chinese Traditional, BIG5" -msgstr "Tradin ntina, BIG5" +msgstr "Tradin ntina, BIG5" #. ENC_CHTR_BIG5HKSCS -#: po/tmp/xap_String_Id.h.h:167 +#: po/tmp/xap_String_Id.h.h:169 msgid "Chinese Traditional, BIG5-HKSCS" -msgstr "Tradin ntina, BIG5-HKSCS" +msgstr "Tradin ntina, BIG5-HKSCS" #. ENC_CHTR_EUC -#: po/tmp/xap_String_Id.h.h:169 +#: po/tmp/xap_String_Id.h.h:171 msgid "Chinese Traditional, EUC-TW" -msgstr "Tradin ntina, EUC-TW" +msgstr "Tradin ntina, EUC-TW" #. ENC_CHTR_WIN -#: po/tmp/xap_String_Id.h.h:171 +#: po/tmp/xap_String_Id.h.h:173 msgid "Chinese Traditional, Windows Code Page 950" -msgstr "Tradin ntina, kdov strnka Windows 950" +msgstr "Tradin ntina, kdov strnka Windows 950" #. DLG_LISTDOCS_Heading1 -#: po/tmp/xap_String_Id.h.h:173 +#: po/tmp/xap_String_Id.h.h:175 msgid "Choose document from the list:" -msgstr "Vyberte dokument zo zoznamu" +msgstr "Vyberte dokument zo zoznamu:" #. TB_ClearBackground -#: po/tmp/xap_String_Id.h.h:175 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:177 msgid "Clear Background" -msgstr "Zmaza farbu pozadia" +msgstr "Vymaza farbu pozadia" #. DLG_CLIPART_Title -#: po/tmp/xap_String_Id.h.h:177 +#: po/tmp/xap_String_Id.h.h:179 msgid "Clip Art" msgstr "Clip Art" #. DLG_CLIPART_Error -#: po/tmp/xap_String_Id.h.h:179 +#: po/tmp/xap_String_Id.h.h:181 msgid "Clip Art could not be loaded" -msgstr "Prvok Clip Art sa nepodarilo spusti" +msgstr "Prvok Clip Art sa nepodarilo spusti" #. DLG_Close -#: po/tmp/xap_String_Id.h.h:181 +#: po/tmp/xap_String_Id.h.h:183 msgid "Close" -msgstr "Zavrie" +msgstr "Zatvori" #. DLG_Exit_CloseWithoutSaving -#: po/tmp/xap_String_Id.h.h:183 +#: po/tmp/xap_String_Id.h.h:185 msgid "Close &Without Saving" -msgstr "Zavrie &bez uloenia" +msgstr "Zatvori &bez uloenia" #. DLG_UP_Collate -#: po/tmp/xap_String_Id.h.h:185 +#: po/tmp/xap_String_Id.h.h:187 msgid "Collate" -msgstr "Zoradi" +msgstr "Zoradi" #. DLG_UP_Color -#: po/tmp/xap_String_Id.h.h:187 +#: po/tmp/xap_String_Id.h.h:189 msgid "Color" msgstr "Farba" #. DLG_Compare -#: po/tmp/xap_String_Id.h.h:191 +#: po/tmp/xap_String_Id.h.h:193 msgid "Compare" -msgstr "Porovna" +msgstr "Porovna" #. DLG_DocComparison_Content -#: po/tmp/xap_String_Id.h.h:193 +#: po/tmp/xap_String_Id.h.h:195 msgid "Content:" msgstr "Obsah:" #. STYLE_TOCHEADING1 -#: po/tmp/xap_String_Id.h.h:195 +#: po/tmp/xap_String_Id.h.h:197 msgid "Contents 1" msgstr "Obsah 1" #. STYLE_TOCHEADING2 -#: po/tmp/xap_String_Id.h.h:197 +#: po/tmp/xap_String_Id.h.h:199 msgid "Contents 2" msgstr "Obsah 2" #. STYLE_TOCHEADING3 -#: po/tmp/xap_String_Id.h.h:199 +#: po/tmp/xap_String_Id.h.h:201 msgid "Contents 3" msgstr "Obsah 3" #. STYLE_TOCHEADING4 -#: po/tmp/xap_String_Id.h.h:201 +#: po/tmp/xap_String_Id.h.h:203 msgid "Contents 4" msgstr "Obsah 4" #. STYLE_TOCHEADING -#: po/tmp/xap_String_Id.h.h:203 +#: po/tmp/xap_String_Id.h.h:205 msgid "Contents Header" msgstr "Zhlavie obsahu" #. DLG_UP_Copies -#: po/tmp/xap_String_Id.h.h:205 +#: po/tmp/xap_String_Id.h.h:207 msgid "Copies: " msgstr "Poet kpi: " #. LANG_COP_EG -#: po/tmp/xap_String_Id.h.h:207 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:209 msgid "Coptic" -msgstr "Kopttina" +msgstr "Kopttina" #. LANG_KW_GB -#: po/tmp/xap_String_Id.h.h:209 +#: po/tmp/xap_String_Id.h.h:211 msgid "Cornish" msgstr "Cornwallina" #. LANG_CO_FR -#: po/tmp/xap_String_Id.h.h:211 +#: po/tmp/xap_String_Id.h.h:213 msgid "Corsican" msgstr "Korzitina" #. DLG_PLUGIN_MANAGER_COULDNT_LOAD -#: po/tmp/xap_String_Id.h.h:213 +#: po/tmp/xap_String_Id.h.h:215 msgid "Could not activate/load plugin" -msgstr "Ned sa aktivova/nahra modul" +msgstr "Ned sa zapn/nahra modul" #. DLG_PLUGIN_MANAGER_COULDNT_UNLOAD -#: po/tmp/xap_String_Id.h.h:215 +#: po/tmp/xap_String_Id.h.h:217 msgid "Could not deactivate plugin" -msgstr "Modul sa ned deaktivova " +msgstr "Modul sa ned vypn " #. SPELL_CANTLOAD_DICT -#: po/tmp/xap_String_Id.h.h:217 +#: po/tmp/xap_String_Id.h.h:219 #, c-format msgid "Could not load the dictionary for the %s language" -msgstr "Ned sa nahra slovnk pre jazyk: %s" +msgstr "Ned sa nahra slovnk pre jazyk: %s" #. DLG_History_Version_Started -#: po/tmp/xap_String_Id.h.h:219 +#: po/tmp/xap_String_Id.h.h:221 msgid "Created" msgstr "Vytvoren" #. DLG_History_Created -#: po/tmp/xap_String_Id.h.h:221 +#: po/tmp/xap_String_Id.h.h:223 msgid "Created:" msgstr "Vytvoril:" #. LANG_HR_HR -#: po/tmp/xap_String_Id.h.h:223 +#: po/tmp/xap_String_Id.h.h:225 msgid "Croatian" -msgstr "Chorvtina" +msgstr "Chorvtina" #. ENC_CROA_MAC -#: po/tmp/xap_String_Id.h.h:225 +#: po/tmp/xap_String_Id.h.h:227 msgid "Croatian, Macintosh" -msgstr "Chorvttina, Macintosh" +msgstr "Chorvtina, Macintosh" #. ENC_CYRL_ISO -#: po/tmp/xap_String_Id.h.h:227 +#: po/tmp/xap_String_Id.h.h:229 msgid "Cyrillic, ISO-8859-5" msgstr "Cyrilika, ISO-8859-5" #. ENC_CYRL_KOI -#: po/tmp/xap_String_Id.h.h:229 +#: po/tmp/xap_String_Id.h.h:231 msgid "Cyrillic, KOI8-R" msgstr "Cyrilika, KOI8-R" #. ENC_CYRL_MAC -#: po/tmp/xap_String_Id.h.h:231 +#: po/tmp/xap_String_Id.h.h:233 msgid "Cyrillic, Macintosh" msgstr "Cyrilika, Macintosh" #. ENC_CYRL_WIN -#: po/tmp/xap_String_Id.h.h:233 +#: po/tmp/xap_String_Id.h.h:235 msgid "Cyrillic, Windows Code Page 1251" msgstr "Cyrilika, kdov strnka Windows 1251" #. LANG_CS_CZ -#: po/tmp/xap_String_Id.h.h:235 +#: po/tmp/xap_String_Id.h.h:237 msgid "Czech" -msgstr "etina" +msgstr "etina" #. LANG_DA_DK -#: po/tmp/xap_String_Id.h.h:237 +#: po/tmp/xap_String_Id.h.h:239 msgid "Danish" msgstr "Dnina" #. DLG_PLUGIN_MANAGER_DEACTIVATE_ALL -#: po/tmp/xap_String_Id.h.h:241 +#: po/tmp/xap_String_Id.h.h:243 msgid "Deactivate all plugins" -msgstr "Deaktivova vetky moduly" +msgstr "Vypn vetky moduly" #. DLG_PLUGIN_MANAGER_DEACTIVATE -#: po/tmp/xap_String_Id.h.h:243 +#: po/tmp/xap_String_Id.h.h:245 msgid "Deactivate plugin" -msgstr "Deaktivova modul" +msgstr "Vypn modul" #. DLG_HTMLOPT_ExpDeclareXML -#: po/tmp/xap_String_Id.h.h:245 +#: po/tmp/xap_String_Id.h.h:247 msgid "Declare as XML (version 1.0)" -msgstr "Deklarova ako XML (verze 1.0)" +msgstr "Deklarova ako XML (verzia 1.0)" #. DLG_ULANG_DefaultLangLabel -#: po/tmp/xap_String_Id.h.h:247 +#: po/tmp/xap_String_Id.h.h:249 msgid "Default language: " -msgstr "Prednastaven jazyk:" +msgstr "Predvolen jazyk:" #. DLG_Image_Placement -#: po/tmp/xap_String_Id.h.h:249 +#: po/tmp/xap_String_Id.h.h:251 msgid "Define Image Placement" msgstr "Zadajte umiestnenie obrzka" #. DLG_Image_TextWrapping -#: po/tmp/xap_String_Id.h.h:251 +#: po/tmp/xap_String_Id.h.h:253 msgid "Define Text Wrapping" -msgstr "Definova zalomenie textu" +msgstr "Vybra zalomenie textu" #. DLG_Remove_Icon -#: po/tmp/xap_String_Id.h.h:260 +#: po/tmp/xap_String_Id.h.h:262 msgid "Do you want to remove this icon from the toolbar?" -msgstr "Chcete zmaza ikonu z panela s nstrojmi?" +msgstr "Chcete odstrni ikonu z panela s nstrojmi?" #. DLG_DocComparison_WindowLabel -#: po/tmp/xap_String_Id.h.h:262 +#: po/tmp/xap_String_Id.h.h:264 msgid "Document Comparison" -msgstr "Porovnanie dokumentu" +msgstr "Porovnanie dokumentov" #. DLG_History_DocumentDetails -#: po/tmp/xap_String_Id.h.h:264 +#: po/tmp/xap_String_Id.h.h:266 msgid "Document Details" -msgstr "Detaily dokumentu" +msgstr "Podrobnosti dokumentu" #. DLG_History_WindowLabel -#: po/tmp/xap_String_Id.h.h:266 +#: po/tmp/xap_String_Id.h.h:268 msgid "Document History" msgstr "Histria dokumentu" #. DLG_History_Path -#: po/tmp/xap_String_Id.h.h:268 +#: po/tmp/xap_String_Id.h.h:270 msgid "Document name:" msgstr "Nzov dokumentu:" #. DLG_DocComparison_DocsCompared -#: po/tmp/xap_String_Id.h.h:270 +#: po/tmp/xap_String_Id.h.h:272 msgid "Documents compared" msgstr "Dokumenty boli porovnan" #. LANG_NL_NL -#: po/tmp/xap_String_Id.h.h:272 +#: po/tmp/xap_String_Id.h.h:274 msgid "Dutch (Netherlands)" msgstr "Holandina (Holandsko)" #. DLG_History_EditTime -#: po/tmp/xap_String_Id.h.h:274 +#: po/tmp/xap_String_Id.h.h:276 msgid "Editing time:" msgstr "as prav:" #. DLG_UFS_EffectsFrameLabel -#: po/tmp/xap_String_Id.h.h:276 +#: po/tmp/xap_String_Id.h.h:278 msgid "Effects" msgstr "Efekty" #. DLG_HTMLOPT_ExpEmbedCSS -#: po/tmp/xap_String_Id.h.h:278 +#: po/tmp/xap_String_Id.h.h:280 msgid "Embed (CSS) style sheet" -msgstr "Vloi (CSS) kaskdov tly" +msgstr "Vloi (CSS) kaskdov tly" #. DLG_UP_EmbedFonts -#: po/tmp/xap_String_Id.h.h:280 +#: po/tmp/xap_String_Id.h.h:282 msgid "Embed Fonts" -msgstr "Vloi psma" +msgstr "Vloi psma" #. DLG_HTMLOPT_ExpEmbedImages -#: po/tmp/xap_String_Id.h.h:282 +#: po/tmp/xap_String_Id.h.h:284 msgid "Embed images in URLs (Base64-encoded)" -msgstr "Vloi obrzky ako interentov strnky (v Base64 kdovn)" +msgstr "Vloi obrzky ako interentov strnky (v kdovan Base64)" #. DLG_UENC_EncTitle -#: po/tmp/xap_String_Id.h.h:284 +#: po/tmp/xap_String_Id.h.h:286 msgid "Encoding" msgstr "Kdovanie" #. DLG_UFS_EncodingLabel -#: po/tmp/xap_String_Id.h.h:286 +#: po/tmp/xap_String_Id.h.h:288 msgid "Encoding:" msgstr "Kdovanie:" #. STYLE_ENDREFERENCE -#: po/tmp/xap_String_Id.h.h:288 +#: po/tmp/xap_String_Id.h.h:290 msgid "Endnote Reference" msgstr "Odkaz na koncov poznmku" #. STYLE_ENDTEXT -#: po/tmp/xap_String_Id.h.h:290 +#: po/tmp/xap_String_Id.h.h:292 msgid "Endnote Text" msgstr "Text koncovej poznmky" #. LANG_EN_AU -#: po/tmp/xap_String_Id.h.h:292 +#: po/tmp/xap_String_Id.h.h:294 msgid "English (Australia)" msgstr "Anglitina (Austrlia)" #. LANG_EN_CA -#: po/tmp/xap_String_Id.h.h:294 +#: po/tmp/xap_String_Id.h.h:296 msgid "English (Canada)" msgstr "Anglitina (Kanada)" #. LANG_EN_IE -#: po/tmp/xap_String_Id.h.h:296 +#: po/tmp/xap_String_Id.h.h:298 msgid "English (Ireland)" msgstr "Anglitina (rsko)" #. LANG_EN_NZ -#: po/tmp/xap_String_Id.h.h:298 +#: po/tmp/xap_String_Id.h.h:300 msgid "English (New Zealand)" msgstr "Anglitina (Nov Zland)" #. LANG_EN_ZA -#: po/tmp/xap_String_Id.h.h:300 +#: po/tmp/xap_String_Id.h.h:302 msgid "English (South Africa)" msgstr "Anglitina (Juhoafrick republika)" #. LANG_EN_GB -#: po/tmp/xap_String_Id.h.h:302 +#: po/tmp/xap_String_Id.h.h:304 msgid "English (UK)" -msgstr "Anglitina (Spojen krovstvo...)" +msgstr "Anglitina (Spojen krovstvo...)" #. LANG_EN_US -#: po/tmp/xap_String_Id.h.h:304 +#: po/tmp/xap_String_Id.h.h:306 msgid "English (US)" -msgstr "Anglitina (Spojen tty)" +msgstr "Anglitina (Spojen tty)" #. DLG_Password_Title -#: po/tmp/xap_String_Id.h.h:306 +#: po/tmp/xap_String_Id.h.h:308 msgid "Enter Password" msgstr "Zadajte heslo" #. LANG_EO -#: po/tmp/xap_String_Id.h.h:308 +#: po/tmp/xap_String_Id.h.h:310 msgid "Esperanto" msgstr "Esperanto" #. LANG_ET -#: po/tmp/xap_String_Id.h.h:310 +#: po/tmp/xap_String_Id.h.h:312 msgid "Estonian" msgstr "Estnina" #. DLG_FOSA_ExportTitle -#: po/tmp/xap_String_Id.h.h:312 +#: po/tmp/xap_String_Id.h.h:314 msgid "Export File" -msgstr "Exportova sbor" +msgstr "Exportova sbor" #. DLG_HTMLOPT_ExpIs4 -#: po/tmp/xap_String_Id.h.h:314 +#: po/tmp/xap_String_Id.h.h:316 msgid "Export as HTML 4.01" -msgstr "Exportova ako dokument HTML 4.01" +msgstr "Exportova ako dokument HTML 4.01" #. DLG_HTMLOPT_ExpAbiWebDoc -#: po/tmp/xap_String_Id.h.h:316 +#: po/tmp/xap_String_Id.h.h:318 msgid "Export with PHP instructions" -msgstr "Exportova s PHP intrukciami" +msgstr "Exportova s PHP intrukciami" #. LANG_FA_IR -#: po/tmp/xap_String_Id.h.h:318 +#: po/tmp/xap_String_Id.h.h:320 msgid "Farsi" -msgstr "Farina" +msgstr "Fartina" #. DLG_UP_File -#: po/tmp/xap_String_Id.h.h:320 +#: po/tmp/xap_String_Id.h.h:322 msgid "File" msgstr "Sbor" #. DLG_OverwriteFile -#: po/tmp/xap_String_Id.h.h:322 +#: po/tmp/xap_String_Id.h.h:324 #, c-format msgid "File already exists. Overwrite file '%s'?" -msgstr "Sbor s tmto nzvom u existuje. Pepsa obsah sboru '%s'?" +msgstr "Sbor s tmto nzvom u existuje. Mm prepsa obsah sboru %s?" #. DLG_FOSA_RecordToFileLabel -#: po/tmp/xap_String_Id.h.h:324 +#: po/tmp/xap_String_Id.h.h:326 msgid "File to record editing:" msgstr "Sbor na zznam prav:" #. DLG_FOSA_ReplayFromFileLabel -#: po/tmp/xap_String_Id.h.h:326 +#: po/tmp/xap_String_Id.h.h:328 msgid "File to replay editing:" msgstr "Sbor na opakovanie prav:" #. LANG_FI_FI -#: po/tmp/xap_String_Id.h.h:328 +#: po/tmp/xap_String_Id.h.h:330 msgid "Finnish" -msgstr "Finina" +msgstr "Fnina" #. LANG_NL_BE -#: po/tmp/xap_String_Id.h.h:330 +#: po/tmp/xap_String_Id.h.h:332 msgid "Flemish (Belgium)" msgstr "Flmina (Belgicko)" #. STYLE_FOOTREFERENCE -#: po/tmp/xap_String_Id.h.h:337 +#: po/tmp/xap_String_Id.h.h:339 msgid "Footnote Reference" msgstr "Odkaz na poznmku pod iarou" #. STYLE_FOOTTEXT -#: po/tmp/xap_String_Id.h.h:339 +#: po/tmp/xap_String_Id.h.h:341 msgid "Footnote Text" msgstr "Text poznmky pod iarou" #. LANG_FR_BE -#: po/tmp/xap_String_Id.h.h:343 +#: po/tmp/xap_String_Id.h.h:345 msgid "French (Belgium)" -msgstr "Francztina (Belgicko)" +msgstr "Francztina (Belgicko)" #. LANG_FR_CA -#: po/tmp/xap_String_Id.h.h:345 +#: po/tmp/xap_String_Id.h.h:347 msgid "French (Canada)" -msgstr "Francztina (Kanada)" +msgstr "Francztina (Kanada)" #. LANG_FR_FR -#: po/tmp/xap_String_Id.h.h:347 +#: po/tmp/xap_String_Id.h.h:349 msgid "French (France)" -msgstr "Francztina (Franczsko)" +msgstr "Francztina (Franczsko)" #. LANG_FR_CH -#: po/tmp/xap_String_Id.h.h:349 +#: po/tmp/xap_String_Id.h.h:351 msgid "French (Switzerland)" -msgstr "Francztina (vajiarsko)" +msgstr "Francztina (vajiarsko)" #. LANG_FY_NL -#: po/tmp/xap_String_Id.h.h:351 +#: po/tmp/xap_String_Id.h.h:353 msgid "Frisian" -msgstr "Fr힚tina" +msgstr "Frztina" #. DLG_UP_From -#: po/tmp/xap_String_Id.h.h:353 +#: po/tmp/xap_String_Id.h.h:355 msgid "From: " msgstr "Od: " #. LANG_GL -#: po/tmp/xap_String_Id.h.h:355 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:357 msgid "Galician (Galego)" -msgstr "Galitina" +msgstr "Galtina" #. LANG_KA_GE -#: po/tmp/xap_String_Id.h.h:357 +#: po/tmp/xap_String_Id.h.h:359 msgid "Georgian" msgstr "Gruznina" #. ENC_GEOR_ACADEMY -#: po/tmp/xap_String_Id.h.h:359 +#: po/tmp/xap_String_Id.h.h:361 msgid "Georgian, Academy" msgstr "Gruznina, Academy" #. ENC_GEOR_PS -#: po/tmp/xap_String_Id.h.h:361 +#: po/tmp/xap_String_Id.h.h:363 msgid "Georgian, PS" msgstr "Gruznina, PS" #. LANG_DE_AT -#: po/tmp/xap_String_Id.h.h:363 +#: po/tmp/xap_String_Id.h.h:365 msgid "German (Austria)" msgstr "Nemina (Raksko)" #. LANG_DE_DE -#: po/tmp/xap_String_Id.h.h:365 +#: po/tmp/xap_String_Id.h.h:367 msgid "German (Germany)" msgstr "Nemina (Nemecko)" #. LANG_DE_CH -#: po/tmp/xap_String_Id.h.h:367 +#: po/tmp/xap_String_Id.h.h:369 msgid "German (Switzerland)" -msgstr "Nemina (vajiarsko)" +msgstr "Nemina (vajiarsko)" #. DLG_UP_Grayscale -#: po/tmp/xap_String_Id.h.h:369 +#: po/tmp/xap_String_Id.h.h:371 msgid "Grayscale" -msgstr "Ve stupoch edej" +msgstr "V stupoch edej" #. LANG_EL_GR -#: po/tmp/xap_String_Id.h.h:371 +#: po/tmp/xap_String_Id.h.h:373 msgid "Greek" msgstr "Grtina" #. ENC_GREE_ISO -#: po/tmp/xap_String_Id.h.h:373 +#: po/tmp/xap_String_Id.h.h:375 msgid "Greek, ISO-8859-7" msgstr "Grtina, ISO-8859-7" #. ENC_GREE_MAC -#: po/tmp/xap_String_Id.h.h:375 +#: po/tmp/xap_String_Id.h.h:377 msgid "Greek, Macintosh" msgstr "Grtina, Macintosh" #. ENC_GREE_WIN -#: po/tmp/xap_String_Id.h.h:377 +#: po/tmp/xap_String_Id.h.h:379 msgid "Greek, Windows Code Page 1253" msgstr "Grtina, kdov strnka Windows 1253" #. DLG_HTMLOPT_ExpTitle -#: po/tmp/xap_String_Id.h.h:379 +#: po/tmp/xap_String_Id.h.h:381 msgid "HTML Export Options" -msgstr "Voby pre export HTML" +msgstr "Voby pre export HTML" #. LANG_HA_NE -#: po/tmp/xap_String_Id.h.h:383 +#: po/tmp/xap_String_Id.h.h:385 msgid "Hausa (Niger)" msgstr "Hausa (Niger)" #. LANG_HA_NG -#: po/tmp/xap_String_Id.h.h:385 +#: po/tmp/xap_String_Id.h.h:387 msgid "Hausa (Nigeria)" msgstr "Hausa (Nigria)" #. LANG_HAW_US -#: po/tmp/xap_String_Id.h.h:387 +#: po/tmp/xap_String_Id.h.h:389 msgid "Hawaiian" msgstr "Havajina" #. STYLE_HEADING1 -#: po/tmp/xap_String_Id.h.h:389 +#: po/tmp/xap_String_Id.h.h:391 msgid "Heading 1" msgstr "Nadpis 1" #. STYLE_HEADING2 -#: po/tmp/xap_String_Id.h.h:391 +#: po/tmp/xap_String_Id.h.h:393 msgid "Heading 2" msgstr "Nadpis 2" #. STYLE_HEADING3 -#: po/tmp/xap_String_Id.h.h:393 +#: po/tmp/xap_String_Id.h.h:395 msgid "Heading 3" msgstr "Nadpis 3" #. STYLE_HEADING4 -#: po/tmp/xap_String_Id.h.h:395 +#: po/tmp/xap_String_Id.h.h:397 msgid "Heading 4" msgstr "Nadpis 4" #. LANG_HE_IL -#: po/tmp/xap_String_Id.h.h:399 +#: po/tmp/xap_String_Id.h.h:401 msgid "Hebrew" msgstr "Hebrejina" #. ENC_HEBR_ISO -#: po/tmp/xap_String_Id.h.h:401 +#: po/tmp/xap_String_Id.h.h:403 msgid "Hebrew, ISO-8859-8" msgstr "Hebrejina, ISO-8859-8" #. ENC_HEBR_MAC -#: po/tmp/xap_String_Id.h.h:403 +#: po/tmp/xap_String_Id.h.h:405 msgid "Hebrew, Macintosh" msgstr "Hebrejina, Macintosh" #. ENC_HEBR_WIN -#: po/tmp/xap_String_Id.h.h:405 +#: po/tmp/xap_String_Id.h.h:407 msgid "Hebrew, Windows Code Page 1255" msgstr "Hebrejina, kdov strnka Windows 1255" #. DLG_Image_Height -#: po/tmp/xap_String_Id.h.h:407 +#: po/tmp/xap_String_Id.h.h:409 msgid "Height:" -msgstr "Vka:" +msgstr "Vka:" #. DLG_IP_Height_Label -#: po/tmp/xap_String_Id.h.h:409 +#: po/tmp/xap_String_Id.h.h:411 msgid "Height: " -msgstr "Vka: " +msgstr "Vka: " #. DLG_UFS_HiddenCheck -#: po/tmp/xap_String_Id.h.h:411 +#: po/tmp/xap_String_Id.h.h:413 msgid "Hidden" msgstr "Skryt" #. DLG_UFS_BGColorTab -#: po/tmp/xap_String_Id.h.h:413 +#: po/tmp/xap_String_Id.h.h:415 msgid "HighLight Color" msgstr "Farba zvraznenia" #. LANG_HI_IN -#: po/tmp/xap_String_Id.h.h:415 +#: po/tmp/xap_String_Id.h.h:417 msgid "Hindi" -msgstr "Hindtina" +msgstr "Hindtina" #. LANG_HU_HU -#: po/tmp/xap_String_Id.h.h:417 +#: po/tmp/xap_String_Id.h.h:419 msgid "Hungarian" msgstr "Maarina" #. LANG_IS_IS -#: po/tmp/xap_String_Id.h.h:419 +#: po/tmp/xap_String_Id.h.h:421 msgid "Icelandic" msgstr "Islandina" #. ENC_ICEL_MAC -#: po/tmp/xap_String_Id.h.h:421 +#: po/tmp/xap_String_Id.h.h:423 msgid "Icelandic, Macintosh" msgstr "Islandina, Macintosh" #. DLG_History_Id -#: po/tmp/xap_String_Id.h.h:423 +#: po/tmp/xap_String_Id.h.h:425 msgid "Identifier:" -msgstr "Identifikace:" +msgstr "Identifikcia:" #. DLG_Image_Title -#: po/tmp/xap_String_Id.h.h:425 +#: po/tmp/xap_String_Id.h.h:427 msgid "Image Properties" -msgstr "Vlastnosti obrzku" +msgstr "Vlastnosti obrzka" #. DLG_Image_WrappedNone -#: po/tmp/xap_String_Id.h.h:427 +#: po/tmp/xap_String_Id.h.h:429 msgid "Image floats above text" -msgstr "Text neobtk obrzok" +msgstr "Obrzok sa pohybuje nad text" #. DLG_Image_InLine -#: po/tmp/xap_String_Id.h.h:429 +#: po/tmp/xap_String_Id.h.h:431 msgid "Image placed in-line (no text wrapping)" -msgstr "Obrzok je vloen medzi riadky (text neobtek)" +msgstr "Obrzok je vloen medzi riadkami (text nekopruje tvar obr.)" #. DLG_FOSA_ImportTitle -#: po/tmp/xap_String_Id.h.h:433 +#: po/tmp/xap_String_Id.h.h:435 msgid "Import File" -msgstr "Importova sbor" +msgstr "Importova sbor" #. MSG_ImportingDoc -#: po/tmp/xap_String_Id.h.h:435 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:437 msgid "Importing Document..." msgstr "Importujem dokument..." #. LANG_ID_ID -#: po/tmp/xap_String_Id.h.h:437 +#: po/tmp/xap_String_Id.h.h:439 msgid "Indonesian" -msgstr "Indontina" +msgstr "Indonztina" #. XIM_Methods -#: po/tmp/xap_String_Id.h.h:439 +#: po/tmp/xap_String_Id.h.h:441 msgid "Input Methods" msgstr "Vstupn metdy" #. DLG_FOSA_InsertObject -#: po/tmp/xap_String_Id.h.h:443 +#: po/tmp/xap_String_Id.h.h:445 msgid "Insert Embeddable Object" -msgstr "Vloi objekt" +msgstr "Vloi objekt" #. DLG_FOSA_FileInsertObject -#: po/tmp/xap_String_Id.h.h:445 +#: po/tmp/xap_String_Id.h.h:447 msgid "Insert Embeddable Object file:" -msgstr "Vloi objekt zo sboru:" +msgstr "Vloi objekt zo sboru:" #. DLG_FOSA_InsertTitle -#: po/tmp/xap_String_Id.h.h:447 +#: po/tmp/xap_String_Id.h.h:449 msgid "Insert File" -msgstr "Vloi sbor" +msgstr "Vloi sbor" #. DLG_FOSA_InsertMath -#: po/tmp/xap_String_Id.h.h:449 +#: po/tmp/xap_String_Id.h.h:451 msgid "Insert Math File" -msgstr "Vloi sbor s matematickmi vrazmi" +msgstr "Vloi sbor s matematickmi vrazmi" #. DLG_FOSA_FileInsertMath -#: po/tmp/xap_String_Id.h.h:451 +#: po/tmp/xap_String_Id.h.h:453 msgid "Insert MathML file:" -msgstr "Vloi sbor MathML:" +msgstr "Vloi sbor MathML:" #. TB_InsertNewTable -#: po/tmp/xap_String_Id.h.h:453 +#: po/tmp/xap_String_Id.h.h:455 msgid "Insert New Table" -msgstr "Vloenie novej tabuky" +msgstr "Vloi nov tabuku" #. DLG_IP_Title -#: po/tmp/xap_String_Id.h.h:455 +#: po/tmp/xap_String_Id.h.h:457 msgid "Insert Picture" -msgstr "Vloenie obrzku" +msgstr "Vloei obrzok" #. DLG_Insert_SymbolTitle -#: po/tmp/xap_String_Id.h.h:457 +#: po/tmp/xap_String_Id.h.h:459 msgid "Insert Symbol" -msgstr "Vloenie symbolu" +msgstr "Vloi symbol" #. DLG_PLUGIN_MANAGER_INSTALL -#: po/tmp/xap_String_Id.h.h:459 +#: po/tmp/xap_String_Id.h.h:461 msgid "Install new plugin" -msgstr "Intalova nov modul" +msgstr "Naintalova nov modul" #. LANG_IA -#: po/tmp/xap_String_Id.h.h:461 +#: po/tmp/xap_String_Id.h.h:463 msgid "Interlingua" msgstr "Interlingua" #. LANG_IU_CA -#: po/tmp/xap_String_Id.h.h:463 +#: po/tmp/xap_String_Id.h.h:465 msgid "Inuktitut" -msgstr "Inukina" +msgstr "Inuktina" #. DLG_InvalidPathname -#: po/tmp/xap_String_Id.h.h:465 +#: po/tmp/xap_String_Id.h.h:467 msgid "Invalid pathname." msgstr "Neplatn umiestnenie." #. LANG_GA_IE -#: po/tmp/xap_String_Id.h.h:467 +#: po/tmp/xap_String_Id.h.h:469 msgid "Irish" msgstr "rina" #. LANG_IT_IT -#: po/tmp/xap_String_Id.h.h:469 +#: po/tmp/xap_String_Id.h.h:471 msgid "Italian (Italy)" msgstr "Talianina (Taliansko)" #. LANG_JA_JP -#: po/tmp/xap_String_Id.h.h:473 +#: po/tmp/xap_String_Id.h.h:475 msgid "Japanese" msgstr "Japonina" #. ENC_JAPN_EUC -#: po/tmp/xap_String_Id.h.h:475 +#: po/tmp/xap_String_Id.h.h:477 msgid "Japanese, EUC-JP" msgstr "Japonina, EUC-JP" #. ENC_JAPN_ISO -#: po/tmp/xap_String_Id.h.h:477 +#: po/tmp/xap_String_Id.h.h:479 msgid "Japanese, ISO-2022-JP" msgstr "Japonina, ISO-2022-JP" #. ENC_JAPN_SJIS -#: po/tmp/xap_String_Id.h.h:479 +#: po/tmp/xap_String_Id.h.h:481 msgid "Japanese, Shift-JIS" msgstr "Japonina, Shift-JIS" #. ENC_JAPN_WIN -#: po/tmp/xap_String_Id.h.h:481 +#: po/tmp/xap_String_Id.h.h:483 msgid "Japanese, Windows Code Page 932" msgstr "Japonina, kdov strnka Windows 932" #. LANG_KN_IN -#: po/tmp/xap_String_Id.h.h:483 +#: po/tmp/xap_String_Id.h.h:485 msgid "Kannada" msgstr "Kannada" #. LANG_KO_KR #. LANG_KO -#: po/tmp/xap_String_Id.h.h:486 +#: po/tmp/xap_String_Id.h.h:488 msgid "Korean" msgstr "Krejina" #. ENC_KORE_EUC -#: po/tmp/xap_String_Id.h.h:488 +#: po/tmp/xap_String_Id.h.h:490 msgid "Korean, EUC-KR" msgstr "Krejina, EUC-KR" #. ENC_KORE_JOHAB -#: po/tmp/xap_String_Id.h.h:490 +#: po/tmp/xap_String_Id.h.h:492 msgid "Korean, Johab" msgstr "Krejina, Johab" #. ENC_KORE_KSC -#: po/tmp/xap_String_Id.h.h:492 +#: po/tmp/xap_String_Id.h.h:494 msgid "Korean, KSC_5601" msgstr "Krejina, KSC_5601" #. ENC_KORE_WIN -#: po/tmp/xap_String_Id.h.h:494 +#: po/tmp/xap_String_Id.h.h:496 msgid "Korean, Windows Code Page 949" msgstr "Krejina, kdov strnka Windows 949" #. LANG_KU -#: po/tmp/xap_String_Id.h.h:496 +#: po/tmp/xap_String_Id.h.h:498 msgid "Kurdish" msgstr "Kurdina" #. LANG_LO_LA -#: po/tmp/xap_String_Id.h.h:498 +#: po/tmp/xap_String_Id.h.h:500 msgid "Lao" -msgstr "Laotina" +msgstr "Laotina" #. DLG_History_LastSaved -#: po/tmp/xap_String_Id.h.h:500 +#: po/tmp/xap_String_Id.h.h:502 msgid "Last saved:" -msgstr "Naposledy uloen:" +msgstr "Naposledy uloen:" #. LANG_LA_IT -#: po/tmp/xap_String_Id.h.h:502 +#: po/tmp/xap_String_Id.h.h:504 msgid "Latin (Renaissance)" -msgstr "Latinina (Renesancia)" +msgstr "Latinina (renesancia)" #. LANG_LV_LV -#: po/tmp/xap_String_Id.h.h:504 +#: po/tmp/xap_String_Id.h.h:506 msgid "Latvian" -msgstr "Lotytina" +msgstr "Lotytina" #. LANG_LT_LT -#: po/tmp/xap_String_Id.h.h:506 +#: po/tmp/xap_String_Id.h.h:508 msgid "Lithuanian" msgstr "Litovina" #. DLG_CLIPART_Loading -#: po/tmp/xap_String_Id.h.h:508 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:510 msgid "Loading Clip Art" -msgstr "Spam prvok Clip Art" +msgstr "Spam prvok Clip Art" #. LANG_MK -#: po/tmp/xap_String_Id.h.h:514 +#: po/tmp/xap_String_Id.h.h:516 msgid "Macedonian" -msgstr "Makednina" +msgstr "Macednina" #. DLG_ULANG_DefaultLangChkbox -#: po/tmp/xap_String_Id.h.h:516 +#: po/tmp/xap_String_Id.h.h:518 msgid "Make default for document" -msgstr "Prednastavi pre dokument" +msgstr "Nastavi pre kad dokument" #. LANG_MS_MY -#: po/tmp/xap_String_Id.h.h:518 +#: po/tmp/xap_String_Id.h.h:520 msgid "Malay" msgstr "Malajina" #. LANG_MI_NZ -#: po/tmp/xap_String_Id.h.h:520 +#: po/tmp/xap_String_Id.h.h:522 msgid "Maori" msgstr "Maorina" #. LANG_MR_IN -#: po/tmp/xap_String_Id.h.h:522 +#: po/tmp/xap_String_Id.h.h:524 msgid "Marathi" -msgstr "Marathi" +msgstr "Marathitina" #. LANG_MH_MH -#: po/tmp/xap_String_Id.h.h:524 +#: po/tmp/xap_String_Id.h.h:526 msgid "Marshallese (Marshall Islands)" -msgstr "Marshallese (Marlove ostrovy)" +msgstr "Marlina (Marlove ostrovy)" #. LANG_MH_NR -#: po/tmp/xap_String_Id.h.h:526 +#: po/tmp/xap_String_Id.h.h:528 msgid "Marshallese (Nauru)" -msgstr "Marshallese (Nauru)" +msgstr "Marlina (Nauru)" #. DLG_Merge -#: po/tmp/xap_String_Id.h.h:528 +#: po/tmp/xap_String_Id.h.h:530 msgid "Merge" -msgstr "Zli" +msgstr "Zli" #. LANG_MN_MN -#: po/tmp/xap_String_Id.h.h:530 +#: po/tmp/xap_String_Id.h.h:532 msgid "Mongolian" msgstr "Mongolina" #. DLG_PLUGIN_MANAGER_NAME -#: po/tmp/xap_String_Id.h.h:532 +#: po/tmp/xap_String_Id.h.h:534 msgid "Name:" msgstr "Nzov:" #. LANG_NE_NP -#: po/tmp/xap_String_Id.h.h:534 +#: po/tmp/xap_String_Id.h.h:536 msgid "Nepali (Nepal)" msgstr "Neplina (Nepl)" #. DLG_QNXMB_No -#: po/tmp/xap_String_Id.h.h:536 +#: po/tmp/xap_String_Id.h.h:538 msgid "No" msgstr "Nie" #. DLG_IP_No_Picture_Label -#: po/tmp/xap_String_Id.h.h:538 +#: po/tmp/xap_String_Id.h.h:540 msgid "No Picture" -msgstr "iadny obrzok" +msgstr "iadny obrzok" #. DLG_PLUGIN_MANAGER_NONE_SELECTED -#: po/tmp/xap_String_Id.h.h:540 +#: po/tmp/xap_String_Id.h.h:542 msgid "No plugin selected" -msgstr "Nie je vybran iadny modul" +msgstr "Nevybrali ste iadny modul" #. STYLE_NORMAL -#: po/tmp/xap_String_Id.h.h:542 +#: po/tmp/xap_String_Id.h.h:544 msgid "Normal" msgstr "Normlny" #. LANG_NB_NO -#: po/tmp/xap_String_Id.h.h:544 +#: po/tmp/xap_String_Id.h.h:546 msgid "Norwegian Bokmal" msgstr "Nrina Bokmal" #. LANG_NN_NO -#: po/tmp/xap_String_Id.h.h:546 +#: po/tmp/xap_String_Id.h.h:548 msgid "Norwegian Nynorsk" msgstr "Nrina Nynorsk" #. DLG_PLUGIN_MANAGER_NOT_AVAILABLE -#: po/tmp/xap_String_Id.h.h:548 +#: po/tmp/xap_String_Id.h.h:550 msgid "Not available" -msgstr "Nedostupn" +msgstr "Nedostupn" #. STYLE_NUMHEAD1 -#: po/tmp/xap_String_Id.h.h:550 +#: po/tmp/xap_String_Id.h.h:552 msgid "Numbered Heading 1" msgstr "slovanie nadpisu 1" #. STYLE_NUMHEAD2 -#: po/tmp/xap_String_Id.h.h:552 +#: po/tmp/xap_String_Id.h.h:554 msgid "Numbered Heading 2" -msgstr "slovnie nadpisu 2" +msgstr "slovanie nadpisu 2" #. STYLE_NUMHEAD3 -#: po/tmp/xap_String_Id.h.h:554 +#: po/tmp/xap_String_Id.h.h:556 msgid "Numbered Heading 3" -msgstr "slovnie nadpisu 3" +msgstr "slovanie nadpisu 3" #. DLG_OK -#: po/tmp/xap_String_Id.h.h:558 +#: po/tmp/xap_String_Id.h.h:560 msgid "OK" msgstr "OK" #. LANG_OC_FR -#: po/tmp/xap_String_Id.h.h:560 +#: po/tmp/xap_String_Id.h.h:562 msgid "Occitan" -msgstr "Occitan" +msgstr "Okcitnina" #. DLG_FOSA_OpenTitle -#: po/tmp/xap_String_Id.h.h:562 +#: po/tmp/xap_String_Id.h.h:564 msgid "Open File" msgstr "Otvorenie sboru" #. DLG_FOSA_FileOpenTypeLabel -#: po/tmp/xap_String_Id.h.h:564 +#: po/tmp/xap_String_Id.h.h:566 msgid "Open file as type:" -msgstr "Otvori sbor typu:" +msgstr "Otvori sbor typu:" #. DLG_LISTDOCS_Title -#: po/tmp/xap_String_Id.h.h:566 +#: po/tmp/xap_String_Id.h.h:568 msgid "Opened Documents" msgstr "Otvoren dokumenty" #. TB_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:568 +#: po/tmp/xap_String_Id.h.h:570 msgid "Other..." -msgstr "alie..." +msgstr "alie..." #. DLG_Zoom_Percent -#: po/tmp/xap_String_Id.h.h:572 +#: po/tmp/xap_String_Id.h.h:574 msgid "P&ercent:" msgstr "P&ercent:" #. TB_Zoom_PageWidth -#: po/tmp/xap_String_Id.h.h:574 +#: po/tmp/xap_String_Id.h.h:576 msgid "Page Width" -msgstr "rka strany" +msgstr "rka strany" #. DLG_UP_PageRanges -#: po/tmp/xap_String_Id.h.h:576 +#: po/tmp/xap_String_Id.h.h:578 msgid "Page ranges:" msgstr "Rozsah tlae:" +#. LANG_PS +#: po/tmp/xap_String_Id.h.h:580 +msgid "Pashto" +msgstr "Patina" + #. DLG_Password_Password -#: po/tmp/xap_String_Id.h.h:578 +#: po/tmp/xap_String_Id.h.h:582 msgid "Password:" msgstr "Heslo:" #. STYLE_PLAIN_TEXT -#: po/tmp/xap_String_Id.h.h:580 +#: po/tmp/xap_String_Id.h.h:584 msgid "Plain Text" msgstr "Neformtovan text" #. DLG_PLUGIN_MANAGER_DETAILS -#: po/tmp/xap_String_Id.h.h:582 +#: po/tmp/xap_String_Id.h.h:586 msgid "Plugin Details:" msgstr "Detaily modulu:" #. DLG_PLUGIN_MANAGER_LIST -#: po/tmp/xap_String_Id.h.h:584 +#: po/tmp/xap_String_Id.h.h:588 msgid "Plugin List" msgstr "Zoznam modulov" #. LANG_PL_PL -#: po/tmp/xap_String_Id.h.h:586 +#: po/tmp/xap_String_Id.h.h:590 msgid "Polish" -msgstr "Poina" +msgstr "Potina" #. LANG_PT_BR -#: po/tmp/xap_String_Id.h.h:588 +#: po/tmp/xap_String_Id.h.h:592 msgid "Portuguese (Brazil)" msgstr "Portugalina (Brazlia)" #. LANG_PT_PT -#: po/tmp/xap_String_Id.h.h:590 +#: po/tmp/xap_String_Id.h.h:594 msgid "Portuguese (Portugal)" msgstr "Portugalina (Portugalsko)" #. DLG_Image_PlaceColumn -#: po/tmp/xap_String_Id.h.h:592 +#: po/tmp/xap_String_Id.h.h:596 msgid "Position relative to its Column" -msgstr "Pozcia vzhadom na stpcu" +msgstr "Umiestni vzhadom na stpec" #. DLG_Image_PlacePage -#: po/tmp/xap_String_Id.h.h:594 +#: po/tmp/xap_String_Id.h.h:598 msgid "Position relative to its Page" -msgstr "Pozcia vzhadom na strane" +msgstr "Umiestni vzhadom na stranu" #. DLG_Image_PlaceParagraph -#: po/tmp/xap_String_Id.h.h:596 +#: po/tmp/xap_String_Id.h.h:600 msgid "Position relative to nearest paragraph" -msgstr "Pozcia vzhadom na najbli odsek" +msgstr "Umiestni vzhadom na najbli odsek" #. DLG_Image_Aspect -#: po/tmp/xap_String_Id.h.h:598 +#: po/tmp/xap_String_Id.h.h:602 msgid "Preserve aspect ratio" -msgstr "Zachova pomer vky a rky" +msgstr "Zachova pomer vky a rky" #. DLG_IP_Activate_Label -#: po/tmp/xap_String_Id.h.h:602 +#: po/tmp/xap_String_Id.h.h:606 msgid "Preview Picture" -msgstr "Nhad obrzka" +msgstr "Ukka obrzka" #. DLG_FOSA_PrintToFileTitle -#: po/tmp/xap_String_Id.h.h:607 +#: po/tmp/xap_String_Id.h.h:611 msgid "Print To File" msgstr "Tla do sboru" #. DLG_FOSA_FilePrintTypeLabel -#: po/tmp/xap_String_Id.h.h:609 +#: po/tmp/xap_String_Id.h.h:613 msgid "Print file as type:" -msgstr "Tlai sbor ako typ:" +msgstr "Tlai sbor ako typ:" #. DLG_UP_PrintIn -#: po/tmp/xap_String_Id.h.h:611 +#: po/tmp/xap_String_Id.h.h:615 msgid "Print in: " -msgstr "Tlai: " +msgstr "Tlai: " #. DLG_UP_PrintTo -#: po/tmp/xap_String_Id.h.h:613 +#: po/tmp/xap_String_Id.h.h:617 msgid "Print to: " -msgstr "Tlai na: " +msgstr "Tlai na: " #. DLG_UP_Printer -#: po/tmp/xap_String_Id.h.h:615 +#: po/tmp/xap_String_Id.h.h:619 msgid "Printer" msgstr "Tlaiare" #. DLG_UP_PrinterCommand -#: po/tmp/xap_String_Id.h.h:617 +#: po/tmp/xap_String_Id.h.h:621 msgid "Printer command: " msgstr "Prkaz na tla: " #. LANG_PA_IN -#: po/tmp/xap_String_Id.h.h:619 +#: po/tmp/xap_String_Id.h.h:623 msgid "Punjabi (Gurmukhi)" -msgstr "Pandbina (Gurmukhi)" +msgstr "Pandbina (Gurmukhi)" #. LANG_PA_PK -#: po/tmp/xap_String_Id.h.h:621 +#: po/tmp/xap_String_Id.h.h:625 msgid "Punjabi (Shahmukhi)" -msgstr "Pandbina (ahmukhi)" +msgstr "Pandbina (ahmukhi)" #. LANG_QU_BO -#: po/tmp/xap_String_Id.h.h:623 +#: po/tmp/xap_String_Id.h.h:627 msgid "Quechua" msgstr "Keunina" #. LANG_QUH_BO -#: po/tmp/xap_String_Id.h.h:625 +#: po/tmp/xap_String_Id.h.h:629 msgid "Quechua (3 vowels)" msgstr "Keunina (3 samohlsky)" #. LANG_QUL_BO -#: po/tmp/xap_String_Id.h.h:627 +#: po/tmp/xap_String_Id.h.h:631 msgid "Quechua (5 vowels)" msgstr "Keunina (5 samohlsok)" #. DLG_FOSA_RecordToFileTitle -#: po/tmp/xap_String_Id.h.h:629 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:633 msgid "Record Editing to File" -msgstr "as prav:" +msgstr "Zapsa as prav do sboru" #. DLG_UFS_StyleRegular -#: po/tmp/xap_String_Id.h.h:631 +#: po/tmp/xap_String_Id.h.h:635 msgid "Regular" msgstr "Obyajn" #. DLG_DocComparison_Relationship -#: po/tmp/xap_String_Id.h.h:633 +#: po/tmp/xap_String_Id.h.h:637 msgid "Relationship:" -msgstr "Vzah:" +msgstr "Vzah:" #. DLG_FOSA_ReplayFromFileTitle -#: po/tmp/xap_String_Id.h.h:635 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:639 msgid "Replay Editing from File" -msgstr "Vybra obrzok zo souboru" +msgstr "Vybra obrzok zo sboru" #. DLG_Restore -#: po/tmp/xap_String_Id.h.h:637 +#: po/tmp/xap_String_Id.h.h:641 msgid "Restore" -msgstr "Obnovi" +msgstr "Obnovi" #. DLG_HTMLOPT_ExpRestore -#: po/tmp/xap_String_Id.h.h:639 +#: po/tmp/xap_String_Id.h.h:643 msgid "Restore Settings" -msgstr "Obnovi nastavenia" +msgstr "Obnovi nastavenia" #. DLG_DocComparison_Results -#: po/tmp/xap_String_Id.h.h:641 +#: po/tmp/xap_String_Id.h.h:645 msgid "Results" msgstr "Vsledky" #. LANG_RO_RO -#: po/tmp/xap_String_Id.h.h:643 +#: po/tmp/xap_String_Id.h.h:647 msgid "Romanian" msgstr "Rumunina" #. ENC_ROMA_MAC -#: po/tmp/xap_String_Id.h.h:645 -msgid "Rumunina, Macintosh" +#: po/tmp/xap_String_Id.h.h:649 +msgid "Romanian, Macintosh" msgstr "Rumunina, Macintosh" #. LANG_RU_RU -#: po/tmp/xap_String_Id.h.h:647 +#: po/tmp/xap_String_Id.h.h:651 msgid "Russian (Russia)" -msgstr "Rutina (Rusko)" +msgstr "Rutina (Rusko)" #. DLG_UFS_SampleFrameLabel -#: po/tmp/xap_String_Id.h.h:649 +#: po/tmp/xap_String_Id.h.h:653 msgid "Sample" -msgstr "Vzorka" +msgstr "Ukka" #. LANG_SC_IT -#: po/tmp/xap_String_Id.h.h:651 +#: po/tmp/xap_String_Id.h.h:655 msgid "Sardinian" msgstr "Sardnina (Taliansko)" #. DLG_FOSA_SaveAsTitle -#: po/tmp/xap_String_Id.h.h:653 +#: po/tmp/xap_String_Id.h.h:657 msgid "Save File As" -msgstr "Uloi sbor ako" +msgstr "Uloi sbor ako" #. DLG_HTMLOPT_ExpSave -#: po/tmp/xap_String_Id.h.h:655 +#: po/tmp/xap_String_Id.h.h:659 msgid "Save Settings" -msgstr "Uloenie nastaven" +msgstr "Uloi nastavenia" #. DLG_FOSA_FileSaveTypeLabel -#: po/tmp/xap_String_Id.h.h:657 +#: po/tmp/xap_String_Id.h.h:661 msgid "Save file as type:" -msgstr "Uloi sbor ako typ:" +msgstr "Uloi sbor ako typ:" #. DLG_UFS_ScriptLabel -#: po/tmp/xap_String_Id.h.h:659 +#: po/tmp/xap_String_Id.h.h:663 msgid "Script:" msgstr "Skript:" #. STYLE_SECTHEADING -#: po/tmp/xap_String_Id.h.h:661 +#: po/tmp/xap_String_Id.h.h:665 msgid "Section Heading" msgstr "Nadpis kapitoly" #. DLG_UENC_EncLabel -#: po/tmp/xap_String_Id.h.h:665 +#: po/tmp/xap_String_Id.h.h:669 msgid "Select Encoding:" msgstr "Vyberte kdovanie" #. DLG_HTMLOPT_ExpLabel -#: po/tmp/xap_String_Id.h.h:667 +#: po/tmp/xap_String_Id.h.h:671 msgid "Select HTML export options:" -msgstr "Vyberte voby pre prevod do HTML:" +msgstr "Vyberte monosti na prevod do HTML:" #. DLG_ULANG_LangLabel -#: po/tmp/xap_String_Id.h.h:669 +#: po/tmp/xap_String_Id.h.h:673 msgid "Select Language:" msgstr "Vyberte jazyk:" #. LANG_SR -#: po/tmp/xap_String_Id.h.h:673 +#: po/tmp/xap_String_Id.h.h:677 msgid "Serbian" msgstr "Srbina" #. DLG_Image_ImageDesc -#: po/tmp/xap_String_Id.h.h:675 +#: po/tmp/xap_String_Id.h.h:679 msgid "Set Image Name" -msgstr "Zadajte nzov obrzku" +msgstr "Zadajte nzov obrzka" #. DLG_Image_ImageSize -#: po/tmp/xap_String_Id.h.h:677 +#: po/tmp/xap_String_Id.h.h:681 msgid "Set Image Size" -msgstr "Zadajte vekos obrzku" +msgstr "Zadajte vekos obrzka" #. DLG_ULANG_LangTitle -#: po/tmp/xap_String_Id.h.h:679 +#: po/tmp/xap_String_Id.h.h:683 msgid "Set Language" -msgstr "Nastavi jazyk" +msgstr "Nastavi jazyk" #. DLG_UFS_TransparencyCheck -#: po/tmp/xap_String_Id.h.h:681 +#: po/tmp/xap_String_Id.h.h:685 msgid "Set no Highlight Color" -msgstr "Nastavi farbu bez zvrazovania" +msgstr "Nezvrazova text" #. DLG_UFS_SizeLabel -#: po/tmp/xap_String_Id.h.h:685 +#: po/tmp/xap_String_Id.h.h:689 msgid "Size:" -msgstr "Vekos:" +msgstr "Vekos:" #. LANG_SK_SK -#: po/tmp/xap_String_Id.h.h:687 +#: po/tmp/xap_String_Id.h.h:691 msgid "Slovak" msgstr "Slovenina" #. LANG_SL_SI -#: po/tmp/xap_String_Id.h.h:689 +#: po/tmp/xap_String_Id.h.h:693 msgid "Slovenian" msgstr "Slovinina" #. LANG_ES_MX -#: po/tmp/xap_String_Id.h.h:691 +#: po/tmp/xap_String_Id.h.h:695 msgid "Spanish (Mexico)" -msgstr "panielina (Mexiko)" +msgstr "panielina (Mexiko)" #. LANG_ES_ES -#: po/tmp/xap_String_Id.h.h:693 +#: po/tmp/xap_String_Id.h.h:697 msgid "Spanish (Spain)" -msgstr "panielina (panielsko)" +msgstr "panielina (panielsko)" #. DLG_Image_SquareWrap -#: po/tmp/xap_String_Id.h.h:697 +#: po/tmp/xap_String_Id.h.h:701 msgid "Square text wrapping" -msgstr "Zalomenie do tvorca" +msgstr "Zalomenie do tvorca" #. DLG_DocComparison_Styles -#: po/tmp/xap_String_Id.h.h:705 +#: po/tmp/xap_String_Id.h.h:709 msgid "Styles:" -msgstr "tly:" +msgstr "tly:" #. LANG_SW -#: po/tmp/xap_String_Id.h.h:711 +#: po/tmp/xap_String_Id.h.h:715 msgid "Swahili" msgstr "Svahilina" #. LANG_SV_SE -#: po/tmp/xap_String_Id.h.h:713 +#: po/tmp/xap_String_Id.h.h:717 msgid "Swedish" -msgstr "vdina" +msgstr "vdina" #. TB_Font_Symbol -#: po/tmp/xap_String_Id.h.h:715 -#, fuzzy +#: po/tmp/xap_String_Id.h.h:719 msgid "Symbols" msgstr "Symboly" #. LANG_SYR -#: po/tmp/xap_String_Id.h.h:717 +#: po/tmp/xap_String_Id.h.h:721 msgid "Syriac" msgstr "Srina" #. LANG_TL_PH -#: po/tmp/xap_String_Id.h.h:721 +#: po/tmp/xap_String_Id.h.h:725 msgid "Tagalog" msgstr "Tagalog" #. LANG_TA_IN -#: po/tmp/xap_String_Id.h.h:723 +#: po/tmp/xap_String_Id.h.h:727 msgid "Tamil" msgstr "Tamilina" #. LANG_TE_IN -#: po/tmp/xap_String_Id.h.h:725 +#: po/tmp/xap_String_Id.h.h:729 msgid "Telugu" msgstr "Telugu" #. DLG_UFS_ColorTab -#: po/tmp/xap_String_Id.h.h:727 +#: po/tmp/xap_String_Id.h.h:731 msgid "Text Color" msgstr "Farba textu" #. DLG_Image_WrappedBoth -#: po/tmp/xap_String_Id.h.h:729 +#: po/tmp/xap_String_Id.h.h:733 msgid "Text wrapped on both sides of the Image" -msgstr "Text zalomen na oboch stranch obrzku" +msgstr "Text je zalomen z oboch strn obrzka" #. DLG_Image_WrappedLeft -#: po/tmp/xap_String_Id.h.h:731 +#: po/tmp/xap_String_Id.h.h:735 msgid "Text wrapped to the Left of the Image" -msgstr "Text zalomen na av stranu obrzku" +msgstr "Text je zalomen z avej strany obrzka" #. DLG_Image_WrappedRight -#: po/tmp/xap_String_Id.h.h:733 +#: po/tmp/xap_String_Id.h.h:737 msgid "Text wrapped to the Right of the Image" -msgstr "Text zalomen na prav stranu obrzku" +msgstr "Text je zalomen z pravej strany obrzka" #. LANG_TH_TH -#: po/tmp/xap_String_Id.h.h:735 +#: po/tmp/xap_String_Id.h.h:739 msgid "Thai" msgstr "Thajina" #. ENC_THAI_MAC -#: po/tmp/xap_String_Id.h.h:737 +#: po/tmp/xap_String_Id.h.h:741 msgid "Thai, Macintosh" msgstr "Thajina, Macintosh" #. ENC_THAI_TIS -#: po/tmp/xap_String_Id.h.h:739 +#: po/tmp/xap_String_Id.h.h:743 msgid "Thai, TIS-620" msgstr "Thajina, TIS-620" #. ENC_THAI_WIN -#: po/tmp/xap_String_Id.h.h:741 +#: po/tmp/xap_String_Id.h.h:745 msgid "Thai, Windows Code Page 874" msgstr "Thajina, kdov strnka Windows 874" #. DLG_NoSaveFile_DirNotWriteable -#: po/tmp/xap_String_Id.h.h:743 +#: po/tmp/xap_String_Id.h.h:747 #, c-format msgid "The directory '%s' is write-protected." -msgstr "Do adresra '%s' sa ned zapisova." +msgstr "Do adresra %s sa ned zapisova." + +#. DLG_FOSA_ExtensionDoesNotMatch +#: po/tmp/xap_String_Id.h.h:749 +msgid "The given file extension does not match the chosen file type. Do you want to use this name anyway?" +msgstr "Tto prpona nezodpoved zvolenmu typu sboru. Chcete ju aj tak poui?" #. MSG_HistoryPartRestore2 -#: po/tmp/xap_String_Id.h.h:745 +#: po/tmp/xap_String_Id.h.h:751 #, c-format -msgid "" -"The nearest version that can be restored fully is %d. Would you like to " -"restore this version instead? To partially restore version %d press No." -msgstr "" -"Najbliia revzia, ktor me by plne obnoven je %d. Chcete ji obnovit " -"namiesto tejto? Ak chcete sten obnovit revziu %d, stlate Nie." +msgid "The nearest version that can be restored fully is %d. Would you like to restore this version instead? To partially restore version %d press No." +msgstr "Najnovia zmena textu, ktor me by plne obnoven je %d. Chcete ju obnovi namiesto tejto? Ak chcete iastone obnovi zmenu %d, stlate Nie." #. DLG_UP_InvalidPrintString -#: po/tmp/xap_String_Id.h.h:747 +#: po/tmp/xap_String_Id.h.h:753 msgid "The print command string is not valid." msgstr "Neplatn prkaz pre tla." #. MSG_NoUndo -#: po/tmp/xap_String_Id.h.h:749 +#: po/tmp/xap_String_Id.h.h:755 msgid "This operation cannot be undone. Are you sure you want to proceed?" -msgstr "Tto opercia sa ned odvola. Chcete naozaj pokraova?" +msgstr "Tto opercia sa ned odvola. Chcete naozaj pokraova?" #. DLG_Image_TightWrap -#: po/tmp/xap_String_Id.h.h:753 +#: po/tmp/xap_String_Id.h.h:759 msgid "Tight text wrapping" msgstr "Tesn zalomenie textu" #. MSG_HistoryPartRestore3 -#: po/tmp/xap_String_Id.h.h:757 +#: po/tmp/xap_String_Id.h.h:763 msgid "To continue anyway, press OK." -msgstr "Ak chcete napriek tomu pokraova, sttlate OK." +msgstr "Ak chcete napriek tomu pokraova, stlate OK." #. MSG_HistoryPartRestore4 -#: po/tmp/xap_String_Id.h.h:759 +#: po/tmp/xap_String_Id.h.h:765 msgid "To quit the restoration attempt, press Cancel." -msgstr "Ak chcete ukoni pokus o obnovu, stlate tlaidlo Zrui." +msgstr "Ak chcete ukoni pokus o obnovu, stlate tlaidlo Zrui." #. LANG_TR_TR -#: po/tmp/xap_String_Id.h.h:765 +#: po/tmp/xap_String_Id.h.h:771 msgid "Turkish" msgstr "Turetina" #. ENC_TURK_ISO -#: po/tmp/xap_String_Id.h.h:767 +#: po/tmp/xap_String_Id.h.h:773 msgid "Turkish, ISO-8859-9" msgstr "Turetina, ISO-8859-9" #. ENC_TURK_MAC -#: po/tmp/xap_String_Id.h.h:769 +#: po/tmp/xap_String_Id.h.h:775 msgid "Turkish, Macintosh" msgstr "Turetina, Macintosh" #. ENC_TURK_WIN -#: po/tmp/xap_String_Id.h.h:771 +#: po/tmp/xap_String_Id.h.h:777 msgid "Turkish, Windows Code Page 1254" msgstr "Turetina, kdov strnka Windows 1254" #. DLG_Image_WrapType -#: po/tmp/xap_String_Id.h.h:773 +#: po/tmp/xap_String_Id.h.h:779 msgid "Type of text wrapping" -msgstr "Typy zalomen textu" +msgstr "Typy zalomenia textu" #. ENC_WEST_ASCII -#: po/tmp/xap_String_Id.h.h:775 +#: po/tmp/xap_String_Id.h.h:781 msgid "US-ASCII" msgstr "US-ASCII" #. LANG_UK_UA -#: po/tmp/xap_String_Id.h.h:777 +#: po/tmp/xap_String_Id.h.h:783 msgid "Ukrainian" msgstr "Ukrajinina" #. ENC_UKRA_KOI -#: po/tmp/xap_String_Id.h.h:779 +#: po/tmp/xap_String_Id.h.h:785 msgid "Ukrainian, KOI8-U" msgstr "Ukrajinina, KOI8-U" #. ENC_UKRA_MAC -#: po/tmp/xap_String_Id.h.h:781 +#: po/tmp/xap_String_Id.h.h:787 msgid "Ukrainian, Macintosh" msgstr "Ukrajinina, Macintosh" #. ENC_UNIC_UCS2 -#: po/tmp/xap_String_Id.h.h:785 +#: po/tmp/xap_String_Id.h.h:791 msgid "Unicode UCS-2" msgstr "Unicode UCS-2" #. ENC_UNIC_UCS_2BE -#: po/tmp/xap_String_Id.h.h:787 +#: po/tmp/xap_String_Id.h.h:793 msgid "Unicode UCS-2 Big Endian" msgstr "Unicode UCS-2 Big Endian" #. ENC_UNIC_UCS_2LE -#: po/tmp/xap_String_Id.h.h:789 +#: po/tmp/xap_String_Id.h.h:795 msgid "Unicode UCS-2 Little Endian" msgstr "Unicode UCS-2 Little Endian" #. ENC_UNIC_UCS4 -#: po/tmp/xap_String_Id.h.h:791 +#: po/tmp/xap_String_Id.h.h:797 msgid "Unicode UCS-4" msgstr "Unicode UCS-4" #. ENC_UNIC_UCS_4BE -#: po/tmp/xap_String_Id.h.h:793 +#: po/tmp/xap_String_Id.h.h:799 msgid "Unicode UCS-4 Big Endian" msgstr "Unicode UCS-4 Big Endian" #. ENC_UNIC_UCS_4LE -#: po/tmp/xap_String_Id.h.h:795 +#: po/tmp/xap_String_Id.h.h:801 msgid "Unicode UCS-4 Little Endian" msgstr "Unicode UCS-4 Little Endian" #. ENC_UNIC_UTF_16 -#: po/tmp/xap_String_Id.h.h:797 +#: po/tmp/xap_String_Id.h.h:803 msgid "Unicode UTF-16" msgstr "Unicode UTF-16" #. ENC_UNIC_UTF_16BE -#: po/tmp/xap_String_Id.h.h:799 +#: po/tmp/xap_String_Id.h.h:805 msgid "Unicode UTF-16 Big Endian" msgstr "Unicode UTF-16 Big Endian" #. ENC_UNIC_UTF_16LE -#: po/tmp/xap_String_Id.h.h:801 +#: po/tmp/xap_String_Id.h.h:807 msgid "Unicode UTF-16 Little Endian" msgstr "Unicode UTF-16 Little Endian" #. ENC_UNIC_UTF_32 -#: po/tmp/xap_String_Id.h.h:803 +#: po/tmp/xap_String_Id.h.h:809 msgid "Unicode UTF-32" msgstr "Unicode UTF-32" #. ENC_UNIC_UTF_32BE -#: po/tmp/xap_String_Id.h.h:805 +#: po/tmp/xap_String_Id.h.h:811 msgid "Unicode UTF-32 Big Endian" msgstr "Unicode UTF-32 Big Endian" #. ENC_UNIC_UTF_32LE -#: po/tmp/xap_String_Id.h.h:807 +#: po/tmp/xap_String_Id.h.h:813 msgid "Unicode UTF-32 Little Endian" msgstr "Unicode UTF-32 Little Endian" #. ENC_UNIC_UTF_7 -#: po/tmp/xap_String_Id.h.h:809 +#: po/tmp/xap_String_Id.h.h:815 msgid "Unicode UTF-7" msgstr "Unicode UTF-7" #. ENC_UNIC_UTF_8 -#: po/tmp/xap_String_Id.h.h:811 +#: po/tmp/xap_String_Id.h.h:817 msgid "Unicode UTF-8" msgstr "Unicode UTF-8" #. UntitledDocument -#: po/tmp/xap_String_Id.h.h:813 +#: po/tmp/xap_String_Id.h.h:819 #, c-format msgid "Untitled%d" msgstr "Bez nzvu %d" #. DLG_Update -#: po/tmp/xap_String_Id.h.h:815 +#: po/tmp/xap_String_Id.h.h:821 msgid "Update" msgstr "Aktualizcia" #. LANG_UR -#: po/tmp/xap_String_Id.h.h:821 +#: po/tmp/xap_String_Id.h.h:827 msgid "Urdu" msgstr "Urdina" #. LANG_UR_PK -#: po/tmp/xap_String_Id.h.h:823 +#: po/tmp/xap_String_Id.h.h:829 msgid "Urdu (Pakistan)" msgstr "Urdina (Pakistan)" #. LANG_UZ_UZ -#: po/tmp/xap_String_Id.h.h:825 +#: po/tmp/xap_String_Id.h.h:831 msgid "Uzbek" msgstr "Uzbetina" #. DLG_History_List_Title -#: po/tmp/xap_String_Id.h.h:829 +#: po/tmp/xap_String_Id.h.h:835 msgid "Version history" -msgstr "Histria verzi" +msgstr "Zoznam verzi" #. DLG_PLUGIN_MANAGER_VERSION #. DLG_History_Version -#: po/tmp/xap_String_Id.h.h:832 +#: po/tmp/xap_String_Id.h.h:838 msgid "Version:" msgstr "Verzia:" #. LANG_VI_VN -#: po/tmp/xap_String_Id.h.h:834 +#: po/tmp/xap_String_Id.h.h:840 msgid "Vietnamese" msgstr "Vietnamina" #. ENC_VIET_TCVN -#: po/tmp/xap_String_Id.h.h:836 +#: po/tmp/xap_String_Id.h.h:842 msgid "Vietnamese, TCVN" msgstr "Vietnamina, TCVN" #. ENC_VIET_VISCII -#: po/tmp/xap_String_Id.h.h:838 +#: po/tmp/xap_String_Id.h.h:844 msgid "Vietnamese, VISCII" msgstr "Vietnamina, VISCII" #. ENC_VIET_WIN -#: po/tmp/xap_String_Id.h.h:840 +#: po/tmp/xap_String_Id.h.h:846 msgid "Vietnamese, Windows Code Page 1258" msgstr "Vietnamina, kdov strnka Windows 1258" #. DLG_MW_MoreWindows -#: po/tmp/xap_String_Id.h.h:842 +#: po/tmp/xap_String_Id.h.h:848 msgid "View Document" -msgstr "Zobrazenie dokumentu" +msgstr "Zobrazi dokument" #. DLG_MW_Activate -#: po/tmp/xap_String_Id.h.h:844 +#: po/tmp/xap_String_Id.h.h:850 msgid "View:" msgstr "Zobrazenie:" #. LANG_CY_GB -#: po/tmp/xap_String_Id.h.h:846 +#: po/tmp/xap_String_Id.h.h:852 msgid "Welsh" -msgstr "Weltina" +msgstr "Waletina" #. ENC_US_DOS -#: po/tmp/xap_String_Id.h.h:848 +#: po/tmp/xap_String_Id.h.h:854 msgid "Western European, DOS/Windows Code Page 437" msgstr "Zpadoeurpske, kdov strnka DOS/Windows 437" #. ENC_MLNG_DOS -#: po/tmp/xap_String_Id.h.h:850 +#: po/tmp/xap_String_Id.h.h:856 msgid "Western European, DOS/Windows Code Page 850" msgstr "Zpadoeurpske, kdov strnka DOS/Windows 850" #. ENC_WEST_HP -#: po/tmp/xap_String_Id.h.h:852 +#: po/tmp/xap_String_Id.h.h:858 msgid "Western European, HP" msgstr "Zpadoeurpske, HP" #. ENC_WEST_ISO -#: po/tmp/xap_String_Id.h.h:854 +#: po/tmp/xap_String_Id.h.h:860 msgid "Western European, ISO-8859-1" msgstr "Zpadoeurpske, ISO-8859-1" #. ENC_WEST_MAC -#: po/tmp/xap_String_Id.h.h:856 +#: po/tmp/xap_String_Id.h.h:862 msgid "Western European, Macintosh" msgstr "Zpadoeurpske, Macintosh" #. ENC_WEST_NXT -#: po/tmp/xap_String_Id.h.h:858 +#: po/tmp/xap_String_Id.h.h:864 msgid "Western European, NeXT" msgstr "Zpadoeurpske, NeXT" #. ENC_WEST_WIN -#: po/tmp/xap_String_Id.h.h:860 +#: po/tmp/xap_String_Id.h.h:866 msgid "Western European, Windows Code Page 1252" msgstr "Zpadoeurpske, kdov strnka Windows 1252" #. TB_Zoom_WholePage -#: po/tmp/xap_String_Id.h.h:862 +#: po/tmp/xap_String_Id.h.h:868 msgid "Whole Page" msgstr "Cel strana" #. DLG_Image_Width -#: po/tmp/xap_String_Id.h.h:864 +#: po/tmp/xap_String_Id.h.h:870 msgid "Width:" -msgstr "rka:" +msgstr "rka:" #. DLG_IP_Width_Label -#: po/tmp/xap_String_Id.h.h:866 +#: po/tmp/xap_String_Id.h.h:872 msgid "Width: " -msgstr "rka: " +msgstr "rka: " #. LANG_WO_SN -#: po/tmp/xap_String_Id.h.h:868 +#: po/tmp/xap_String_Id.h.h:874 msgid "Wolof (Senegal)" msgstr "Wolof (Senegal)" #. DLG_QNXMB_Yes -#: po/tmp/xap_String_Id.h.h:870 +#: po/tmp/xap_String_Id.h.h:876 msgid "Yes" msgstr "no" #. LANG_YI -#: po/tmp/xap_String_Id.h.h:872 +#: po/tmp/xap_String_Id.h.h:878 msgid "Yiddish" -msgstr "Jidi" +msgstr "Jidi" #. MSG_HistoryConfirmSave -#: po/tmp/xap_String_Id.h.h:874 +#: po/tmp/xap_String_Id.h.h:880 #, c-format msgid "You have to save changes to document %s before proceeding. Save now?" -msgstr "Predtm ako budete pokraova, mali by ste v dokumente %s uloi zmeny. Chcete to urobi teraz?" +msgstr "Predtm, ako budete pokraova, mali by ste v dokumente %s uloi zmeny. Chcete to urobi teraz?" #. DLG_Zoom_RadioFrameCaption -#: po/tmp/xap_String_Id.h.h:878 +#: po/tmp/xap_String_Id.h.h:884 msgid "Zoom to" -msgstr "Zvi na" +msgstr "Zvi na" #. DLG_UnixMB_No -#: po/tmp/xap_String_Id.h.h:880 +#: po/tmp/xap_String_Id.h.h:886 msgid "_No" msgstr "_Nie" #. DLG_UnixMB_Yes -#: po/tmp/xap_String_Id.h.h:882 +#: po/tmp/xap_String_Id.h.h:888 msgid "_Yes" msgstr "_no" #. DLG_Unit_cm -#: po/tmp/xap_String_Id.h.h:884 +#: po/tmp/xap_String_Id.h.h:890 msgid "cm" msgstr "cm" #. DLG_DocComparison_Different -#: po/tmp/xap_String_Id.h.h:886 +#: po/tmp/xap_String_Id.h.h:892 msgid "different" msgstr "rzne" #. DLG_DocComparison_DivergingPos -#: po/tmp/xap_String_Id.h.h:888 +#: po/tmp/xap_String_Id.h.h:894 #, c-format msgid "diverging after document position %d" -msgstr "odlin od pozcie %d v dokumente" +msgstr "odlin od pozcie %d v dokumente" #. DLG_DocComparison_Diverging -#: po/tmp/xap_String_Id.h.h:890 +#: po/tmp/xap_String_Id.h.h:896 #, c-format msgid "diverging after version %d of %s" -msgstr "odlin od verzie %d z(-o) %s" +msgstr "odlin od verzie %d z(-o) %s" #. DLG_DocComparison_Identical -#: po/tmp/xap_String_Id.h.h:892 +#: po/tmp/xap_String_Id.h.h:898 msgid "identical" msgstr "rovnak" #. DLG_Unit_inch -#: po/tmp/xap_String_Id.h.h:894 +#: po/tmp/xap_String_Id.h.h:900 msgid "inch" msgstr "palce" #. DLG_Unit_mm -#: po/tmp/xap_String_Id.h.h:896 +#: po/tmp/xap_String_Id.h.h:902 msgid "mm" msgstr "mm" #. DLG_Unit_pica -#: po/tmp/xap_String_Id.h.h:898 +#: po/tmp/xap_String_Id.h.h:904 msgid "pica" msgstr "pico" #. DLG_Unit_points -#: po/tmp/xap_String_Id.h.h:900 +#: po/tmp/xap_String_Id.h.h:906 msgid "points" -msgstr "body (-ov)" +msgstr "body" #. DLG_DocComparison_Siblings -#: po/tmp/xap_String_Id.h.h:902 +#: po/tmp/xap_String_Id.h.h:908 msgid "siblings" msgstr "podobn" #. DLG_DocComparison_Unrelated -#: po/tmp/xap_String_Id.h.h:904 +#: po/tmp/xap_String_Id.h.h:910 msgid "unrelated" -msgstr "neporovnaten" +msgstr "neporovnaten" +#~ msgid "Skry text pod Nadpisom 3" +#~ msgstr "Fold below level 3" + +#, fuzzy +#~ msgid "&Delete annotation" +#~ msgstr "&Zmaza oznaen text" +#~ msgid "&Edit annotation" +#~ msgstr "Upr&avi formtovaciu znaku" +#~ msgid "&Jump to annotation" +#~ msgstr "&Cho na anotciu" + +#, fuzzy +#~ msgid "&Show annotations" +#~ msgstr "&Zobrazi stavov panel" + +#, fuzzy +#~ msgid "Create from &selection" +#~ msgstr "Odstrni oznaen text" + +#, fuzzy +#~ msgid "Delete annotation" +#~ msgstr "Odstrni oznaen oblas" + +#, fuzzy +#~ msgid "Edit Annotation" +#~ msgstr "Upravi odsadenie" + +#, fuzzy +#~ msgid "Edit annotation" +#~ msgstr "Upravi odsadenie" + +#, fuzzy +#~ msgid "Insert selected text into a new annotation" +#~ msgstr "Zmen vybran text na tabuku" +#~ msgid "Jump to annotation" +#~ msgstr "Cho na formtovaciu znaku" + +#, fuzzy +#~ msgid "New &annotation" +#~ msgstr "Nov formtovacia znaka" + +#, fuzzy +#~ msgid "Show/hide annotations" +#~ msgstr "Zobraz/skryje formtovacie znaky" +#~ msgid "Pobaltsk jazyky, Windows Code Page 1257" +#~ msgstr "Pobaltsk jazyky, kdov strnka 1257" +#~ msgid "Rumunina, Macintosh" +#~ msgstr "Rumunina, Macintosh" #~ msgid "&From File" #~ msgstr "Zo sbo&ru" - #~ msgid "Insert a picture" -#~ msgstr "Vlo obrzok" - +#~ msgstr "Vlo obrzok" #~ msgid "M&erge documents" -#~ msgstr "Z&li dokumenty" - +#~ msgstr "Z&li dokumenty" #~ msgid "Show the AbiWord splash screen on application startup" -#~ msgstr "Zobrazi vodn obrazovku Abiword pri tarte" - +#~ msgstr "Pri tarte zobrazi vodn obrazovku Abiword" #~ msgid "" #~ "The documents you are trying to merge are unrelated. AbiWord will attempt " #~ "to merge them, but the result might be meaningless." #~ msgstr "" -#~ "Dokumenty, kter sa snate spoji, s neporovnaten. AbiWord sa " -#~ "ich pokus spoji, ale vsledok me bt nezmyseln." - +#~ "Medti dokumentami, ktor sa snate zli, nie je iadny vzah. AbiWord " +#~ "sa ich pokus zli, ale vsledok me by nezmyseln." #~ msgid "&Autotext" #~ msgstr "&Automatick text" - #~ msgid "ATTN:" -#~ msgstr "ATTN:" - +#~ msgstr "Do rk" #~ msgid "About &GNU Free Software" #~ msgstr "O &GNU Free Software" - #~ msgid "About &Open Source" #~ msgstr "O Open &Source" - #~ msgid "About the GNU project" #~ msgstr "O projekte GNU" - #~ msgid "Attention:" -#~ msgstr "Varovanie:" - +#~ msgstr "Do rk p. " #~ msgid "BCC:" #~ msgstr "BCC:" - #~ msgid "Best regards," -#~ msgstr "So srdenm pozdravom," - +#~ msgstr "So srdenm pozdravom" #~ msgid "Best wishes," -#~ msgstr "Vetko najlepie," - +#~ msgstr "Vetko najlepie" #~ msgid "CC:" #~ msgstr "CC:" - #~ msgid "CERTIFIED MAIL" -#~ msgstr "Doporuened" - +#~ msgstr "Doporuene" #~ msgid "CONFIDENTIAL" #~ msgstr "DVERN" - #~ msgid "Check &Version" -#~ msgstr "Skontrolova &verziu" - +#~ msgstr "Skontrolova &verziu" #~ msgid "Closing:" #~ msgstr "Zveren frza:" - #~ msgid "Cordially," #~ msgstr "S pozdravom," - #~ msgid "Dear Mom and Dad," #~ msgstr "Mil mamka a ocko," - #~ msgid "Dear Sir or Madam:" -#~ msgstr "Ven pn alebo pani" - +#~ msgstr "Ven (-) pn (-i)" #~ msgid "Display information about Open Source" #~ msgstr "Zobraz informcie o Open Source" - #~ msgid "Display program version number" #~ msgstr "Zobraz slo verzie programu" - #~ msgid "Email:" #~ msgstr "Email:" - #~ msgid "From:" #~ msgstr "Od:" - #~ msgid "Fwd:" -#~ msgstr "Preposla:" - +#~ msgstr "Preposla:" #~ msgid "In reply to:" -#~ msgstr "Odpov na:" - +#~ msgstr "V odpovedi na:" #~ msgid "Ladies and Gentlemen:" #~ msgstr "Dmy a pni," - #~ msgid "Love," #~ msgstr "S lskou," - #~ msgid "Mail Instructions:" -#~ msgstr "Pokyny pre potu:" - +#~ msgstr "Pokyny pre potu:" #~ msgid "PERSONAL" #~ msgstr "OSOBN" - #~ msgid "RE:" #~ msgstr "Vec" - #~ msgid "REGISTERED MAIL" #~ msgstr "Doporuene" - #~ msgid "Reference:" -#~ msgstr "Nae slo:" - +#~ msgstr "Nae slo:" #~ msgid "Regards," -#~ msgstr "S pozdravom," - +#~ msgstr "a ostvame s pozdravom" #~ msgid "Respectfully yours," -#~ msgstr "S ctou v (vaa)," - +#~ msgstr "S ctou v (-a)" #~ msgid "Respectfully," -#~ msgstr "S ctou," - +#~ msgstr "S ctou" #~ msgid "SPECIAL DELIVERY" -#~ msgstr "PECILNE DORUENIE" - +#~ msgstr "PECILNE DORUENIE" #~ msgid "Salutation:" #~ msgstr "Oslovenie:" - #~ msgid "Sincerely yours," -#~ msgstr "S pozdravom v/vaa," - +#~ msgstr "a ostvam s pozdravom" #~ msgid "Take care," #~ msgstr "Opatruj sa," - #~ msgid "Thank you," -#~ msgstr "akujem," - +#~ msgstr "S vakou" #~ msgid "Thanks," -#~ msgstr "Vaka," - +#~ msgstr "Diki" #~ msgid "To Whom It May Concern:" -#~ msgstr "Tomu, koho sa to tka:" - +#~ msgstr "Tm, ktorch sa to tka:" #~ msgid "To:" #~ msgstr "Komu:" - #~ msgid "VIA AIRMAIL" #~ msgstr "LETECKY" - #~ msgid "VIA FACSIMILE" #~ msgstr "FAXOM" - #~ msgid "VIA OVERNIGHT MAIL" -#~ msgstr "NONOU POTOU" - +#~ msgstr "NONOU POTOU" #~ msgid "Yours truly," -#~ msgstr "Na vdy v/vaa," +#~ msgstr "S pozdravom" Binary files /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/po/zh-CN.po and /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/po/zh-CN.po differ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/cocoa/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/cocoa/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/ev/cocoa/GNUmakefile.in 2008-04-06 22:26:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/cocoa/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -228,8 +227,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -309,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -355,7 +353,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -372,10 +370,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -423,8 +421,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -487,8 +485,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -500,8 +498,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -511,13 +509,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/ev/GNUmakefile.in 2008-04-06 22:26:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -65,7 +65,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -230,8 +229,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -311,6 +308,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -357,7 +355,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -374,10 +372,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -412,8 +410,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -526,8 +524,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -552,8 +550,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -563,13 +561,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/qnx/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/qnx/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/ev/qnx/GNUmakefile.in 2008-04-06 22:26:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/qnx/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -228,8 +227,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -309,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -355,7 +353,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -372,10 +370,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -423,8 +421,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -487,8 +485,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -500,8 +498,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -511,13 +509,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/unix/ev_UnixMenu.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/unix/ev_UnixMenu.cpp --- abiword-2.6.2/abiword/src/af/ev/unix/ev_UnixMenu.cpp 2008-04-06 17:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/unix/ev_UnixMenu.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -85,7 +85,7 @@ // map the user_data into an object and dispatch the event. _wd * wd = static_cast<_wd *>(callback_data); - UT_ASSERT(wd); + UT_return_if_fail(wd); wd->m_pUnixMenu->menuEvent(wd->m_id); } @@ -95,11 +95,11 @@ UT_ASSERT(widget && data); _wd * wd = static_cast<_wd *>(data); - UT_ASSERT(wd && wd->m_pUnixMenu); + UT_return_if_fail(wd && wd->m_pUnixMenu); // WL_REFACTOR: redundant code XAP_Frame * pFrame = wd->m_pUnixMenu->getFrame(); - UT_ASSERT(pFrame); + UT_return_if_fail(pFrame); EV_Menu_Label * pLabel = wd->m_pUnixMenu->getLabelSet()->getLabel(wd->m_id); if (!pLabel) { @@ -118,10 +118,10 @@ UT_ASSERT(widget && data); _wd * wd = static_cast<_wd *>(data); - UT_ASSERT(wd && wd->m_pUnixMenu); + UT_return_if_fail(wd && wd->m_pUnixMenu); XAP_Frame * pFrame = wd->m_pUnixMenu->getFrame(); - UT_ASSERT(pFrame); + UT_return_if_fail(pFrame); pFrame->setStatusMessage(NULL); } @@ -129,19 +129,19 @@ static void s_onInitMenu(GtkMenuItem * menuItem, gpointer callback_data) { _wd * wd = static_cast<_wd *>(callback_data); - UT_ASSERT(wd); + UT_return_if_fail(wd); wd->m_pUnixMenu->refreshMenu(wd->m_pUnixMenu->getFrame()->getCurrentView()); } static void s_onDestroyMenu(GtkMenuItem * menuItem, gpointer callback_data) { _wd * wd = static_cast<_wd *>(callback_data); - UT_ASSERT(wd); + UT_return_if_fail(wd); // we always clear the status bar when a menu goes away, so we don't // leave a message behind XAP_Frame * pFrame = wd->m_pUnixMenu->getFrame(); - UT_ASSERT(pFrame); + UT_return_if_fail(pFrame); pFrame->setStatusMessage(NULL); } @@ -315,17 +315,17 @@ // return true if handled. const EV_Menu_ActionSet * pMenuActionSet = m_pUnixApp->getMenuActionSet(); - UT_ASSERT(pMenuActionSet); + UT_return_val_if_fail(pMenuActionSet, false); const EV_Menu_Action * pAction = pMenuActionSet->getAction(id); - UT_ASSERT(pAction); + UT_return_val_if_fail(pAction, false); const char * szMethodName = pAction->getMethodName(); if (!szMethodName) return false; const EV_EditMethodContainer * pEMC = m_pUnixApp->getEditMethodContainer(); - UT_ASSERT(pEMC); + UT_return_val_if_fail(pEMC, false); EV_EditMethod * pEM = pEMC->findEditMethodByName(szMethodName); UT_ASSERT(pEM); // make sure it's bound to something @@ -420,7 +420,7 @@ for (UT_uint32 k = 0; (k < nrLabelItemsInLayout); k++) { EV_Menu_LayoutItem * pLayoutItem = m_pMenuLayout->getLayoutItem(k); - UT_ASSERT(pLayoutItem); + UT_continue_if_fail(pLayoutItem); XAP_Menu_Id id = pLayoutItem->getMenuId(); // VERY BAD HACK! It will be here until I fix the const correctness of all the functions diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/unix/ev_UnixMouse.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/unix/ev_UnixMouse.cpp --- abiword-2.6.2/abiword/src/af/ev/unix/ev_UnixMouse.cpp 2008-04-06 17:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/unix/ev_UnixMouse.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -257,9 +257,15 @@ // map the scrolling type generated from mouse buttons 4 to 7 onto mousebuttons if (e->direction == GDK_SCROLL_UP) - emb = EV_EMB_BUTTON4; + { + emb = EV_EMB_BUTTON4; + xxx_UT_DEBUGMSG(("Scroll up detected \n")); + } else if (e->direction == GDK_SCROLL_DOWN) - emb = EV_EMB_BUTTON5; + { + emb = EV_EMB_BUTTON5; + xxx_UT_DEBUGMSG(("Scroll down detected \n")); + } /*else if (e->direction == GDK_SCROLL_LEFT) // we don't handle buttons 6 and 7 emb = EV_EMB_BUTTON6; else if (e->direction == GDK_SCROLL_RIGHT) @@ -270,7 +276,7 @@ UT_DEBUGMSG(("EV_UnixMouse::mouseScroll: unhandled scroll action\n")); return; } - + if (e->state & GDK_SHIFT_MASK) state |= EV_EMS_SHIFT; if (e->state & GDK_CONTROL_MASK) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/unix/ev_UnixToolbar.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/unix/ev_UnixToolbar.cpp --- abiword-2.6.2/abiword/src/af/ev/unix/ev_UnixToolbar.cpp 2008-04-06 17:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/unix/ev_UnixToolbar.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -284,8 +284,8 @@ g_signal_handler_block (G_OBJECT (combo), handler_id); prelight_handler_id = 0; if (ABI_IS_FONT_COMBO (combo)) { - prelight_handler_id = * (gulong *) g_object_get_data (G_OBJECT (combo), PROP_HANDLER_ID); - g_signal_handler_block (G_OBJECT (combo), prelight_handler_id); + prelight_handler_id = GPOINTER_TO_UINT(g_object_get_data (G_OBJECT (combo), PROP_HANDLER_ID)); + g_signal_handler_block (G_OBJECT (combo), prelight_handler_id); } gtk_combo_box_set_active_iter (combo, &iter); @@ -298,7 +298,7 @@ else if (ABI_IS_FONT_COMBO (combo)) { // special case font combo, non existant entries are added g_signal_handler_block (G_OBJECT (combo), handler_id); - prelight_handler_id = * (gulong *) g_object_get_data (G_OBJECT (combo), PROP_HANDLER_ID); + prelight_handler_id = GPOINTER_TO_UINT(g_object_get_data (G_OBJECT (combo), PROP_HANDLER_ID)); g_signal_handler_block (G_OBJECT (combo), prelight_handler_id); abi_font_combo_insert_font (ABI_FONT_COMBO (combo), text, TRUE); @@ -332,7 +332,7 @@ // map the user_data into an object and dispatch the event. _wd * wd = static_cast<_wd *>(user_data); - UT_ASSERT(wd); + UT_return_if_fail(wd); GdkEvent * event = gtk_get_current_event(); wd->m_pUnixToolbar->setCurrentEvent(event); if (!wd->m_blockSignal) @@ -347,7 +347,7 @@ // map the user_data into an object and dispatch the event. _wd * wd = reinterpret_cast<_wd *>(user_data); - UT_ASSERT(wd); + UT_return_if_fail(wd); GdkEvent * event = gtk_get_current_event(); wd->m_pUnixToolbar->setCurrentEvent(event); if (!wd->m_blockSignal && (rows > 0) && (cols > 0)) @@ -456,7 +456,7 @@ static void s_combo_changed(GtkComboBox * combo, _wd * wd) { - UT_ASSERT(wd); + UT_return_if_fail(wd); // only act if the widget has been shown and embedded in the toolbar if (!wd->m_widget || wd->m_blockSignal) { @@ -555,7 +555,7 @@ const gchar * editMethod = gtk_action_get_name(action); XAP_UnixApp * pUnixApp = wd->m_pUnixToolbar->getApp(); const EV_EditMethodContainer * pEMC = pUnixApp->getEditMethodContainer(); - UT_ASSERT(pEMC); + UT_return_if_fail(pEMC); EV_EditMethod * pEM = NULL; AV_View * pView = wd->m_pUnixToolbar->getFrame()->getCurrentView(); @@ -585,6 +585,9 @@ EV_UnixToolbar::~EV_UnixToolbar(void) { UT_VECTOR_PURGEALL(_wd *,m_vecToolbarWidgets); + if(m_wVSizeGroup) { + g_object_unref(m_wVSizeGroup); + } _releaseListener(); } @@ -605,7 +608,7 @@ XAP_Toolbar_Id id = wd->m_id; const EV_Toolbar_ActionSet * pToolbarActionSet = m_pUnixApp->getToolbarActionSet(); - UT_ASSERT(pToolbarActionSet); + UT_return_val_if_fail(pToolbarActionSet, false); const EV_Toolbar_Action * pAction = pToolbarActionSet->getAction(id); UT_ASSERT(pAction); @@ -642,7 +645,7 @@ return false; const EV_EditMethodContainer * pEMC = m_pUnixApp->getEditMethodContainer(); - UT_ASSERT(pEMC); + UT_return_val_if_fail(pEMC, false); EV_EditMethod * pEM = pEMC->findEditMethodByName(szMethodName); UT_ASSERT(pEM); // make sure it's bound to something @@ -787,6 +790,7 @@ //m_wHSizeGroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); m_wVSizeGroup = gtk_size_group_new(GTK_SIZE_GROUP_VERTICAL); + g_object_ref(m_wVSizeGroup); #if defined(EMBEDDED_TARGET) && EMBEDDED_TARGET == EMBEDDED_TARGET_HILDON #else @@ -802,7 +806,7 @@ for (UT_uint32 k=0; (k < nrLabelItemsInLayout); k++) { EV_Toolbar_LayoutItem * pLayoutItem = m_pToolbarLayout->getLayoutItem(k); - UT_ASSERT(pLayoutItem); + UT_continue_if_fail(pLayoutItem); XAP_Toolbar_Id id = pLayoutItem->getToolbarId(); EV_Toolbar_Action * pAction = pToolbarActionSet->getAction(id); @@ -870,7 +874,10 @@ gtk_drag_source_set(wwd,GDK_BUTTON3_MASK, s_AbiTBTargets,1, GDK_ACTION_COPY); - setDragIcon(wwd, (GtkImage*)gtk_image_new_from_stock(ABIWORD_INSERT_TABLE, GTK_ICON_SIZE_DND)); + GtkImage * dragimage = (GtkImage*)gtk_image_new_from_stock(ABIWORD_INSERT_TABLE, GTK_ICON_SIZE_DND); + g_object_ref_sink(dragimage); + setDragIcon(wwd, dragimage); // does not take ownership + g_object_unref(dragimage); gtk_drag_dest_set(wwd, GTK_DEST_DEFAULT_ALL, s_AbiTBTargets,1, GDK_ACTION_COPY); @@ -887,16 +894,6 @@ UT_ASSERT(g_ascii_strcasecmp(pLabel->getIconName(),"NoIcon")!=0); gboolean show = TRUE; - if (0 == strncmp("ALIGN_RIGHT", pLabel->getIconName(), strlen("ALIGN_RIGHT")) && - GTK_TEXT_DIR_RTL != gtk_widget_get_direction(m_wToolbar)) { - /* only show in rtl mode */ - show = FALSE; - } - else if (0 == strncmp("ALIGN_LEFT", pLabel->getIconName(), strlen("ALIGN_LEFT")) && - GTK_TEXT_DIR_RTL == gtk_widget_get_direction(m_wToolbar)) { - /* only show in ltr mode */ - show = FALSE; - } wd->m_widget = toolbar_append_toggle (GTK_TOOLBAR (m_wToolbar), pLabel->getIconName(), pLabel->getToolbarLabel(), NULL, (GCallback) _wd::s_callback, (gpointer) wd, @@ -912,7 +909,10 @@ s_AbiTBTargets,1, GDK_ACTION_COPY); gchar *stock_id = abi_stock_from_toolbar_id(pLabel->getIconName()); - setDragIcon(wwd, (GtkImage*)gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_DND)); + GtkImage *dragimage = (GtkImage*)gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_DND); + g_object_ref_sink(dragimage); + setDragIcon(wwd, dragimage); // does not take dragimage ownership + g_object_unref(dragimage); g_free (stock_id); stock_id = NULL; gtk_drag_dest_set(wwd,static_cast(GTK_DEST_DEFAULT_ALL), @@ -948,10 +948,10 @@ proxy_action_name = "dlgFont"; } else if (wd->m_id == AP_TOOLBAR_ID_FMT_FONT) { - gulong *handler_id = new gulong; + gulong handler_id; combo = abi_font_combo_new (); gtk_widget_set_name (combo, "AbiFontCombo"); - *handler_id = g_signal_connect (G_OBJECT(combo), "prelight", + handler_id = g_signal_connect (G_OBJECT(combo), "prelight", G_CALLBACK(_wd::s_font_prelight), wd); g_signal_connect (G_OBJECT(combo), "popup-opened", @@ -960,7 +960,8 @@ g_signal_connect (G_OBJECT(combo), "popup-closed", G_CALLBACK(_wd::s_font_popup_closed), wd); - g_object_set_data (G_OBJECT (combo), PROP_HANDLER_ID, handler_id); + g_object_set_data (G_OBJECT (combo), PROP_HANDLER_ID, + GUINT_TO_POINTER(handler_id)); // same size for font and font-size combos // gtk_widget_set_size_request (combo, 0, -1); // gtk_size_group_add_widget (m_wHSizeGroup, combo); @@ -1204,11 +1205,11 @@ for (UT_uint32 k=0; (k < nrLabelItemsInLayout); k++) { EV_Toolbar_LayoutItem * pLayoutItem = m_pToolbarLayout->getLayoutItem(k); - UT_ASSERT(pLayoutItem); + UT_continue_if_fail(pLayoutItem); XAP_Toolbar_Id id = pLayoutItem->getToolbarId(); EV_Toolbar_Action * pAction = pToolbarActionSet->getAction(id); - UT_ASSERT(pAction); + UT_continue_if_fail(pAction); AV_ChangeMask maskOfInterest = pAction->getChangeMaskOfInterest(); if ((maskOfInterest & mask) == 0) // if this item doesn't care about @@ -1436,7 +1437,7 @@ // UT_ASSERT(wd->m_id == AP_TOOLBAR_ID_FMT_STYLE); XAP_Toolbar_ControlFactory * pFactory = m_pUnixApp->getControlFactory(); - UT_ASSERT(pFactory); + UT_return_val_if_fail(pFactory, false); EV_Toolbar_Control * pControl = pFactory->getControl(this, id); AP_UnixToolbar_StyleCombo * pStyleC = static_cast(pControl); pStyleC->repopulate(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/unix/gnome/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/unix/gnome/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/ev/unix/gnome/GNUmakefile.in 2008-04-06 22:26:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/unix/gnome/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -228,8 +227,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -309,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -355,7 +353,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -372,10 +370,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -417,8 +415,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -477,8 +475,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -490,8 +488,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -501,13 +499,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/unix/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/ev/unix/GNUmakefile.in 2008-04-06 22:26:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -243,8 +242,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -324,6 +321,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -370,7 +368,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -387,10 +385,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -454,8 +452,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -603,8 +601,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -629,8 +627,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -640,13 +638,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Keyboard.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Keyboard.h --- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Keyboard.h 2008-04-06 17:00:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Keyboard.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ class AV_View; -class ev_Win32Keyboard : public EV_Keyboard +class ABI_EXPORT ev_Win32Keyboard : public EV_Keyboard { public: ev_Win32Keyboard(EV_EditEventMapper * pEEM); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Menu.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Menu.h --- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Menu.h 2008-04-06 17:00:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Menu.h 2009-07-15 16:56:23.000000000 +0100 @@ -42,7 +42,7 @@ } EV_Menu_Bitmap; -class EV_Win32Menu : public EV_Menu +class ABI_EXPORT EV_Win32Menu : public EV_Menu { public: EV_Win32Menu(XAP_Win32App * pWin32App, @@ -98,7 +98,7 @@ /*****************************************************************/ -class EV_Win32MenuBar : public EV_Win32Menu +class ABI_EXPORT EV_Win32MenuBar : public EV_Win32Menu { public: EV_Win32MenuBar(XAP_Win32App * pWin32App, @@ -112,7 +112,7 @@ /*****************************************************************/ -class EV_Win32MenuPopup : public EV_Win32Menu +class ABI_EXPORT EV_Win32MenuPopup : public EV_Win32Menu { public: EV_Win32MenuPopup(XAP_Win32App * pWin32App, diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Mouse.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Mouse.h --- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Mouse.h 2008-04-06 17:00:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Mouse.h 2009-07-15 16:56:23.000000000 +0100 @@ -34,7 +34,7 @@ class AV_View; -class EV_Win32Mouse : public EV_Mouse +class ABI_EXPORT EV_Win32Mouse : public EV_Mouse { public: EV_Win32Mouse(EV_EditEventMapper * pEEM); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Toolbar.cpp --- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar.cpp 2008-04-06 17:00:03.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Toolbar.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -74,7 +74,7 @@ // This one should really be in the anonymous namespace in this translation // unit, but since we don't use namespaces... // -class foo_Bitmap_container +class ABI_EXPORT foo_Bitmap_container { public: // d'tor needs to be public due to buggy MSVC compilers ~foo_Bitmap_container(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Toolbar.h --- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar.h 2008-04-06 17:00:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Toolbar.h 2009-07-15 16:56:23.000000000 +0100 @@ -45,7 +45,7 @@ #define _ev_MENU_OFFSET 1000 #endif -class EV_Win32Toolbar : public EV_Toolbar +class ABI_EXPORT EV_Win32Toolbar : public EV_Toolbar { public: EV_Win32Toolbar(XAP_Win32App * pWin32App, XAP_Frame * pFrame, diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar_ViewListener.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Toolbar_ViewListener.h --- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar_ViewListener.h 2008-04-06 17:00:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/win/ev_Win32Toolbar_ViewListener.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ class AV_View; -class EV_Win32Toolbar_ViewListener : public AV_Listener +class ABI_EXPORT EV_Win32Toolbar_ViewListener : public AV_Listener { public: EV_Win32Toolbar_ViewListener(EV_Win32Toolbar * pWin32Toolbar, diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/win/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/win/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/ev/win/GNUmakefile.in 2008-04-06 22:26:03.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/win/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -229,8 +228,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -310,6 +307,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -356,7 +354,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -373,10 +371,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -426,8 +424,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -490,8 +488,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -503,8 +501,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -514,13 +512,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/xp/ev_EditBinding.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/xp/ev_EditBinding.cpp --- abiword-2.6.2/abiword/src/af/ev/xp/ev_EditBinding.cpp 2008-04-06 17:00:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/xp/ev_EditBinding.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -63,7 +63,7 @@ /*****************************************************************/ /*****************************************************************/ -class ev_EB_MouseTable +class ABI_EXPORT ev_EB_MouseTable { public: ev_EB_MouseTable() @@ -88,7 +88,7 @@ EV_EditBinding * m_peb[EV_COUNT_EMO][EV_COUNT_EMS][EV_COUNT_EMC]; }; -class ev_EB_NVK_Table +class ABI_EXPORT ev_EB_NVK_Table { public: ev_EB_NVK_Table() @@ -110,7 +110,7 @@ EV_EditBinding * m_peb[EV_COUNT_NVK][EV_COUNT_EMS]; }; -class ev_EB_Char_Table +class ABI_EXPORT ev_EB_Char_Table { public: ev_EB_Char_Table() @@ -140,7 +140,8 @@ /*****************************************************************/ /*****************************************************************/ -EV_EditBindingMap::EV_EditBindingMap(EV_EditMethodContainer * pemc) +EV_EditBindingMap::EV_EditBindingMap(EV_EditMethodContainer * pemc): + m_iLastMouseNo(0) { UT_ASSERT(pemc); m_pemc = pemc; @@ -334,6 +335,16 @@ if (EV_IsMouse(eb)) // mouse { UT_uint32 n_emb = EV_EMB_ToNumber(eb)-1; + xxx_UT_DEBUGMSG(("is mouse %d binding number %d \n",eb,n_emb)); + // + // Handle the case of accidently middle clicking during a + // mouse wheel scroll. + // + if((n_emb == 2) && ((m_iLastMouseNo == 4) || (m_iLastMouseNo == 5))) + { + n_emb = m_iLastMouseNo; + } + m_iLastMouseNo = n_emb; class ev_EB_MouseTable * p = m_pebMT[n_emb]; if (!p) return 0; // no bindings of anykind for this mouse button diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/xp/ev_EditBinding.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/xp/ev_EditBinding.h --- abiword-2.6.2/abiword/src/af/ev/xp/ev_EditBinding.h 2008-04-06 17:00:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/xp/ev_EditBinding.h 2009-07-15 16:56:23.000000000 +0100 @@ -98,6 +98,7 @@ ev_EB_Char_Table * m_pebChar; bool bindingUsesMethod( EV_EditBinding* binding, EV_EditMethod* method ); + UT_uint32 m_iLastMouseNo; }; /*****************************************************************/ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/xp/ev_EditMethod.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/xp/ev_EditMethod.cpp --- abiword-2.6.2/abiword/src/af/ev/xp/ev_EditMethod.cpp 2008-04-06 17:00:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/xp/ev_EditMethod.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -282,9 +282,7 @@ return pEM->Fn(pView, pData); } pView = pFrame->getCurrentView() ; - UT_ASSERT(pView); - if (!pView) - return false; + UT_return_val_if_fail(pView, false); // return whatever the method says to based on the data at hand return pEM->Fn(pView, pData); @@ -314,17 +312,13 @@ bool ev_EditMethod_invoke (const char * methodName, const char * data) { - UT_ASSERT(data); - if(!data) - return false; + UT_return_val_if_fail(data, false); return ev_EditMethod_invoke ( methodName, UT_String(data) ) ; } bool ev_EditMethod_invoke (const char * methodName, const UT_UCSChar * data) { - UT_ASSERT(data); - if(!data) - return false; + UT_return_val_if_fail(data, false); return ev_EditMethod_invoke ( methodName, UT_UCS4String(data) ) ; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/xp/ev_Menu.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/xp/ev_Menu.cpp --- abiword-2.6.2/abiword/src/af/ev/xp/ev_Menu.cpp 2008-04-06 17:00:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/xp/ev_Menu.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -150,7 +150,7 @@ UT_uint32 dataLength) { UT_ASSERT(pView); - UT_ASSERT(pEM); + UT_return_val_if_fail(pEM, false); //UT_DEBUGMSG(("invokeMenuMethod: %s\n",pEM->getName())); @@ -221,13 +221,13 @@ if (szMethodName) { const EV_EditMethodContainer * pEMC = pApp->getEditMethodContainer(); - UT_ASSERT(pEMC); + UT_return_val_if_fail(pEMC, NULL); EV_EditMethod * pEM = pEMC->findEditMethodByName(szMethodName); UT_ASSERT(pEM); // make sure it's bound to something const EV_EditEventMapper * pEEM = getApp()->getEditEventMapper(); - UT_ASSERT(pEEM); + UT_return_val_if_fail(pEEM, NULL); const char * string = pEEM->getShortcutFor(pEM); if (string && *string) @@ -266,7 +266,7 @@ const UT_GenericVector * labels_table = labels->getAllLabels(); const EV_Menu_Label *l = 0; - UT_ASSERT(labels_table); + UT_return_val_if_fail(labels_table, 0); UT_uint32 size_labels = labels_table->size(); XAP_Menu_Id id = 0; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/xp/ev_Toolbar.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/xp/ev_Toolbar.cpp --- abiword-2.6.2/abiword/src/af/ev/xp/ev_Toolbar.cpp 2008-04-06 17:00:03.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/xp/ev_Toolbar.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -74,7 +74,7 @@ UT_uint32 dataLength) { UT_ASSERT(pView); - UT_ASSERT(pEM); + UT_return_val_if_fail(pEM, false); //UT_DEBUGMSG(("invokeToolbarMethod: %s\n",pEM->getName())); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/ev/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/ev/xp/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/ev/xp/GNUmakefile.in 2008-04-06 22:26:03.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/ev/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -233,8 +232,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -314,6 +311,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -360,7 +358,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -377,10 +375,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -448,8 +446,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -522,8 +520,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -535,8 +533,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -546,13 +544,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/GNUmakefile.in 2008-04-06 22:26:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,7 +53,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -205,8 +204,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -286,6 +283,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = tf ev gr util xap @@ -297,8 +295,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -398,8 +396,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -424,8 +422,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -435,13 +433,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/cocoa/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/cocoa/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/gr/cocoa/GNUmakefile.in 2008-04-06 22:26:03.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/cocoa/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -226,8 +225,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -307,6 +304,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -353,7 +351,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -370,10 +368,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -415,8 +413,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -476,8 +474,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -489,8 +487,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -500,13 +498,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/gr/GNUmakefile.in 2008-04-06 22:26:03.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -65,7 +65,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -230,8 +229,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -311,6 +308,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -357,7 +355,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -374,10 +372,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -411,8 +409,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -525,8 +523,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -551,8 +549,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -562,13 +560,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/qnx/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/qnx/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/gr/qnx/GNUmakefile.in 2008-04-06 22:26:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/qnx/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -227,8 +226,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -308,6 +305,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -354,7 +352,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -371,10 +369,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -414,8 +412,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -475,8 +473,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -488,8 +486,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -499,13 +497,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/unix/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/gr/unix/GNUmakefile.in 2008-04-06 22:26:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -228,8 +227,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -309,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -355,7 +353,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -372,10 +370,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -418,8 +416,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -481,8 +479,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -494,8 +492,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -505,13 +503,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixImage.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixImage.cpp --- abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixImage.cpp 2008-04-06 16:59:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixImage.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -352,6 +352,18 @@ g_object_unref(G_OBJECT(ldr)); return false; } + + if ( !gdk_pixbuf_loader_close (ldr, &err) ) + { + if(err != NULL) + { + UT_DEBUGMSG(("DOM: couldn't close loader:%s \n", err->message)); + g_error_free(err); + } + g_object_unref(G_OBJECT(ldr)); + return false; + } + // // This is just pointer to the buffer in the loader. This can be deleted // when we close the loader. diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixImage.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixImage.h --- abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixImage.h 2008-04-06 16:59:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixImage.h 2009-07-15 16:56:23.000000000 +0100 @@ -24,7 +24,7 @@ #include "gr_Image.h" -class GR_UnixImage : public GR_RasterImage +class ABI_EXPORT GR_UnixImage : public GR_RasterImage { friend class GR_UnixPangoGraphics; public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixNullGraphics.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixNullGraphics.h --- abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixNullGraphics.h 2008-04-06 16:59:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixNullGraphics.h 2009-07-15 16:56:23.000000000 +0100 @@ -29,7 +29,7 @@ /*****************************************************************/ /*****************************************************************/ -class GR_UnixNullGraphicsAllocInfo : public GR_AllocInfo +class ABI_EXPORT GR_UnixNullGraphicsAllocInfo : public GR_AllocInfo { public: GR_UnixNullGraphicsAllocInfo() diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.cpp --- abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.cpp 2008-04-06 16:59:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -48,6 +48,7 @@ #include #include #include +#include #ifdef HAVE_PANGOFT2 #include @@ -81,6 +82,20 @@ int GR_UnixPangoGraphics::s_iMaxScript = 0; +static void _pango_item_list_free(GList * items) +{ + GList * l; + for( l = items; l ; l = l->next) { + if(l->data) { + pango_item_free(static_cast(l->data)); + l->data = NULL; + } + } + g_list_free(items); +} + + + class GR_UnixPangoItem: public GR_Item { friend class GR_UnixPangoGraphics; @@ -137,6 +152,7 @@ GR_UnixPangoRenderInfo(GR_ScriptType t): GR_RenderInfo(t), m_pGlyphs(NULL), + m_pScaledGlyphs(NULL), m_pLogOffsets(NULL), m_pJustify(NULL), m_iZoom(0), @@ -153,6 +169,8 @@ delete [] m_pJustify; delete [] m_pLogOffsets; if(m_pGlyphs) pango_glyph_string_free(m_pGlyphs); + if(m_pScaledGlyphs) + pango_glyph_string_free(m_pScaledGlyphs); s_iInstanceCount--; if(!s_iInstanceCount) @@ -187,6 +205,7 @@ } PangoGlyphString* m_pGlyphs; + PangoGlyphString* m_pScaledGlyphs; int * m_pLogOffsets; int * m_pJustify; UT_uint32 m_iZoom; @@ -237,10 +256,13 @@ : m_pFontMap(NULL), m_pContext(NULL), + m_pLayoutFontMap(NULL), + m_pLayoutContext(NULL), m_bOwnsFontMap(false), m_pPFont(NULL), m_pPFontGUI(NULL), m_pAdjustedPangoFont(NULL), + m_pAdjustedLayoutPangoFont(NULL), m_pAdjustedPangoFontSource(NULL), m_iAdjustedPangoFontZoom (0), m_iDeviceResolution(96), @@ -262,10 +284,13 @@ : m_pFontMap(NULL), m_pContext(NULL), + m_pLayoutFontMap(NULL), + m_pLayoutContext(NULL), m_bOwnsFontMap(false), m_pPFont(NULL), m_pPFontGUI(NULL), m_pAdjustedPangoFont(NULL), + m_pAdjustedLayoutPangoFont(NULL), m_pAdjustedPangoFontSource(NULL), m_iAdjustedPangoFontZoom (0), m_iDeviceResolution(96), @@ -285,10 +310,15 @@ GR_UnixPangoGraphics::~GR_UnixPangoGraphics() { + xxx_UT_DEBUGMSG(("Deleting UnixPangoGraphics %x \n",this)); if(m_pAdjustedPangoFont!= NULL) { g_object_unref(m_pAdjustedPangoFont); } + if(m_pAdjustedLayoutPangoFont!= NULL) + { + g_object_unref(m_pAdjustedLayoutPangoFont); + } if (m_pContext != NULL) { g_object_unref(m_pContext); @@ -299,6 +329,12 @@ _destroyFonts(); delete m_pPFontGUI; + g_object_unref(m_pLayoutContext); + if(m_pLayoutFontMap) { + // see bug http://bugzilla.gnome.org/show_bug.cgi?id=143542 + pango_fc_font_map_cache_clear((PangoFcFontMap*)m_pLayoutFontMap); + g_object_unref(m_pLayoutFontMap); + } if (m_pXftDraw) g_free(m_pXftDraw); @@ -455,7 +491,7 @@ #ifdef HAVE_PANGOFT2 else { - m_iDeviceResolution = 72; + m_iDeviceResolution = 72.; m_pFontMap = pango_ft2_font_map_new (); pango_ft2_font_map_set_resolution(reinterpret_cast(m_pFontMap), m_iDeviceResolution, @@ -463,6 +499,11 @@ m_pContext = pango_ft2_font_map_create_context(reinterpret_cast(m_pFontMap)); m_bOwnsFontMap = true; } + m_pLayoutFontMap = pango_ft2_font_map_new (); + pango_ft2_font_map_set_resolution(reinterpret_cast(m_pLayoutFontMap), + getResolution(), + getResolution()); + m_pLayoutContext = pango_ft2_font_map_create_context(reinterpret_cast(m_pLayoutFontMap)); #endif } @@ -1037,6 +1078,11 @@ } } + if(pfs) + { + g_object_unref((GObject*)pfs); + pfs = NULL; + } if (pFontSubst) { /* @@ -1046,7 +1092,7 @@ if (pItem->m_pi->analysis.font) g_object_unref (G_OBJECT (pItem->m_pi->analysis.font)); - pItem->m_pi->analysis.font = pFontSubst; + pItem->m_pi->analysis.font = (PangoFont*)g_object_ref((GObject*)pFontSubst); } RI->m_iCharCount = si.m_iLength; @@ -1057,7 +1103,14 @@ RI->m_pGlyphs = NULL; } + if(RI->m_pScaledGlyphs) + { + pango_glyph_string_free(RI->m_pScaledGlyphs); + RI->m_pScaledGlyphs = NULL; + } + RI->m_pGlyphs = pango_glyph_string_new(); + RI->m_pScaledGlyphs = pango_glyph_string_new(); /* * We want to do the shaping on a font at it's actual point size, so we @@ -1094,9 +1147,10 @@ } UT_return_val_if_fail(pfd, false); - PangoFont * pf = pango_context_load_font(getContext(), pfd); + PangoFont * pf = pango_context_load_font(getLayoutContext(), pfd); pango_font_description_free(pfd); + // no need to ref pf because it will replaced right after pItem->m_pi->analysis.font = pf; // need to set the embedding level here based on the level of our run @@ -1104,9 +1158,10 @@ pango_shape(utf8.utf8_str(), utf8.byteLength(), &(pItem->m_pi->analysis), RI->m_pGlyphs); + pango_shape(utf8.utf8_str(), utf8.byteLength(), + &(pItem->m_pi->analysis), RI->m_pScaledGlyphs); - if (pPangoFontOrig) - pItem->m_pi->analysis.font = pPangoFontOrig; + pItem->m_pi->analysis.font = pPangoFontOrig; if(RI->m_pLogOffsets) { @@ -1147,7 +1202,13 @@ GR_UnixPangoFont * pFont = (GR_UnixPangoFont *) RI.m_pFont; UT_return_val_if_fail( pFont, 0 ); - PangoFont * pf = _adjustedPangoFont(pFont, pItem->m_pi->analysis.font); + // + // Actually want the layout font here + // + PangoFont * pf = _adjustedLayoutPangoFont(pFont, pItem->m_pi->analysis.font); + PangoFont * pfa = _adjustedPangoFont(pFont, pItem->m_pi->analysis.font); + + xxx_UT_DEBUGMSG(("Adjusted Layout font %x Adjusted font %x \n",pf,pfa)); UT_return_val_if_fail( pf, 0 ); UT_sint32 iStart = RI.m_iOffset; @@ -1233,7 +1294,11 @@ } UT_ASSERT_HARMLESS( iOffsetStart >= 0 ); - + + PangoFontDescription * pfd = pango_font_describe (pf); + int isize = pango_font_description_get_size(pfd); + xxx_UT_DEBUGMSG(("Font size in _measureExtents %d \n",isize)); + if(iOffsetEnd < 0 && iDir == UT_BIDI_LTR) { // to the end @@ -1258,7 +1323,7 @@ xxx_UT_DEBUGMSG(("::getTextWidth start %d, end %d, w %d, x %d\n", iOffsetStart, iOffsetEnd, LR.width, LR.x)); - return ptlu(LR.width + LR.x); + return ptlunz(LR.width + LR.x); } @@ -1283,7 +1348,7 @@ } /* - * This is used to get PangoFont that is correct for present zoom level. + * This is used to get device zoomed PangoFont that is correct for present zoom level. * pFont is the font that we are supposed to be using (the user-selected font) * pf is the PangoFont that we are actually using (possibly a different, * substituted font). @@ -1310,23 +1375,87 @@ PangoFontDescription * pfd = pango_font_describe (pf); double dSize = pFont->getPointSize (); + + /* We cache this font to avoid all this huha if we can */ + if (m_pAdjustedLayoutPangoFont) + { + g_object_unref(m_pAdjustedLayoutPangoFont); + } + if (m_pAdjustedPangoFont) + { + g_object_unref(m_pAdjustedPangoFont); + } + pango_font_description_set_size (pfd, (gint)dSize * PANGO_SCALE); + m_pAdjustedLayoutPangoFont = pango_context_load_font(getLayoutContext(), pfd); + m_pAdjustedPangoFontSource = pFont; + dSize = (gint)(dSize*(double)PANGO_SCALE *(double)getZoomPercentage() / 100.0); + pango_font_description_set_size (pfd, (gint)dSize); + m_pAdjustedPangoFont = pango_context_load_font(getContext(), pfd); + m_iAdjustedPangoFontZoom = getZoomPercentage(); + pango_font_description_free(pfd); + + return m_pAdjustedPangoFont; +} + + +/* + * This is used to get Layout PangoFont that is correct for present zoom level. + * pFont is the font that we are supposed to be using (the user-selected font) + * pf is the PangoFont that we are actually using (possibly a different, + * substituted font). + */ +PangoFont * GR_UnixPangoGraphics::_adjustedLayoutPangoFont (GR_UnixPangoFont * pFont, PangoFont * pf) +{ + UT_return_val_if_fail(pFont, NULL); + + if (!pf) + { + xxx_UT_DEBUGMSG(("Getting Layout font \n")); + return pFont->getPangoLayoutFont(); + } + /* See if this is not the font we have currently cached */ + if (pFont == m_pAdjustedPangoFontSource && + m_iAdjustedPangoFontZoom == getZoomPercentage()) + { + return m_pAdjustedLayoutPangoFont; + } + + /* + * When Pango is doing font substitution for us, the substitute font + * we are getting always has size 12pt, so we have to use the size of + * our own font to fix this. + */ + PangoFontDescription * pfd = pango_font_describe (pf); + + double dSize = pFont->getPointSize()*(double)PANGO_SCALE; + + xxx_UT_DEBUGMSG(("Setting adjustedLayout point size %f \n",dSize)); pango_font_description_set_size (pfd, (gint)dSize); /* We cache this font to avoid all this huha if we can */ - if (m_pAdjustedPangoFont) + if (m_pAdjustedLayoutPangoFont) + { + g_object_unref(m_pAdjustedLayoutPangoFont); + } + if (m_pAdjustedPangoFont ) { g_object_unref(m_pAdjustedPangoFont); } - m_pAdjustedPangoFont = pango_context_load_font(getContext(), pfd); + m_pAdjustedLayoutPangoFont = pango_context_load_font(getLayoutContext(), pfd); m_pAdjustedPangoFontSource = pFont; + + dSize = + (gint)(dSize* (double)getZoomPercentage() / 100.0); + pango_font_description_set_size (pfd, (gint)dSize); + m_pAdjustedPangoFont = pango_context_load_font(getContext(), pfd); m_iAdjustedPangoFontZoom = getZoomPercentage(); pango_font_description_free(pfd); - return m_pAdjustedPangoFont; + return m_pAdjustedLayoutPangoFont; } @@ -1346,6 +1475,9 @@ if(RI.m_iLength == 0) return; + // + // Actually want the zoomed device font here + // PangoFont * pf = _adjustedPangoFont(pFont, pItem->m_pi->analysis.font); xxx_UT_DEBUGMSG(("Pango renderChars: xoff %d yoff %d\n", @@ -1354,14 +1486,15 @@ UT_sint32 xoff = _tduX(RI.m_xoff); UT_sint32 yoff = _tduY(RI.m_yoff + getFontAscent(pFont)); - UT_return_if_fail(m_pXftDraw && RI.m_pGlyphs); + UT_return_if_fail(m_pXftDraw && RI.m_pScaledGlyphs); // TODO -- test here for the endpoint as well if(RI.m_iOffset == 0 && (RI.m_iLength == (UT_sint32)RI.m_iCharCount || !RI.m_iCharCount)) { + xxx_UT_DEBUGMSG(("Doing XFT Render now.\n")); pango_xft_render(m_pXftDraw, &m_XftColor, pf, - RI.m_pGlyphs, xoff, yoff); + RI.m_pScaledGlyphs, xoff, yoff); } else { @@ -1386,7 +1519,7 @@ { // it seems the iterator run out on us // this should probably not happen - UT_DEBUGMSG(("gr_UnixPangoGraphics::renderChars: iterator too short\n")); + xxx_UT_DEBUGMSG(("gr_UnixPangoGraphics::renderChars: iterator too short\n")); return; } @@ -1415,12 +1548,12 @@ UT_sint32 iGlyphsEnd = -1; i = 0; - while(i < (UT_uint32)RI.m_pGlyphs->num_glyphs) + while(i < (UT_uint32)RI.m_pScaledGlyphs->num_glyphs) { - if(iGlyphsStart < 0 && RI.m_pGlyphs->log_clusters[i] == iOffsetStart) + if(iGlyphsStart < 0 && RI.m_pScaledGlyphs->log_clusters[i] == iOffsetStart) iGlyphsStart = i; - if(RI.m_pGlyphs->log_clusters[i] == iOffsetEnd) + if(RI.m_pScaledGlyphs->log_clusters[i] == iOffsetEnd) { iGlyphsEnd = i; break; @@ -1430,13 +1563,13 @@ } // both of these can be 0 (iGlyphsEnd == 0 => only 1 glyph) - UT_return_if_fail( iGlyphsStart >= 0 && iGlyphsEnd >= 0 ); - xxx_UT_DEBUGMSG(("Drawing glyph subset from %d to %d (offsets %d, %d)\n", + // UT_return_if_fail( iGlyphsStart >= 0 && iGlyphsEnd >= 0 ); + UT_DEBUGMSG(("Drawing glyph subset from %d to %d (offsets %d, %d)\n", iGlyphsStart, iGlyphsEnd, iOffsetStart, iOffsetEnd)); gs.num_glyphs = iGlyphsEnd - iGlyphsStart + 1; // including the last glyph - gs.glyphs = RI.m_pGlyphs->glyphs + iGlyphsStart; + gs.glyphs = RI.m_pScaledGlyphs->glyphs + iGlyphsStart; gs.log_clusters = RI.m_pGlyphs->log_clusters + iGlyphsStart; pango_xft_render(m_pXftDraw, &m_XftColor, pf, @@ -1448,39 +1581,26 @@ void GR_UnixPangoGraphics::_scaleCharacterMetrics(GR_UnixPangoRenderInfo & RI) { UT_uint32 iZoom = getZoomPercentage(); - if(RI.m_iZoom == iZoom) - return; + xxx_UT_DEBUGMSG(("_scaleCharacterMetrics... \n")); for(int i = 0; i < RI.m_pGlyphs->num_glyphs; ++i) { - RI.m_pGlyphs->glyphs[i].geometry.x_offset = - (int)((double)RI.m_pGlyphs->glyphs[i].geometry.x_offset * - (double)iZoom / (double)RI.m_iZoom + 0.5) ; + RI.m_pScaledGlyphs->glyphs[i].geometry.x_offset = + _tduX(RI.m_pGlyphs->glyphs[i].geometry.x_offset); - RI.m_pGlyphs->glyphs[i].geometry.y_offset = - (int)((double)RI.m_pGlyphs->glyphs[i].geometry.y_offset * - (double)iZoom / (double)RI.m_iZoom + 0.5); - RI.m_pGlyphs->glyphs[i].geometry.width = - (int)((double)RI.m_pGlyphs->glyphs[i].geometry.width * - (double)iZoom / (double)RI.m_iZoom + 0.5); - } + RI.m_pScaledGlyphs->glyphs[i].geometry.y_offset = _tduY(RI.m_pGlyphs->glyphs[i].geometry.y_offset); + RI.m_pScaledGlyphs->glyphs[i].geometry.width =_tduX(RI.m_pGlyphs->glyphs[i].geometry.width ); + } RI.m_iZoom = iZoom; } void GR_UnixPangoGraphics::_scaleJustification(GR_UnixPangoRenderInfo & RI) { - UT_uint32 iZoom = getZoomPercentage(); - if(RI.m_iZoom == iZoom) - return; - - for(int i = 0; i < RI.m_pGlyphs->num_glyphs; ++i) - { - RI.m_pJustify[i] = - (int)((double)RI.m_pJustify[i] * (double)iZoom / (double)RI.m_iZoom + 0.5) ; - } + RI.m_iZoom = getZoomPercentage(); + return; } @@ -1683,7 +1803,10 @@ // but in both cases we will let the delete proceed as is } - +/*! + * I believe this code clears all the justification points. MES June 2008 + * It returns the total space assigned to justify the text in layout units. + */ UT_sint32 GR_UnixPangoGraphics::resetJustification(GR_RenderInfo & ri, bool bPermanent) { @@ -1693,8 +1816,6 @@ if(!RI.m_pJustify) return 0; - if(RI.m_iZoom != getZoomPercentage()) - _scaleCharacterMetrics(RI); UT_sint32 iWidth2 = 0; for(UT_sint32 i = 0; i < RI.m_pGlyphs->num_glyphs; ++i) @@ -1704,6 +1825,10 @@ // TODO here we need to substract the amount from pango metrics RI.m_pGlyphs->glyphs[i].geometry.width -= RI.m_pJustify[i]; } + // + // This sets the glyphs that will be displayed on screen. + // + _scaleCharacterMetrics(RI); if(bPermanent) { @@ -1715,7 +1840,9 @@ memset(RI.m_pJustify, 0, RI.m_pGlyphs->num_glyphs * sizeof(int)); } - return ptlu(-iWidth2); + // Justification in pango units. Convert to layout units. + + return -ptlunz(iWidth2); } @@ -1766,6 +1893,10 @@ We take the same approach as with Uniscribe; we store the justification amount in a separate array of the ri and add it to the offsets before we draw. We will probably need some static buffers to speed things up + +It requires as input RI.m_iJustificationAmount and RI.m_iJustificationPoints. +These are determined in fp_TextRun using calculations in layout units + */ void GR_UnixPangoGraphics::justify(GR_RenderInfo & ri) { @@ -1776,8 +1907,9 @@ return; // make sure that we are not adding apples to oranges - if(RI.m_iZoom != getZoomPercentage()) - _scaleCharacterMetrics(RI); + // We don't need this now. + // if(RI.m_iZoom != getZoomPercentage()) + // _scaleCharacterMetrics(RI); if(!RI.m_pJustify) RI.m_pJustify = new int[RI.m_pGlyphs->num_glyphs]; @@ -1788,6 +1920,9 @@ UT_uint32 iExtraSpace = RI.m_iJustificationAmount; UT_uint32 iPoints = RI.m_iJustificationPoints; + xxx_UT_DEBUGMSG(("::Justify Extra justification space %d \n",iExtraSpace)); + xxx_UT_DEBUGMSG(("::Justify Number of justification points %d \n",iPoints)); + UT_return_if_fail(RI.m_pText); UT_TextIterator & text = *RI.m_pText; @@ -1801,6 +1936,8 @@ UT_sint32 i; // glyph index UT_sint32 j; // text index + + UT_uint32 iSpace = iExtraSpace/iPoints; if (iDir == UT_BIDI_LTR) { @@ -1816,13 +1953,16 @@ if(c == UCS_SPACE) { - UT_uint32 iSpace = iExtraSpace/iPoints; - iExtraSpace -= iSpace; + + // iSpace is in layout units. Convert to pango units + + RI.m_pJustify[i] = ltpunz(iSpace); + iPoints--; - RI.m_pJustify[i] = ltpu(iSpace); + // add this amount the pango units + xxx_UT_DEBUGMSG(("Justify-1 Prev geom width %d additional %d \n",RI.m_pGlyphs->glyphs[i].geometry.width,RI.m_pJustify[i])); - // add this amount the pango metrics RI.m_pGlyphs->glyphs[i].geometry.width += RI.m_pJustify[i]; if(!iPoints) @@ -1863,13 +2003,15 @@ if(c == UCS_SPACE) { - UT_uint32 iSpace = iExtraSpace/iPoints; - iExtraSpace -= iSpace; iPoints--; - RI.m_pJustify[i] = ltpu(iSpace); + // iSpace is in layout units. Convert to pango units + + RI.m_pJustify[i] = ltpunz(iSpace); // add this amount the pango metrics + + xxx_UT_DEBUGMSG(("Justify-2 Prev geom width %d additional %d \n",RI.m_pGlyphs->glyphs[i].geometry.width,RI.m_pJustify[i])); RI.m_pGlyphs->glyphs[i].geometry.width += RI.m_pJustify[i]; if(!iPoints) @@ -1896,10 +2038,16 @@ j += iDiff; } } - - UT_ASSERT_HARMLESS( !iExtraSpace ); + // + // Now scale the metrics for the drawing glyphs + // + _scaleCharacterMetrics(RI); } +/*! + * This function takes (x,y) in layout units and determines the location in the + * pango string. + */ UT_uint32 GR_UnixPangoGraphics::XYToPosition(const GR_RenderInfo & ri, UT_sint32 x, UT_sint32 y) const { UT_return_val_if_fail(ri.getType() == GRRI_UNIX_PANGO, 0); @@ -1917,7 +2065,10 @@ utf8 += RI.m_pText->getChar(); } - int x_pos = ltpu(x); + // Since the glyphs are measured in pango units + // we need to convert from layout units + + int x_pos = ltpunz(x); int len = utf8.byteLength(); int iPos = len; int iTrailing; @@ -1949,6 +2100,9 @@ return i; } +/*! + * Return a location in layout units (x,y) of a pango glyph. + */ void GR_UnixPangoGraphics::positionToXY(const GR_RenderInfo & ri, UT_sint32& x, UT_sint32& y, UT_sint32& x2, UT_sint32& y2, @@ -2017,7 +2171,10 @@ bTrailing, &x); - x = ptlu(x); + // + // Since the glyphs are measured in pango units we need to convert to layout + // + x = ptlunz(x); x2 = x; } @@ -2073,16 +2230,25 @@ UT_ASSERT(pItem); if(pGstring) pango_glyph_string_free(pGstring); - g_list_free(pItems); + _pango_item_list_free(pItems); return; } - pItem->analysis.font = pf; + g_object_unref(pItem->analysis.font); + pItem->analysis.font = (PangoFont*)g_object_ref((GObject*)pf); pango_shape(utf8.utf8_str()+ pItem->offset, pItem->length, &(pItem->analysis), pGstring); + if(pCharWidth) + { + for(int j=0; jnum_glyphs; j++) + { + + pGstring->glyphs[j].geometry.width = _tduX(pCharWidth[j]*PANGO_SCALE); + } + } pango_xft_render(m_pXftDraw, &m_XftColor, pf, pGstring, xoffD, yoffD); // now advance xoff @@ -2092,7 +2258,7 @@ if(pGstring) pango_glyph_string_free(pGstring); - g_list_free(pItems); + _pango_item_list_free(pItems); } UT_uint32 GR_UnixPangoGraphics::measureString(const UT_UCSChar * pChars, @@ -2127,14 +2293,14 @@ } // this function expect indexes in bytes !!! (stupid) - GList * pItems = pango_itemize(getContext(), + GList * pItems = pango_itemize(getLayoutContext(), utf8.utf8_str(), 0, utf8.byteLength(), NULL, NULL); PangoGlyphString * pGstring = pango_glyph_string_new(); - PangoFont * pf = m_pPFont->getPangoFont(); + PangoFont * pf = m_pPFont->getPangoLayoutFont(); PangoRectangle LR; UT_uint32 iOffset = 0; GList * l = pItems; @@ -2149,13 +2315,13 @@ if(!pItem) { UT_ASSERT(pItem); - if(pGstring) - pango_glyph_string_free(pGstring); - g_list_free(pItems); - return 0; + iWidth = 0; + goto cleanup; } - pItem->analysis.font = pf; + // the PangoItem has to take ownership of that. + g_object_unref(pItem->analysis.font); + pItem->analysis.font = (PangoFont*)g_object_ref((GObject*)pf); pango_shape(utf8.utf8_str()+ pItem->offset, pItem->length, @@ -2163,8 +2329,9 @@ pGstring); pango_glyph_string_extents(pGstring, pf, NULL, &LR); - iWidth += ptlu(LR.width + LR.x); - UT_uint32 h = ptlu(LR.height); + iWidth += ((double) LR.width + (double)LR.x)/PANGO_SCALE; + UT_uint32 h = LR.height/PANGO_SCALE; + xxx_UT_DEBUGMSG(("measure string iWidth %d height %d \n",iWidth,h)); if (height && *height < h) *height = h; @@ -2241,9 +2408,12 @@ xxx_UT_DEBUGMSG(("Length %d, Offset %d\n", iLength, iOffset)); +cleanup: if(pGstring) pango_glyph_string_free(pGstring); - g_list_free(pItems); + + _pango_item_list_free(pItems); + return iWidth; } @@ -2633,14 +2803,12 @@ typedef _MyPangoCoverage MyPangoCoverage; - void GR_UnixPangoGraphics::getCoverage(UT_NumberVector& coverage) { + coverage.clear(); + UT_return_if_fail(m_pPFont); -#if 0 - /* the PangoCoverage info seems broken -- it is telling me that - * Times New Roman does not have a glyph for the " character :/ - */ + PangoCoverage * pc = m_pPFont->getPangoCoverage(); if(!pc) @@ -2654,7 +2822,14 @@ bool bInRange = false; UT_uint32 iRangeStart = 0; - for(UT_uint32 i = 0; i < iMaxChar; ++i) + // Skip the coverage for character 0 as pango doesn't seem to be able to + // handle it properly. + // Note that for almost all fonts pango reports that it has no coverage for + // character 0, so this is a non-issue there. However, for some (broken?) fonts + // like 'Fixedsys Excelsior 2.00' pango reports it *has* coverage for character 0. + // This will lead to crashes when attempting to shape and/or draw it, like + // the crash in bug 11731 - MARCM + for(UT_uint32 i = 1; i < iMaxChar; ++i) { PangoCoverageLevel pl = pango_coverage_get(pc, i); @@ -2678,61 +2853,6 @@ } } } -#else - FcChar32 coverage_map[FC_CHARSET_MAP_SIZE]; - FcChar32 next; - const FcChar32 invalid = (FcChar32) - 1; - FcChar32 base_range = invalid; - coverage.clear(); - - XftFont* xft_fnt = pango_xft_font_get_font (m_pPFont->getPangoFont()); - int i; - - for (FcChar32 ucs4 = - FcCharSetFirstPage(xft_fnt->charset, coverage_map, &next); - ucs4 != FC_CHARSET_DONE; - ucs4 = - FcCharSetNextPage(xft_fnt->charset, coverage_map, &next)) - { - for (i = 0; i < FC_CHARSET_MAP_SIZE; i++) - { - FcChar32 bits = coverage_map[i]; - FcChar32 base = ucs4 + (i << 5); - int b = 0; - - if (base_range != invalid && bits == 0xFFFFFFFF) - continue; - - while (bits) - { - if (bits & 1) - { - if (base_range == invalid) - base_range = base + b; - } - else - { - if (base_range != invalid) - { - coverage.push_back(base_range); - coverage.push_back(base + b - base_range); - base_range = invalid; - } - } - - bits >>= 1; - b++; - } - - if (b < 32 && base_range != invalid) - { - coverage.push_back(base_range); - coverage.push_back(base + b - base_range); - base_range = invalid; - } - } - } -#endif } const std::vector & GR_UnixPangoGraphics::getAllFontNames(void) @@ -3173,12 +3293,23 @@ */ inline int GR_UnixPangoGraphics::ptlu(int p) const { - double d = (double)p * 100.0 * (double) getResolution()/ + double d = (double)p * (double) getResolution() * 100.0 / ((double)getDeviceResolution()*(double)getZoomPercentage()*(double) PANGO_SCALE) + .5; return (int) d; } + +/*! + Convert pango units to layout units without zoom +*/ +inline int GR_UnixPangoGraphics::ptlunz(int p) const +{ + double d = ((double)p / ((double) PANGO_SCALE)) + .5; //getDeviceResolution + + return (int) d; +} + /*! Convert layout units to pango units */ @@ -3186,7 +3317,18 @@ { double d = (double)l * (double)getDeviceResolution() * (double)PANGO_SCALE * (double)getZoomPercentage()/ - ((double)getResolution() * 100.0) + .5; + (100.0 * (double) getResolution()) + .5; + + return (int) d; +} + + +/*! + Convert layout units to pango units without zoom +*/ +inline int GR_UnixPangoGraphics::ltpunz(int l) const +{ + double d = (double)l * PANGO_SCALE + .5; //getDeviceResolution() return (int) d; } @@ -3280,16 +3422,18 @@ m_pf(NULL), m_bGuiFont(bGuiFont), m_pCover(NULL), - m_pfd(NULL), + m_pfdDev(NULL), + m_pfdLay(NULL), m_pPLang(NULL), m_iAscent(0), - m_iDescent(0) + m_iDescent(0), + m_pLayoutF(NULL) { m_eType = GR_FONT_UNIX_PANGO; UT_return_if_fail( pDesc && pG && pLang); + m_sLayoutDesc = pDesc; m_sDesc = pDesc; - setLanguage(pLang); reloadFont(pG); } @@ -3302,7 +3446,12 @@ { g_object_unref(m_pf); } - pango_font_description_free(m_pfd); + if (m_pLayoutF) + { + g_object_unref(m_pLayoutF); + } + pango_font_description_free(m_pfdDev); + pango_font_description_free(m_pfdLay); } void GR_UnixPangoFont::setLanguage(const char * pLang) @@ -3327,37 +3476,60 @@ m_iZoom = iZoom; UT_LocaleTransactor t(LC_NUMERIC, "C"); - UT_String s; + UT_String sLay; + UT_String sDev; if(!m_bGuiFont && pG->queryProperties(GR_Graphics::DGP_SCREEN)) - UT_String_sprintf(s, "%s %f", m_sDesc.c_str(), m_dPointSize * (double)m_iZoom / 100.0); + { + UT_String_sprintf(sDev, "%s %f", m_sDesc.c_str(), m_dPointSize * (double)m_iZoom / 100.0); + UT_String_sprintf(sLay, "%s %f", m_sLayoutDesc.c_str(), m_dPointSize); + } else - UT_String_sprintf(s, "%s %f", m_sDesc.c_str(), m_dPointSize); - + { + UT_String_sprintf(sDev, "%s %f", m_sDesc.c_str(), m_dPointSize); + UT_String_sprintf(sLay, "%s %f", m_sLayoutDesc.c_str(), m_dPointSize); + } + + if(m_pfdLay) + { + pango_font_description_free(m_pfdLay); + m_pfdLay = NULL; + } + - if(m_pfd) + if(m_pfdDev) { - pango_font_description_free(m_pfd); - m_pfd = NULL; + pango_font_description_free(m_pfdDev); + m_pfdDev = NULL; } - m_pfd = pango_font_description_from_string(s.c_str()); - UT_return_if_fail(m_pfd); + m_pfdLay = pango_font_description_from_string(sLay.c_str()); + UT_return_if_fail(m_pfdLay); + + m_pfdDev = pango_font_description_from_string(sDev.c_str()); + UT_return_if_fail(m_pfdLay); if (m_pf) { g_object_unref(m_pf); } - m_pf = pango_context_load_font(pG->getContext(), m_pfd); + m_pf = pango_context_load_font(pG->getContext(), m_pfdDev); + if(m_pLayoutF) { + g_object_unref(m_pLayoutF); + } + m_pLayoutF = pango_context_load_font(pG->getLayoutContext(), m_pfdLay); UT_return_if_fail( m_pf ); + UT_return_if_fail( m_pLayoutF ); // FIXME: we probably want the real language from somewhere - PangoFontMetrics * pfm = pango_font_get_metrics(m_pf, m_pPLang); + PangoFontMetrics * pfm = pango_font_get_metrics(m_pLayoutF, m_pPLang); UT_return_if_fail( pfm); // pango_metrics_ functions return in points * PANGO_SCALE (points * 1024) - m_iAscent = (UT_uint32) pG->ptlu(pango_font_metrics_get_ascent(pfm)); - m_iDescent = (UT_uint32) pG->ptlu(pango_font_metrics_get_descent(pfm)); - xxx_UT_DEBUGMSG(("Font Ascent %d point size %f zoom %d \n",m_iAscent, m_dPointSize, m_iZoom)); + m_iAscent = (UT_uint32) pango_font_metrics_get_ascent(pfm)/PANGO_SCALE; + m_iDescent = (UT_uint32) pango_font_metrics_get_descent(pfm)/PANGO_SCALE; + xxx_UT_DEBUGMSG(("Layout Font Ascent %d point size %f zoom %d \n",m_iAscent, m_dPointSize, m_iZoom)); pango_font_metrics_unref(pfm); + + UT_return_if_fail( pfm); } @@ -3411,8 +3583,8 @@ { UT_return_val_if_fail( m_pf, false ); - guint iGlyphIndx = pango_fc_font_get_glyph (PANGO_FC_FONT(m_pf), g); - FT_Face pFace = pango_fc_font_lock_face(PANGO_FC_FONT(m_pf)); + guint iGlyphIndx = pango_fc_font_get_glyph (PANGO_FC_FONT(m_pLayoutF), g); + FT_Face pFace = pango_fc_font_lock_face(PANGO_FC_FONT(m_pLayoutF)); double resRatio = 1.0; @@ -3424,6 +3596,7 @@ if (pPGP) resRatio = pPGP->_getResolutionRatio(); + } #endif FT_Error error = FT_Load_Glyph(pFace, iGlyphIndx, @@ -3439,8 +3612,7 @@ return false; } - UT_uint32 iSize = (UT_uint32)(0.5 + m_dPointSize * resRatio *(double)pG->getResolution() / - (double)pG->getDeviceResolution()); + UT_uint32 iSize = (UT_uint32)(0.5 + m_dPointSize * resRatio *(double)pG->getResolution() / (double)pG->getDeviceResolution()); rec.left = static_cast(0.5 + fontPoints2float(iSize, pFace, pFace->glyph->metrics.horiBearingX)); @@ -3464,9 +3636,9 @@ const char* GR_UnixPangoFont::getFamily() const { - UT_return_val_if_fail( m_pfd, NULL ); + UT_return_val_if_fail( m_pfdLay, NULL ); - return pango_font_description_get_family(m_pfd); + return pango_font_description_get_family(m_pfdLay); } @@ -3646,12 +3818,6 @@ else { #ifdef HAVE_PANGOFT2 - // hardcode to something sane-ish. printing and unixnull graphics will use this - // fallback case - m_iScreenResolution = m_iDeviceResolution; - - m_pContext = pango_ft2_get_context(m_iScreenResolution, m_iScreenResolution); - m_pFontMap = pango_ft2_font_map_new (); m_bOwnsFontMap = true; #else UT_DEBUGMSG(("No screen, no display, and no PangoFT2. We're screwed.\n")); @@ -3745,32 +3911,32 @@ UT_uint32 GR_UnixPangoPrintGraphics::getFontAscent() { - return static_cast(static_cast(GR_UnixPangoGraphics::getFontAscent())*m_dResRatio); + return static_cast(static_cast(GR_UnixPangoGraphics::getFontAscent())); } UT_uint32 GR_UnixPangoPrintGraphics::getFontDescent() { - return static_cast(static_cast(GR_UnixPangoGraphics::getFontDescent())*m_dResRatio); + return static_cast(static_cast(GR_UnixPangoGraphics::getFontDescent())); } UT_uint32 GR_UnixPangoPrintGraphics::getFontHeight() { - return static_cast(static_cast(GR_UnixPangoGraphics::getFontHeight())*m_dResRatio); + return static_cast(static_cast(GR_UnixPangoGraphics::getFontHeight())); } UT_uint32 GR_UnixPangoPrintGraphics::getFontAscent(const GR_Font * fnt) { - return static_cast(static_cast(GR_UnixPangoGraphics::getFontAscent(fnt))*m_dResRatio); + return static_cast(static_cast(GR_UnixPangoGraphics::getFontAscent(fnt))); } UT_uint32 GR_UnixPangoPrintGraphics::getFontDescent(const GR_Font * fnt ) { - return static_cast(static_cast(GR_UnixPangoGraphics::getFontDescent(fnt))*m_dResRatio); + return static_cast(static_cast(GR_UnixPangoGraphics::getFontDescent(fnt))); } UT_uint32 GR_UnixPangoPrintGraphics::getFontHeight(const GR_Font * fnt) { - return static_cast(static_cast(GR_UnixPangoGraphics::getFontHeight(fnt))*m_dResRatio); + return static_cast(static_cast(GR_UnixPangoGraphics::getFontHeight(fnt))); } UT_sint32 GR_UnixPangoPrintGraphics::scale_ydir (UT_sint32 in) const @@ -3841,7 +4007,8 @@ { PangoGlyphString * pGlyphs = pango_glyph_string_new(); PangoItem *pItem = (PangoItem *)g_list_nth(pItems, i)->data; - pItem->analysis.font = pf; + g_object_unref(pItem->analysis.font); + pItem->analysis.font = (PangoFont*)g_object_ref((GObject*)pf); pango_shape(utf8.utf8_str() + pItem->offset, pItem->length, & pItem->analysis, pGlyphs); @@ -3853,7 +4020,7 @@ } gnome_print_grestore (m_gpc); - g_list_free(pItems); + _pango_item_list_free(pItems); } bool GR_UnixPangoPrintGraphics::shape(GR_ShapingInfo & si, GR_RenderInfo *& ri) @@ -3865,7 +4032,7 @@ UT_return_val_if_fail( ri, false ); GR_UnixPangoRenderInfo & RI = (GR_UnixPangoRenderInfo &)*ri; - +#if 0 for(int i = 0; i < RI.m_pGlyphs->num_glyphs; ++i) { RI.m_pGlyphs->glyphs[i].geometry.x_offset = @@ -3880,13 +4047,13 @@ (int)((double)RI.m_pGlyphs->glyphs[i].geometry.width * (double)m_iDeviceResolution / (double)m_iScreenResolution + 0.5); } - +#endif return true; } void GR_UnixPangoPrintGraphics::renderChars(GR_RenderInfo & ri) { - xxx_UT_DEBUGMSG(("GR_UnixPangoGraphics::renderChars\n")); + xxx_UT_DEBUGMSG(("GR_UnixPangoPrintGraphics::renderChars\n")); UT_return_if_fail(ri.getType() == GRRI_UNIX_PANGO); GR_UnixPangoRenderInfo & RI = (GR_UnixPangoRenderInfo &)ri; GR_UnixPangoFont * pFont = (GR_UnixPangoFont *)RI.m_pFont; @@ -3898,7 +4065,7 @@ xxx_UT_DEBUGMSG(("PangoPrint renderChars: xoff %d yoff %d\n", RI.m_xoff, RI.m_yoff)); UT_sint32 xoff = _tduX(RI.m_xoff); - UT_sint32 yoff = scale_ydir(_tduY(RI.m_yoff + getFontAscent(pFont))); + UT_sint32 yoff = scale_ydir(_tduY((RI.m_yoff + getFontAscent(pFont)))); xxx_UT_DEBUGMSG(("about to gnome_print_pango_gplyph_string render xoff %d yoff %d\n", xoff, yoff)); @@ -3924,7 +4091,21 @@ xxx_UT_DEBUGMSG(("@@@@ tdu(%d)== %d, _tduX(%d) == %d, _tduY(%d) == %d\n", _N, tdu(_N), _N, _tduX(_N), _N, _tduY(_N))); #undef _N - gnome_print_pango_glyph_string(m_gpc, pf, RI.m_pGlyphs); + + for(int i = 0; i < RI.m_pGlyphs->num_glyphs; ++i) + { + RI.m_pScaledGlyphs->glyphs[i].geometry.x_offset = + _tduX(RI.m_pGlyphs->glyphs[i].geometry.x_offset); + + + RI.m_pScaledGlyphs->glyphs[i].geometry.y_offset = + _tduY(RI.m_pGlyphs->glyphs[i].geometry.y_offset); + + RI.m_pScaledGlyphs->glyphs[i].geometry.width = + _tduX(RI.m_pGlyphs->glyphs[i].geometry.width ); + } + + gnome_print_pango_glyph_string(m_gpc, pf, RI.m_pScaledGlyphs); gnome_print_grestore (m_gpc); } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.h --- abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.h 2008-04-06 16:59:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.h 2009-07-15 16:56:23.000000000 +0100 @@ -76,6 +76,7 @@ virtual bool doesGlyphExist(UT_UCS4Char g); virtual bool glyphBox(UT_UCS4Char g, UT_Rect & rec, GR_Graphics * pG); PangoFont * getPangoFont() const {return m_pf;} + PangoFont * getPangoLayoutFont() const {return m_pLayoutF;} void reloadFont(GR_UnixPangoGraphics * pG); double getPointSize() const {return m_dPointSize;} @@ -84,7 +85,7 @@ const UT_String & getDescription() const {return m_sDesc;} virtual const char* getFamily() const; - const PangoFontDescription * getPangoDescription() const {return m_pfd;} + const PangoFontDescription * getPangoDescription() const {return m_pfdLay;} // ascent/descent in layout units UT_uint32 getAscent() const {return m_iAscent;} @@ -96,21 +97,24 @@ private: UT_String m_sDesc; + UT_String m_sLayoutDesc; double m_dPointSize; UT_uint32 m_iZoom; PangoFont * m_pf; bool m_bGuiFont; mutable PangoCoverage *m_pCover; - PangoFontDescription * m_pfd; + PangoFontDescription * m_pfdDev; + PangoFontDescription * m_pfdLay; PangoLanguage * m_pPLang; UT_uint32 m_iAscent; UT_uint32 m_iDescent; + PangoFont * m_pLayoutF; }; class GR_UnixPangoRenderInfo; -class GR_UnixAllocInfo : public GR_AllocInfo +class ABI_EXPORT GR_UnixAllocInfo : public GR_AllocInfo { public: GR_UnixAllocInfo(GdkWindow * win) @@ -209,6 +213,8 @@ PangoFontMap * getFontMap() const {return m_pFontMap;} PangoContext * getContext() const {return m_pContext;} + PangoFontMap * getLayoutFontMap() const {return m_pLayoutFontMap;} + PangoContext * getLayoutContext() const {return m_pLayoutContext;} virtual UT_uint32 getFontAscent(); virtual UT_uint32 getFontDescent(); @@ -257,7 +263,9 @@ int dtpu(int d) const; int ptdu(int p) const; int ptlu(int p) const; + int ptlunz(int p) const; int ltpu(int l) const; + int ltpunz(int l) const; int pftlu(int pf) const; virtual bool queryProperties(GR_Graphics::Properties gp) const; @@ -332,15 +340,19 @@ void _setColor(GdkColor & c); PangoFont * _adjustedPangoFont (GR_UnixPangoFont * pFont, PangoFont * pf); + PangoFont * _adjustedLayoutPangoFont (GR_UnixPangoFont * pFont, PangoFont * pf); protected: PangoFontMap * m_pFontMap; PangoContext * m_pContext; + PangoFontMap * m_pLayoutFontMap; + PangoContext * m_pLayoutContext; bool m_bOwnsFontMap; GR_UnixPangoFont* m_pPFont; GR_UnixPangoFont* m_pPFontGUI; PangoFont * m_pAdjustedPangoFont; + PangoFont * m_pAdjustedLayoutPangoFont; GR_UnixPangoFont* m_pAdjustedPangoFontSource; UT_uint32 m_iAdjustedPangoFontZoom; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoPixmapGraphics.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixPangoPixmapGraphics.h --- abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoPixmapGraphics.h 2008-04-06 16:59:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/unix/gr_UnixPangoPixmapGraphics.h 2009-07-15 16:56:23.000000000 +0100 @@ -24,7 +24,7 @@ #include "gr_UnixPangoGraphics.h" -class GR_UnixPixmapAllocInfo : public GR_AllocInfo +class ABI_EXPORT GR_UnixPixmapAllocInfo : public GR_AllocInfo { public: GR_UnixPixmapAllocInfo(GdkPixmap * pix) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/win/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/win/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/gr/win/GNUmakefile.in 2008-04-06 22:26:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/win/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -228,8 +227,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -309,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -355,7 +353,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -372,10 +370,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -420,8 +418,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -483,8 +481,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -496,8 +494,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -507,13 +505,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/win/gr_Win32CharWidths.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/win/gr_Win32CharWidths.h --- abiword-2.6.2/abiword/src/af/gr/win/gr_Win32CharWidths.h 2008-04-06 16:59:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/win/gr_Win32CharWidths.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ // the only reason that we subclass is because Win32 provides a // routine to fetch the widths of a whole font in one call. -class GR_Win32CharWidths : public GR_CharWidths +class ABI_EXPORT GR_Win32CharWidths : public GR_CharWidths { public: void setCharWidthsOfRange(HDC hdc, UT_UCSChar c0, UT_UCSChar c1); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/win/gr_Win32Graphics.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/win/gr_Win32Graphics.cpp --- abiword-2.6.2/abiword/src/af/gr/win/gr_Win32Graphics.cpp 2008-04-06 16:59:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/win/gr_Win32Graphics.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -68,7 +68,7 @@ /*****************************************************************/ // A small helper class -class private_FontReverter +class ABI_EXPORT private_FontReverter { public: private_FontReverter(GR_Win32Graphics& gr, GR_Font* pOldFont) @@ -233,7 +233,7 @@ for (int n = 0; nhPen); - delete m_pArPens; + DELETEPV(m_pArPens); DELETEP(m_pFontGUI); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/win/gr_Win32Graphics.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/win/gr_Win32Graphics.h --- abiword-2.6.2/abiword/src/af/gr/win/gr_Win32Graphics.h 2008-04-06 16:59:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/win/gr_Win32Graphics.h 2009-07-15 16:56:23.000000000 +0100 @@ -150,7 +150,7 @@ ////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////// -class GR_Win32AllocInfo : public GR_AllocInfo +class ABI_EXPORT GR_Win32AllocInfo : public GR_AllocInfo { public: GR_Win32AllocInfo(): diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/win/gr_Win32USPGraphics.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/win/gr_Win32USPGraphics.cpp --- abiword-2.6.2/abiword/src/af/gr/win/gr_Win32USPGraphics.cpp 2008-04-06 16:59:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/win/gr_Win32USPGraphics.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -106,7 +106,7 @@ } #define GR_WIN32_USP_FONT_SCALING 20 -class GR_Win32USPItem: public GR_Item +class ABI_EXPORT GR_Win32USPItem: public GR_Item { friend class GR_Win32USPGraphics; @@ -126,7 +126,7 @@ SCRIPT_ITEM m_si; }; -class GR_Win32USPRenderInfo : public GR_RenderInfo +class ABI_EXPORT GR_Win32USPRenderInfo : public GR_RenderInfo { public: GR_Win32USPRenderInfo(GR_ScriptType type): diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/xp/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/gr/xp/GNUmakefile.in 2008-04-06 22:26:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -231,8 +230,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -312,6 +309,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -358,7 +356,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -375,10 +373,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -437,8 +435,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -507,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -520,8 +518,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -531,13 +529,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/xp/gr_Caret.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/xp/gr_Caret.h --- abiword-2.6.2/abiword/src/af/gr/xp/gr_Caret.h 2008-04-06 16:59:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/xp/gr_Caret.h 2009-07-15 16:56:23.000000000 +0100 @@ -122,7 +122,7 @@ UT_sint32 m_iCaretNumber; }; -class GR_CaretDisabler +class ABI_EXPORT GR_CaretDisabler { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/xp/gr_CharWidthsCache.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/xp/gr_CharWidthsCache.h --- abiword-2.6.2/abiword/src/af/gr/xp/gr_CharWidthsCache.h 2008-04-06 16:59:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/xp/gr_CharWidthsCache.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ class GR_Font; class GR_CharWidths; -class GR_CharWidthsCache +class ABI_EXPORT GR_CharWidthsCache { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/xp/gr_Graphics.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/xp/gr_Graphics.h --- abiword-2.6.2/abiword/src/af/gr/xp/gr_Graphics.h 2008-04-06 16:59:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/xp/gr_Graphics.h 2009-07-15 16:56:23.000000000 +0100 @@ -268,7 +268,7 @@ Platform implementation needs to override getType() so that graphicsAllocator() can do type-checking. */ -class GR_AllocInfo +class ABI_EXPORT GR_AllocInfo { public: virtual ~GR_AllocInfo() {} @@ -288,7 +288,7 @@ use. The factory provides access to all graphics classes known to the application. */ -class GR_GraphicsFactory +class ABI_EXPORT GR_GraphicsFactory { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/xp/gr_Painter.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/xp/gr_Painter.h --- abiword-2.6.2/abiword/src/af/gr/xp/gr_Painter.h 2008-04-06 16:59:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/xp/gr_Painter.h 2009-07-15 16:56:23.000000000 +0100 @@ -23,7 +23,7 @@ #include "xap_Features.h" #include "gr_Graphics.h" -class GR_Painter +class ABI_EXPORT GR_Painter { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/gr/xp/gr_RenderInfo.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/gr/xp/gr_RenderInfo.h --- abiword-2.6.2/abiword/src/af/gr/xp/gr_RenderInfo.h 2008-04-06 16:59:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/gr/xp/gr_RenderInfo.h 2009-07-15 16:56:23.000000000 +0100 @@ -69,7 +69,7 @@ \note constructor should be protected; new instances can only be created via GR_Graphics::newItem() */ -class GR_Item +class ABI_EXPORT GR_Item { public: virtual ~GR_Item(){}; @@ -82,7 +82,7 @@ }; -class GR_XPItem : public GR_Item +class ABI_EXPORT GR_XPItem : public GR_Item { friend class GR_Graphics; @@ -119,7 +119,7 @@ getItemCount() returns the count of all items, including the dummy GRScriptType_Void item. */ -class GR_Itemization +class ABI_EXPORT GR_Itemization { public: GR_Itemization(): @@ -206,7 +206,7 @@ always set them if the function to which GR_RenderInfo is passed is going to use them */ -class GR_RenderInfo +class ABI_EXPORT GR_RenderInfo { public: GR_RenderInfo(GR_ScriptType type) @@ -265,7 +265,7 @@ This is an xp implementation of GR_RenderInfo for use with the built in UT_contextGlyph class. */ -class GR_XPRenderInfo : public GR_RenderInfo +class ABI_EXPORT GR_XPRenderInfo : public GR_RenderInfo { public: GR_XPRenderInfo(GR_ScriptType type); @@ -310,7 +310,7 @@ /** Encapsulates input to GR_Graphics::shape() */ -class GR_ShapingInfo +class ABI_EXPORT GR_ShapingInfo { public: GR_ShapingInfo(UT_TextIterator & text, UT_uint32 iLen, diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/tf/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/tf/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/tf/GNUmakefile.in 2008-04-06 22:26:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/tf/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -229,8 +228,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -310,6 +307,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -356,7 +354,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -373,10 +371,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -406,8 +404,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -520,8 +518,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -546,8 +544,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -557,13 +555,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/tf/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/tf/xp/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/tf/xp/GNUmakefile.in 2008-04-06 22:26:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/tf/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -65,7 +65,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -227,8 +226,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -308,6 +305,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -354,7 +352,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -371,10 +369,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -410,8 +408,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -470,8 +468,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -483,8 +481,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -494,13 +492,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/util/GNUmakefile.in 2008-04-06 22:26:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -65,7 +65,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -234,8 +233,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -315,6 +312,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -361,7 +359,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -378,10 +376,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -422,8 +420,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -543,8 +541,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -569,8 +567,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -580,13 +578,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/Makefile --- abiword-2.6.2/abiword/src/af/util/Makefile 2008-04-06 17:00:13.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -109,7 +109,6 @@ $(OBJDIR)/ut_path.$(OBJ_SUFFIX) \ $(OBJDIR)/ut_math.$(OBJ_SUFFIX) \ $(OBJDIR)/ut_xml.$(OBJ_SUFFIX) \ - $(OBJDIR)/ut_thread.$(OBJ_SUFFIX) \ $(OBJDIR)/ut_decompress.$(OBJ_SUFFIX) \ $(OBJDIR)/ut_crc32.$(OBJ_SUFFIX) \ $(OBJDIR)/ut_uuid.$(OBJ_SUFFIX) \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/qnx/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/qnx/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/util/qnx/GNUmakefile.in 2008-04-06 22:26:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/qnx/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -229,8 +228,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -310,6 +307,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -356,7 +354,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -373,10 +371,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -428,8 +426,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -495,8 +493,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -508,8 +506,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -519,13 +517,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/unix/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/unix/GNUmakefile.am --- abiword-2.6.2/abiword/src/af/util/unix/GNUmakefile.am 2008-04-06 17:00:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/unix/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -39,7 +39,6 @@ ut_files.h \ ut_mutexImpl.h \ ut_sleep.h \ - ut_threadImpl.h \ ut_unixAssert.h \ ut_unixDirent.h \ ut_unixIdle.h \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/unix/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/util/unix/GNUmakefile.in 2008-04-06 22:26:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -229,8 +228,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -310,6 +307,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -356,7 +354,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -373,10 +371,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -414,7 +412,6 @@ ut_files.h \ ut_mutexImpl.h \ ut_sleep.h \ - ut_threadImpl.h \ ut_unixAssert.h \ ut_unixDirent.h \ ut_unixIdle.h \ @@ -429,8 +426,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -496,8 +493,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -509,8 +506,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -520,13 +517,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/unix/ut_threadImpl.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/unix/ut_threadImpl.h --- abiword-2.6.2/abiword/src/af/util/unix/ut_threadImpl.h 2008-04-06 17:00:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/unix/ut_threadImpl.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,105 +0,0 @@ -/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ - -/* AbiSource Program Utilities - * Copyright (C) 2002 Dom Lachowicz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ -#ifndef UT_THREADIMPL_H -#define UT_THREADIMPL_H - -#include - -#include "ut_thread.h" -#include "ut_assert.h" -#include "ut_debugmsg.h" - -class ABI_EXPORT UT_ThreadImpl -{ - - public: - - UT_ThreadImpl ( UT_Thread * owner ) - : mOwner ( owner ), mThread ( 0 ) - { - } - - ~UT_ThreadImpl () - { - } - - /*! - * Starts a new thread and executes the code in the - * (overridden) run method - */ - void start () - { - if (!g_thread_supported ()) g_thread_init (NULL); - - GError * err = NULL ; - if ( (mThread = g_thread_create ( start_routine, this, TRUE, &err ) ) == NULL ) - { - UT_DEBUGMSG(( "Thread create failed: %s!!\n", err->message )); - g_error_free ( err ) ; - } - } - - /*! - * Sets this thread's priority - */ - void setPriority ( UT_Thread::Priority pri ) - { - GThreadPriority priority = G_THREAD_PRIORITY_NORMAL; - - if ( pri == UT_Thread::PRI_LOW ) - priority = G_THREAD_PRIORITY_LOW; - else if ( pri == UT_Thread::PRI_HIGH ) - priority = G_THREAD_PRIORITY_HIGH; - - if ( mThread != NULL ) - g_thread_set_priority ( mThread, priority ) ; - } - - /*! - * Causes the current running thread to temporarily pause - * and let other threads execute - */ - static void yield () - { - g_thread_yield () ; - } - - void join () - { - if ( mThread != NULL ) - g_thread_join ( mThread ) ; - } - - private: - - static void * start_routine ( void * inPtr ) - { - UT_Thread * thisPtr = static_cast(inPtr)->mOwner; - UT_DEBUGMSG(( "In the start routine: %d\n", thisPtr == NULL )); - thisPtr->run () ; - return NULL ; - } - - UT_Thread * mOwner; - GThread * mThread; -}; - -#endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/unix/ut_unixAssert.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/unix/ut_unixAssert.cpp --- abiword-2.6.2/abiword/src/af/util/unix/ut_unixAssert.cpp 2008-04-06 17:00:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/unix/ut_unixAssert.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ #include "ut_assert.h" #include "ut_unixAssert.h" -void UT_UnixAssertMsg(const char * szMsg, const char * szFile, int iLine) +int UT_UnixAssertMsg(const char * szMsg, const char * szFile, int iLine) { static int count = 0; @@ -34,7 +34,7 @@ printf("**** (%d) %s at %s:%d ****\n", count,szMsg,szFile,iLine); while (1) { - printf("**** (%d) Continue ? (y/n) [y] : ", count); + printf("**** (%d) Continue ? (y/n/i(gnore)) [y] : ", count); fflush(stdout); char buf[10]; @@ -48,12 +48,17 @@ case '\n': case 'y': case 'Y': - return; // continue the application + return 1; // continue the application case 'n': case 'N': abort(); // kill the application - return; + return 0; + + case 'i': + case 'I': + return -1; + default: break; // ?? ask them again } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/unix/ut_unixAssert.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/unix/ut_unixAssert.h --- abiword-2.6.2/abiword/src/af/util/unix/ut_unixAssert.h 2008-04-06 17:00:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/unix/ut_unixAssert.h 2009-07-15 16:56:23.000000000 +0100 @@ -20,6 +20,6 @@ #ifndef UT_UNIXASSERT_H #define UT_UNIXASSERT_H -void UT_UnixAssertMsg(const char * szMsg, const char * szFile, int iLine); +int UT_UnixAssertMsg(const char * szMsg, const char * szFile, int iLine); #endif /* UT_UNIXASSERT_H */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/unix/ut_unixDirent.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/unix/ut_unixDirent.cpp --- abiword-2.6.2/abiword/src/af/util/unix/ut_unixDirent.cpp 2008-04-06 17:00:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/unix/ut_unixDirent.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -47,6 +47,8 @@ #include #include +#include + #include "ut_unixDirent.h" /* diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/win/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/win/GNUmakefile.am --- abiword-2.6.2/abiword/src/af/util/win/GNUmakefile.am 2008-04-06 17:00:12.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/win/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -44,7 +44,6 @@ noinst_HEADERS = \ ut_mutexImpl.h \ ut_sleep.h \ - ut_threadImpl.h \ ut_Win32Idle.h \ ut_Win32Locale.h \ ut_Win32OS.h \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/win/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/win/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/util/win/GNUmakefile.in 2008-04-06 22:26:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/win/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -230,8 +229,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -311,6 +308,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -357,7 +355,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -374,10 +372,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -421,7 +419,6 @@ noinst_HEADERS = \ ut_mutexImpl.h \ ut_sleep.h \ - ut_threadImpl.h \ ut_Win32Idle.h \ ut_Win32Locale.h \ ut_Win32OS.h \ @@ -440,8 +437,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -510,8 +507,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -523,8 +520,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -534,13 +531,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/win/ut_mutexImpl.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/win/ut_mutexImpl.h --- abiword-2.6.2/abiword/src/af/util/win/ut_mutexImpl.h 2008-04-06 17:00:12.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/win/ut_mutexImpl.h 2009-07-15 16:56:23.000000000 +0100 @@ -21,11 +21,12 @@ #define UT_MUTEXIMPL_H #include +#include "ut_types.h" /*! * Win32 implementation of a mutex class */ -class UT_MutexImpl +class ABI_EXPORT UT_MutexImpl { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/win/ut_threadImpl.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/win/ut_threadImpl.h --- abiword-2.6.2/abiword/src/af/util/win/ut_threadImpl.h 2008-04-06 17:00:12.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/win/ut_threadImpl.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,100 +0,0 @@ -/* AbiSource Program Utilities - * Copyright (C) 2002 Dom Lachowicz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ -#ifndef UT_THREADIMPL_H -#define UT_THREADIMPL_H - -#include "ut_assert.h" -#include "ut_thread.h" -#include - -// for friendly assert message -#define PRIORITIES_NOT_SUPPORTED 0 - - -class ABI_EXPORT UT_ThreadImpl -{ - - public: - - UT_ThreadImpl ( UT_Thread * owner ) - : mOwner ( owner ), mThread ( 0 ) - { - } - - ~UT_ThreadImpl () - { - // only exit if started - if ( mOwner->mbStarted ) - _endthread(); - } - - /*! - * Starts a new thread and executes the code in the - * (overridden) run method - */ - void start () - { - //UT_Thread::Priority pri = mOwner->getPriority () ; - - // the priority is ignored - - if (mThread = _beginthread(start_routine, 0, (void *)this) == -1) - { - //printf ( "thread create failed!!\n" ) ; - //MessageBox( NULL, "thread create failed!!\n", NULL, MB_OK ); - UT_ASSERT_HARMLESS(mThread != -1); - } - } - - /*! - * Sets this thread's priority - */ - void setPriority ( UT_Thread::Priority pri ) - { - UT_ASSERT_HARMLESS(PRIORITIES_NOT_SUPPORTED); - } - - /*! - * Causes the current running thread to temporarily pause - * and let other threads execute - */ - static void yield () - { - // yield? - } - - void join () - { - UT_ASSERT_HARMLESS(UT_NOT_IMPLEMENTED); - } - - private: - - static void start_routine ( void * inPtr ) - { - UT_Thread * thisPtr = static_cast(inPtr)->mOwner; - // printf ( "In the start routine: %d\n", thisPtr == NULL ); - thisPtr->run () ; - } - - UT_Thread * mOwner; - unsigned long mThread; -}; - -#endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/win/ut_Win32Idle.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/win/ut_Win32Idle.h --- abiword-2.6.2/abiword/src/af/util/win/ut_Win32Idle.h 2008-04-06 17:00:12.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/win/ut_Win32Idle.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ #include "ut_idle.h" #include "ut_vector.h" -class UT_Win32Idle : public UT_Idle +class ABI_EXPORT UT_Win32Idle : public UT_Idle { public: UT_Win32Idle(UT_WorkerCallback pCallback, void* pData); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/win/ut_Win32Misc.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/win/ut_Win32Misc.cpp --- abiword-2.6.2/abiword/src/af/util/win/ut_Win32Misc.cpp 2008-04-06 17:00:12.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/win/ut_Win32Misc.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -413,7 +413,7 @@ Class that implements an assert dialogue; this is a private class, we only access it through UT_Win32ThrowAssert() function */ -class UT_Win32AssertDlg +class ABI_EXPORT UT_Win32AssertDlg { friend int ABI_EXPORT UT_Win32ThrowAssert(const char *, const char *, int, int); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/GNUmakefile.am --- abiword-2.6.2/abiword/src/af/util/xp/GNUmakefile.am 2008-04-06 17:00:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -27,17 +27,7 @@ noinst_LIBRARIES = libUtil_xp.a -if SCRIPT -SCRIPT_OBJ=ut_PerlBindings.cpp -else SCRIPT_OBJ= -endif - -if HAVE_THREADS -THREAD_OBJ=ut_thread.cpp -else -THREAD_OBJ= -endif CFLAGS+=-frepo @@ -133,7 +123,6 @@ ut_svg.h \ ut_test.h \ ut_TextIterator.h \ - ut_thread.h \ ut_timer.h \ ut_types.h \ ut_unicode.h \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/util/xp/GNUmakefile.in 2008-04-06 22:26:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -84,20 +83,7 @@ ARFLAGS = cru libUtil_xp_a_AR = $(AR) $(ARFLAGS) libUtil_xp_a_LIBADD = -am__libUtil_xp_a_SOURCES_DIST = ut_AdobeEncoding.cpp ut_allocator.cpp \ - ut_base64.cpp ut_base64_TestRoutines.cpp ut_bytebuf.cpp \ - ut_decompress.cpp ut_growbuf.cpp ut_hash.cpp ut_Language.cpp \ - ut_math.cpp ut_mbtowc.cpp ut_misc.cpp ut_mutex.cpp \ - ut_locale.cpp ut_png.cpp ut_svg.cpp ut_Script.cpp ut_stack.cpp \ - ut_string.cpp ut_string_class.cpp ut_stringbuf.cpp ut_test.cpp \ - ut_timer.cpp ut_types.cpp ut_unicode.cpp ut_worker.cpp \ - ut_idle.cpp ut_units.cpp ut_PropVector.cpp ut_vector.cpp \ - ut_wctomb.cpp ut_OverstrikingChars.cpp ut_bijection.cpp \ - ut_Encoding.cpp ut_iconv.cpp ut_rand.cpp ut_xml_libxml2.cpp \ - ut_PerlBindings.cpp ut_thread.cpp ut_xml.cpp ut_html.cpp \ - ut_crc32.cpp ut_uuid.cpp ut_go_file.cpp -@SCRIPT_TRUE@am__objects_1 = ut_PerlBindings.$(OBJEXT) -@HAVE_THREADS_TRUE@am__objects_2 = ut_thread.$(OBJEXT) +am__objects_1 = am_libUtil_xp_a_OBJECTS = ut_AdobeEncoding.$(OBJEXT) \ ut_allocator.$(OBJEXT) ut_base64.$(OBJEXT) \ ut_base64_TestRoutines.$(OBJEXT) ut_bytebuf.$(OBJEXT) \ @@ -113,9 +99,8 @@ ut_wctomb.$(OBJEXT) ut_OverstrikingChars.$(OBJEXT) \ ut_bijection.$(OBJEXT) ut_Encoding.$(OBJEXT) \ ut_iconv.$(OBJEXT) ut_rand.$(OBJEXT) ut_xml_libxml2.$(OBJEXT) \ - $(am__objects_1) $(am__objects_2) ut_xml.$(OBJEXT) \ - ut_html.$(OBJEXT) ut_crc32.$(OBJEXT) ut_uuid.$(OBJEXT) \ - ut_go_file.$(OBJEXT) + $(am__objects_1) ut_xml.$(OBJEXT) ut_html.$(OBJEXT) \ + ut_crc32.$(OBJEXT) ut_uuid.$(OBJEXT) ut_go_file.$(OBJEXT) libUtil_xp_a_OBJECTS = $(am_libUtil_xp_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/ac-helpers/depcomp @@ -126,7 +111,7 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ SOURCES = $(libUtil_xp_a_SOURCES) -DIST_SOURCES = $(am__libUtil_xp_a_SOURCES_DIST) +DIST_SOURCES = $(libUtil_xp_a_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -267,8 +252,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -348,6 +331,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -394,7 +378,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -411,10 +395,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -441,10 +425,7 @@ -I$(srcdir)/../unix noinst_LIBRARIES = libUtil_xp.a -@SCRIPT_FALSE@SCRIPT_OBJ = -@SCRIPT_TRUE@SCRIPT_OBJ = ut_PerlBindings.cpp -@HAVE_THREADS_FALSE@THREAD_OBJ = -@HAVE_THREADS_TRUE@THREAD_OBJ = ut_thread.cpp +SCRIPT_OBJ = SUBDIRS = t libUtil_xp_a_SOURCES = \ ut_AdobeEncoding.cpp \ @@ -536,7 +517,6 @@ ut_svg.h \ ut_test.h \ ut_TextIterator.h \ - ut_thread.h \ ut_timer.h \ ut_types.h \ ut_unicode.h \ @@ -556,8 +536,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -599,7 +579,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_Encoding.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_Language.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_OverstrikingChars.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_PerlBindings.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_PropVector.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_Script.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_allocator.Po@am__quote@ @@ -628,7 +607,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_stringbuf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_svg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_thread.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_timer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_types.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut_unicode.Po@am__quote@ @@ -729,8 +707,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -755,8 +733,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -766,13 +744,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/Makefile --- abiword-2.6.2/abiword/src/af/util/xp/Makefile 2008-04-06 17:00:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -56,7 +56,6 @@ ut_OverstrikingChars.cpp \ ut_Language.cpp \ ut_Encoding.cpp \ - ut_thread.cpp \ ut_decompress.cpp \ ut_crc32.cpp \ ut_uuid.cpp \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/t/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/t/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/util/xp/t/GNUmakefile.in 2008-04-06 22:26:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/t/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -225,8 +224,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -306,6 +303,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -352,7 +350,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -369,10 +367,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -409,8 +407,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -474,8 +472,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -487,8 +485,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -498,13 +496,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_allocator.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_allocator.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_allocator.h 2008-04-06 17:00:12.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_allocator.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ * This class is responsible for creating and destroying memory buffers * It provides a default implementation based on g_try_malloc/g_free */ -class UT_Allocator +class ABI_EXPORT UT_Allocator { public: UT_Allocator (); @@ -42,7 +42,7 @@ /*! * Returns zeroed memory, either via g_try_malloc&memset or UT_calloc */ -class UT_NullAllocator : public UT_Allocator +class ABI_EXPORT UT_NullAllocator : public UT_Allocator { public: UT_NullAllocator (); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_assert.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_assert.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_assert.h 2008-04-06 17:00:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_assert.h 2009-07-15 16:56:23.000000000 +0100 @@ -195,10 +195,12 @@ // Please keep the "/**/" to stop MSVC dependency generator complaining. # include /**/ "ut_unixAssert.h" # define UT_ASSERT(expr) \ - ((void) ((expr) || \ - (UT_UnixAssertMsg(#expr, \ - __FILE__, __LINE__), \ - 0))) + { \ + static bool __bOnceOnly = false; \ + if (!__bOnceOnly && !(expr)) \ + if (UT_UnixAssertMsg(#expr, __FILE__, __LINE__) == -1) \ + __bOnceOnly = true; \ + } # endif #endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_bytebuf.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_bytebuf.cpp --- abiword-2.6.2/abiword/src/af/util/xp/ut_bytebuf.cpp 2008-04-06 17:00:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_bytebuf.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -198,7 +198,7 @@ if(!fp) return false; - bool res = insertFromInput (0, fp); + bool res = insertFromInput (iPosition, fp); g_object_unref (fp); return res; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_crc32.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_crc32.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_crc32.h 2008-04-06 17:00:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_crc32.h 2009-07-15 16:56:23.000000000 +0100 @@ -12,7 +12,7 @@ #endif //! CRC Checksum Calculation -class UT_CRC32 +class ABI_EXPORT UT_CRC32 { public: enum {DIGESTSIZE = 4}; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_go_file.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_go_file.cpp --- abiword-2.6.2/abiword/src/af/util/xp/ut_go_file.cpp 2008-04-06 17:00:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_go_file.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -3,12 +3,12 @@ * go-file.c : * * Copyright (C) 2004 Morten Welinder (terra@gnome.org) - * Copyright (C) 2004 Yukihiro Nakai * Copyright (C) 2003, Red Hat, Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,8 +17,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 - * USA + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. */ #ifdef HAVE_CONFIG_H @@ -83,7 +83,7 @@ gsf_input_memory_new_from_file (FILE * input) { GsfOutput *memory_output; - GsfInput *memory_input; + GsfInput *memory_input = NULL; g_return_val_if_fail (input != NULL, NULL); @@ -91,17 +91,23 @@ while (TRUE) { guint8 buf[1024]; size_t nread; + gboolean res; nread = fread (buf, 1, sizeof(buf), input); - gsf_output_write (memory_output, nread, buf); - if ((nread < sizeof(buf)) && (ferror (input) || feof (input))) - break; - } + res = gsf_output_write (memory_output, nread, buf); - gsf_output_close (memory_output); + if (ferror (input) || !res) { + /* trouble reading from @input or trouble writing to @memory_output */ + g_object_unref (G_OBJECT (memory_output)); + return NULL; + } + else if ((nread < sizeof(buf)) && feof (input)) /* hit eof */ + break; + } - memory_input = gsf_input_memory_new_clone (gsf_output_memory_get_bytes (GSF_OUTPUT_MEMORY (memory_output)), - gsf_output_size (memory_output)); + if (gsf_output_close (memory_output)) + memory_input = gsf_input_memory_new_clone (gsf_output_memory_get_bytes (GSF_OUTPUT_MEMORY (memory_output)), + gsf_output_size (memory_output)); g_object_unref (G_OBJECT (memory_output)); @@ -1552,75 +1558,6 @@ /* ------------------------------------------------------------------------- */ -/* - * UT_go_url_decode: decode the result of UT_go_url_encode. - */ -gchar* -UT_go_url_decode (gchar const *text) -{ - GString *result; - - g_return_val_if_fail (text != NULL, NULL); - g_return_val_if_fail (*text != '\0', NULL); - - result = g_string_new (NULL); - while (*text) { - unsigned char c = *text++; - if (c == '%') { - if (g_ascii_isxdigit (text[0]) && g_ascii_isxdigit (text[1])) { - g_string_append_c (result, - (g_ascii_xdigit_value (text[0]) << 4) | - g_ascii_xdigit_value (text[1])); - text += 2; - } else { - /* Bogus. */ - return g_string_free (result, TRUE); - } - } else - g_string_append_c (result, c); - } - - return g_string_free (result, FALSE); -} - -/** - * UT_go_url_encode: url-encode a string according to RFC 2368. - */ -gchar* -UT_go_url_encode (gchar const *text, int type) -{ - const char *good; - static const char hex[17] = "0123456789ABCDEF"; - GString* result; - - g_return_val_if_fail (text != NULL, NULL); - g_return_val_if_fail (*text != '\0', NULL); - - switch (type) { - case 0: /* mailto: */ - good = ".-_@"; - break; - case 1: /* file: or http: */ - good = "!$&'()*+,-./:=@_"; - break; - default: - return NULL; - } - - result = g_string_new (NULL); - while (*text) { - unsigned char c = *text++; - if (g_ascii_isalnum (c) || strchr (good, c)) - g_string_append_c (result, c); - else { - g_string_append_c (result, '%'); - g_string_append_c (result, hex[c >> 4]); - g_string_append_c (result, hex[c & 0xf]); - } - } - return g_string_free (result, FALSE); -} - #ifndef WITH_GNOMEUI static char * check_program (char const *prog) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_go_file.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_go_file.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_go_file.h 2008-04-06 17:00:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_go_file.h 2009-07-15 16:56:23.000000000 +0100 @@ -4,8 +4,9 @@ * Copyright (C) 2004 Morten Welinder (terra@gnome.org) * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,13 +15,19 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 - * USA + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. */ #ifndef UT_GO_FILE_H #define UT_GO_FILE_H - +/* pre-emptive dismissal; ut_types.h is needed by just about everything, + * so even if it's commented out in-file that's still a lot of work for + * the preprocessor to do... + */ +#ifndef UT_TYPES_H +#include "ut_types.h" +#endif #include #include @@ -51,52 +58,50 @@ UT_GO_DOTDOT_LEAVE /* Leave alone. */ } UT_GODotDot; -gboolean UT_go_path_is_uri (const char * path); +ABI_EXPORT gboolean UT_go_path_is_uri (const char * path); -char *UT_go_filename_simplify (const char *filename, UT_GODotDot dotdot, gboolean make_absolute); -char *UT_go_url_simplify (const char *uri); +ABI_EXPORT char *UT_go_filename_simplify (const char *filename, UT_GODotDot dotdot, gboolean make_absolute); +ABI_EXPORT char *UT_go_url_simplify (const char *uri); -char *UT_go_filename_from_uri (const char *uri); -char *UT_go_filename_to_uri (const char *filename); +ABI_EXPORT char *UT_go_filename_from_uri (const char *uri); +ABI_EXPORT char *UT_go_filename_to_uri (const char *filename); -char *UT_go_url_resolve_relative (const char *ref_uri, const char *rel_uri); -char *UT_go_url_make_relative (const char *uri, const char *ref_uri); +ABI_EXPORT char *UT_go_url_resolve_relative (const char *ref_uri, const char *rel_uri); +ABI_EXPORT char *UT_go_url_make_relative (const char *uri, const char *ref_uri); -char *UT_go_shell_arg_to_uri (const char *arg); -char *UT_go_basename_from_uri (const char *uri); -char *UT_go_dirname_from_uri (const char *uri, gboolean brief); -gboolean UT_go_directory_create (char const *uri, int mode, GError **err); -gchar const **UT_go_shell_argv_to_glib_encoding (gint argc, gchar const **argv); -void UT_go_shell_argv_to_glib_encoding_free (void); +ABI_EXPORT char *UT_go_shell_arg_to_uri (const char *arg); +ABI_EXPORT char *UT_go_basename_from_uri (const char *uri); +ABI_EXPORT char *UT_go_dirname_from_uri (const char *uri, gboolean brief); +ABI_EXPORT gboolean UT_go_directory_create (char const *uri, int mode, GError **err); +ABI_EXPORT gchar const **UT_go_shell_argv_to_glib_encoding (gint argc, gchar const **argv); +ABI_EXPORT void UT_go_shell_argv_to_glib_encoding_free (void); -GsfInput *UT_go_file_open (char const *uri, GError **err); -GsfOutput *UT_go_file_create (char const *uri, GError **err); -GSList *UT_go_file_split_urls (char const *data); +ABI_EXPORT GsfInput *UT_go_file_open (char const *uri, GError **err); +ABI_EXPORT GsfOutput *UT_go_file_create (char const *uri, GError **err); +ABI_EXPORT GSList *UT_go_file_split_urls (char const *data); -gboolean UT_go_file_remove (char const *uri, GError **err); +ABI_EXPORT gboolean UT_go_file_remove (char const *uri, GError **err); -gboolean UT_go_file_exists (char const *uri); +ABI_EXPORT gboolean UT_go_file_exists (char const *uri); -UT_GOFilePermissions *UT_go_get_file_permissions (char const *uri); -void UT_go_set_file_permissions (char const *uri, UT_GOFilePermissions * file_permissions); +ABI_EXPORT UT_GOFilePermissions *UT_go_get_file_permissions (char const *uri); +ABI_EXPORT void UT_go_set_file_permissions (char const *uri, UT_GOFilePermissions * file_permissions); -time_t UT_go_file_get_date_accessed (char const *uri); -time_t UT_go_file_get_date_modified (char const *uri); -time_t UT_go_file_get_date_changed (char const *uri); +ABI_EXPORT time_t UT_go_file_get_date_accessed (char const *uri); +ABI_EXPORT time_t UT_go_file_get_date_modified (char const *uri); +ABI_EXPORT time_t UT_go_file_get_date_changed (char const *uri); -gchar *UT_go_url_decode (gchar const *text); -gchar *UT_go_url_encode (gchar const *text, int type); -GError *UT_go_url_show (gchar const *url); -gboolean UT_go_url_check_extension (gchar const *uri, +ABI_EXPORT GError *UT_go_url_show (gchar const *url); +ABI_EXPORT gboolean UT_go_url_check_extension (gchar const *uri, gchar const *std_ext, gchar **new_uri); -gchar *UT_go_get_mime_type (gchar const *uri); -gchar *UT_go_get_mime_type_for_data (gconstpointer data, int data_size); -gchar const *UT_go_mime_type_get_description (gchar const *mime_type); - -const char * UT_go_guess_encoding (const char *raw, size_t len, const char *user_guess, char **utf8_str); -char const * UT_go_get_real_name (void); -gint UT_go_utf8_collate_casefold (const char *a, const char *b); +ABI_EXPORT gchar *UT_go_get_mime_type (gchar const *uri); +ABI_EXPORT gchar *UT_go_get_mime_type_for_data (gconstpointer data, int data_size); +ABI_EXPORT gchar const *UT_go_mime_type_get_description (gchar const *mime_type); + +ABI_EXPORT const char * UT_go_guess_encoding (const char *raw, size_t len, const char *user_guess, char **utf8_str); +ABI_EXPORT char const * UT_go_get_real_name (void); +ABI_EXPORT gint UT_go_utf8_collate_casefold (const char *a, const char *b); G_END_DECLS diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_hash.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_hash.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_hash.h 2008-04-06 17:00:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_hash.h 2009-07-15 16:56:23.000000000 +0100 @@ -1,3 +1,5 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + /* AbiSource Program Utilities * * Copyright (C) 2001 Mike Nordell @@ -45,13 +47,13 @@ #endif // fwd. decl. -template class hash_slot; +template class ABI_EXPORT hash_slot; template class ABI_EXPORT UT_GenericStringMap; // Like a std cursor -class _UT_StringMapImp +class ABI_EXPORT _UT_StringMapImp { @@ -62,7 +64,7 @@ { public: UT_GenericStringMap(size_t expected_cardinality = 11); - ~UT_GenericStringMap(); + virtual ~UT_GenericStringMap(); // insertion/addition bool insert(const char* key, T value); @@ -95,7 +97,7 @@ inline size_t cardinality() const { return n_keys; } inline size_t size() const { return n_keys; } - class UT_Cursor + class ABI_EXPORT UT_Cursor { friend class UT_GenericStringMap; @@ -244,18 +246,24 @@ //template class ABI_EXPORT UT_GenericStringMap; #endif -typedef UT_GenericStringMap UT_StringPtrMap; - +// TODO Rob: try to export like this once plugin loading is fixed: +// template class ABI_EXPORT UT_GenericStringMap; +class ABI_EXPORT UT_StringPtrMap : public UT_GenericStringMap { +public: + UT_StringPtrMap(size_t expected_cardinality = 11) + : UT_GenericStringMap(expected_cardinality) + {} +}; // Template implementation // fwd. decls. -UT_uint32 _Recommended_hash_size(UT_uint32 size); +ABI_EXPORT UT_uint32 _Recommended_hash_size(UT_uint32 size); // wrapper class for keys -class key_wrapper +class ABI_EXPORT key_wrapper { public: key_wrapper() @@ -307,7 +315,7 @@ // bucket for data -template class hash_slot +template class ABI_EXPORT hash_slot { public: hash_slot() diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_html.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_html.cpp --- abiword-2.6.2/abiword/src/af/util/xp/ut_html.cpp 2008-04-06 17:00:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_html.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -171,8 +171,8 @@ if (htmlParseChunk (ctxt, buffer, static_cast(length), 0)) { UT_DEBUGMSG (("Error parsing '%s' (Line: %d, Column: %d)\n", - szFilename, getLineNumber(ctxt), - getColumnNumber(ctxt))); + szFilename, xmlSAX2GetLineNumber(ctxt), + xmlSAX2GetColumnNumber(ctxt))); ret = UT_IE_IMPORTERROR; break; } @@ -183,8 +183,8 @@ if (htmlParseChunk (ctxt, 0, 0, 1)) { UT_DEBUGMSG (("Error parsing '%s' (Line: %d, Column: %d)\n", - szFilename, getLineNumber(ctxt), - getColumnNumber(ctxt))); + szFilename, xmlSAX2GetLineNumber(ctxt), + xmlSAX2GetColumnNumber(ctxt))); ret = UT_IE_IMPORTERROR; } } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_iconv.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_iconv.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_iconv.h 2008-04-06 17:00:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_iconv.h 2009-07-15 16:56:23.000000000 +0100 @@ -62,27 +62,27 @@ G_BEGIN_DECLS -const char * ucs2Internal (); +ABI_EXPORT const char * ucs2Internal (); #define UCS_2_INTERNAL ucs2Internal() -const char * ucs4Internal (); +ABI_EXPORT const char * ucs4Internal (); #define UCS_INTERNAL ucs4Internal() -UT_iconv_t UT_iconv_open( const char* to, const char* from ); -size_t UT_iconv( UT_iconv_t cd, const char **inbuf, +ABI_EXPORT UT_iconv_t UT_iconv_open( const char* to, const char* from ); +ABI_EXPORT size_t UT_iconv( UT_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft ); -int UT_iconv_close( UT_iconv_t cd ); -void UT_iconv_reset( UT_iconv_t cd ); -int UT_iconv_isValid ( UT_iconv_t cd ); +ABI_EXPORT int UT_iconv_close( UT_iconv_t cd ); +ABI_EXPORT void UT_iconv_reset( UT_iconv_t cd ); +ABI_EXPORT int UT_iconv_isValid ( UT_iconv_t cd ); -char * UT_convert (const char *str, +ABI_EXPORT char * UT_convert (const char *str, UT_sint32 len, const char *from_codeset, const char *to_codeset, UT_uint32 *bytes_read, UT_uint32 *bytes_written); -char * UT_convert_cd (const char *str, +ABI_EXPORT char * UT_convert_cd (const char *str, UT_sint32 len, UT_iconv_t cd, UT_uint32 *bytes_read, diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_locale.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_locale.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_locale.h 2008-04-06 17:00:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_locale.h 2009-07-15 16:56:23.000000000 +0100 @@ -23,7 +23,7 @@ #include #include "ut_string_class.h" -class UT_LocaleTransactor +class ABI_EXPORT UT_LocaleTransactor { public: @@ -40,7 +40,7 @@ char * mOldLocale; }; -class UT_LocaleInfo +class ABI_EXPORT UT_LocaleInfo { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_misc.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_misc.cpp --- abiword-2.6.2/abiword/src/af/util/xp/ut_misc.cpp 2008-04-06 17:00:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_misc.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -599,6 +599,36 @@ } +/*! This function takes in a color string of any form (e.g. "red", "CMYK()", + "#000000", "000000", etc.) and returns an RGB hexadecimal string. + \param szColor The incoming string to parse + \param bPrefix The return string will be prefixed with a '#' + if bPrefix is true. Defaults to false. + \return An RGB hexadecimal string or an empty string if szColor is empty + + WARNING: Will return 000000 or #000000 if an invalid color is passed in +*/ + +std::string UT_colorToHex(const char * szColor, bool bPrefix) +{ + std::string sColor; + UT_return_val_if_fail(szColor && *szColor, sColor); + + // This initialization will cause black to be returned if an invalid + // color is passed in. TODO: make UT_parseColor() return a bool to + // make this unnecessary? + UT_RGBColor color(0,0,0); + UT_HashColor hashColor; + + UT_parseColor(szColor, color); + sColor = hashColor.setColor(color.m_red, color.m_grn, color.m_blu); + + if(!bPrefix) + sColor.erase(0, 1); + + return sColor; +} + #ifdef WIN32 #define ut_PATHSEP '\\' #else diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_misc.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_misc.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_misc.h 2008-04-06 17:00:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_misc.h 2009-07-15 16:56:23.000000000 +0100 @@ -34,6 +34,8 @@ #include "ut_vector.h" #endif +#include + class UT_RGBColor; class UT_Rect; class UT_String; @@ -109,6 +111,7 @@ void UT_setColor(UT_RGBColor & col, unsigned char r, unsigned char g, unsigned char b, bool bTransparent = false); ABI_EXPORT void UT_parseColor(const char*, UT_RGBColor&); +ABI_EXPORT std::string UT_colorToHex(const char*, bool bPrefix = false); class ABI_EXPORT UT_HashColor { @@ -214,7 +217,7 @@ UT_uint32 m_iID[(UT_uint32)_Last]; }; -bool UT_parseBool (const char * param, bool dfl); +ABI_EXPORT bool UT_parseBool (const char * param, bool dfl); #if 0 diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_mutex.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_mutex.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_mutex.h 2008-04-06 17:00:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_mutex.h 2009-07-15 16:56:23.000000000 +0100 @@ -19,6 +19,14 @@ #ifndef UT_MUTEX_H #define UT_MUTEX_H +/* pre-emptive dismissal; ut_types.h is needed by just about everything, + * so even if it's commented out in-file that's still a lot of work for + * the preprocessor to do... + */ +#ifndef UT_TYPES_H +#include "ut_types.h" +#endif + class UT_MutexImpl; class UT_MutexAcquirer; @@ -30,7 +38,7 @@ * UT_MutexImpl has the same signature as UT_Mutex except that it's * implemented in platform-specific code */ -class UT_Mutex +class ABI_EXPORT UT_Mutex { friend class UT_MutexImpl; friend class UT_MutexAcquirer; @@ -67,7 +75,7 @@ * // done transparently by the acquirer * } */ -class UT_MutexAcquirer +class ABI_EXPORT UT_MutexAcquirer { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_PerlBindings.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_PerlBindings.cpp --- abiword-2.6.2/abiword/src/af/util/xp/ut_PerlBindings.cpp 2008-04-06 17:00:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_PerlBindings.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,423 +0,0 @@ -// If PERL_OBJECT is defined, perl guts are C++ functions, and thus we should -// not use extern "C". -#ifndef PERL_OBJECT -# define is_cplusplus -#endif - -#include "ut_PerlBindings.h" -#include "ut_string_class.h" -#include "xap_App.h" -#include "xap_Frame.h" -#include "xav_View.h" -#include "ut_debugmsg.h" -#include "ev_EditMethod.h" -#include "ev_Menu.h" -#include "ev_Menu_Actions.h" - -// for scandir - TODO: make me less unixy -//win32 #include -//win32 #include - -// HACK to not collide with perl DEBUG -#ifdef DEBUG -# define ABI_DEBUG -# undef DEBUG -#endif - -#include -#include // printf - -#ifdef is_cplusplus -extern "C" { -#endif - -// perl has its own 'bool' datatype that clashes with C++'s -// builtin bool. perl will define bool as an enum, int, or char -// if you'd don't define this. this hack allows our perl bindings -// to compile on *BSD -#define HAS_BOOL 1 - -// perl uses some wacky define's for the SvTRUE macro's and the like which -// gcc (read: ISO C++) does not allow. Defining PERL_GCC_BRACE_GROUPS_FORBIDDEN -// forces 'perl' not these defines and to use another macro definition. See sv.h -// for more information. -#define PERL_GCC_BRACE_GROUPS_FORBIDDEN 1 - -#include -#include - -#ifdef is_cplusplus -} -#endif - -#ifdef PERL_OBJECT -# define NO_XSLOCKS -# include -# include "win32iop.h" -# include -# include -#endif - -#ifdef DEBUG -# define PERL_DEBUG -# undef DEBUG -#endif - -#ifdef ABI_DEBUG -# define DEBUG -#endif - -extern "C" { - -#ifdef NOT_PERL_5_8 - void boot_DynaLoader(CV* cv); - void xs_init () -#else - void boot_DynaLoader(PerlInterpreter *pi, CV* cv); - void xs_init(PerlInterpreter * my_perl) -#endif - { - newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, __FILE__); - /* we want to link to the module code, but until it's stable - it's better to have it dynamically loaded... - newXS("abi::boot_AbiWord", boot_AbiWord, file);*/ - } -} - -////////////////////////////////////////////////// -// Impl -////////////////////////////////////////////////// -struct UT_PerlBindings::Impl -{ -public: - PerlInterpreter* pPerlInt; - UT_String errmsg; -}; - -#ifdef PERL_DEBUG -#define DEBUG -#endif - -extern "C" { - - // return > 0 for perl directory entries -#if defined (__APPLE__) || defined (__FreeBSD__) || defined (__OpenBSD__) \ - || defined(_AIX) - static int perl_only (struct dirent *d) -#else - static int perl_only (const struct dirent *d) -#endif - { - const char * name = d->d_name; - - if ( name ) - { - int len = strlen (name); - - if (len >= 3) - { - if(!strcmp(name+(len-3), ".pl") || !strcmp(name+(len-3), ".pm")) - return 1; - } - } - return 0; - } -} // extern "C" block - -UT_PerlBindings::UT_PerlBindings() - : impl_(new UT_PerlBindings::Impl) -{ - char *argv[] = { "", "-MAbiWord", "-e", "0" }; - - impl_->pPerlInt = perl_alloc(); - - // how can I signal that there is not enough memory without throwing an exception? - if (impl_->pPerlInt == 0) { - UT_DEBUGMSG(("Not enough memory to start a perl interpreter!\n")); - UT_ASSERT_NOT_REACHED(); - DELETEP(impl_); - return; - } - - perl_construct(impl_->pPerlInt); - int exitstatus = perl_parse(impl_->pPerlInt, xs_init, sizeof(argv) / sizeof(char*), argv, 0); - - if (exitstatus != 0) - { - UT_DEBUGMSG(("perl_parse failed with error nb: %d", exitstatus)); - UT_ASSERT_NOT_REACHED(); - DELETEP(impl_); - return; - } - - exitstatus = perl_run(impl_->pPerlInt); - - if (exitstatus != 0) - { - UT_DEBUGMSG(("perl_run failed with error nb: %d", exitstatus)); - UT_ASSERT_NOT_REACHED(); - DELETEP(impl_); - return; - } - - // interpreter loaded, now to auto-load plugins... TODO: make this less unix-ish - { - struct dirent **namelist; - int n = 0; - - UT_String scriptList[2]; - - // global script dir - UT_String scriptDir = XAP_App::getApp()->getAbiSuiteAppDir(); - scriptDir += "/scripts/"; - scriptList[0] = scriptDir; - - // the user-local script directory - scriptDir = XAP_App::getApp()->getUserPrivateDirectory (); - scriptDir += "/AbiWord/scripts/"; - scriptList[1] = scriptDir; - - for(UT_uint32 i = 0; i < (sizeof(scriptList)/sizeof(scriptList[0])); i++) - { - scriptDir = scriptList[i]; - - n = scandir(scriptDir.c_str(), &namelist, perl_only, alphasort); - UT_DEBUGMSG(("DOM: found %d PERL scripts in %s\n", n, scriptDir.c_str())); - - if (n > 0) - { - while(n--) - { - UT_String script (scriptDir + namelist[n]->d_name); - - UT_DEBUGMSG(("DOM: loading PERL script %s\n", script.c_str())); - - evalFile ( script ) ; - - g_free(namelist[n]); - } - } - g_free (namelist); - } - } -} - -UT_PerlBindings::~UT_PerlBindings() -{ - if (impl_) - { - perl_destruct(impl_->pPerlInt); - perl_free(impl_->pPerlInt); - delete impl_; - } -} - -UT_PerlBindings& -UT_PerlBindings::getInstance() -{ - static UT_PerlBindings instance; - return instance; -} - -const UT_String& -UT_PerlBindings::errmsg() const -{ - static const UT_String& empty(""); - return impl_ ? impl_->errmsg : empty; -} - -bool -UT_PerlBindings::evalFile(const UT_String& filename) -{ - if (0 == impl_) - return false; - -#ifndef NOT_PERL_5_8 - PerlInterpreter * my_perl = impl_->pPerlInt; -#endif - - UT_String code("require \""); - - for (size_t i = 0; i < filename.size(); ++i) - { - if (filename[i] != '\\') - code += filename[i]; - else - code += "\\\\"; - } - - code += "\""; - - SV* retval = perl_eval_pv(code.c_str(), FALSE); - - if (!SvOK(retval)) - { - if (SvTRUE(ERRSV)) - { - UT_DEBUGMSG(("Error compiling perl script.\n")); - - if (impl_) - { - impl_->errmsg = "Error compiling perl script:\n"; - impl_->errmsg += SvPV_nolen(ERRSV); - warpString(impl_->errmsg, 50); - } - } - - return false; - } - else - { - if (!SvTRUE(retval)) - { - UT_DEBUGMSG(("Error running perl script.\n")); - - if (impl_) - impl_->errmsg = "Error running perl script.\n"; - - return false; - } - } - - code = "delete $INC{\""; - - for (size_t i = 0; i < filename.size(); ++i) - { - if (filename[i] != '\\') - code += filename[i]; - else - code += "\\\\"; - } - - code += "\"}"; - - perl_eval_pv(code.c_str(), FALSE); - - return true; -} - -bool -UT_PerlBindings::runCallback(const char* method) -{ -#ifndef NOT_PERL_5_8 - PerlInterpreter * my_perl = impl_->pPerlInt; -#endif - - dSP; - PUSHMARK(SP); - -#ifdef NOT_PERL_5_8 - Perl_call_pv(method, - G_VOID | G_DISCARD | G_NOARGS /* | G_EVAL */ ); -#else - Perl_call_pv(my_perl, method, - G_VOID | G_DISCARD | G_NOARGS /* | G_EVAL */ ); -#endif - - if (SvTRUE(ERRSV)) - { - if (impl_) - { - impl_->errmsg = "Error executing perl script:\n"; - impl_->errmsg += SvPV_nolen(ERRSV); - warpString(impl_->errmsg, 50); - } - - return false; - } - - return true; -} - -void -UT_PerlBindings::registerCallback(const char* pszFunctionName, - const char* pszMenuPath, - const char* pszDescription, - bool bRaisesDialog) -{ - XAP_App* app = XAP_App::getApp(); - XAP_Menu_Id id = 0; - UT_ASSERT(app); - UT_ASSERT(pszFunctionName); - UT_ASSERT(pszMenuPath); - UT_ASSERT(pszDescription); - - UT_uint32 nb_frames = app->getFrameCount(); - for (UT_uint32 i = 0; i < nb_frames; ++i) - { - XAP_Frame* frame = app->getFrame(i); - UT_ASSERT(frame); - EV_Menu* menu = frame->getMainMenu(); - UT_ASSERT(menu); - id = menu->addMenuItem(pszMenuPath, pszDescription); - } - - app->getMenuActionSet()->addAction(new EV_Menu_Action(id, false, bRaisesDialog, false, false, "executeScript", 0, 0, pszFunctionName)); -} - -/***************************************************************************/ -/***************************************************************************/ - -UT_PerlScriptSniffer::UT_PerlScriptSniffer () -{ -} - -UT_PerlScriptSniffer::~UT_PerlScriptSniffer () -{ -} - -bool UT_PerlScriptSniffer::recognizeContents (const char * szBuf, - UT_uint32 iNumbytes) const -{ - // this can obviously get better - if (NULL == strstr(szBuf, "perl")) - return false; - - return true; -} - -bool UT_PerlScriptSniffer::recognizeSuffix (const char * szSuffix) const -{ - if ( !g_ascii_strcasecmp ( szSuffix, ".perl" ) || !g_ascii_strcasecmp (szSuffix, ".pl" ) ) - return true; - - return false; -} - -bool UT_PerlScriptSniffer::getDlgLabels (const char ** szDesc, - const char ** szSuffixList, - UT_ScriptIdType * ft) const -{ - *szDesc = "Perl Scripts (.perl, .pl)"; - *szSuffixList = "*.perl; *.pl"; - *ft = getType(); - return true; -} - -UT_Error UT_PerlScriptSniffer::constructScript(UT_Script** ppscript) const -{ - *ppscript = new UT_PerlScript(); - return UT_OK; -} - -/***************************************************************************/ -/***************************************************************************/ - -UT_PerlScript::UT_PerlScript() -{ -} - -UT_PerlScript::~UT_PerlScript() -{ -} - -UT_Error UT_PerlScript::execute(const char * fileName) -{ - UT_PerlBindings& instance = UT_PerlBindings::getInstance(); - UT_String file(fileName); - - if (instance.evalFile(file)) - return UT_OK; - - return UT_ERROR; -} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_PropVector.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_PropVector.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_PropVector.h 2008-04-06 17:00:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_PropVector.h 2009-07-15 16:56:23.000000000 +0100 @@ -22,7 +22,7 @@ #include "ut_vector.h" -class UT_PropVector +class ABI_EXPORT UT_PropVector : public UT_GenericVector { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_stringbuf.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_stringbuf.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_stringbuf.h 2008-04-06 17:00:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_stringbuf.h 2009-07-15 16:56:23.000000000 +0100 @@ -46,7 +46,7 @@ template -class UT_StringImpl +class ABI_EXPORT UT_StringImpl { public: UT_StringImpl(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_string_class.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_string_class.cpp --- abiword-2.6.2/abiword/src/af/util/xp/ut_string_class.cpp 2008-04-06 17:00:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_string_class.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -269,18 +269,9 @@ UT_String& UT_String_vprintf (UT_String & inStr, const char *format, va_list args1) { - char *buffer; - va_list args2; - - G_VA_COPY (args2, args1); - - buffer = new char [ g_printf_string_upper_bound (format, args1) ]; - vsprintf (buffer, format, args2); - va_end (args2); - + char *buffer = g_strdup_vprintf(format, args1); inStr = buffer; - - delete [] buffer; + g_free(buffer); return inStr; } @@ -556,6 +547,7 @@ bool operator==(const UT_String& s1, const UT_String& s2) { + if (s1.size() != s2.size()) return false; return strcmp(s1.c_str(), s2.c_str()) == 0; } @@ -1190,12 +1182,13 @@ } bool operator==(const UT_UTF8String& s1, const UT_UTF8String& s2) { + if (s1.size() != s2.size()) return false; return strcmp(s1.utf8_str(), s2.utf8_str()) == 0; } bool operator!=(const UT_UTF8String& s1, const UT_UTF8String& s2) { - return strcmp(s1.utf8_str(), s2.utf8_str()) != 0; + return !(s1 == s2); } bool operator==(const UT_UTF8String& s1, const char * s2) @@ -1210,11 +1203,13 @@ bool operator==(const UT_UTF8String& s1, const std::string &s2) { + if (s1.size() != s2.size()) return false; return s1.utf8_str() == s2; } bool operator!=(const UT_UTF8String& s1, const std::string &s2) { + if (s1.size() != s2.size()) return true; return s1.utf8_str() != s2; } @@ -1308,7 +1303,7 @@ /* construct from a string in UTF-8 format * if (strip_whitespace == true) replace all white space sequences with a single UCS_SPACE * if (strip_whitespace != true) replace CR-LF & CR by LF - * non-breaking spaces (  UCS_NBSP 0x0a) are not white space; see UT_UCS4_isspace() + * non-breaking spaces (  UCS_NBSP 0x0a) are not white space */ UT_UCS4String::UT_UCS4String(const char * utf8_str, size_t bytelength /* 0 == zero-terminate */, bool strip_whitespace) : pimpl(new UT_StringImpl) @@ -1322,7 +1317,7 @@ if (ucs4a == 0) break; // end-of-string UT_UCS4Char ucs4b = UT_Unicode::UTF8_to_UCS4 (utf8_str, bytelength); - if (UT_UCS4_isspace (ucs4a)) { + if ((UCS_NBSP != ucs4a) && UT_UCS4_isspace (ucs4a)) { if (strip_whitespace) { if (!UT_UCS4_isspace (ucs4b)) { ucs4a = UCS_SPACE; @@ -1482,6 +1477,7 @@ bool operator==(const UT_UCS4String& s1, const UT_UCS4String& s2) { + if (s1.size() != s2.size()) return false; return UT_UCS4_strcmp(s1.ucs4_str(), s2.ucs4_str()) == 0; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_thread.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_thread.cpp --- abiword-2.6.2/abiword/src/af/util/xp/ut_thread.cpp 2008-04-06 17:00:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_thread.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -/* AbiSource Program Utilities - * Copyright (C) 2002 Dom Lachowicz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ -#include "ut_thread.h" -#include "ut_threadImpl.h" -#include "ut_assert.h" - -UT_Thread::UT_Thread ( UT_Thread::Priority pri ) - : mPri ( pri ), mbStarted ( false ) -{ - mPimpl = new UT_ThreadImpl ( this ) ; - UT_ASSERT(mPimpl); -} - -UT_Thread::~UT_Thread () -{ - if ( mPimpl ) - delete mPimpl ; -} - -void UT_Thread::setPriority ( UT_Thread::Priority pri ) -{ - mPri = pri; - - if ( mbStarted ) - mPimpl->setPriority ( pri ) ; -} - -void UT_Thread::yield () -{ - UT_ThreadImpl::yield () ; -} - -void UT_Thread::join() -{ - mPimpl->join (); -} - -void UT_Thread::start () -{ - UT_ASSERT(!mbStarted); - mbStarted = true ; - mPimpl->start () ; - setPriority(getPriority()); -} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_thread.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_thread.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_thread.h 2008-04-06 17:00:12.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_thread.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,92 +0,0 @@ -/* AbiSource Program Utilities - * Copyright (C) 2002 Dom Lachowicz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ -#ifndef UT_THREAD_H -#define UT_THREAD_H - -/* pre-emptive dismissal; ut_types.h is needed by just about everything, - * so even if it's commented out in-file that's still a lot of work for - * the preprocessor to do... - */ -#ifndef UT_TYPES_H -#include "ut_types.h" -#endif - -class UT_ThreadImpl; - -class ABI_EXPORT UT_Thread -{ - friend class UT_ThreadImpl; - - public: - - typedef enum { - PRI_LOW, - PRI_NORMAL, - PRI_HIGH - } Priority; - - virtual ~UT_Thread (); - - /*! - * Starts a new thread and executes the code in the - * (overridden) run method - */ - void start () ; - - /*! - * Get this thread's priority - */ - UT_Thread::Priority getPriority () const - { - return mPri; - } - - /*! - * Sets this thread's priority - */ - void setPriority ( UT_Thread::Priority pri ) ; - - /*! - * Causes the currently-executing thread to wait until - * this thread terminates - */ - void join () ; - - /*! - * Causes the current running thread to temporarily pause - * and let other threads execute - */ - static void yield () ; - - protected: - // qualifying Priority with UT_Thread:: confuses VC - UT_Thread (Priority pri = PRI_NORMAL) ; - - /*! - * Pretty pretty please override me!! - */ - virtual void run () = 0; - - private: - UT_ThreadImpl * mPimpl; - UT_Thread::Priority mPri; - bool mbStarted; -}; - -#endif /* UT_THREAD_H */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_unicode.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_unicode.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_unicode.h 2008-04-06 17:00:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_unicode.h 2009-07-15 16:56:23.000000000 +0100 @@ -31,7 +31,7 @@ /** contain various unicode function. Just a namespace */ -class UT_Unicode +class ABI_EXPORT UT_Unicode { public: /** scans a buffer for the next valid UTF-8 sequence and returns the corresponding diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_units.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_units.cpp --- abiword-2.6.2/abiword/src/af/util/xp/ut_units.cpp 2008-04-06 17:00:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_units.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -417,6 +417,8 @@ double UT_convertDimensionless(const char * sz) { + UT_return_val_if_fail(sz, 0); + // convert given string into a number -- without using any dimension // info that may be in the string. // diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_vector.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_vector.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_vector.h 2008-04-06 17:00:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_vector.h 2009-07-15 16:56:23.000000000 +0100 @@ -140,12 +140,23 @@ UT_uint32 m_iPostCutoffIncrement; }; -#if 0 //def _MSC_VER // have to intialise the templates in order to have class exported -#include "ut_Win32Vector.h" -#endif +// TODO Rob: try to export like this once plugin loading is fixed: +// template class ABI_EXPORT UT_GenericVector; +class ABI_EXPORT UT_Vector : public UT_GenericVector { +public: + UT_Vector(UT_uint32 sizehint = 32, UT_uint32 baseincr = 4, bool bPrealloc = false) + : UT_GenericVector(sizehint, baseincr, bPrealloc) + {} +}; -typedef ABI_EXPORT UT_GenericVector UT_Vector; -typedef ABI_EXPORT UT_GenericVector UT_NumberVector; +// TODO Rob: try to export like this once plugin loading is fixed: +// template class ABI_EXPORT UT_GenericVector; +class ABI_EXPORT UT_NumberVector : public UT_GenericVector { +public: + UT_NumberVector(UT_uint32 sizehint = 32, UT_uint32 baseincr = 4, bool bPrealloc = false) + : UT_GenericVector(sizehint, baseincr, bPrealloc) + {} +}; #include #include diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_worker.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_worker.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_worker.h 2008-04-06 17:00:12.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_worker.h 2009-07-15 16:56:23.000000000 +0100 @@ -59,8 +59,7 @@ /*! * This class is a generic "worker" class which will - * serve as a base-class for UT_Timers, UT_Idles, and - * UT_Threads + * serve as a base-class for UT_Timers and UT_Idles */ class ABI_EXPORT UT_Worker { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_xml.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_xml.cpp --- abiword-2.6.2/abiword/src/af/util/xp/ut_xml.cpp 2008-04-06 17:00:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_xml.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -356,7 +356,7 @@ /**************************************************************/ /**************************************************************/ -class UT_XML_Decoder : public UT_XML::Listener +class ABI_EXPORT UT_XML_Decoder : public UT_XML::Listener { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_xml.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_xml.h --- abiword-2.6.2/abiword/src/af/util/xp/ut_xml.h 2008-04-06 17:00:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_xml.h 2009-07-15 16:56:23.000000000 +0100 @@ -195,7 +195,7 @@ void defaultData (const gchar * buffer, int length); }; -class DefaultReader : public UT_XML::Reader +class ABI_EXPORT DefaultReader : public UT_XML::Reader { public: DefaultReader (); @@ -214,7 +214,7 @@ * * NOTE: The buffer is not copied, or g_free()ed. */ -class UT_XML_BufReader : public UT_XML::Reader +class ABI_EXPORT UT_XML_BufReader : public UT_XML::Reader { public: UT_XML_BufReader (const char * buffer, UT_uint32 length); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/util/xp/ut_xml_libxml2.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/util/xp/ut_xml_libxml2.cpp --- abiword-2.6.2/abiword/src/af/util/xp/ut_xml_libxml2.cpp 2008-04-06 17:00:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/util/xp/ut_xml_libxml2.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -207,7 +207,7 @@ { if(getNumMinorErrors() > getNumRecoveredErrors()) { - UT_DEBUGMSG (("Error - 1 parsing '%s' (Line: %d, Column: %d)\n", szFilename, getLineNumber(ctxt), getColumnNumber(ctxt))); + UT_DEBUGMSG (("Error - 1 parsing '%s' (Line: %d, Column: %d)\n", szFilename, xmlSAX2GetLineNumber(ctxt), xmlSAX2GetColumnNumber(ctxt))); ret = UT_IE_IMPORTERROR; break; } @@ -218,7 +218,7 @@ { if (xmlParseChunk (ctxt, "", 0, 1)) { - UT_DEBUGMSG (("Error -2 parsing '%s' (Line: %d, Column: %d)\n", szFilename, getLineNumber(ctxt), getColumnNumber(ctxt))); + UT_DEBUGMSG (("Error -2 parsing '%s' (Line: %d, Column: %d)\n", szFilename, xmlSAX2GetLineNumber(ctxt), xmlSAX2GetColumnNumber(ctxt))); ret = UT_IE_IMPORTERROR; } } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/cocoa/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/cocoa/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/xap/cocoa/GNUmakefile.in 2008-04-06 22:26:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/cocoa/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -257,8 +256,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -338,6 +335,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -384,7 +382,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -401,10 +399,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -540,8 +538,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -644,8 +642,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -657,8 +655,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -668,13 +666,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/xap/GNUmakefile.in 2008-04-06 22:26:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -65,7 +65,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -234,8 +233,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -315,6 +312,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -361,7 +359,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -378,10 +376,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -420,8 +418,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -541,8 +539,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -567,8 +565,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -578,13 +576,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/qnx/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/qnx/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/xap/qnx/GNUmakefile.in 2008-04-06 22:26:07.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/qnx/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -242,8 +241,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -323,6 +320,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -369,7 +367,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -386,10 +384,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -481,8 +479,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -566,8 +564,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -579,8 +577,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -590,13 +588,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/GNUmakefile.am --- abiword-2.6.2/abiword/src/af/xap/unix/GNUmakefile.am 2008-04-06 16:59:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ +## -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- ## AbiSource Applications ## Copyright (C) 2001 Sam Tobin-Hochstadt diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/xap/unix/GNUmakefile.in 2008-04-06 22:26:07.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,7 +67,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -282,8 +281,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -363,6 +360,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -409,7 +407,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -426,10 +424,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -562,8 +560,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -754,8 +752,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -780,8 +778,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -791,13 +789,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -961,7 +958,6 @@ uninstall uninstall-am uninstall-gladeDATA \ uninstall-headersDATA -/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ #@PLATFORM@/t/*.o # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/hildon/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/hildon/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/xap/unix/hildon/GNUmakefile.in 2008-04-06 22:26:07.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/hildon/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -227,8 +226,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -308,6 +305,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -354,7 +352,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -371,10 +369,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -416,8 +414,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -477,8 +475,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -490,8 +488,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -501,13 +499,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/t/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/t/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/xap/unix/t/GNUmakefile.in 2008-04-06 22:26:07.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/t/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -222,8 +221,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -303,6 +300,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -349,7 +347,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -366,10 +364,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -401,8 +399,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -461,8 +459,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -474,8 +472,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -485,13 +483,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixApp.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixApp.cpp --- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixApp.cpp 2008-04-06 16:59:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixApp.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -180,8 +180,6 @@ bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue) { - if (!g_thread_supported ()) g_thread_init (NULL); - // let our base class do it's thing. XAP_App::initialize(szKeyBindingsKey, szKeyBindingsDefaultValue); @@ -232,7 +230,7 @@ void XAP_UnixApp::getWinGeometry(int * x, int * y, UT_uint32 * width, UT_uint32 * height, UT_uint32 * flags) { - UT_ASSERT(x && y && width && height); + UT_return_if_fail(x && y && width && height); *x = m_geometry.x; *y = m_geometry.y; *width = m_geometry.width; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_About.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_About.cpp --- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_About.cpp 2008-04-06 16:59:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_About.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -61,7 +61,7 @@ static const gchar *documenters[] = {"David Chart ", NULL}; - static const gchar *copyright = "(c) 1998-2008 Dom Lachowicz and other contributors, GNU GPL v2.0"; + static const gchar *copyright = "(c) 1998-2009 Dom Lachowicz and other contributors, GNU GPL v2.0"; static const gchar *website = "http://www.abisource.com"; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp --- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2008-04-06 16:59:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -103,7 +103,7 @@ static void s_dialog_response(GtkWidget * /* widget */, gint answer, - XAP_Dialog_FileOpenSaveAs::tAnswer * ptr) + XAP_Dialog_FileOpenSaveAs::tAnswer * ptr, bool bQuit = true) { switch (answer) { @@ -114,7 +114,8 @@ *ptr = XAP_Dialog_FileOpenSaveAs::a_CANCEL; else *ptr = XAP_Dialog_FileOpenSaveAs::a_OK; - gtk_main_quit(); + if (bQuit) + gtk_main_quit(); break; default: // do nothing @@ -122,6 +123,12 @@ } } +static void dialog_response(GtkWidget *widget, + gint answer, + XAP_Dialog_FileOpenSaveAs::tAnswer * ptr) { + s_dialog_response(widget, answer, ptr); +} + static void s_delete_clicked(GtkWidget *widget, GdkEvent *event, gpointer data) @@ -131,6 +138,7 @@ gtk_main_quit(); } + static gint s_preview_exposed(GtkWidget * /* widget */, GdkEventExpose * /* pExposeEvent */, gpointer ptr) @@ -163,7 +171,12 @@ static void s_file_activated(GtkWidget * w, XAP_Dialog_FileOpenSaveAs::tAnswer * answer) { - s_dialog_response(w, GTK_RESPONSE_ACCEPT, answer); + // whenever the "file-activated" signal is called, it will also be followed + // (or preceded?) by a "response" signal. That "response" signal will manage + // the closing of the dialog for us. Now we don't want to close the dialog + // twice, hence the last 'false' parameter. + // Hardly elegant, but none of this code is :/ It fixes bug #11647 too - MARCM. + s_dialog_response(w, GTK_RESPONSE_ACCEPT, answer, false); } static void file_selection_changed (GtkTreeSelection *selection, @@ -413,9 +426,11 @@ { return; } - gchar * uri = gtk_file_chooser_get_uri(m_FC); - UT_String sFileName(uri); - FREEP(uri); + + gchar * filename = gtk_file_chooser_get_filename(m_FC); + UT_String sFileName = filename; + FREEP(filename); + UT_String sSuffix = m_szSuffixes[nFileType-1]; sSuffix = sSuffix.substr(1,sSuffix.length()-1); UT_sint32 i = 0; @@ -732,7 +747,7 @@ g_signal_connect (G_OBJECT (m_FC), "response", - G_CALLBACK(s_dialog_response), &m_answer); + G_CALLBACK(dialog_response), &m_answer); g_signal_connect (G_OBJECT (m_FC), "file-activated", diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp --- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp 2008-04-06 16:59:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -1,3 +1,5 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + /* AbiSource Application Framework * Copyright (C) 1998-2000 AbiSource, Inc. * @@ -175,7 +177,7 @@ return FALSE; } -static void s_select_row_font(GtkWidget * /* widget */, XAP_UnixDialog_FontChooser * dlg) +static void s_select_row_font(GtkTreeSelection * /* widget */, XAP_UnixDialog_FontChooser * dlg) { UT_return_if_fail(dlg); // update the row number and show the changed preview @@ -184,7 +186,7 @@ } -static void s_select_row_style(GtkWidget * /* widget */, XAP_UnixDialog_FontChooser * dlg) +static void s_select_row_style(GtkTreeSelection * /* widget */, XAP_UnixDialog_FontChooser * dlg) { UT_return_if_fail(dlg); @@ -192,7 +194,7 @@ dlg->styleRowChanged(); } -static void s_select_row_size(GtkWidget * /* widget */, XAP_UnixDialog_FontChooser * dlg) +static void s_select_row_size(GtkTreeSelection * /* widget */, XAP_UnixDialog_FontChooser * dlg) { UT_return_if_fail(dlg); @@ -288,17 +290,18 @@ void XAP_UnixDialog_FontChooser::fontRowChanged(void) { static char szFontFamily[60]; - GtkTreeSelection* selection; - GtkTreeModel* model; + GtkTreeSelection *selection; + GtkTreeModel *model; GtkTreeIter iter; - gchar* text; + gchar *text; + model = gtk_tree_view_get_model(GTK_TREE_VIEW(m_fontList)); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_fontList)); if ( gtk_tree_selection_get_selected (selection, &model, &iter) ) { gtk_tree_model_get(model, &iter, TEXT_COLUMN, &text, -1); - UT_ASSERT(text); g_snprintf(szFontFamily, 50, "%s",text); + g_free(text), text = NULL; addOrReplaceVecProp("font-family",static_cast(szFontFamily)); } @@ -310,7 +313,6 @@ GtkTreeSelection* selection; GtkTreeModel* model; GtkTreeIter iter; - gchar* text; gint rowNumber; GtkTreePath* path; @@ -321,9 +323,6 @@ rowNumber = gtk_tree_path_get_indices(path)[0]; gtk_tree_path_free(path); - gtk_tree_model_get(model, &iter, TEXT_COLUMN, &text, -1); - UT_ASSERT(text); - // perhaps these attributes really should be smashed // into bitfields. :) if (rowNumber == LIST_STYLE_NORMAL) @@ -369,13 +368,9 @@ { gtk_tree_model_get(model, &iter, TEXT_COLUMN, &text, -1); UT_ASSERT(text); - g_snprintf(szFontSize, 50, "%spt", static_cast(XAP_EncodingManager::fontsizes_mapping.lookupByTarget(text))); - -// g_snprintf(szFontSize, 50, "%spt",(UT_convertToPoints(text[0]))); -// g_snprintf(szFontSize, 50, "%spt",text[0]); - + g_free(text), text = NULL; addOrReplaceVecProp("font-size",static_cast(szFontSize)); } updatePreview(); @@ -447,6 +442,7 @@ // the Windows layout, with some changes for color selector GtkWidget * XAP_UnixDialog_FontChooser::constructWindowContents(GtkWidget *parent) { + GtkTreeSelection *selection; GtkWidget *vboxMain; GtkWidget *notebookMain; GtkWidget *labelFont; @@ -778,19 +774,26 @@ G_CALLBACK(s_transparency_toggled), static_cast(this)); - g_signal_connect(G_OBJECT(listFonts), - "cursor_changed", + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(listFonts)); + g_signal_connect(G_OBJECT(selection), + "changed", G_CALLBACK(s_select_row_font), static_cast(this)); + selection = NULL; - g_signal_connect(G_OBJECT(listStyles), - "cursor_changed", + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(listStyles)); + g_signal_connect(G_OBJECT(selection), + "changed", G_CALLBACK(s_select_row_style), static_cast(this)); - g_signal_connect(G_OBJECT(listSizes), - "cursor_changed", + selection = NULL; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(listSizes)); + g_signal_connect(G_OBJECT(selection), + "changed", G_CALLBACK(s_select_row_size), static_cast(this)); + selection = NULL; // This is a catch-all color selector callback which catches any // real-time updating of the color so we can refresh our preview diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.h --- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.h 2008-04-06 16:59:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.h 2009-07-15 16:56:23.000000000 +0100 @@ -1,3 +1,5 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + /* AbiSource Application Framework * Copyright (C) 1998-2000 AbiSource, Inc. * diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_History.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_History.cpp --- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_History.cpp 2008-04-06 16:59:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_History.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -56,7 +56,8 @@ } UT_DEBUGMSG(("In s_history_selected \n")); // Get the row and col number - GValue value = {0,}; + GValue value; + g_value_init(&value, G_TYPE_INVALID); gtk_tree_model_get_value (model, &iter,3,&value); item = g_value_get_int(&value); UT_DEBUGMSG(("Vlaue of id selected %d \n",item)); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp --- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp 2008-04-06 16:59:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -224,11 +224,9 @@ m_Inserted_Symbol = m_CurrentSymbol; _onInsertButton(); #else - UT_ASSERT(m_pListener); - const char * symfont = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(m_fontcombo)->entry)); - m_Inserted_Symbol = gucharmap_table_get_active_character(gucharmap_charmap_get_chartable(GUCHARMAP_CHARMAP(m_SymbolMap))); - m_pListener->setView(getActiveFrame()->getCurrentView()); - m_pListener->insertSymbol(m_Inserted_Symbol, symfont); + const char * symfont = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(m_fontcombo)->entry)); + m_Inserted_Symbol = gucharmap_table_get_active_character(gucharmap_charmap_get_chartable(GUCHARMAP_CHARMAP(m_SymbolMap))); + _insert(m_Inserted_Symbol, symfont); #endif } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixFrameImpl.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixFrameImpl.cpp --- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixFrameImpl.cpp 2008-04-06 16:59:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixFrameImpl.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -1736,7 +1736,9 @@ end_p = pView->mapDocPosSimple (FV_DOCPOS_EOB); here = pView->getInsPoint (); - UT_UCSChar * text = pView->getTextBetweenPos (begin_p, end_p); + UT_UCSChar * text = NULL; + if (end_p > begin_p) + text = pView->getTextBetweenPos (begin_p, end_p); if (!text) return TRUE; @@ -1803,7 +1805,7 @@ pUnixKeyboard->charDataEvent(pView, static_cast(0), text, strlen(text)); - UT_DEBUGMSG(("<<<<<<<<_imCommit: text %s, len %d\n", text, strlen(text))); + xxx_UT_DEBUGMSG(("<<<<<<<<_imCommit: text %s, len %d\n", text, strlen(text))); } GtkIMContext * XAP_UnixFrameImpl::getIMContext() diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixTableWidget.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixTableWidget.cpp --- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixTableWidget.cpp 2008-04-06 16:59:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/unix/xap_UnixTableWidget.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -123,7 +123,7 @@ g_return_if_fail(table); if (table->selected_rows == 0 && table->selected_cols == 0) - text = g_strdup_printf(table->szCancel); + text = g_strdup(table->szCancel); else { UT_UTF8String prText = "%d x %d "; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/xap/win/GNUmakefile.in 2008-04-06 22:26:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -252,8 +251,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -333,6 +330,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -379,7 +377,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -396,10 +394,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -541,8 +539,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -634,8 +632,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -647,8 +645,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -658,13 +656,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32App.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32App.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32App.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32App.h 2009-07-15 16:56:23.000000000 +0100 @@ -41,7 +41,7 @@ ****************************************************************** *****************************************************************/ -class XAP_Win32App : public XAP_App +class ABI_EXPORT XAP_Win32App : public XAP_App { public: XAP_Win32App(HINSTANCE hInstance, XAP_Args * pArgs, const char * szAppName); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32AppImpl.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32AppImpl.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32AppImpl.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32AppImpl.h 2009-07-15 16:56:23.000000000 +0100 @@ -22,7 +22,7 @@ #include "xap_AppImpl.h" -class XAP_Win32AppImpl +class ABI_EXPORT XAP_Win32AppImpl : public XAP_AppImpl { protected: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Clipboard.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Clipboard.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Clipboard.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Clipboard.h 2009-07-15 16:56:23.000000000 +0100 @@ -24,7 +24,7 @@ #include "ut_vector.h" #include "xap_Clipboard.h" -class XAP_Win32Clipboard +class ABI_EXPORT XAP_Win32Clipboard { public: XAP_Win32Clipboard(void); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32ColourButton.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32ColourButton.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32ColourButton.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32ColourButton.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ #define COLOUR_SMPLENGTH 20 #define COLOUR_SMPHIGH 10 -class XAP_Win32ColourButton +class ABI_EXPORT XAP_Win32ColourButton { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32DialogBase.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32DialogBase.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32DialogBase.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32DialogBase.h 2009-07-15 16:56:23.000000000 +0100 @@ -39,7 +39,7 @@ class XAP_Frame; class XAP_StringSet; -class XAP_Win32DialogBase +class ABI_EXPORT XAP_Win32DialogBase { public: XAP_Win32DialogBase() : m_tag(magic_tag), m_hDlg(0), m_pDlg(0), m_pSS(0) {} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32DialogHelper.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32DialogHelper.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32DialogHelper.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32DialogHelper.h 2009-07-15 16:56:23.000000000 +0100 @@ -35,7 +35,7 @@ #include "xap_Win32FrameImpl.h" #include "ut_Xpm2Bmp.h" -class XAP_Win32Dialog +class ABI_EXPORT XAP_Win32Dialog { public: virtual BOOL _onInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) = 0; @@ -43,7 +43,7 @@ virtual BOOL _onDeltaPos(NM_UPDOWN * pnmud) = 0; }; -class XAP_Win32DialogHelper +class ABI_EXPORT XAP_Win32DialogHelper { public: XAP_Win32DialogHelper(XAP_Win32Dialog* p_dialog) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_About.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_About.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_About.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_About.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_About: public XAP_Dialog_About +class ABI_EXPORT XAP_Win32Dialog_About: public XAP_Dialog_About { public: XAP_Win32Dialog_About(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_ClipArt.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_ClipArt.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_ClipArt.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_ClipArt.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_ClipArt: public XAP_Dialog_ClipArt +class ABI_EXPORT XAP_Win32Dialog_ClipArt: public XAP_Dialog_ClipArt { public: XAP_Win32Dialog_ClipArt(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_DocComparison.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_DocComparison.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_DocComparison.h 2008-04-06 16:59:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_DocComparison.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_DocComparison: public XAP_Dialog_DocComparison +class ABI_EXPORT XAP_Win32Dialog_DocComparison: public XAP_Dialog_DocComparison { public: XAP_Win32Dialog_DocComparison(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Encoding.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Encoding.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Encoding.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Encoding.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_Encoding: public XAP_Win32DialogBase, public XAP_Dialog_Encoding +class ABI_EXPORT XAP_Win32Dialog_Encoding: public XAP_Win32DialogBase, public XAP_Dialog_Encoding { public: XAP_Win32Dialog_Encoding(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.h 2009-07-15 16:56:23.000000000 +0100 @@ -29,7 +29,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_FileOpenSaveAs : public XAP_Dialog_FileOpenSaveAs +class ABI_EXPORT XAP_Win32Dialog_FileOpenSaveAs : public XAP_Dialog_FileOpenSaveAs { public: XAP_Win32Dialog_FileOpenSaveAs(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_FontChooser.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_FontChooser.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_FontChooser.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_FontChooser.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_FontChooser : public XAP_Dialog_FontChooser +class ABI_EXPORT XAP_Win32Dialog_FontChooser : public XAP_Dialog_FontChooser { public: XAP_Win32Dialog_FontChooser(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_History.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_History.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_History.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_History.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_History: public XAP_Dialog_History +class ABI_EXPORT XAP_Win32Dialog_History: public XAP_Dialog_History { public: XAP_Win32Dialog_History(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_HTMLOptions.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_HTMLOptions.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_HTMLOptions.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_HTMLOptions.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_HTMLOptions : public XAP_Win32DialogBase, public XAP_Dialog_HTMLOptions +class ABI_EXPORT XAP_Win32Dialog_HTMLOptions : public XAP_Win32DialogBase, public XAP_Dialog_HTMLOptions { public: XAP_Win32Dialog_HTMLOptions(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Image.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Image.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Image.h 2008-04-06 16:59:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Image.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ class XAP_Frame; /*****************************************************************/ -class XAP_Win32Dialog_Image: public XAP_Win32DialogBase, public XAP_Dialog_Image +class ABI_EXPORT XAP_Win32Dialog_Image: public XAP_Win32DialogBase, public XAP_Dialog_Image { public: XAP_Win32Dialog_Image(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.h 2009-07-15 16:56:23.000000000 +0100 @@ -35,7 +35,7 @@ static char Symbol_font_selected[32] = "Symbol"; -class XAP_Draw_Symbol_sample : public XAP_Preview +class ABI_EXPORT XAP_Draw_Symbol_sample : public XAP_Preview { public: @@ -59,7 +59,7 @@ -class XAP_Win32Dialog_Insert_Symbol: public XAP_Win32DialogBase, public XAP_Dialog_Insert_Symbol +class ABI_EXPORT XAP_Win32Dialog_Insert_Symbol: public XAP_Win32DialogBase, public XAP_Dialog_Insert_Symbol { public: XAP_Win32Dialog_Insert_Symbol(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Language.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Language.cpp --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Language.cpp 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Language.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -301,6 +301,7 @@ { bool b = (IsDlgButtonChecked(hWnd,XAP_RID_DIALOG_LANGUAGE_DOCLANG_CHKBOX)==BST_CHECKED); setMakeDocumentDefault(b); + return 1; } default: // we did not handle this notification diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Language.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Language.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Language.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Language.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_Language: public XAP_Dialog_Language +class ABI_EXPORT XAP_Win32Dialog_Language: public XAP_Dialog_Language { public: XAP_Win32Dialog_Language(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_ListDocuments.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_ListDocuments.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_ListDocuments.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_ListDocuments.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_ListDocuments: public XAP_Dialog_ListDocuments +class ABI_EXPORT XAP_Win32Dialog_ListDocuments: public XAP_Dialog_ListDocuments { public: XAP_Win32Dialog_ListDocuments(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_MessageBox.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_MessageBox.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_MessageBox.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_MessageBox.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_MessageBox : public XAP_Dialog_MessageBox +class ABI_EXPORT XAP_Win32Dialog_MessageBox : public XAP_Dialog_MessageBox { public: XAP_Win32Dialog_MessageBox(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Password.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Password.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Password.h 2008-04-06 16:59:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Password.h 2009-07-15 16:56:23.000000000 +0100 @@ -29,7 +29,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_Password: public XAP_Win32DialogBase, public XAP_Dialog_Password +class ABI_EXPORT XAP_Win32Dialog_Password: public XAP_Win32DialogBase, public XAP_Dialog_Password { public: XAP_Win32Dialog_Password(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_PluginManager.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_PluginManager.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_PluginManager.h 2008-04-06 16:59:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_PluginManager.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_PluginManager: public XAP_Win32DialogBase, public XAP_Dialog_PluginManager +class ABI_EXPORT XAP_Win32Dialog_PluginManager: public XAP_Win32DialogBase, public XAP_Dialog_PluginManager { public: XAP_Win32Dialog_PluginManager(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Print.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Print.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Print.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Print.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ #include /*****************************************************************/ -class XAP_Win32Dialog_Print : public XAP_Dialog_Print +class ABI_EXPORT XAP_Win32Dialog_Print : public XAP_Dialog_Print { public: XAP_Win32Dialog_Print(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_PrintPreview.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_PrintPreview.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_PrintPreview.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_PrintPreview.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_PrintPreview : public XAP_Dialog_PrintPreview +class ABI_EXPORT XAP_Win32Dialog_PrintPreview : public XAP_Dialog_PrintPreview { public: XAP_Win32Dialog_PrintPreview(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Stub.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Stub.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Stub.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Stub.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_Stub: public XAP_Dialog_Stub +class ABI_EXPORT XAP_Win32Dialog_Stub: public XAP_Dialog_Stub { public: XAP_Win32Dialog_Stub(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_WindowMore.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_WindowMore.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_WindowMore.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_WindowMore.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ class XAP_Frame; /*****************************************************************/ -class XAP_Win32Dialog_WindowMore: public XAP_Win32DialogBase, public XAP_Dialog_WindowMore +class ABI_EXPORT XAP_Win32Dialog_WindowMore: public XAP_Win32DialogBase, public XAP_Dialog_WindowMore { public: XAP_Win32Dialog_WindowMore(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Zoom.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Zoom.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Zoom.h 2008-04-06 16:59:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Dlg_Zoom.h 2009-07-15 16:56:23.000000000 +0100 @@ -28,7 +28,7 @@ /*****************************************************************/ -class XAP_Win32Dialog_Zoom: public XAP_Win32DialogBase, public XAP_Dialog_Zoom +class ABI_EXPORT XAP_Win32Dialog_Zoom: public XAP_Win32DialogBase, public XAP_Dialog_Zoom { public: XAP_Win32Dialog_Zoom(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32EncodingManager.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32EncodingManager.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32EncodingManager.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32EncodingManager.h 2009-07-15 16:56:23.000000000 +0100 @@ -4,7 +4,7 @@ #include "xap_EncodingManager.h" /* it's assumed that only one instance of this class will exist */ -class XAP_Win32EncodingManager: public XAP_EncodingManager +class ABI_EXPORT XAP_Win32EncodingManager: public XAP_EncodingManager { protected: XAP_Win32EncodingManager(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32FontPreview.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32FontPreview.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32FontPreview.h 2008-04-06 16:59:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32FontPreview.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ class GR_Win32Graphics; -class XAP_Win32FontPreview : public XAP_FontPreview +class ABI_EXPORT XAP_Win32FontPreview : public XAP_FontPreview { public: XAP_Win32FontPreview(XAP_Frame * pFrame, UT_sint32 left, UT_uint32 top); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Module.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Module.cpp --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Module.cpp 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Module.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -35,7 +35,7 @@ static const char szErrAlreadyLoaded[] = "Library already loaded"; static const char szErrCouldNotUnload[] = "Could not unload library"; -class XAP_Win32ModuleImpl +class ABI_EXPORT XAP_Win32ModuleImpl { public: XAP_Win32ModuleImpl() : m_hMod(0), m_pszErr(0), m_pszModuleName(0) { } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Module.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Module.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Module.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Module.h 2009-07-15 16:56:23.000000000 +0100 @@ -18,8 +18,8 @@ * 02111-1307, USA. */ -#ifndef XAP_UNIXMODULE_H -#define XAP_UNIXMODULE_H +#ifndef XAP_WIN32MODULE_H +#define XAP_WIN32MODULE_H #include "xap_Module.h" @@ -28,7 +28,7 @@ Implements the XAP_Module interface. */ -class XAP_Win32Module : public XAP_Module +class ABI_EXPORT XAP_Win32Module : public XAP_Module { friend class XAP_ModuleManager; @@ -49,4 +49,4 @@ class XAP_Win32ModuleImpl* pimpl; }; -#endif /* XAP_UNIXMODULE_H */ +#endif /* XAP_WIN32MODULE_H */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32PreviewWidget.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32PreviewWidget.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32PreviewWidget.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32PreviewWidget.h 2009-07-15 16:56:23.000000000 +0100 @@ -36,7 +36,7 @@ ////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////// -class XAP_Win32PreviewWidget +class ABI_EXPORT XAP_Win32PreviewWidget { public: XAP_Win32PreviewWidget(XAP_Win32App * pWin32App, diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32PropertySheet.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32PropertySheet.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32PropertySheet.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32PropertySheet.h 2009-07-15 16:56:23.000000000 +0100 @@ -39,7 +39,7 @@ #define ID_APPLY_NOW 0x3021 -class XAP_Win32PropertyPage +class ABI_EXPORT XAP_Win32PropertyPage { public: @@ -73,7 +73,7 @@ }; -class XAP_Win32PropertySheet +class ABI_EXPORT XAP_Win32PropertySheet { public: XAP_Win32PropertySheet(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Slurp.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Slurp.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Slurp.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Slurp.h 2009-07-15 16:56:23.000000000 +0100 @@ -21,7 +21,7 @@ #include class XAP_Win32APP; -class XAP_Win32Slurp +class ABI_EXPORT XAP_Win32Slurp { public: XAP_Win32Slurp(XAP_Win32App * pApp); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32_TB_CFactory.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32_TB_CFactory.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32_TB_CFactory.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32_TB_CFactory.h 2009-07-15 16:56:23.000000000 +0100 @@ -22,7 +22,7 @@ #include "xap_Toolbar_ControlFactory.h" -class AP_Win32Toolbar_ControlFactory : public XAP_Toolbar_ControlFactory +class ABI_EXPORT AP_Win32Toolbar_ControlFactory : public XAP_Toolbar_ControlFactory { public: AP_Win32Toolbar_ControlFactory(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Toolbar_Icons.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Toolbar_Icons.h --- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Toolbar_Icons.h 2008-04-06 16:59:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/win/xap_Win32Toolbar_Icons.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ /*****************************************************************/ -class AP_Win32Toolbar_Icons : public AP_Toolbar_Icons +class ABI_EXPORT AP_Win32Toolbar_Icons : public AP_Toolbar_Icons { public: AP_Win32Toolbar_Icons(void); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/GNUmakefile.in --- abiword-2.6.2/abiword/src/af/xap/xp/GNUmakefile.in 2008-04-06 22:26:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -273,8 +272,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -354,6 +351,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @EMBEDDED_HILDON_FALSE@AF_INCLUDES = -I'$(top_srcdir)/src/af/util/xp' \ @@ -400,7 +398,7 @@ # these are appropriately empty when the various --enable-foo's are # off ABI_CFLAGS = @WARNING_CFLAGS@ @DEBUG_CFLAGS@ @OPTIMIZE_CFLAGS@ \ - @PROFILE_CFLAGS@ @XML_CFLAGS@ @SCRIPT_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ + @PROFILE_CFLAGS@ @XML_CFLAGS@ @PLUGIN_CFLAGS@ @FRIBIDI_CFLAGS@ \ @WV_CFLAGS@ @LIBPOPT_CFLAGS@ @XFT_CFLAGS@ @FREETYPE_CFLAGS@ \ @LIBPNG_CFLAGS@ @ZLIB_CFLAGS@ @THREAD_CFLAGS@ @ABI_FEATURE_DEFS@ @ABITYPES_CFLAGS@ \ @GSF_CFLAGS@ @GOFFICE_CFLAGS@ @SPELL_CFLAGS@ @DEFS@ @@ -417,10 +415,10 @@ @WITH_COCOA_FALSE@COCOA_CFLAGS = @WITH_COCOA_TRUE@COCOA_CFLAGS = -DXP_TARGET_COCOA $(MACOSX_CFLAGS) ABI_GNOME_PREFIX = Gnome -OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @SCRIPT_LIBS@ @PLUGIN_LIBS@ \ - @FRIBIDI_LIBS@ @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ \ - @LIBPNG_LIBS@ @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ \ - @FREETYPE_LIBS@ @THREAD_LIBS@ $(am__append_3) +OTHER_LIBS = @SPELL_LIBS@ @XML_LIBS@ @PLUGIN_LIBS@ @FRIBIDI_LIBS@ \ + @WV_LIBS@ @GSF_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @LIBPNG_LIBS@ \ + @ZLIB_LIBS@ @LIBPOPT_LIBS@ @XFT_LIBS@ @FREETYPE_LIBS@ \ + @THREAD_LIBS@ $(am__append_3) # BiDi needs a specific lib #automake is TEH SILLY! @@ -577,8 +575,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -685,8 +683,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -698,8 +696,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -709,13 +707,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xad_Document.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xad_Document.h --- abiword-2.6.2/abiword/src/af/xap/xp/xad_Document.h 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xad_Document.h 2009-07-15 16:56:23.000000000 +0100 @@ -44,7 +44,7 @@ class AV_View; // a helper class for history tracking -class AD_VersionData +class ABI_EXPORT AD_VersionData { public: @@ -94,7 +94,7 @@ // a helper class for keeping track of revisions in the document -class AD_Revision +class ABI_EXPORT AD_Revision { public: AD_Revision(UT_uint32 iId, UT_UCS4Char * pDesc, time_t start, UT_uint32 iVer = 0) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_App.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_App.cpp --- abiword-2.6.2/abiword/src/af/xap/xp/xap_App.cpp 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_App.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,7 @@ #include #include +#include #include #include "ut_types.h" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_AppImpl.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_AppImpl.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_AppImpl.h 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_AppImpl.h 2009-07-15 16:56:23.000000000 +0100 @@ -21,10 +21,18 @@ #ifndef _XAP_APP_IMPL_H_ #define _XAP_APP_IMPL_H_ +/* pre-emptive dismissal; ut_types.h is needed by just about everything, + * so even if it's commented out in-file that's still a lot of work for + * the preprocessor to do... + */ +#ifndef UT_TYPES_H +#include "ut_types.h" +#endif + class UT_String; -class XAP_AppImpl +class ABI_EXPORT XAP_AppImpl { public: virtual ~XAP_AppImpl() {} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Args.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Args.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Args.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Args.h 2009-07-15 16:56:23.000000000 +0100 @@ -28,7 +28,7 @@ #include "ut_types.h" #endif -class XAP_Args +class ABI_EXPORT XAP_Args { public: XAP_Args(int argc, const char ** argv); /* for systems which cut up the command line for us */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dialog.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dialog.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dialog.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dialog.h 2009-07-15 16:56:23.000000000 +0100 @@ -259,7 +259,7 @@ { public: - class Page { + class ABI_EXPORT Page { public: Page() {} Page(const gchar *title, AbiNativeWidget * widget) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_About.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_About.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_About.h 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_About.h 2009-07-15 16:56:23.000000000 +0100 @@ -20,6 +20,14 @@ #ifndef XAP_DIALOG_ABOUT_H #define XAP_DIALOG_ABOUT_H +/* pre-emptive dismissal; ut_types.h is needed by just about everything, + * so even if it's commented out in-file that's still a lot of work for + * the preprocessor to do... + */ +#ifndef UT_TYPES_H +#include "ut_types.h" +#endif + #include "xap_Dialog.h" #include "xav_View.h" @@ -28,7 +36,7 @@ #define XAP_ABOUT_TITLE "About %s" #define XAP_ABOUT_DESCRIPTION "%s is an Open Source application licensed under the GNU GPL.\nYou are free to redistribute this application." -#define XAP_ABOUT_COPYRIGHT "Copyright (C) 1998-2008 Dom Lachowicz, and others" +#define XAP_ABOUT_COPYRIGHT "Copyright (C) 1998-2009 Dom Lachowicz, and others" #define XAP_ABOUT_GPL "%s is available for use under the the terms\nof the GNU General Public License" #define XAP_ABOUT_VERSION "Version: %s" #define XAP_ABOUT_BUILD "Build options: %s" @@ -62,7 +70,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \ GNU General Public License for more details." -class XAP_Dialog_About : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_About : public XAP_Dialog_NonPersistent { public: XAP_Dialog_About(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_ClipArt.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_ClipArt.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_ClipArt.h 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_ClipArt.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ class XAP_Frame; -class XAP_Dialog_ClipArt : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_ClipArt : public XAP_Dialog_NonPersistent { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_DocComparison.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_DocComparison.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_DocComparison.h 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_DocComparison.h 2009-07-15 16:56:23.000000000 +0100 @@ -54,7 +54,7 @@ const UT_uint32 iResultCount = 4; -class XAP_Dialog_DocComparison : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_DocComparison : public XAP_Dialog_NonPersistent { public: XAP_Dialog_DocComparison(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Encoding.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Encoding.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Encoding.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Encoding.h 2009-07-15 16:56:23.000000000 +0100 @@ -49,7 +49,7 @@ -class XAP_Dialog_Encoding : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_Encoding : public XAP_Dialog_NonPersistent { public: typedef enum { a_OK, a_CANCEL, a_YES, a_NO } tAnswer; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_FontChooser.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_FontChooser.cpp --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_FontChooser.cpp 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_FontChooser.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -92,7 +92,6 @@ UT_sint32 len = UT_UCS4_strlen(str); if(len <= 0) { - FREEP(str); UT_UCS4_cloneString_char (&m_drawString, PREVIEW_ENTRY_DEFAULT_STRING); } else @@ -100,6 +99,7 @@ UT_UCS4_cloneString(&m_drawString, str); } } + void XAP_Dialog_FontChooser::setGraphicsContext(GR_Graphics * pGraphics) { m_pGraphics = pGraphics; @@ -151,12 +151,14 @@ */ void XAP_Dialog_FontChooser::event_previewExposed(const UT_UCSChar * pszChars) { - UT_sint32 len = UT_UCS4_strlen(pszChars); - if(len <= 0) + UT_UCSChar * pszNew = NULL; + if(!pszChars || UT_UCS4_strlen(pszChars) <= 0) { - FREEP(pszChars); - UT_UCSChar * pszNew = NULL; + //FREEP(pszChars); // we should not g_free it here UT_UCS4_cloneString_char (&pszNew, PREVIEW_ENTRY_DEFAULT_STRING); + if (!pszNew) + return; + m_pFontPreview->setDrawString(pszNew); } else @@ -164,6 +166,8 @@ m_pFontPreview->setDrawString(pszChars); } m_pFontPreview->draw(); + + FREEP(pszNew); } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_FontChooser.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_FontChooser.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_FontChooser.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_FontChooser.h 2009-07-15 16:56:23.000000000 +0100 @@ -38,7 +38,7 @@ class GR_Graphics; -class XAP_Preview_FontPreview : public XAP_Preview +class ABI_EXPORT XAP_Preview_FontPreview : public XAP_Preview { public: explicit XAP_Preview_FontPreview(GR_Graphics * gc, const gchar * pszClrBackgound); @@ -70,7 +70,7 @@ /*****************************************************************/ -class XAP_Dialog_FontChooser : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_FontChooser : public XAP_Dialog_NonPersistent { public: XAP_Dialog_FontChooser(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_History.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_History.cpp --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_History.cpp 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_History.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -114,17 +114,35 @@ tT = pUUID->getTime(); tM = localtime(&tT); s = (char*)g_try_malloc(30); - strftime(s,30,"%c",tM); + if(!s) + return NULL; + + size_t len = strftime(s,30,"%c",tM); + if(!len) + { + FREEP(s); + return NULL; + } + return s; } case 3: - tT = m_pDoc->getLastSavedTime(); - tM = localtime(&tT); - s = (char*)g_try_malloc(30); - strftime(s,30,"%c",tM); - return s; + { + tT = m_pDoc->getLastSavedTime(); + tM = localtime(&tT); + s = (char*)g_try_malloc(30); + if(!s) + return NULL; + size_t len = strftime(s,30,"%c",tM); + if(!len) + { + FREEP(s); + return NULL; + } + return s; + } case 4: { UT_uint32 iEditTime = m_pDoc->getEditTime(); @@ -205,11 +223,22 @@ return g_strdup(S.c_str()); case 1: - tT = m_pDoc->getHistoryNthTimeStarted(item); - tM = localtime(&tT); - s = (char*)g_try_malloc(30); - strftime(s,30,"%c",tM); - return s; + { + tT = m_pDoc->getHistoryNthTimeStarted(item); + tM = localtime(&tT); + s = (char*)g_try_malloc(30); + if(!s) + return NULL; + + size_t len = strftime(s,30,"%c",tM); + if(!len) + { + FREEP(s); + return NULL; + } + + return s; + } case 2: { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_History.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_History.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_History.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_History.h 2009-07-15 16:56:23.000000000 +0100 @@ -59,7 +59,7 @@ const UT_uint32 iButtonCount = 2; const UT_uint32 iListColumnCount = 3; -class XAP_Dialog_History : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_History : public XAP_Dialog_NonPersistent { public: XAP_Dialog_History(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_HTMLOptions.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_HTMLOptions.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_HTMLOptions.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_HTMLOptions.h 2009-07-15 16:56:23.000000000 +0100 @@ -53,7 +53,7 @@ bool bMultipart; }; -class XAP_Dialog_HTMLOptions : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_HTMLOptions : public XAP_Dialog_NonPersistent { public: XAP_Dialog_HTMLOptions (XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Image.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Image.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Image.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Image.h 2009-07-15 16:56:23.000000000 +0100 @@ -51,7 +51,7 @@ /* #include "xav_View.h" */ -class XAP_Dialog_Image : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_Image : public XAP_Dialog_NonPersistent { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.cpp --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.cpp 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -123,23 +123,33 @@ void XAP_Dialog_Insert_Symbol::_onInsertButton() { - UT_ASSERT(m_pListener); - - // Now connect to the current active frame using the robust - // getActiveFrame - - m_pListener->setView(getActiveFrame()->getCurrentView()); - - /* Now get the character to be inserted */ - + // get the character to be inserted UT_UCSChar c = getInsertedSymbol(); + // get the font of the symbol to be inserted + gchar * symfont = (gchar *) getInsertedFont(); + // do the actual insert + _insert(c, const_cast(symfont)); +} - /* Now get the font of the symbol to be inserted */ +void XAP_Dialog_Insert_Symbol::_insert(UT_UCSChar c, const char* symfont) +{ + UT_return_if_fail(m_pListener); - gchar * symfont = (gchar *) getInsertedFont(); + if (c == 0x00) + { + // Pango certainly doesn't like shaping 0x00 characters (it crashes when trying), + // and I'm not sure if other font renderers do. Since it doesn't really make + // any sense to allow such characters in the first place, let's just drop + // it on the floor. - MARCM + UT_DEBUGMSG(("Dropping 0x00 character on the floor\n")); + return; + } + + // connect to the current active frame using the robust getActiveFrame + m_pListener->setView(getActiveFrame()->getCurrentView()); - m_pListener->insertSymbol(c, (char*)symfont); UT_DEBUGMSG(("Insert Char %x \n",c)); + m_pListener->insertSymbol(c, (char*)symfont); } void XAP_Dialog_Insert_Symbol::setActiveFrame(XAP_Frame *pFrame) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.h 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.h 2009-07-15 16:56:23.000000000 +0100 @@ -31,7 +31,7 @@ class XAP_Frame; class XAP_Draw_Symbol; -class XAP_Insert_symbol_listener +class ABI_EXPORT XAP_Insert_symbol_listener { public: virtual ~XAP_Insert_symbol_listener() {} @@ -40,7 +40,7 @@ virtual bool insertSymbol(UT_UCSChar Char, const char *p_font_name) = 0; }; -class XAP_Dialog_Insert_Symbol : public XAP_Dialog_Modeless +class ABI_EXPORT XAP_Dialog_Insert_Symbol : public XAP_Dialog_Modeless { public: XAP_Dialog_Insert_Symbol(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); @@ -86,6 +86,7 @@ void _createSymbolareaFromGC(GR_Graphics * gc, UT_uint32 width, UT_uint32 height); void _onInsertButton(); + void _insert(UT_UCSChar c, const char* symfont); // This function returns the current Symbol Map class XAP_Draw_Symbol * _getCurrentSymbolMap(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_ListDocuments.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_ListDocuments.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_ListDocuments.h 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_ListDocuments.h 2009-07-15 16:56:23.000000000 +0100 @@ -58,7 +58,7 @@ */ -class XAP_Dialog_ListDocuments : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_ListDocuments : public XAP_Dialog_NonPersistent { public: XAP_Dialog_ListDocuments(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_MessageBox.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_MessageBox.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_MessageBox.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_MessageBox.h 2009-07-15 16:56:23.000000000 +0100 @@ -23,7 +23,7 @@ #include "xap_Dialog.h" #include "xap_Strings.h" -class XAP_Dialog_MessageBox : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_MessageBox : public XAP_Dialog_NonPersistent { public: XAP_Dialog_MessageBox(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Password.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Password.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Password.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Password.h 2009-07-15 16:56:23.000000000 +0100 @@ -28,7 +28,7 @@ class XAP_Frame; -class XAP_Dialog_Password : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_Password : public XAP_Dialog_NonPersistent { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_PluginManager.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_PluginManager.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_PluginManager.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_PluginManager.h 2009-07-15 16:56:23.000000000 +0100 @@ -34,7 +34,7 @@ // todo: it makes sense to make me modeless -class XAP_Dialog_PluginManager : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_PluginManager : public XAP_Dialog_NonPersistent { public: XAP_Dialog_PluginManager (XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Print.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Print.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Print.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Print.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ /*****************************************************************/ -class XAP_Dialog_Print : public XAP_Dialog_AppPersistent +class ABI_EXPORT XAP_Dialog_Print : public XAP_Dialog_AppPersistent { public: XAP_Dialog_Print(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_PrintPreview.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_PrintPreview.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_PrintPreview.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_PrintPreview.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,7 +30,7 @@ /*****************************************************************/ -class XAP_Dialog_PrintPreview : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_PrintPreview : public XAP_Dialog_NonPersistent { public: XAP_Dialog_PrintPreview(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Stub.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Stub.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Stub.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Stub.h 2009-07-15 16:56:23.000000000 +0100 @@ -40,7 +40,7 @@ *much* better off stealing code from another existing dialog which does something real. */ -class XAP_Dialog_Stub : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_Stub : public XAP_Dialog_NonPersistent { public: XAP_Dialog_Stub(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_WindowMore.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_WindowMore.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_WindowMore.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_WindowMore.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ class XAP_Frame; -class XAP_Dialog_WindowMore : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_WindowMore : public XAP_Dialog_NonPersistent { public: XAP_Dialog_WindowMore(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Zoom.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Zoom.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Zoom.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Dlg_Zoom.h 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ #define XAP_DLG_ZOOM_MAXIMUM_ZOOM 500 // arbitrary value (percentage) #define XAP_DLG_ZOOM_MINIMUM_ZOOM 20 // arbitrary value (percentage) -class XAP_Dialog_Zoom : public XAP_Dialog_NonPersistent +class ABI_EXPORT XAP_Dialog_Zoom : public XAP_Dialog_NonPersistent { public: XAP_Dialog_Zoom(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Draw_Symbol.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Draw_Symbol.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Draw_Symbol.h 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Draw_Symbol.h 2009-07-15 16:56:23.000000000 +0100 @@ -34,7 +34,7 @@ class GR_Font; -class XAP_Draw_Symbol : public XAP_Preview +class ABI_EXPORT XAP_Draw_Symbol : public XAP_Preview { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_FakeClipboard.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_FakeClipboard.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_FakeClipboard.h 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_FakeClipboard.h 2009-07-15 16:56:23.000000000 +0100 @@ -33,7 +33,7 @@ struct _ClipboardItem; -class XAP_FakeClipboard +class ABI_EXPORT XAP_FakeClipboard { public: XAP_FakeClipboard(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_FontPreview.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_FontPreview.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_FontPreview.h 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_FontPreview.h 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ #define PREVIEW_WIDTH 400 #define PREVIEW_HEIGHT 75 -class XAP_FontPreview +class ABI_EXPORT XAP_FontPreview { public: XAP_FontPreview(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Frame.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Frame.cpp --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Frame.cpp 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Frame.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -30,6 +30,7 @@ #include "ut_string.h" #include "ut_growbuf.h" #include "ut_timer.h" +#include "ut_go_file.h" #include "xap_App.h" #include "xap_Frame.h" #include "xap_FrameImpl.h" @@ -138,12 +139,9 @@ /* if we're auto-saving files and now we're exiting normally * delete/unlink the file */ - // bool autosave = true; - // getApp()->getPrefsValueBool(XAP_PREF_KEY_AutoSaveFile, &autosave); - if (/* autosave && */ m_stAutoSaveNamePrevious.size()) + if (!m_stAutoSaveNamePrevious.empty()) { - UT_DEBUGMSG(("DOM: removing backup file %s\n", m_stAutoSaveNamePrevious.c_str())); - g_unlink ( m_stAutoSaveNamePrevious.c_str() ); + _removeAutoSaveFile(); } // only delete the things that we created... @@ -410,16 +408,54 @@ UT_Timer *timer = UT_Timer::static_constructor(autoSaveCallback, this); UT_String stPeriod; - XAP_App::getApp()->getPrefsValue(XAP_PREF_KEY_AutoSaveFilePeriod, stPeriod); - UT_ASSERT(stPeriod.empty() == false); - m_iAutoSavePeriod = atoi(stPeriod.c_str()); - + bool bFound = XAP_App::getApp()->getPrefsValue(XAP_PREF_KEY_AutoSaveFilePeriod, stPeriod); + + if(!bFound || stPeriod.empty()) + m_iAutoSavePeriod = atoi(XAP_PREF_DEFAULT_AutoSaveFilePeriod); + else + m_iAutoSavePeriod = atoi(stPeriod.c_str()); + + if(m_iAutoSavePeriod < 1) + m_iAutoSavePeriod = 1; + // stPeriod is in minutes, and we should use milliseconds timer->set(m_iAutoSavePeriod * 60000); m_iIdAutoSaveTimer = timer->getIdentifier(); UT_DEBUGMSG(("Creating auto save timer [%d] with a timeout of [%d] minutes.\n", m_iIdAutoSaveTimer, m_iAutoSavePeriod)); } +void XAP_Frame::_removeAutoSaveFile() +{ + const char *filename = NULL; + bool bURI = UT_go_path_is_uri(m_stAutoSaveNamePrevious.c_str()); + + if(bURI) + { + filename = UT_go_filename_from_uri(m_stAutoSaveNamePrevious.c_str()); + } + else + { + // It shouldn't be a file name here, but handle it nonetheless + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); + filename = m_stAutoSaveNamePrevious.c_str(); + } + + if(filename) + { + UT_DEBUGMSG(("DOM: removing backup file %s\n", filename)); + int res = g_unlink(filename); + + if(res == -1) + { + UT_DEBUGMSG(("Failed to unlink old backup file %s\n", filename)); + } + + // only g_free in the UT_go_filename_from_uri case + if(bURI) + FREEP(filename); + } +} + /*! * This starts the auto Updater for the view */ @@ -691,7 +727,12 @@ if (b && !m_iIdAutoSaveTimer) { UT_Timer *timer = UT_Timer::static_constructor(autoSaveCallback, this); - UT_ASSERT(m_iAutoSavePeriod != 0); + if(m_iAutoSavePeriod < 1) + { + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); + m_iAutoSavePeriod = 1; + } + timer->set(m_iAutoSavePeriod * 60000); m_iIdAutoSaveTimer = timer->getIdentifier(); timer->start(); @@ -711,6 +752,14 @@ if(b) { UT_Timer *timer = UT_Timer::findTimer(m_iIdAutoSaveTimer); + if(m_iAutoSavePeriod < 1) + { + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); + m_iAutoSavePeriod = 1; + } + + // reset the timer, because the interval might have changed (Bug 9329) + timer->set(m_iAutoSavePeriod * 60000); timer->start(); return; } @@ -808,7 +857,7 @@ UT_String ext(szExt ? szExt : m_stAutoSaveExt.c_str()); UT_String oldName(m_pDoc->getFilename() ? m_pDoc->getFilename() : ""); UT_String backupName; - UT_DEBUGMSG(("In make Backup name. Old Name is %s \n",oldName.c_str())); + UT_DEBUGMSG(("In make Backup name. Old Name is (%s) \n",oldName.c_str())); if (oldName.empty()) { const XAP_StringSet * pSS = XAP_App::getApp()->getStringSet(); @@ -823,7 +872,19 @@ backupName = oldName + ext; - UT_DEBUGMSG(("DOM: created backup filename %s\n", backupName.c_str())); + const char* uri = NULL; + bool bURI = UT_go_path_is_uri(backupName.c_str()); + + if(!bURI) + uri = UT_go_filename_to_uri(backupName.c_str()); + + if(uri) + { + backupName = uri; + FREEP(uri); + } + + UT_DEBUGMSG(("DOM: created backup filename (%s)\n", backupName.c_str())); return backupName; } @@ -853,7 +914,7 @@ /* If the user does a Save-As to rename the file then the auto-save name also changes, so * need to remove the old backup file... */ - g_unlink(m_stAutoSaveNamePrevious.c_str()); + _removeAutoSaveFile(); } m_stAutoSaveNamePrevious = backupName; @@ -873,7 +934,15 @@ error = m_pDoc->saveAs(backupName.c_str(), iEFT, false); } - UT_DEBUGMSG(("File %s saved.\n", backupName.c_str())); + if(error == UT_OK) + { + UT_DEBUGMSG(("File %s saved.\n", backupName.c_str())); + } + else + { + // TODO: alert the user + UT_DEBUGMSG(("File backup failed.\n")); + } m_bBackupInProgress = false; return error; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Frame.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Frame.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Frame.h 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Frame.h 2009-07-15 16:56:23.000000000 +0100 @@ -250,6 +250,7 @@ private: void _createAutoSaveTimer(); + void _removeAutoSaveFile(); UT_UTF8String m_sTitle; UT_UTF8String m_sNonDecoratedTitle; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_LoadBindings.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_LoadBindings.h --- abiword-2.6.2/abiword/src/af/xap/xp/xap_LoadBindings.h 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_LoadBindings.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ /*****************************************************************/ -class XAP_BindingSet +class ABI_EXPORT XAP_BindingSet { public: XAP_BindingSet(EV_EditMethodContainer * pemc); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Log.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Log.cpp --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Log.cpp 2008-04-06 16:59:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Log.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -7,7 +7,7 @@ XAP_Log *XAP_Log::m_pInstance = 0; -class XAP_LogDestructor +class ABI_EXPORT XAP_LogDestructor { public: XAP_LogDestructor() : t_(0) {} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/src/af/xap/xp/xap_Prefs.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Prefs.cpp --- abiword-2.6.2/abiword/src/af/xap/xp/xap_Prefs.cpp 2008-04-06 16:59:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/src/af/xap/xp/xap_Prefs.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -446,6 +446,7 @@ case Error: *s += "error: "; + break; case Log: default: *s += "message: "; @@ -1495,7 +1496,7 @@ "\t @@ -17,9 +17,9 @@ - - - + + +
diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/scripts/abw2html.pl /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/scripts/abw2html.pl --- abiword-2.6.2/abiword/user/wp/scripts/abw2html.pl 2008-04-06 17:00:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/scripts/abw2html.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,162 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# Copyright (C) 2001 AbiWord development Team -# http://www.abisource.com -# -# Copyright (C) 2001 Gaetan RYCKEBOER - Club LinuX Nord-Pas de Calais -# http://clx.anet.fr -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -############################################################################### -## -## Revision 1.1 2001/03/07 16:15:35 dom -## CSS/HTML script from Gaetan RYCKEBOER -## -# -# -# TODO : I & O filename on command line. (I won't do it...) -# - -# -# Differents line end markers -# -#$/="\n"; -#$/="\r"; -#$/="\f"; - -sub ShowHelp -{ - print ( -"Usage: abw2html.pl [options] [filename] - -AbiWord 2 HTML translator. - Input : (stdin) : abiword made html file - output ; (stdout) : html css based \"on the fly\" file. - - ex : cat abi.html | abw2html.pl > abi-css.html - -Options : - -h, --help : show this help - -v, --version : show version - -Report bugs to . -"); -} - -# ---------------------------------------------------------------------------- -# Print the abw2html version on the standard ouptut. - -sub ShowVersion -{ - print ( -" -abw2html.pl Version 0.1 -CVS :$id - -abiword made html to css/html translator. ------------------------------------------ - - Copyright (C) 2001 - Gaetan RYCKEBOER - Club LinuX Nord-Pas de Calais - asr@mail.dotcom.fr - http://clx.anet.fr - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -"); -} - - -# command line handling -foreach $i ( @ARGV ) -{ - # - # Show help message. - # - if ( $i =~ /^-h/ || $i =~ /^--help/ ) - { - &ShowHelp(); - exit(0); - } - # - # Show version - if ( $i =~ /^-v/ || $i =~ /^--version/ ) - { - &ShowVersion(); - exit(0); - } - # etc. - # put here code to open file -} - -@styles=(); -$stylenum=0; -$head=0; - -foreach $inp () { - if ($head!=1){ - if ($inp =~ /(.*)(.*)/) { - $head=1; - print $1; - $inp=$2; - } else { - print "$inp"; - } - } - if ($head==1) { - $line=""; - while ($inp =~ /^([^<]*)<([^>]*)>(.*)$/) { - $beg=$1; - $end=$3; - $inp="$end"; - $tag=$2; - if ($tag =~ /span style="(.*)"/) { - $style=$snum{"$1"}; - if ($style=='') { - $styles{++$stylenum}=$1; - $style=$stylenum; - $snum{$1}=$style; - } - $line.="$beg"; - - } elsif ($tag =~ /\/span/) { - $line.="$beg"; - } else { - $line.="$beg<$tag>"; - } - } - $lines.="$line\n"; - } -} - -print (" - -"); - -print $lines; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/scripts/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/scripts/GNUmakefile.am --- abiword-2.6.2/abiword/user/wp/scripts/GNUmakefile.am 2008-04-06 17:00:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/scripts/GNUmakefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ - -EXTRA_DIST = \ - $(scripts_DATA) - -scriptsdir = $(ABIWORD_DATADIR)/scripts -scripts_DATA = \ - abw2html.pl diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/scripts/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/scripts/GNUmakefile.in --- abiword-2.6.2/abiword/user/wp/scripts/GNUmakefile.in 2008-04-06 22:26:21.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/scripts/GNUmakefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,478 +0,0 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = user/wp/scripts -DIST_COMMON = $(srcdir)/GNUmakefile.am $(srcdir)/GNUmakefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/ac-helpers/abi-c-inline.m4 \ - $(top_srcdir)/ac-helpers/abi-detect-platform.m4 \ - $(top_srcdir)/ac-helpers/abi-embedded.m4 \ - $(top_srcdir)/ac-helpers/abi-freetype.m4 \ - $(top_srcdir)/ac-helpers/abi-fribidi.m4 \ - $(top_srcdir)/ac-helpers/abi-glib-gtk.m4 \ - $(top_srcdir)/ac-helpers/abi-gnome.m4 \ - $(top_srcdir)/ac-helpers/abi-gnomeprint.m4 \ - $(top_srcdir)/ac-helpers/abi-goffice.m4 \ - $(top_srcdir)/ac-helpers/abi-gsf.m4 \ - $(top_srcdir)/ac-helpers/abi-gucharmap.m4 \ - $(top_srcdir)/ac-helpers/abi-iconv.m4 \ - $(top_srcdir)/ac-helpers/abi-lib.m4 \ - $(top_srcdir)/ac-helpers/abi-libjpeg.m4 \ - $(top_srcdir)/ac-helpers/abi-libpng.m4 \ - $(top_srcdir)/ac-helpers/abi-magick.m4 \ - $(top_srcdir)/ac-helpers/abi-peer-config.m4 \ - $(top_srcdir)/ac-helpers/abi-plugins.m4 \ - $(top_srcdir)/ac-helpers/abi-popt.m4 \ - $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ - $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ - $(top_srcdir)/ac-helpers/abi-types.m4 \ - $(top_srcdir)/ac-helpers/abi-wv.m4 \ - $(top_srcdir)/ac-helpers/abi-xft.m4 \ - $(top_srcdir)/ac-helpers/abi-xml-parser.m4 \ - $(top_srcdir)/ac-helpers/abi-zlib.m4 \ - $(top_srcdir)/ac-helpers/aclocal-include.m4 \ - $(top_srcdir)/ac-helpers/binreloc.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(scriptsdir)" -scriptsDATA_INSTALL = $(INSTALL_DATA) -DATA = $(scripts_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABITYPES_CFLAGS = @ABITYPES_CFLAGS@ -ABIWORD_DATADIR = @ABIWORD_DATADIR@ -ABIWORD_GLADEDIR = @ABIWORD_GLADEDIR@ -ABIWORD_HEADERSDIR = @ABIWORD_HEADERSDIR@ -ABIWORD_LIBDIR = @ABIWORD_LIBDIR@ -ABIWORD_PLUGINSDIR = @ABIWORD_PLUGINSDIR@ -ABIWORD_REQUIRED_PKGS = @ABIWORD_REQUIRED_PKGS@ -ABIWORD_SERIES = @ABIWORD_SERIES@ -ABI_BE = @ABI_BE@ -ABI_FE = @ABI_FE@ -ABI_FEATURE_DEFS = @ABI_FEATURE_DEFS@ -ABI_MACSDK_ROOT = @ABI_MACSDK_ROOT@ -ABI_SCANDIR_SELECT_QUALIFIER = @ABI_SCANDIR_SELECT_QUALIFIER@ -ABI_XML_CONFIG = @ABI_XML_CONFIG@ -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BE_PLATFORM = @BE_PLATFORM@ -BINRELOC_CFLAGS = @BINRELOC_CFLAGS@ -BINRELOC_LIBS = @BINRELOC_LIBS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEBUG_CFLAGS = @DEBUG_CFLAGS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EMBEDDED_CFLAGS = @EMBEDDED_CFLAGS@ -EMBEDDED_LIBS = @EMBEDDED_LIBS@ -EPATH_WV_BUILD_FLAGS = @EPATH_WV_BUILD_FLAGS@ -EXEEXT = @EXEEXT@ -EXPAT_PEERDIR = @EXPAT_PEERDIR@ -FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ -FREETYPE_LIBS = @FREETYPE_LIBS@ -FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@ -FRIBIDI_LIBS = @FRIBIDI_LIBS@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ -GNOMEPRINT_CFLAGS = @GNOMEPRINT_CFLAGS@ -GNOMEPRINT_LIBS = @GNOMEPRINT_LIBS@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@ -GNOMEVFS_LIBS = @GNOMEVFS_LIBS@ -GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ -GOFFICE_LIBS = @GOFFICE_LIBS@ -GREP = @GREP@ -GSF_CFLAGS = @GSF_CFLAGS@ -GSF_HTTP_CFLAGS = @GSF_HTTP_CFLAGS@ -GSF_HTTP_LIBS = @GSF_HTTP_LIBS@ -GSF_LIBS = @GSF_LIBS@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ -GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HILDON_CFLAGS = @HILDON_CFLAGS@ -HILDON_LIBS = @HILDON_LIBS@ -ICONV_INCLUDES = @ICONV_INCLUDES@ -ICONV_LIBS = @ICONV_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBICONV_PEERDIR = @LIBICONV_PEERDIR@ -LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@ -LIBJPEG_LIBS = @LIBJPEG_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ -LIBPNG_LIBS = @LIBPNG_LIBS@ -LIBPNG_PEERDIR = @LIBPNG_PEERDIR@ -LIBPOPT_CFLAGS = @LIBPOPT_CFLAGS@ -LIBPOPT_LIBS = @LIBPOPT_LIBS@ -LIBPOPT_PEERDIR = @LIBPOPT_PEERDIR@ -LIBS = @LIBS@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -OBJCXX = @OBJCXX@ -OBJCXXDEPMODE = @OBJCXXDEPMODE@ -OBJCXXFLAGS = @OBJCXXFLAGS@ -OBJEXT = @OBJEXT@ -OPTIMIZE_CFLAGS = @OPTIMIZE_CFLAGS@ -OS_NAME = @OS_NAME@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@ -PANGOFT2_LIBS = @PANGOFT2_LIBS@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PEERDIRS = @PEERDIRS@ -PEERS = @PEERS@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM = @PLATFORM@ -PLATFORM_CFLAGS = @PLATFORM_CFLAGS@ -PLATFORM_LIBS = @PLATFORM_LIBS@ -PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ -PLUGIN_DEFS = @PLUGIN_DEFS@ -PLUGIN_LIBS = @PLUGIN_LIBS@ -PLUGIN_LIST = @PLUGIN_LIST@ -PROFILE_CFLAGS = @PROFILE_CFLAGS@ -RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPELL_CFLAGS = @SPELL_CFLAGS@ -SPELL_LIBS = @SPELL_LIBS@ -STRIP = @STRIP@ -THREAD_CFLAGS = @THREAD_CFLAGS@ -THREAD_LIBS = @THREAD_LIBS@ -VALGRIND = @VALGRIND@ -VERSION = @VERSION@ -WARNING_CFLAGS = @WARNING_CFLAGS@ -WV_CFLAGS = @WV_CFLAGS@ -WV_LIBS = @WV_LIBS@ -XFT_CFLAGS = @XFT_CFLAGS@ -XFT_LIBS = @XFT_LIBS@ -XMKMF = @XMKMF@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -XSUBPPDIR = @XSUBPPDIR@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -_abi_openwriter_CFLAGS = @_abi_openwriter_CFLAGS@ -_abi_openwriter_LIBS = @_abi_openwriter_LIBS@ -_abi_ots_CFLAGS = @_abi_ots_CFLAGS@ -_abi_ots_LIBS = @_abi_ots_LIBS@ -_abi_sdw_CFLAGS = @_abi_sdw_CFLAGS@ -_abi_sdw_LIBS = @_abi_sdw_LIBS@ -_abi_wordperfect_CFLAGS = @_abi_wordperfect_CFLAGS@ -_abi_wordperfect_LIBS = @_abi_wordperfect_LIBS@ -abi_magickpp_config = @abi_magickpp_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -goffice_datadir = @goffice_datadir@ -goffice_gladedir = @goffice_gladedir@ -goffice_icondir = @goffice_icondir@ -goffice_libdir = @goffice_libdir@ -goffice_localedir = @goffice_localedir@ -goffice_plugindir = @goffice_plugindir@ -host_alias = @host_alias@ -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@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = \ - $(scripts_DATA) - -scriptsdir = $(ABIWORD_DATADIR)/scripts -scripts_DATA = \ - abw2html.pl - -all: all-am - -.SUFFIXES: -$(srcdir)/GNUmakefile.in: $(srcdir)/GNUmakefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign user/wp/scripts/GNUmakefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign user/wp/scripts/GNUmakefile -.PRECIOUS: GNUmakefile -GNUmakefile: $(srcdir)/GNUmakefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-scriptsDATA: $(scripts_DATA) - @$(NORMAL_INSTALL) - test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" - @list='$(scripts_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(scriptsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(scriptsdir)/$$f'"; \ - $(scriptsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(scriptsdir)/$$f"; \ - done - -uninstall-scriptsDATA: - @$(NORMAL_UNINSTALL) - @list='$(scripts_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(scriptsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(scriptsdir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: GNUmakefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(scriptsdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f GNUmakefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-scriptsDATA - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f GNUmakefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-scriptsDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-scriptsDATA install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-scriptsDATA - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/strings/ast-ES.strings /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/strings/ast-ES.strings --- abiword-2.6.2/abiword/user/wp/strings/ast-ES.strings 2008-04-06 17:00:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/strings/ast-ES.strings 2009-07-15 16:56:23.000000000 +0100 @@ -10,219 +10,236 @@ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/strings/da-DK.strings /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/strings/da-DK.strings --- abiword-2.6.2/abiword/user/wp/strings/da-DK.strings 2008-04-06 17:00:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/strings/da-DK.strings 2009-07-15 16:56:23.000000000 +0100 @@ -10,130 +10,237 @@ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/strings/eu-ES.strings /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/strings/eu-ES.strings --- abiword-2.6.2/abiword/user/wp/strings/eu-ES.strings 2008-04-06 17:00:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/strings/eu-ES.strings 2009-07-15 16:56:23.000000000 +0100 @@ -10,141 +10,237 @@ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/strings/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/strings/GNUmakefile.in --- abiword-2.6.2/abiword/user/wp/strings/GNUmakefile.in 2008-04-06 22:26:21.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/strings/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,7 +54,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -203,8 +202,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -284,6 +281,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ @@ -298,8 +296,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/strings/pt-BR.strings /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/strings/pt-BR.strings --- abiword-2.6.2/abiword/user/wp/strings/pt-BR.strings 2008-04-06 17:00:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/strings/pt-BR.strings 2009-07-15 16:56:23.000000000 +0100 @@ -13,6 +13,8 @@ DLG_ABOUT_Title="Sobre %s" DLG_Apply="Aplicar" DLG_Break_Insert="Inserir" +DLG_CLIPART_Error="" +DLG_CLIPART_Loading="Portfolio" DLG_CLIPART_Title="Portfolio" DLG_Cancel="Cancela" DLG_Close="Fechar" @@ -38,6 +40,7 @@ DLG_FOSA_ALLDOCS="Todos os Documentos" DLG_FOSA_ALLIMAGES="Todas as Imagens" DLG_FOSA_ExportTitle="Exportar Documento" +DLG_FOSA_ExtensionDoesNotMatch="" DLG_FOSA_FileInsertMath="Inserir arquivo MathML:" DLG_FOSA_FileInsertObject="Inserir arquivo com Objeto Embutido:" DLG_FOSA_FileOpenTypeLabel="Abrir um arquivo do tipo:" @@ -50,6 +53,10 @@ DLG_FOSA_InsertTitle="&Inserir Documento" DLG_FOSA_OpenTitle="Abrir" DLG_FOSA_PrintToFileTitle="Imprimir para arquivo" +DLG_FOSA_RecordToFileLabel="" +DLG_FOSA_RecordToFileTitle="Tempo de edio:" +DLG_FOSA_ReplayFromFileLabel="" +DLG_FOSA_ReplayFromFileTitle="Selecionar imagem do Arquivo" DLG_FOSA_SaveAsTitle="Salvar como" DLG_FormatFrame_Color="Cor:" DLG_FormatFrame_Preview="Prvisualizar" @@ -325,15 +332,21 @@ LANG_AF_ZA="Afrikaans" LANG_AK_GH="Afrikaans" LANG_AM_ET="Amrico (Etipia)" +LANG_AR="Lista rabe" LANG_AR_EG="rabe (Egipto)" LANG_AR_SA="rabe (Arbia Saudita)" LANG_AST_ES="" LANG_AS_IN="Asams (ndia)" +LANG_AYC_BO="" +LANG_AYM_BO="" +LANG_AYR="" LANG_BE_BY="Bielorusso" +LANG_BE_LATIN="Bielorusso" LANG_BG_BG="Blgaro" LANG_BN_IN="" LANG_BR_FR="Breto" LANG_CA_ES="Catalo" +LANG_COP_EG="Copiar" LANG_CO_FR="Corso" LANG_CS_CZ="Checo" LANG_CY_GB="Gals" @@ -362,13 +375,13 @@ LANG_FR_FR="Francs (Frana)" LANG_FY_NL="Frsio" LANG_GA_IE="Gals (Eire)" -LANG_GL_ES="Galego" +LANG_GL="Galego" LANG_HAW_US="" LANG_HA_NE="Hausa (Nigria)" LANG_HA_NG="Hausa (Nigria)" LANG_HE_IL="Hebreu" LANG_HI_IN="Hindu" -LANG_HR="Croata" +LANG_HR_HR="Croata" LANG_HU_HU="Hngaro" LANG_HY_AM="Armnio" LANG_IA="Interlngua" @@ -379,6 +392,7 @@ LANG_JA_JP="Japons" LANG_KA_GE="Georgiano" LANG_KN_IN="" +LANG_KO="Coreano" LANG_KO_KR="Coreano" LANG_KU="Turco" LANG_KW_GB="Corns" @@ -392,7 +406,9 @@ LANG_MK="Macednio" LANG_MN_MN="" LANG_MR_IN="" +LANG_MS_MY="" LANG_NB_NO="Noruegus Bokmal" +LANG_NE_NP="" LANG_NL_BE="Holands (Blgica)" LANG_NL_NL="Holands" LANG_NN_NO="Noruegus Nyorsk" @@ -400,8 +416,11 @@ LANG_PA_IN="" LANG_PA_PK="" LANG_PL_PL="Polaco" +LANG_PS="Colar" LANG_PT_BR="Portugus (Brasil)" LANG_PT_PT="Portugus (Portugal)" +LANG_QUH_BO="" +LANG_QUL_BO="" LANG_QU_BO="" LANG_RO_RO="Romeno" LANG_RU_RU="Russo (Rssia)" @@ -419,9 +438,11 @@ LANG_TL_PH="" LANG_TR_TR="Turco" LANG_UK_UA="Ukraniano" -LANG_UR_PK="Urdo" +LANG_UR="Urdo" +LANG_UR_PK="" LANG_UZ_UZ="" LANG_VI_VN="Vietnamita" +LANG_WO_SN="" LANG_YI="Yeddish" LANG_ZH_CN="Chins (PRC)" LANG_ZH_HK="Chins (Hong Kong)" @@ -485,6 +506,7 @@ STYLE_TRIANGLELIST="Listas com Tringulos" STYLE_UPPERCASTELIST="Lista com maisculas" STYLE_UPPERROMANLIST="Lista romnica com maisculas" +TB_ClearBackground="Remover Cor de Fundo" TB_Font_Symbol="Smbolos" TB_InsertNewTable="Inserir Nova Tabela" TB_Table="Tabela" @@ -813,7 +835,6 @@ DLG_Options_Label_PrefsAutoSave="Salvar alteraes das perferncias automaticamente" DLG_Options_Label_PrefsCurrentScheme="Esquema de preferncias atual" DLG_Options_Label_Schemes="Esquema de Preferncias..." -DLG_Options_Label_ShowSplash="Exibir logotipo de inicializao" DLG_Options_Label_SmartQuotesEnable="Usar spas inteligentes" DLG_Options_Label_SpellAutoReplace="Substituir automaticamente palavras mal escritas" DLG_Options_Label_SpellCheckAsType="Verificar ortografia enquanto escreve" @@ -929,10 +950,10 @@ DLG_Para_TabLabelIndentsAndSpacing="&Identao e Espaamento" DLG_Para_TabLabelLineAndPageBreaks="&Quebras de Linha e Pgina" DLG_Spell_AddToDict="Adicionar ao dicionrio" -DLG_Spell_Change="Mudar todas" +DLG_Spell_Change="Mudar" DLG_Spell_ChangeAll="Mudar todas" DLG_Spell_ChangeTo="Mudar para:" -DLG_Spell_Ignore="Ignora todas" +DLG_Spell_Ignore="Ignorar" DLG_Spell_IgnoreAll="Ignora todas" DLG_Spell_NoSuggestions="Nenhuma sugesto" DLG_Spell_SpellTitle="Ortografia" @@ -954,7 +975,7 @@ DLG_Styles_ErrBlankName="O nome do estilo no pode ficar em branco" DLG_Styles_ErrNoStyle="Para modificar um estilo tem de o selecionar primeiro" DLG_Styles_ErrNotTitle1="Nome do Estilo - " -DLG_Styles_ErrNotTitle2="Reservado. No pode usar este nome. Escolha outro " +DLG_Styles_ErrNotTitle2=" - Reservado. No pode usar este nome. Escolha outro " DLG_Styles_ErrStyleBuiltin="No pode modificar um estilo base." DLG_Styles_ErrStyleCantDelete="No possvel apagar este estilo." DLG_Styles_ErrStyleNot="Este estilo no existe e por isso no pode ser modificado" @@ -1112,16 +1133,17 @@ MENU_LABEL_EDIT_COPY_FRAME="Copiar Caixa de Texto" MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION="C&opia localizao de hiperlink" MENU_LABEL_EDIT_CUT="Co&rtar" -MENU_LABEL_EDIT_CUTEMBED="Definir" +MENU_LABEL_EDIT_CUTEMBED="Remover Objeto" MENU_LABEL_EDIT_CUTIMAGE="Remover Imagem" MENU_LABEL_EDIT_CUT_FRAME="Remover Caixa de Texto" -MENU_LABEL_EDIT_DELETEEMBED="Apagar &Tabela" +MENU_LABEL_EDIT_DELETEEMBED="Apagar Objeto" MENU_LABEL_EDIT_DELETEFRAME="Remover Caixa de Texto" MENU_LABEL_EDIT_DELETEIMAGE="Remover Imagem" MENU_LABEL_EDIT_EDITFOOTER="Editar &Rodap" MENU_LABEL_EDIT_EDITHEADER="Editar &Cabealho" MENU_LABEL_EDIT_FIND="&Procurar" MENU_LABEL_EDIT_GOTO="&Ir para" +MENU_LABEL_EDIT_LATEXEQUATION="Equao" MENU_LABEL_EDIT_PASTE="Co&lar" MENU_LABEL_EDIT_PASTE_SPECIAL="Colar &Especial" MENU_LABEL_EDIT_REDO="&Refazer" @@ -1171,10 +1193,12 @@ MENU_LABEL_FMT_COLUMNS="C&olunas" MENU_LABEL_FMT_DIRECTION="Dir&eo Texto" MENU_LABEL_FMT_DIRECTION_DD_RTL="&Pargrafo da Direita para a Esquerda" +MENU_LABEL_FMT_DIRECTION_DOCD_RTL="&Documento" MENU_LABEL_FMT_DIRECTION_DO_LTR="Texto no sentido &esquerda para a direita" MENU_LABEL_FMT_DIRECTION_DO_RTL="Texto no sentido &direita para esquerda" +MENU_LABEL_FMT_DIRECTION_SD_RTL="Seleo" MENU_LABEL_FMT_DOCUMENT="&Documento" -MENU_LABEL_FMT_EMBED="Formatar Tabela" +MENU_LABEL_FMT_EMBED="Formatar Objeto" MENU_LABEL_FMT_FONT="&Tipo" MENU_LABEL_FMT_FOOTNOTES="Formatar Notas de Rodap e do Final" MENU_LABEL_FMT_FRAME="Caixa de Texto" @@ -1188,7 +1212,7 @@ MENU_LABEL_FMT_SETPOSIMAGE="Colocar Imagem Posicionada" MENU_LABEL_FMT_STRIKE="&Riscar" MENU_LABEL_FMT_STYLE="&Estilo" -MENU_LABEL_FMT_STYLE_DEFINE="&Criar e Modificar" +MENU_LABEL_FMT_STYLE_DEFINE="&Criar e Modificar Estilos" MENU_LABEL_FMT_STYLIST="" MENU_LABEL_FMT_SUBSCRIPT="n&dice" MENU_LABEL_FMT_SUPERSCRIPT="&Expoente" @@ -1206,6 +1230,7 @@ MENU_LABEL_HELP_INDEX="&ndice da Ajuda" MENU_LABEL_HELP_REPORT_BUG="Informe &Bugs" MENU_LABEL_HELP_SEARCH="&Pesquisar na Ajuda" +MENU_LABEL_INSERT_ANNOTATION="Identao" MENU_LABEL_INSERT_BOOKMARK="&Bookmark" MENU_LABEL_INSERT_BREAK="&Quebra" MENU_LABEL_INSERT_CLIPART="&Portfolio" @@ -1224,12 +1249,11 @@ MENU_LABEL_INSERT_FOOTER="Rodap" MENU_LABEL_INSERT_FOOTNOTE="Inserir &Nota de Rodap" MENU_LABEL_INSERT_GOTO_HYPERLINK="&Saltar para hiperlink" -MENU_LABEL_INSERT_GRAPHIC="Do &Arquivo" +MENU_LABEL_INSERT_GRAPHIC="&Imagem" MENU_LABEL_INSERT_HEADER="Cabealho" MENU_LABEL_INSERT_HYPERLINK="&Hiperligao" MENU_LABEL_INSERT_MAILMERGE="&Mala Direta" MENU_LABEL_INSERT_PAGENO="&Nmerao" -MENU_LABEL_INSERT_PICTURE="&Imagem" MENU_LABEL_INSERT_SYMBOL="&Smbolo" MENU_LABEL_INSERT_TABLEOFCONTENTS="ndice" MENU_LABEL_INSERT_TEXTBOX="Caixa de Texto" @@ -1306,7 +1330,6 @@ MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT="Procurar &prxima reviso" MENU_LABEL_TOOLS_REVISIONS_FIND_PREV="Procurar reviso pr&via" MENU_LABEL_TOOLS_REVISIONS_MARK="&Marcar revises enquanto se escreve" -MENU_LABEL_TOOLS_REVISIONS_MERGE_DOCUMENTS="R&econciliar documentos" MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION="Comear nova reviso" MENU_LABEL_TOOLS_REVISIONS_PURGE="&Revises" MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION="&Rejeitar reviso" @@ -1361,14 +1384,14 @@ MENU_LABEL_WINDOW_9="&9 %s" MENU_LABEL_WINDOW_MORE="&Mais janelas" MENU_LABEL_WINDOW_NEW="&Nova" -MENU_LABEL__BOGUS1__="Fechar documento" -MENU_LABEL__BOGUS2__="Fechar documento" -MENU_STATUSLINE_ALIGN="Fechar documento" +MENU_LABEL__BOGUS1__=" " +MENU_LABEL__BOGUS2__=" " +MENU_STATUSLINE_ALIGN=" " MENU_STATUSLINE_ALIGN_CENTER="Centralizar texto" MENU_STATUSLINE_ALIGN_JUSTIFY="Justificar texto" MENU_STATUSLINE_ALIGN_LEFT="Alinhar esquerda" MENU_STATUSLINE_ALIGN_RIGHT="Alinhar direita" -MENU_STATUSLINE_EDIT="Fechar documento" +MENU_STATUSLINE_EDIT=" " MENU_STATUSLINE_EDIT_CLEAR="Apagar seleo" MENU_STATUSLINE_EDIT_COPY="Copiar seleo" MENU_STATUSLINE_EDIT_COPYEMBED="Copiar Objeto Embutido" @@ -1386,6 +1409,7 @@ MENU_STATUSLINE_EDIT_EDITHEADER="Editar cabealho" MENU_STATUSLINE_EDIT_FIND="Procurar no documento" MENU_STATUSLINE_EDIT_GOTO="Deslocar o cursor para" +MENU_STATUSLINE_EDIT_LATEXEQUATION="Equao LaTeX" MENU_STATUSLINE_EDIT_PASTE="Colar seleo" MENU_STATUSLINE_EDIT_PASTE_SPECIAL="Colar objeto no formatado" MENU_STATUSLINE_EDIT_REDO="Refazer ltima ao cancelada" @@ -1395,7 +1419,7 @@ MENU_STATUSLINE_EDIT_SELECTALL="Selecionar todo o documento" MENU_STATUSLINE_EDIT_SELECT_FRAME="Selecionar a Caixa de Texto" MENU_STATUSLINE_EDIT_UNDO="Cancelar ltima ao" -MENU_STATUSLINE_FILE="Fechar documento" +MENU_STATUSLINE_FILE=" " MENU_STATUSLINE_FILE_CLOSE="Fechar documento" MENU_STATUSLINE_FILE_EXIT="Fechar todas as janelas e sair" MENU_STATUSLINE_FILE_EXPORT="Salvar como" @@ -1425,7 +1449,7 @@ MENU_STATUSLINE_FILE_SAVEEMBED="Salvar o Objeto Embutido" MENU_STATUSLINE_FILE_SAVEIMAGE="Salvar a imagem selecionadas para um arquivo" MENU_STATUSLINE_FILE_SAVE_TEMPLATE="Salvar o documento como modelo" -MENU_STATUSLINE_FMT="Fechar documento" +MENU_STATUSLINE_FMT=" " MENU_STATUSLINE_FMT_BACKGROUND="Mudar cor de fundo" MENU_STATUSLINE_FMT_BACKGROUND_PAGE_COLOR="Mudar a cor de pgina do seu documento" MENU_STATUSLINE_FMT_BACKGROUND_PAGE_IMAGE="Colocar uma imagem como fundo para sua pgina" @@ -1436,8 +1460,10 @@ MENU_STATUSLINE_FMT_COLUMNS="Mudar o nmero de colunas" MENU_STATUSLINE_FMT_DIRECTION="Mudar propriedades direcionais do texto" MENU_STATUSLINE_FMT_DIRECTION_DD_RTL="Mudar a direo dominante do pargrafo para DPE" +MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL="Mudar a direo dominante do pargrafo para DPE" MENU_STATUSLINE_FMT_DIRECTION_DO_LTR="Forar direo do texto da esquerda para a direita" MENU_STATUSLINE_FMT_DIRECTION_DO_RTL="Forar direo do texto da direita para a esquerda" +MENU_STATUSLINE_FMT_DIRECTION_SD_RTL="Mudar a direo dominante do pargrafo para DPE" MENU_STATUSLINE_FMT_DOCUMENT="Configurar as propriedades do seu documento, como tamanho de pgina e margensFormatar propriedades do documento, tais como tamanho do papel e margens" MENU_STATUSLINE_FMT_EMBED="Formatar Objeto Embutido" MENU_STATUSLINE_FMT_FONT="Mudar tipo de letra" @@ -1462,8 +1488,8 @@ MENU_STATUSLINE_FMT_TOGGLECASE="Mudar capitalizao da rea seleccionada" MENU_STATUSLINE_FMT_TOPLINE="Colocar/Remover linha acima da seleo" MENU_STATUSLINE_FMT_UNDERLINE="Sublinhar texto" -MENU_STATUSLINE_FORMAT="Fechar documento" -MENU_STATUSLINE_HELP="Fechar documento" +MENU_STATUSLINE_FORMAT=" " +MENU_STATUSLINE_HELP=" " MENU_STATUSLINE_HELP_ABOUT="Ver informaes sobre o programa, nmero de verso e copyrights" MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE="Saiba mais sobre o projecto GNOME Office" MENU_STATUSLINE_HELP_CHECKVER="Verificar se h verses atualizadas do AbiWord na Internet" @@ -1472,7 +1498,8 @@ MENU_STATUSLINE_HELP_INDEX="Mostrar o Index da ajuda" MENU_STATUSLINE_HELP_REPORT_BUG="Relatar um erro e ajudar o AbiWord a se tornar um produto melhor" MENU_STATUSLINE_HELP_SEARCH="Pesquisar ajuda sobre..." -MENU_STATUSLINE_INSERT="Fechar documento" +MENU_STATUSLINE_INSERT=" " +MENU_STATUSLINE_INSERT_ANNOTATION="Inserir nota final" MENU_STATUSLINE_INSERT_BOOKMARK="Inserir bookmark" MENU_STATUSLINE_INSERT_BREAK="Inserir quebras de pgina, seo..." MENU_STATUSLINE_INSERT_CLIPART="Inserir grficos do portfolio" @@ -1493,11 +1520,10 @@ MENU_STATUSLINE_INSERT_HYPERLINK="Inserir hiperligao" MENU_STATUSLINE_INSERT_MAILMERGE="Inserir um campo de reconciliao de correio" MENU_STATUSLINE_INSERT_PAGENO="Inserir nmerao de pginas" -MENU_STATUSLINE_INSERT_PICTURE="Inserir imagem" MENU_STATUSLINE_INSERT_SYMBOL="Inserir caracteres especiais" MENU_STATUSLINE_INSERT_TABLEOFCONTENTS="Inserir um ndice baseado nos Cabealhos" MENU_STATUSLINE_INSERT_TEXTBOX="Inserir uma Caixa de Texto" -MENU_STATUSLINE_OPEN_TEMPLATE="Fechar documento" +MENU_STATUSLINE_OPEN_TEMPLATE=" " MENU_STATUSLINE_SPELL_ADD="Adicionar esta palavra ao dicionrio custumizvel" MENU_STATUSLINE_SPELL_IGNOREALL="Ignorar todas as ocorrncias desta palavra no documento" MENU_STATUSLINE_SPELL_SUGGEST_1="Mudar para a sugesto" @@ -1551,7 +1577,7 @@ MENU_STATUSLINE_TABLE_TEXTTOTABLE="Converter Texto Selectionado em Tabela" MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL="Dividir em todos os delimitadores de palavras, incluindo espaos" MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES="Dividir em todos os delimitadores com exceo dos espaos" -MENU_STATUSLINE_TOOLS="Fechar documento" +MENU_STATUSLINE_TOOLS=" " MENU_STATUSLINE_TOOLS_AUTOSPELL="Verificar ortografia do documento automaticamente" MENU_STATUSLINE_TOOLS_HISTORY="Ver histrico do documento corrente" MENU_STATUSLINE_TOOLS_HISTORY_PURGE="Remover cabealho" @@ -1578,10 +1604,10 @@ MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_BEFORE="Mostrar como o documento antes das revises" MENU_STATUSLINE_TOOLS_SCRIPTS="Executar scripts" MENU_STATUSLINE_TOOLS_SPELL="Verificar ortografia do documento agora" -MENU_STATUSLINE_TOOLS_SPELLING="Fechar documento" +MENU_STATUSLINE_TOOLS_SPELLING=" " MENU_STATUSLINE_TOOLS_SPELLPREFS="Definir opes de ortografia" MENU_STATUSLINE_TOOLS_WORDCOUNT="Contar palavras no documento" -MENU_STATUSLINE_VIEW="Fechar documento" +MENU_STATUSLINE_VIEW=" " MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT="Voltar o layout das barra de ferramenta atual para o padro" MENU_STATUSLINE_VIEW_FULLSCREEN="Mostrar somente as pginas" MENU_STATUSLINE_VIEW_HEADFOOT="Editar os cabealhos e rodaps" @@ -1596,7 +1622,7 @@ MENU_STATUSLINE_VIEW_TB_2="Mostrar ou esconder a barra de ferramentas" MENU_STATUSLINE_VIEW_TB_3="Mostrar ou esconder a barra de ferramentas" MENU_STATUSLINE_VIEW_TB_4="Mostrar ou esconder a barra de ferramentas" -MENU_STATUSLINE_VIEW_TOOLBARS="Fechar documento" +MENU_STATUSLINE_VIEW_TOOLBARS=" " MENU_STATUSLINE_VIEW_WEB="Ver documento como pgina WWW" MENU_STATUSLINE_VIEW_ZOOM="Aproximar ou afastar do texto" MENU_STATUSLINE_VIEW_ZOOM_100="Zoom a 100%" @@ -1608,7 +1634,7 @@ MENU_STATUSLINE_VIEW_ZOOM_WIDTH="Zoom largura da pgina" MENU_STATUSLINE_WEB_SAVEASWEB="Ver o documento (antes de imprimir) como uma pgina de WWW" MENU_STATUSLINE_WEB_WEBPREVIEW="Ver o documento (antes de imprimir) como uma pgina de WWW" -MENU_STATUSLINE_WINDOW="Fechar documento" +MENU_STATUSLINE_WINDOW=" " MENU_STATUSLINE_WINDOW_1="Mudar para a primeira janela" MENU_STATUSLINE_WINDOW_2="Mudar para a primeira janela" MENU_STATUSLINE_WINDOW_3="Mudar para a primeira janela" @@ -1620,8 +1646,8 @@ MENU_STATUSLINE_WINDOW_9="Mudar para a primeira janela" MENU_STATUSLINE_WINDOW_MORE="Mostrar lista completa de janelas" MENU_STATUSLINE_WINDOW_NEW="Abrir outra janela para este documento" -MENU_STATUSLINE__BOGUS1__="Fechar documento" -MENU_STATUSLINE__BOGUS2__="Fechar documento" +MENU_STATUSLINE__BOGUS1__=" " +MENU_STATUSLINE__BOGUS2__=" " MSG_AfterRestartNew="Estas alteraes tomaro efeito quando recomear o AbiWord ou quando criar um novo documento." MSG_AutoMerge="Reconciliao automtica" MSG_AutoRevisionOffWarning="Voc tem certeza de que no quer manter o registro completo do histrico? Se voc proceder, poder no ser possver restaurar verses anteriores deste documento." @@ -1647,7 +1673,6 @@ MSG_IE_UnknownType="%s de um formato desconhecido" MSG_IE_UnsupportedType="O arquivo %s de um tipo ainda no suportado" MSG_ImportError="Erro de importao do arquivo %s." -MSG_MergeDocsNotRelated="Estes documentos que voc est tentando reconciliar no so relacionados. O AbiWord tentar reconcili-los, mas o resultado pode no fazer sentido." MSG_NoBreakInsideFrame="No possvel inserir uma quebra dentro de uma caixa de texto" MSG_NoBreakInsideTable="No possver inserir uma quebra dentro de uma tabela" MSG_OpenFailed="Impossvel salvar o arquivo %s." @@ -1668,11 +1693,12 @@ RightMarginStatus="Margem Direita [%s]" SCRIPT_CANTRUN="Erro de importao do arquivo %s." SCRIPT_NOSCRIPTS="No foram encontrados scripts" +TB_Embedded="Numerada" TB_Extra="Extra" TB_Format="Formato" TB_Simple="Amostra" TB_Standard="Padro" -TOC_TocHeading="ndice" +TOC_TocHeading="Cotedo 1" TOOLBAR_LABEL_1COLUMN="1 Coluna" TOOLBAR_LABEL_2COLUMN="2 Colunas" TOOLBAR_LABEL_3COLUMN="3 Colunas" @@ -1717,6 +1743,7 @@ TOOLBAR_LABEL_INSERT_TABLE="Inserir tabela" TOOLBAR_LABEL_LISTS_BULLETS="Lista Pontuada" TOOLBAR_LABEL_LISTS_NUMBERS="Numerao" +TOOLBAR_LABEL_MENU="" TOOLBAR_LABEL_MERGEABOVE="Juntar acima" TOOLBAR_LABEL_MERGEBELOW="Juntar abaixo" TOOLBAR_LABEL_MERGELEFT="Juntar esquerda" @@ -1730,6 +1757,7 @@ TOOLBAR_LABEL_SPELLCHECK="Ortografia" TOOLBAR_LABEL_SPLIT_CELLS="Separar clulas" TOOLBAR_LABEL_UNINDENT="Remover identao" +TOOLBAR_LABEL_VIEW_FULL_SCREEN="&S a Pgina" TOOLBAR_LABEL_VIEW_SHOWPARA="Ver Pargrafos" TOOLBAR_STATUSLINE_1COLUMN="1 Coluna" TOOLBAR_STATUSLINE_2COLUMN="2 Colunas" @@ -1776,6 +1804,7 @@ TOOLBAR_STATUSLINE_INSERT_TABLE="Inserir uma nova tabela no documento" TOOLBAR_STATUSLINE_LISTS_BULLETS="Lista Pontuada" TOOLBAR_STATUSLINE_LISTS_NUMBERS="Numerao" +TOOLBAR_STATUSLINE_MENU="" TOOLBAR_STATUSLINE_MERGEABOVE="Juntar com a clula acima da atual" TOOLBAR_STATUSLINE_MERGEBELOW="Juntar com a clula abaixo da atual" TOOLBAR_STATUSLINE_MERGELEFT="Juntar com a clula esquerda da atual" @@ -1789,6 +1818,7 @@ TOOLBAR_STATUSLINE_SPELLCHECK="Verificar ortografia" TOOLBAR_STATUSLINE_SPLIT_CELLS="Separar clulas" TOOLBAR_STATUSLINE_UNINDENT="Remover identao" +TOOLBAR_STATUSLINE_VIEW_FULL_SCREEN="&S a Pgina" TOOLBAR_STATUSLINE_VIEW_SHOWPARA="Ver/Esconder " TOOLBAR_TOOLTIP_1COLUMN="1 Coluna" TOOLBAR_TOOLTIP_2COLUMN="2 Colunas" @@ -1835,6 +1865,7 @@ TOOLBAR_TOOLTIP_INSERT_TABLE="Inserir uma nova tabela no documento" TOOLBAR_TOOLTIP_LISTS_BULLETS="Lista Pontuada" TOOLBAR_TOOLTIP_LISTS_NUMBERS="Numerao" +TOOLBAR_TOOLTIP_MENU="" TOOLBAR_TOOLTIP_MERGEABOVE="Juntar com a clula acima da atual" TOOLBAR_TOOLTIP_MERGEBELOW="Juntar com a clula abaixo da atual" TOOLBAR_TOOLTIP_MERGELEFT="Juntar com a clula esquerda da atual" @@ -1848,6 +1879,7 @@ TOOLBAR_TOOLTIP_SPELLCHECK="Verificar ortografia" TOOLBAR_TOOLTIP_SPLIT_CELLS="Separar clulas" TOOLBAR_TOOLTIP_UNINDENT="Remover identao" +TOOLBAR_TOOLTIP_VIEW_FULL_SCREEN="&S a Pgina" TOOLBAR_TOOLTIP_VIEW_SHOWPARA="Ver/Esconder " TabStopStatus="Fim de Tabulao [%s]" TabToggleBarTab="Tabulao em Barra" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/strings/ro-RO.strings /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/strings/ro-RO.strings --- abiword-2.6.2/abiword/user/wp/strings/ro-RO.strings 2008-04-06 17:00:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/strings/ro-RO.strings 2009-07-15 16:56:23.000000000 +0100 @@ -1,5 +1,4 @@ - - + @@ -8,853 +7,1167 @@ - - - - - diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/strings/sk-SK.strings /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/strings/sk-SK.strings --- abiword-2.6.2/abiword/user/wp/strings/sk-SK.strings 2008-04-06 17:00:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/strings/sk-SK.strings 2009-07-15 16:56:23.000000000 +0100 @@ -11,181 +11,179 @@ @@ -555,71 +555,70 @@ BottomMarginStatus="Doln okraje [%s]" ColumnGapStatus="Medzera medzi stpcami [%s]" ColumnStatus="Stpec [%d]" -DLG_Annotation_Title="Upravi odsadenie" -DLG_ApplyButton="&Poui" -DLG_Background_ClearClr="Zmaza farbu pozadia" -DLG_Background_ClearHighlight="Zmaza farbu pre zvrazovanie" -DLG_Background_Title="Zmeni farby pozadia" -DLG_Background_TitleFore="Zmeni farbu textu" -DLG_Background_TitleHighlight="Zmeni farbu zvraznenia" -DLG_Break_BreakTitle="Vloi zlom" -DLG_Break_BreakTitle_Capital="Vloi zlom" +DLG_ApplyButton="&Poui" +DLG_Background_ClearClr="Zmaza farbu pozadia" +DLG_Background_ClearHighlight="Vyisti farbu zvraznenia" +DLG_Background_Title="Zmeni farbu pozadia" +DLG_Background_TitleFore="Zmeni farbu textu" +DLG_Background_TitleHighlight="Zmeni farbu zvraznenia" +DLG_Break_BreakTitle="Vloi zlom" +DLG_Break_BreakTitle_Capital="Vloi zlom" DLG_Break_ColumnBreak="Z&lom stpca" -DLG_Break_Continuous="P&rieben" +DLG_Break_Continuous="P&rieben" DLG_Break_EvenPage="P&rne strany" -DLG_Break_NextPage="alia &strana" +DLG_Break_NextPage="alia &strana" DLG_Break_OddPage="&Neprne strany" DLG_Break_PageBreak="&Zlom strany" DLG_Break_SectionBreaks="Zlomy v kapitole" DLG_Break_SectionBreaks_Capital="Zlomy v kapitole" -DLG_CloseButton="&Zavrie" -DLG_Column_ColumnTitle="Stpcov" +DLG_CloseButton="&Zatvori" +DLG_Column_ColumnTitle="Stpce" DLG_Column_Line_Between="Medzi riadkami" DLG_Column_Number="Poet stpcov" DLG_Column_Number_Cols="Poet stpcov" DLG_Column_One="Jeden" -DLG_Column_RtlOrder="Poui RTL poradie" -DLG_Column_Size="Maximlna vekos stpca" +DLG_Column_RtlOrder="Poui poradie sprava doava" +DLG_Column_Size="Maximlna vekos stpca" DLG_Column_Space_After="Medzera za stpcom" DLG_Column_Three="Tri" DLG_Column_Two="Dva" DLG_DateTime_AvailableFormats="&Dostupn spsoby zpisu:" DLG_DateTime_AvailableFormats_Capital="Dostupn spsoby zpisu" -DLG_DateTime_DateTimeTitle="Vloi dtum a as" -DLG_FR_FindLabel="&o hada:" -DLG_FR_FindNextButton="&Hada alej" -DLG_FR_FindTitle="Hada" -DLG_FR_FinishedFind="Abiword dokonil prehadvanie dokumentu." -DLG_FR_FinishedReplace="Abiword dokonil prehadvanie dokumentu a urobil %d prav(-y)." -DLG_FR_MatchCase="&Rozliova mal a vek psmen" -DLG_FR_ReplaceAllButton="Nahradi &vetko" -DLG_FR_ReplaceButton="Nah&radi" -DLG_FR_ReplaceTitle="Nahradi" -DLG_FR_ReplaceWithLabel="m na&hradi:" -DLG_FR_ReverseFind="Hada &od zaiatku" +DLG_DateTime_DateTimeTitle="Vloi dtum a as" +DLG_FR_FindLabel="&o hada:" +DLG_FR_FindNextButton="&Hada alej" +DLG_FR_FindTitle="Hada" +DLG_FR_FinishedFind="Abiword dokonil prehadvanie dokumentu." +DLG_FR_FinishedReplace="Abiword dokonil prehadvanie dokumentu a urobil %d prav(-u/-y)." +DLG_FR_MatchCase="&Rozliova mal a vek psmen" +DLG_FR_ReplaceAllButton="Nahradi &vetko" +DLG_FR_ReplaceButton="Nah&radi" +DLG_FR_ReplaceTitle="Nahradi" +DLG_FR_ReplaceWithLabel="Na&hradi za:" +DLG_FR_ReverseFind="Hada &od zaiatku" DLG_FR_WholeWord="&Cel slovo" -DLG_Field_FieldTitle="Vloi pole" -DLG_Field_FieldTitle_Capital="Vloi pole" +DLG_Field_FieldTitle="Vloi pole" +DLG_Field_FieldTitle_Capital="Vloi pole" DLG_Field_Fields="&Polia:" -DLG_Field_Fields_No_Colon="&Polia(-)" -DLG_Field_Parameters="Dalie parametre:" -DLG_Field_Parameters_Capital="Dalie parametre" +DLG_Field_Fields_No_Colon="&Polia" +DLG_Field_Parameters="alie parametre:" +DLG_Field_Parameters_Capital="alie parametre" DLG_Field_Types="&Typy:" DLG_Field_Types_No_Colon="&Typy" -DLG_FormatFootnotes_EndInitialVal="Poiaton hodnota koncovej poznmky" -DLG_FormatFootnotes_EndPlaceEndDoc="Umiestni na koniec dokumentu" -DLG_FormatFootnotes_EndPlaceEndSec="Umiestni na koniec kapitoly" +DLG_FormatFootnotes_EndInitialVal="Zaiaton hodnota koncovej poznmky" +DLG_FormatFootnotes_EndPlaceEndDoc="Umiestni na koniec dokumentu" +DLG_FormatFootnotes_EndPlaceEndSec="Umiestni na koniec kapitoly" DLG_FormatFootnotes_EndPlacement="Umiestnenie" -DLG_FormatFootnotes_EndRestartSec="Odznova v kadej kapitole" -DLG_FormatFootnotes_EndStyle="tl koncovch poznmok" +DLG_FormatFootnotes_EndRestartSec="Odznova v kadej kapitole" +DLG_FormatFootnotes_EndStyle="tl koncovch poznmok" DLG_FormatFootnotes_Endnotes="Formt poznmky pod iarou" -DLG_FormatFootnotes_FootInitialVal="Poiaton hodnota poznmky pod iarou" -DLG_FormatFootnotes_FootRestartNone="Neobnovova" -DLG_FormatFootnotes_FootRestartPage="Odznova na kadej strane" -DLG_FormatFootnotes_FootRestartSec="Odznova v kadej kapitole" -DLG_FormatFootnotes_FootStyle="tl poznmky pod iarou" +DLG_FormatFootnotes_FootInitialVal="Zaiaton hodnota poznmky pod iarou" +DLG_FormatFootnotes_FootRestartNone="Neobnovova" +DLG_FormatFootnotes_FootRestartPage="Odznova na kadej strane" +DLG_FormatFootnotes_FootRestartSec="Odznova v kadej kapitole" +DLG_FormatFootnotes_FootStyle="tl poznmky pod iarou" DLG_FormatFootnotes_FootnoteRestart="slovanie" -DLG_FormatFootnotes_Footnotes="Formt poznmky pod arou:" +DLG_FormatFootnotes_Footnotes="Formt poznmky pod iarou:" DLG_FormatFootnotes_Title="Formt poznmky pod iarou a koncovej poznmky" DLG_FormatFrameTitle="Formt textovho rmu" DLG_FormatFrame_Background="Pozadie" @@ -628,440 +627,440 @@ DLG_FormatFrame_Borders="Okraje" DLG_FormatFrame_NoImageBackground="Bez obrzka" DLG_FormatFrame_PositionTo="Pozcia textovho rmu" -DLG_FormatFrame_SelectImage="Vybra obrzok zo sboru" -DLG_FormatFrame_SetImage="Nastavi obrzok" +DLG_FormatFrame_SelectImage="Vybra obrzok zo sboru" +DLG_FormatFrame_SetImage="Nastavi obrzok" DLG_FormatFrame_SetImageBackground="Obrzok pozadia" -DLG_FormatFrame_SetTextWrapping="Nastavenia zalamovania textu" +DLG_FormatFrame_SetTextWrapping="Nastavenie zalamovania textu" DLG_FormatFrame_SetToColumn="Pozcia v stpci" DLG_FormatFrame_SetToPage="Pozcia na strane" DLG_FormatFrame_SetToParagraph="Pozcia v odseku" DLG_FormatFrame_TextWrapping="Zalomenie textu" -DLG_FormatTOC_ChangeStyle="Zmeni tl" +DLG_FormatTOC_ChangeStyle="Zmeni tl" DLG_FormatTOC_DetailsTabPage="Tabultory a slovanie" -DLG_FormatTOC_DetailsTop="Defincie nadpisov" -DLG_FormatTOC_DispStyle="Zobrazi tl:" -DLG_FormatTOC_FillStyle="tl vplne:" -DLG_FormatTOC_General="Veobecn" +DLG_FormatTOC_DetailsTop="Vlastnosti nadpisov" +DLG_FormatTOC_DispStyle="Zobrazi tl:" +DLG_FormatTOC_FillStyle="tl vplne:" +DLG_FormatTOC_General="Veobecn" DLG_FormatTOC_HasHeading="&Nadpis 3" DLG_FormatTOC_HasLabel="&Obsahuje nadpis" -DLG_FormatTOC_HeadingStyle="tly nadpisov:" +DLG_FormatTOC_HeadingStyle="tly nadpisov:" DLG_FormatTOC_HeadingText="T&ext nadpisu:" DLG_FormatTOC_Indent="O&dsadenie:" -DLG_FormatTOC_InheritLabel="&Vloi tabuku" +DLG_FormatTOC_InheritLabel="&Vloi tabuku" DLG_FormatTOC_LayoutDetails="Podrobnosti rozmiestnenia" DLG_FormatTOC_Level1="rove 1" DLG_FormatTOC_Level2="rove 2" DLG_FormatTOC_Level3="rove 3" DLG_FormatTOC_Level4="rove 4" -DLG_FormatTOC_LevelDefs="Definova hlavn vlastnosti" -DLG_FormatTOC_None="Ni" -DLG_FormatTOC_NumberingType="&Typ slovnia:" +DLG_FormatTOC_LevelDefs="Definova hlavn vlastnosti" +DLG_FormatTOC_None="iadny" +DLG_FormatTOC_NumberingType="&Typ slovania:" DLG_FormatTOC_PageNumbering="s&lovanie strn:" -DLG_FormatTOC_StartAt="&Zaa na:" -DLG_FormatTOC_TabLeader="Z&hlavie:" +DLG_FormatTOC_StartAt="&Zaa na:" +DLG_FormatTOC_TabLeader="&Vodiaci znak:" DLG_FormatTOC_TextAfter="Text &za:" DLG_FormatTOC_TextBefore="Text &pred:" DLG_FormatTOC_Title="Formt obsahu" -DLG_FormatTableTitle="Formt tabuky" -DLG_FormatTable_Apply_To="Poui na:" -DLG_FormatTable_Apply_To_Column="Stpec" +DLG_FormatTableTitle="Formt tabuky" +DLG_FormatTable_Apply_To="Poui na:" +DLG_FormatTable_Apply_To_Column="stpec" DLG_FormatTable_Apply_To_Row="Riadok" DLG_FormatTable_Background="Pozadie" DLG_FormatTable_Background_Color="Farba pozadia:" DLG_FormatTable_Border_Color="Farba okraja:" DLG_FormatTable_Borders="Okraje" DLG_FormatTable_NoImageBackground="Bez obrzka" -DLG_FormatTable_SelectImage="Vybra obrzok zo sboru" -DLG_FormatTable_SetImage="Nastavi obrzok" +DLG_FormatTable_SelectImage="Vybra obrzok zo sboru" +DLG_FormatTable_SetImage="Nastavi obrzok" DLG_FormatTable_SetImageBackground="Obrzok pozadia" DLG_FormatTable_Thickness="Hrbka:" DLG_Goto_Btn_Goto="Cho na" -DLG_Goto_Btn_Next="al >>" -DLG_Goto_Btn_Prev="<< Predchdzajci" -DLG_Goto_Label_Help="Vyberte cie v avej asti. Ak chcete poui tlaidlo "Cho na", zadajte len slo strany. Mete tie prida + a - pre relatvny posun.\tNapr. ak zadte "+2" a vyberete "Riadky" a potom "Cho na", posuniete sa o 2 riadky niie." +DLG_Goto_Btn_Next="al >>" +DLG_Goto_Btn_Prev="<< Predchdzaj." +DLG_Goto_Label_Help="Vyberte cie v avej asti. Ak chcete poui tlaidlo "Cho na", zadajte len slo strany. Mete tie prida +/- pre posun o urit poet str., riad., zlo.\tNapr. ak zadte "+2" a vyberiete "riadky" a potom "Cho na", posuniete sa o 2 riadky niie." DLG_Goto_Label_Name="&Nzov:" DLG_Goto_Label_Number="&slo:" -DLG_Goto_Label_What="Cho na &o:" -DLG_Goto_Target_Bookmark="Zloka" -DLG_Goto_Target_Line="Riadku" +DLG_Goto_Label_What="Cho &na:" +DLG_Goto_Target_Bookmark="zloku" +DLG_Goto_Target_Line="riadok" DLG_Goto_Target_Page="Strana" DLG_Goto_Target_Picture="Obrzok" DLG_Goto_Title="Cho na..." -DLG_HdrFtr_FooterEven="In pta na protiahlch stranch" -DLG_HdrFtr_FooterFirst="In pta na prvej strane" +DLG_HdrFtr_FooterEven="in pta na protiahlch stranch" +DLG_HdrFtr_FooterFirst="in pta na prvej strane" DLG_HdrFtr_FooterFrame="Vlastnosti pty" -DLG_HdrFtr_FooterLast="In pta na poslednej strane" -DLG_HdrFtr_HeaderEven="In zhlavie na protiahlch stranch" -DLG_HdrFtr_HeaderFirst="In zhlavie na prvej strane" +DLG_HdrFtr_FooterLast="in pta na poslednej strane" +DLG_HdrFtr_HeaderEven="in zhlavie na protiahlch stranch" +DLG_HdrFtr_HeaderFirst="in zhlavie na prvej strane" DLG_HdrFtr_HeaderFrame="Vlastnosti zhlavia" -DLG_HdrFtr_HeaderLast="In zhlavie na poslednej strane" -DLG_HdrFtr_PageNumberProperties="Vlastnosti slovnia strn" -DLG_HdrFtr_RestartCheck="Kad kapitolu slova osobitne" -DLG_HdrFtr_RestartNumbers="Obnovi slovanie od:" +DLG_HdrFtr_HeaderLast="in zhlavie na poslednej strane" +DLG_HdrFtr_PageNumberProperties="Vlastnosti slovania strn" +DLG_HdrFtr_RestartCheck="Kad kapitolu slova osobitne" +DLG_HdrFtr_RestartNumbers="Obnovi slovanie od:" DLG_HdrFtr_Title="Formt zhlavia/pty" DLG_HelpButton="&Npoveda" -DLG_InsertBookmark_Msg="Zadejte nzov pre zloku, alebo vyberte existujci zo seznamu." -DLG_InsertBookmark_Title="Vloi zloku" -DLG_InsertHyperlink_Msg="Vyberte cieov zloku zo zoznamu." -DLG_InsertHyperlink_Title="Vloi hypertextov odkaz" -DLG_InsertTable_AutoColSize="Automatick vekos stpca" -DLG_InsertTable_AutoFit="Sprvanie automatickho dopania" -DLG_InsertTable_AutoFit_Capital="Sprvanie automatickho dopania" -DLG_InsertTable_FixedColSize="Presn vekos stpca:" +DLG_InsertBookmark_Msg="Zadajte nzov pre nov zloku, alebo nejak vyberte zo zoznamu." +DLG_InsertBookmark_Title="Vloi zloku" +DLG_InsertHyperlink_Msg="Vyberte cieov zloku zo zoznamu." +DLG_InsertHyperlink_Title="Vloi hypertextov odkaz" +DLG_InsertTable_AutoColSize="Automatick vekos stpca" +DLG_InsertTable_AutoFit="Vlastnosti automatickej tabuky" +DLG_InsertTable_AutoFit_Capital="Vlastnosti automatickej tabuky" +DLG_InsertTable_FixedColSize="Presn vekos stpca:" DLG_InsertTable_NumCols="Poet stpcov:" DLG_InsertTable_NumRows="Poet riadkov:" -DLG_InsertTable_TableSize="Vekos tabuky" -DLG_InsertTable_TableSize_Capital="Vekos tabuky" -DLG_InsertTable_TableTitle="Vlo tabuku" -DLG_Latex_Example="Vzorka:" +DLG_InsertTable_TableSize="Vekos tabuky" +DLG_InsertTable_TableSize_Capital="Vekos tabuky" +DLG_InsertTable_TableTitle="Vlo tabuku" +DLG_Latex_Example="Ukka:" DLG_Latex_LatexEquation="Matematick vraz programu Latex" DLG_Latex_LatexTitle="Matematick vraz programu Latex" DLG_ListRevisions_Column1Label="ID zmeny textu" DLG_ListRevisions_Column2Label="Dtum" DLG_ListRevisions_Column3Label="Komentr" DLG_ListRevisions_Label1="Existujce zmeny textu:" -DLG_ListRevisions_LevelZero="(Vetky zmeny v texte s zobrazen)" +DLG_ListRevisions_LevelZero="(Vetky zmeny v texte s zobrazen)" DLG_ListRevisions_Title="Vber zmeny textu" DLG_Lists_Align="Zarovnanie textu:" -DLG_Lists_Apply_Current="Poui na sasn zoznam" -DLG_Lists_Arabic_List="Odrky arabskmi slicami" +DLG_Lists_Apply_Current="Poui na sasn zoznam" +DLG_Lists_Arabic_List="Odrky arabskmi slicami" DLG_Lists_ButtonFont="Psmo..." -DLG_Lists_Cur_Change_Start="Zmeni aktulny zoznam" +DLG_Lists_Cur_Change_Start="Zmeni aktulny zoznam" DLG_Lists_Current_Font="Aktulne psmo" DLG_Lists_Current_List_Label="Aktulny nzov zoznamu" DLG_Lists_Current_List_Type="Aktulny typ zoznamu" -DLG_Lists_Customize="Vlastn zoznam" -DLG_Lists_DelimiterString="Oddeova rovn:" -DLG_Lists_FoldingLevel0="No Folding" -DLG_Lists_FoldingLevel1="Fold below level 1" -DLG_Lists_FoldingLevel2="Fold below level 2" -DLG_Lists_FoldingLevel3="Fold below level 3" -DLG_Lists_FoldingLevel4="Fold below level 4" -DLG_Lists_FoldingLevelexp="Skry text pod rovou zoznamu" +DLG_Lists_Customize="Vlastn zoznam" +DLG_Lists_DelimiterString="Oddeova rovn:" +DLG_Lists_FoldingLevel0="Neskrva text" +DLG_Lists_FoldingLevel1="Skry text pod Nadpisom 2" +DLG_Lists_FoldingLevel2="Skry text pod Nadpisom 2" +DLG_Lists_FoldingLevel3="Skry text pod Nadpisom 2" +DLG_Lists_FoldingLevel4="Skry text pod Nadpisom 4" +DLG_Lists_FoldingLevelexp="Skry text pod rovou zoznamu" DLG_Lists_Hebrew_List="Zoznam pre hebrejinu" DLG_Lists_Indent="Zarovnanie nzvu:" DLG_Lists_Level="rove:" DLG_Lists_New_List_Label="Nov nzov zoznamu" DLG_Lists_New_List_Type="Nov typ zoznamu" -DLG_Lists_PageFolding="Text Folding" +DLG_Lists_PageFolding="Skrvanie textu" DLG_Lists_PageProperties="Vlastnosti zoznamu" -DLG_Lists_Resume="Pripoji k prechdzajcemu zoznamu" -DLG_Lists_Resume_Previous_List="Obnovi predchdzajci zoznam" -DLG_Lists_SetDefault="Prednastavi hodnoty" -DLG_Lists_Start="Zaa na:" -DLG_Lists_Start_New="Zaa nov zoznam" -DLG_Lists_Start_New_List="Zaa nov zoznam" -DLG_Lists_Start_Sub="Zaa podzoznam" -DLG_Lists_Starting_Value="Nov poiaton hodnota" -DLG_Lists_Stop_Current_List="Ukoni sasn zoznam" -DLG_Lists_Title="Seznamy pre/na " +DLG_Lists_Resume="Prida k prechdzajcemu zoznamu" +DLG_Lists_Resume_Previous_List="Obnovi predchdzajci zoznam" +DLG_Lists_SetDefault="Prednastavi hodnoty" +DLG_Lists_Start="Zaa na:" +DLG_Lists_Start_New="Zaa nov zoznam" +DLG_Lists_Start_New_List="Zaa nov zoznam" +DLG_Lists_Start_Sub="Zaa podzoznam" +DLG_Lists_Starting_Value="Nov zaiaton hodnota" +DLG_Lists_Stop_Current_List="Ukoni sasn zoznam" +DLG_Lists_Title="Zoznamy" DLG_Lists_Type="Typ:" -DLG_Lists_Type_bullet="Grafick" -DLG_Lists_Type_none="Ni" -DLG_Lists_Type_numbered="slovan" +DLG_Lists_Type_bullet="grafick" +DLG_Lists_Type_none="iadny" +DLG_Lists_Type_numbered="slovan" DLG_MailMerge_AvailableFields="Dostupn polia" -DLG_MailMerge_Insert="Nzov poa:" -DLG_MailMerge_Insert_No_Colon="Nzov poa" -DLG_MailMerge_MailMergeTitle="Vloenie poa hromadnej korepondencie" -DLG_MailMerge_OpenFile="&Otvori sbor" -DLG_MarkRevisions_Check1Label="Pokraovat v predchdzajcej zmene textu (slo %d)" -DLG_MarkRevisions_Check2Label="Zaznamena nov zmenu v texte" -DLG_MarkRevisions_Comment2Label="Komentr, ktor pripojen ku zmene:" -DLG_MarkRevisions_Title="Oznaeni zmeny textu" +DLG_MailMerge_Insert="Nzov poa:" +DLG_MailMerge_Insert_No_Colon="Nzov poa" +DLG_MailMerge_MailMergeTitle="Vloenie poa hromadnej korepondencie" +DLG_MailMerge_OpenFile="&Otvori sbor" +DLG_MarkRevisions_Check1Label="Pokraova v predchdzajcej zmene textu (slo %d)" +DLG_MarkRevisions_Check2Label="Zaznamena nov zmenu v texte" +DLG_MarkRevisions_Comment2Label="Komentr, ktor bude pripojen k zmene:" +DLG_MarkRevisions_Title="Oznai zmeny textu" DLG_MergeCellsTitle="Zlenie buniek" -DLG_MergeCells_Above="Slouit nad" -DLG_MergeCells_Below="Zli pod" +DLG_MergeCells_Above="Zli nad" +DLG_MergeCells_Below="Zli pod" DLG_MergeCells_Frame="Zlenie buniek" -DLG_MergeCells_Left="Zli vavo" -DLG_MergeCells_Right="Zli vpravo" +DLG_MergeCells_Left="Zli vavo" +DLG_MergeCells_Right="Zli vpravo" DLG_MetaData_Category_LBL="Kategria:" -DLG_MetaData_CoAuthor_LBL="Prispievate(-lia):" +DLG_MetaData_CoAuthor_LBL="Prispel(-i):" DLG_MetaData_Coverage_LBL="Dosah:" -DLG_MetaData_Keywords_LBL="Kov slov:" -DLG_MetaData_Languages_LBL="Jazyk(y):" -DLG_MetaData_Publisher_LBL="Vydavate:" -DLG_MetaData_Relation_LBL="Vzah:" +DLG_MetaData_Keywords_LBL="Kov slov:" +DLG_MetaData_Languages_LBL="Jazyk(-y):" +DLG_MetaData_Publisher_LBL="Vydavate:" +DLG_MetaData_Relation_LBL="Vzah:" DLG_MetaData_Rights_LBL="Prva:" DLG_MetaData_Source_LBL="Zdroj:" -DLG_MetaData_Subject_LBL="Predmet:" -DLG_MetaData_TAB_General="Veobecn" +DLG_MetaData_Subject_LBL="Predmet (Vec):" +DLG_MetaData_TAB_General="Veobecn" DLG_MetaData_TAB_Permission="Prva" DLG_MetaData_TAB_Summary="Shrn" DLG_MetaData_Title="Vlastnosti dokumentu" -DLG_NEW_Choose="Vybra" -DLG_NEW_Create="Vytvori nov dokument zo ablny" -DLG_NEW_NoFile="iadny sbor" -DLG_NEW_Open="Otvori existujc dokument" -DLG_NEW_StartEmpty="Vytvori nov dokument" +DLG_NEW_Choose="Vybra" +DLG_NEW_Create="Vytvori nov dokument zo ablny" +DLG_NEW_NoFile="iadny sbor" +DLG_NEW_Open="Otvori existujci dokument" +DLG_NEW_StartEmpty="Vytvori przdny dokument" DLG_NEW_Tab1="Sprva slov" -DLG_NEW_Tab1_FAX1="Vytvori fax" -DLG_NEW_Tab1_WP1="Vytvori nov przdny dokument" +DLG_NEW_Tab1_FAX1="Vytvori fax" +DLG_NEW_Tab1_WP1="Vytvori nov przdny dokument" DLG_NEW_Title="Nov dokument" DLG_Options_Btn_CustomDict="&Slovnk..." -DLG_Options_Btn_Default="&Prednastaven" -DLG_Options_Btn_IgnoreEdit="&Upravi" -DLG_Options_Btn_IgnoreReset="&Obnovi" -DLG_Options_Btn_Save="&Uloi" -DLG_Options_Label_AppStartup="Spustenie aplikcie" +DLG_Options_Btn_Default="&Predvolen" +DLG_Options_Btn_IgnoreEdit="&Upravi" +DLG_Options_Btn_IgnoreReset="&Obnovi" +DLG_Options_Btn_Save="&Uloi" +DLG_Options_Label_AppStartup="Spustenie programu" DLG_Options_Label_AutoSave="Automatick ukladanie" -DLG_Options_Label_AutoSaveCurrent="Automaticky &uloi sbor kadch" +DLG_Options_Label_AutoSaveCurrent="Automaticky &uloi sbor kadch" DLG_Options_Label_AutoSaveInterval="&Interval:" DLG_Options_Label_AutoSaveUnderline="Automatick &ukladanie" -DLG_Options_Label_BiDiOptions="Voby pre obojsmernos" +DLG_Options_Label_BiDiOptions="Nastavenie smeru textu" DLG_Options_Label_Both="Text a ikona" -DLG_Options_Label_CheckAllowCustomToolbars="Dovoli vlastn nstrojovo litu" -DLG_Options_Label_CheckAutoLoadPlugins="Automaticky nahra vetky njden moduly" -DLG_Options_Label_CheckEnableSmoothScrolling="Dovoli jemn rolovanie" -DLG_Options_Label_CheckWhiteForTransparent="Dovoli in farbu obrazovku ako bielu" -DLG_Options_Label_ChooseForTransparent="Vybrat farbu obrazovky" -DLG_Options_Label_ColorChooserLabel="Vybrat farbu obrazovky pre AbiWord" +DLG_Options_Label_CheckAllowCustomToolbars="Dovoli vlastn panel s nstrojmi" +DLG_Options_Label_CheckAutoLoadPlugins="Automaticky nahra vetky njden moduly" +DLG_Options_Label_CheckEnableSmoothScrolling="Dovoli jemn rolovanie" +DLG_Options_Label_CheckWhiteForTransparent="Dovol in farbu obrazovku ako bielu" +DLG_Options_Label_ChooseForTransparent="Vybra farbu obrazovky" +DLG_Options_Label_ColorChooserLabel="Vybra farbu obrazovky AbiWordu" DLG_Options_Label_CustomDict="custom.dic" -DLG_Options_Label_DefaultPageSize="Nastaven vekos strany" -DLG_Options_Label_DirectionRtl="Pvodn smer textu sprava doava" +DLG_Options_Label_DefaultPageSize="Nastaven vekos strany" +DLG_Options_Label_DirectionRtl="Pvodn smer textu sprava doava" DLG_Options_Label_Documents="Dokumenty" DLG_Options_Label_FileExtension="&Prpona sboru:" -DLG_Options_Label_General="Veobecn" +DLG_Options_Label_General="Veobecn" DLG_Options_Label_Grammar="Automatick kontrola gramatiky" -DLG_Options_Label_GrammarCheck="&Kontrolovat gramatiku poas psania" -DLG_Options_Label_HebrewContextGlyphs="Poui ozdobn tvary pre hebrejinu" -DLG_Options_Label_Hide="Skry" +DLG_Options_Label_GrammarCheck="&Kontrolova gramatiku poas psania" +DLG_Options_Label_HebrewContextGlyphs="Poui ozdobn tvary pre hebrejinu" +DLG_Options_Label_Hide="Skry" DLG_Options_Label_Icons="Ikony" -DLG_Options_Label_Ignore="Ignorova" -DLG_Options_Label_InvalidRangeForAutoSave="Rozsah asu pre automatick ukladanie treba zvoli od 1 do 120" +DLG_Options_Label_Ignore="Ignorova" +DLG_Options_Label_InvalidRangeForAutoSave="Ako as automatickho ukladania treba zvoli slo od 1 do 120" DLG_Options_Label_LangSettings="Nastavenia jazyka" DLG_Options_Label_Language="Jazyk" DLG_Options_Label_Layout="Rozmiestnenie" -DLG_Options_Label_Look="tl tlaidiel" +DLG_Options_Label_Look="tl tlaidiel" DLG_Options_Label_Minutes="minty" -DLG_Options_Label_PrefsAutoSave="&Automaticky uklada tto schmu" -DLG_Options_Label_PrefsCurrentScheme="S&asn nastavenia pre schmu" -DLG_Options_Label_Schemes="Monosti schm" -DLG_Options_Label_SmartQuotesEnable="P&ovoli okrhle vodzovky" -DLG_Options_Label_SpellAutoReplace="Automaticky nahradi preklepy" -DLG_Options_Label_SpellCheckAsType="&Kontrolovat preklepy poas psania" -DLG_Options_Label_SpellCustomDict="Uvatesk slovnk:" +DLG_Options_Label_PrefsAutoSave="&Automaticky uklada tto schmu" +DLG_Options_Label_PrefsCurrentScheme="S&asn nastavenia schmy" +DLG_Options_Label_Schemes="Monosti schm" +DLG_Options_Label_SmartQuotesEnable="P&ovoli okrhle vodzovky" +DLG_Options_Label_SpellAutoReplace="Automaticky nahradi preklepy" +DLG_Options_Label_SpellCheckAsType="&Kontrolova preklepy poas psania" +DLG_Options_Label_SpellCustomDict="Uvatesk slovnk:" DLG_Options_Label_SpellDictionaries="Slovnky" -DLG_Options_Label_SpellHideErrors="&Nepodiarkova chyby v dokumente" -DLG_Options_Label_SpellHighlightMisspelledWords="&Zvrazni preklepy" -DLG_Options_Label_SpellIgnoreWords="Ignorovan slov" +DLG_Options_Label_SpellHideErrors="&Skry chyby v dokumente" +DLG_Options_Label_SpellHighlightMisspelledWords="&Zvrazni preklepy" +DLG_Options_Label_SpellIgnoreWords="Preskakovan slov" DLG_Options_Label_SpellIgnoredWord="Ignorovan slov:" -DLG_Options_Label_SpellMainOnly="Ukza nvrhy len z &hlavnho slovnka" -DLG_Options_Label_SpellNumbers="Slova s s&lami" -DLG_Options_Label_SpellSuggest="Vdy nav&rhova opravy" -DLG_Options_Label_SpellUppercase="Slova &VEKMI psmenami" +DLG_Options_Label_SpellMainOnly="Ukazova nvrhy len z &hlavnho slovnka" +DLG_Options_Label_SpellNumbers="slov s s&lami" +DLG_Options_Label_SpellSuggest="Vdy nav&rhova opravy" +DLG_Options_Label_SpellUppercase="slov s &VEKMI psmenami" DLG_Options_Label_Text="Text" DLG_Options_Label_Toolbars="Panely s nstrojmi" -DLG_Options_Label_UI="Uivatesk rozhranie" +DLG_Options_Label_UI="Uvatesk rozhranie" DLG_Options_Label_UILang="Vyberte jazyk pre rozhranie" -DLG_Options_Label_ViewAll="&Vetko" +DLG_Options_Label_ViewAll="&Vetko" DLG_Options_Label_ViewCursorBlink="&Blikajci kurzor" -DLG_Options_Label_ViewExtraTB="al panel s nstrojmi" +DLG_Options_Label_ViewExtraTB="al panel s nstrojmi" DLG_Options_Label_ViewFormatTB="Formt panelu s nstrojmi" DLG_Options_Label_ViewHiddenText="&Skryt text" DLG_Options_Label_ViewRuler="&Pravtko" -DLG_Options_Label_ViewShowHide="Zobrazi..." -DLG_Options_Label_ViewSimpleTB="Nstroje tabuky" +DLG_Options_Label_ViewShowHide="Zobrazi..." +DLG_Options_Label_ViewSimpleTB="Jednoduch nstroje" DLG_Options_Label_ViewStandardTB="Standardn panel s nstrojmi" -DLG_Options_Label_ViewStatusBar="&Stavov panel" -DLG_Options_Label_ViewTableTB="Nstroje tabuky" -DLG_Options_Label_ViewTooltips="Zobrazi tipy v paneli" -DLG_Options_Label_ViewUnits="&Jednotky:" -DLG_Options_Label_ViewUnprintable="Neviditen pomo&cn iary" -DLG_Options_Label_ViewViewFrame="Zobrazi..." -DLG_Options_Label_Visible="Viditenos" +DLG_Options_Label_ViewStatusBar="&Stavov panel" +DLG_Options_Label_ViewTableTB="Nstroje tabuky" +DLG_Options_Label_ViewTooltips="Zobrazi tipy v paneli" +DLG_Options_Label_ViewUnits="&Jedn.:" +DLG_Options_Label_ViewUnprintable="Neviditen pomo&cn iary" +DLG_Options_Label_ViewViewFrame="Zobrazi..." +DLG_Options_Label_Visible="Viditenos" DLG_Options_Label_WithExtension="Prpona:" -DLG_Options_OptionsTitle="Monosti" -DLG_Options_Prompt_IgnoreResetAll="Chcete zmaza zoznam ignorovanch slov vo vetkch dokumentoch?" -DLG_Options_Prompt_IgnoreResetCurrent="Chcete zmaza zoznam ignorovanch slov v tomto dokumente?" -DLG_Options_Prompt_YouMustRestart="Nov jazyk uvateskho rozhrania sa prejav a po alom spusten programu." +DLG_Options_OptionsTitle="Monosti" +DLG_Options_Prompt_IgnoreResetAll="Chcete zmaza zoznam ignorovanch slov vo vetkch dokumentoch?" +DLG_Options_Prompt_IgnoreResetCurrent="Chcete zmaza zoznam ignorovanch slov v tomto dokumente?" +DLG_Options_Prompt_YouMustRestart="Uvatesk rozhranie sa zobraz v novom jazyku a po optovnom spusten programu." DLG_Options_SpellCheckingTitle="Kontrola preklepov" DLG_Options_TabLabel_Misc="Rzne" DLG_Options_TabLabel_Other="In" -DLG_Options_TabLabel_Preferences="Monosti schm" +DLG_Options_TabLabel_Preferences="Monosti schm" DLG_Options_TabLabel_Spelling="Preklepy" -DLG_Options_TabLabel_View="Zobrazi" -DLG_PageNumbers_Alignment="Zarovnanie" +DLG_Options_TabLabel_View="Zobrazi" +DLG_PageNumbers_Alignment="Zarovnanie:" DLG_PageNumbers_Alignment_No_Colon="Zarovnanie" DLG_PageNumbers_Center="Na stred" DLG_PageNumbers_Footer="Pta" DLG_PageNumbers_Header="Zhlavie" -DLG_PageNumbers_Left="av" +DLG_PageNumbers_Left="vavo" DLG_PageNumbers_Position="Pozcia:" DLG_PageNumbers_Position_No_Colon="Pozcia" -DLG_PageNumbers_Right="Prav" -DLG_PageNumbers_Title="sla stn" -DLG_PageSetup_Adjust="U&pravi na:" -DLG_PageSetup_Bottom="&Dolny okraj:" -DLG_PageSetup_ErrBigMargins="Vybran okraje s prli vek." +DLG_PageNumbers_Right="vpravo" +DLG_PageNumbers_Title="sla strn" +DLG_PageSetup_Adjust="U&pravi na:" +DLG_PageSetup_Bottom="&Doln okraj:" +DLG_PageSetup_ErrBigMargins="Vybran okraje s prli vek." DLG_PageSetup_Footer="&Pta:" DLG_PageSetup_Header="&Zhlavie:" -DLG_PageSetup_Height="&Vka:" -DLG_PageSetup_Landscape="Na r&ku" -DLG_PageSetup_Left="&Vavo:" +DLG_PageSetup_Height="&Vka:" +DLG_PageSetup_Landscape="Na r&ku" +DLG_PageSetup_Left="&Vavo:" DLG_PageSetup_Margin="Okraje" DLG_PageSetup_Orient="Orientcia..." DLG_PageSetup_Page="Strana" DLG_PageSetup_Paper="Papier..." -DLG_PageSetup_Paper_Size="Veko&s strany:" -DLG_PageSetup_Percent="% normlnej vekosti" -DLG_PageSetup_Portrait="Na &vku" +DLG_PageSetup_Paper_Size="Veko&s strany:" +DLG_PageSetup_Percent="% normlnej vekosti" +DLG_PageSetup_Portrait="Na &vku" DLG_PageSetup_Right="V&pravo:" DLG_PageSetup_Scale="Mierka..." DLG_PageSetup_Title="Nastavenia strany" DLG_PageSetup_Top="&Horn okraj:" -DLG_PageSetup_Units="&Jednotky:" -DLG_PageSetup_Width="&rka:" +DLG_PageSetup_Units="&Jedn.:" +DLG_PageSetup_Width="&rka:" DLG_Para_AlignCentered="Na stred" DLG_Para_AlignJustified="Do bloku" -DLG_Para_AlignLeft="av" -DLG_Para_AlignRight="Prav" +DLG_Para_AlignLeft="vavo" +DLG_Para_AlignRight="vpravo" DLG_Para_ButtonTabs="&Tabultory..." -DLG_Para_DomDirection="Pre&vld zprava do leva" +DLG_Para_DomDirection="Pre&vlda text sprava doava" DLG_Para_LabelAfter="&Za:" DLG_Para_LabelAlignment="Za&rovnanie:" DLG_Para_LabelAt="&Na:" DLG_Para_LabelBefore="&Pred:" DLG_Para_LabelBy="&Od:" -DLG_Para_LabelIndentation="Medzera od okraja" -DLG_Para_LabelLeft="&Vavo:" +DLG_Para_LabelIndentation="Odsadenie" +DLG_Para_LabelLeft="&Vavo:" DLG_Para_LabelLineSpacing="Ria&dkovanie:" DLG_Para_LabelPagination="Strnkovanie" DLG_Para_LabelRight="V&pravo:" -DLG_Para_LabelSpacing="Medzery" -DLG_Para_LabelSpecial="V&lastn:" +DLG_Para_LabelSpacing="Riadkovanie" +DLG_Para_LabelSpecial="V&lastn tl:" DLG_Para_ParaTitle="Odsek" -DLG_Para_PreviewFollowParagraph="Nasledujci odsek Nasledujci odsek Nasledujci odsek Nasledujci odsek Nsledujc odsek Nsledujc odsek Nsledujc odsek" +DLG_Para_PreviewFollowParagraph="al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek al odsek" DLG_Para_PreviewPrevParagraph="Predchdzajci odsek Predchdzajci odsek Predchdzajci odsek Predchdzajci odsek Predchdzajci odsek Predchdzajci odsek" -DLG_Para_PreviewSampleFallback="Tento odsek predstavuje slova tak, ako sa mu objavi vo vaom dokumente. Ak chcete vidie text vho dokumentu v tomto zobrazen, nastavte kurzor na niektor odsek textu a otvorte toto okno." -DLG_Para_PushKeepLinesTogether="U&dra riadky spolu" -DLG_Para_PushKeepWithNext="Ud&ra s alm" -DLG_Para_PushNoHyphenate="&Nerozdeova slov" -DLG_Para_PushPageBreakBefore="Zalo&mi stranu pred" -DLG_Para_PushSuppressLineNumbers="Po&tlai slovanie riadkov" +DLG_Para_PreviewSampleFallback="Tento odsek ukazuje slov tak, ako sa mu objavi vo vaom dokumente. Ak chcete vidie text vho dokumentu v tomto zobrazen, nastavte kurzor na niektor odsek a otvorte toto okno." +DLG_Para_PushKeepLinesTogether="U&dra riadky spolu" +DLG_Para_PushKeepWithNext="Ud&ra odsek s alm" +DLG_Para_PushNoHyphenate="&Nerozdeova slov" +DLG_Para_PushPageBreakBefore="Zalo&mi stranu pred" +DLG_Para_PushSuppressLineNumbers="Po&tlai slovanie riadkov" DLG_Para_PushWidowOrphanControl="&Ovldanie okien/tzv. sirt" -DLG_Para_SpacingAtLeast="Na konci" +DLG_Para_SpacingAtLeast="Aspo" DLG_Para_SpacingDouble="Dvojit" DLG_Para_SpacingExactly="Presne" -DLG_Para_SpacingHalf="1.5 riadku" +DLG_Para_SpacingHalf="1,5 riadka" DLG_Para_SpacingMultiple="Nsobky" DLG_Para_SpacingSingle="Jednoduch" DLG_Para_SpecialFirstLine="Prv riadok" DLG_Para_SpecialHanging="Zavesenie" -DLG_Para_SpecialNone="(iadne)" -DLG_Para_TabLabelIndentsAndSpacing="Odsadenie a medzery" +DLG_Para_SpecialNone="(iadny)" +DLG_Para_TabLabelIndentsAndSpacing="Odsadenie a riadkovanie" DLG_Para_TabLabelLineAndPageBreaks="Zlomy riadkov a strn" DLG_Spell_AddToDict="&Pridaj do slovnka" -DLG_Spell_Change="&Zameni" -DLG_Spell_ChangeAll="Zmeni &vetko" -DLG_Spell_ChangeTo="Za&meni za:" -DLG_Spell_Ignore="&Ignorova" -DLG_Spell_IgnoreAll="I&gnorova vetky" -DLG_Spell_NoSuggestions="(iadne nvrhy)" +DLG_Spell_Change="Na&hradi" +DLG_Spell_ChangeAll="Nahradi &vdy" +DLG_Spell_ChangeTo="Z&meni na:" +DLG_Spell_Ignore="&Preskoi vdy" +DLG_Spell_IgnoreAll="Pr&eskoi vdy" +DLG_Spell_NoSuggestions="(iadne nvrhy)" DLG_Spell_SpellTitle="Preklepy" DLG_Spell_Suggestions="Nvr&hy:" -DLG_Spell_UnknownWord="Nie je v &slovnku:" +DLG_Spell_UnknownWord="Slovo nie je v &slovnku:" DLG_SplitCellsTitle="Rozdel bunky" -DLG_SplitCells_Above="Rozdeli na hornej strane" -DLG_SplitCells_Below="Rozdeli na dolnej strane" +DLG_SplitCells_Above="Rozdeli na hornej strane" +DLG_SplitCells_Below="Rozdeli na dolnej strane" DLG_SplitCells_Frame="Rozdel bunky" -DLG_SplitCells_HoriMid="Rozdeli v strede" -DLG_SplitCells_Left="Rozdeli na avej strane" -DLG_SplitCells_Right="Rozdeli na pravej strane" -DLG_SplitCells_VertMid="Rozdeli v strede" -DLG_Styles_Available="Dostupn tly" -DLG_Styles_CharPrev="Nhad na znak" +DLG_SplitCells_HoriMid="Rozdeli v strede" +DLG_SplitCells_Left="Rozdeli na avej strane" +DLG_SplitCells_Right="Rozdeli na pravej strane" +DLG_SplitCells_VertMid="Rozdeli v strede" +DLG_Styles_Available="Dostupn tly" +DLG_Styles_CharPrev="Ukka znaku" DLG_Styles_DefCurrent="Aktulne nastavenia" -DLG_Styles_DefNone="Ni" -DLG_Styles_Description="Popis" -DLG_Styles_ErrBlankName="Nzov stylu neme obsahova przdny znak vavo" -DLG_Styles_ErrNoStyle="Nie je vybran iadny tl take ani nemono iadny upravi" -DLG_Styles_ErrNotTitle1="Nzov tlu - " -DLG_Styles_ErrNotTitle2=" - Obsaden. Toto meno nemete poui. Prosm, vyberte si in " -DLG_Styles_ErrStyleBuiltin="Zabudovan tl sa ned upravi" -DLG_Styles_ErrStyleCantDelete="Tento tl sa ned zmaza" -DLG_Styles_ErrStyleNot="Tento tl neexistuje take sa ned upravi" -DLG_Styles_LBL_InUse="Pouva se" +DLG_Styles_DefNone="iadny" +DLG_Styles_Description="Vlastnosti" +DLG_Styles_ErrBlankName="Nzov tlu neme osta nevyplnen" +DLG_Styles_ErrNoStyle="Nevybrali ste iadny tl, take nemono ani iadny upravi" +DLG_Styles_ErrNotTitle1="Nzov tlu - " +DLG_Styles_ErrNotTitle2=" - Pouit. Tento nzov nemete poui. Prosm, vyberte si in. " +DLG_Styles_ErrStyleBuiltin="Zabudovan tl sa ned upravi" +DLG_Styles_ErrStyleCantDelete="Tento tl sa ned zmaza" +DLG_Styles_ErrStyleNot="Tento tl neexistuje, take sa ned upravi" +DLG_Styles_LBL_InUse="Pouva sa" DLG_Styles_LBL_TxtMsg="o Boh stvoril" -DLG_Styles_LBL_UserDefined="Uvatemi definovan tly" +DLG_Styles_LBL_UserDefined="tly vytvoren uvatemi" DLG_Styles_List="Zoznam" -DLG_Styles_Modify="Zmeni..." -DLG_Styles_ModifyAutomatic="Automatick aktualizcia" -DLG_Styles_ModifyBasedOn="Zaloen na:" +DLG_Styles_Modify="Upravi..." +DLG_Styles_ModifyAutomatic="Automaticky aktualizova" +DLG_Styles_ModifyBasedOn="Zaloen na:" DLG_Styles_ModifyCharacter="Znak" -DLG_Styles_ModifyDescription="Popis" -DLG_Styles_ModifyFollowing="tl nsledujceho odseku" +DLG_Styles_ModifyDescription="Vlastnosti" +DLG_Styles_ModifyFollowing="tl alieho odseku" DLG_Styles_ModifyFormat="Formt" DLG_Styles_ModifyLanguage="Jazyk" -DLG_Styles_ModifyName="Nzov tlu:" +DLG_Styles_ModifyName="Nzov tlu:" DLG_Styles_ModifyNumbering="slovanie" DLG_Styles_ModifyParagraph="Odsek" DLG_Styles_ModifyShortCut="Klvesov skratka" DLG_Styles_ModifyTabs="Tabultory" -DLG_Styles_ModifyTemplate="Prida do ablny" -DLG_Styles_ModifyTitle="Zmena tlov" -DLG_Styles_ModifyType="Typ tlu" +DLG_Styles_ModifyTemplate="Prida do ablny" +DLG_Styles_ModifyTitle="Zmena tlov" +DLG_Styles_ModifyType="Typ tlu" DLG_Styles_New="Nov..." -DLG_Styles_NewTitle="Nov tl" -DLG_Styles_ParaPrev="Nhad na odsek" -DLG_Styles_RemoveButton="Odstrni" -DLG_Styles_RemoveLab="Odstrni vlastnos zo tlu" -DLG_Styles_StylesLocked="Vypn vetky formtovacie prkazy okrem tlov" -DLG_Styles_StylesTitle="tly" -DLG_Stylist_FootnoteStyles="tly poznmky" -DLG_Stylist_HeadingStyles="tly nadpisov" -DLG_Stylist_ListStyles="tly pre zoznam" -DLG_Stylist_MiscStyles="alie tly" -DLG_Stylist_Styles="tly" -DLG_Stylist_Title="Zoznam tlov" -DLG_Stylist_UserStyles="Uvatemi definovan tly" -DLG_Tab_Button_Clear="Zmaza" -DLG_Tab_Button_ClearAll="Zmaza &vetko" -DLG_Tab_Button_Set="Nastavi" +DLG_Styles_NewTitle="Nov tl" +DLG_Styles_ParaPrev="Ukka odseku" +DLG_Styles_RemoveButton="Odstrni" +DLG_Styles_RemoveLab="Odstrni vlastnos zo tlu" +DLG_Styles_StylesLocked="Vypn vetky formtovacie prkazy okrem tlov" +DLG_Styles_StylesTitle="tly" +DLG_Stylist_FootnoteStyles="tly poznmky" +DLG_Stylist_HeadingStyles="tly nadpisov" +DLG_Stylist_ListStyles="tly pre zoznam" +DLG_Stylist_MiscStyles="alie tly" +DLG_Stylist_Styles="tly" +DLG_Stylist_Title="Zoznam tlov" +DLG_Stylist_UserStyles="tly vytvoren uvatemi" +DLG_Tab_Button_Clear="Zmaza" +DLG_Tab_Button_ClearAll="Zmaza &vetko" +DLG_Tab_Button_Set="Nastavi" DLG_Tab_Label_Alignment="Zarovnanie" -DLG_Tab_Label_DefaultTS="Nastaven vzdialenos tabultorov:" -DLG_Tab_Label_Existing="Uvatemi definovan tabultory" -DLG_Tab_Label_Leader="Zhlavie tabuky" -DLG_Tab_Label_New="Vloenie novho tabultora" +DLG_Tab_Label_DefaultTS="Vzdialenos tab.:" +DLG_Tab_Label_Existing="Tabultory zadan uvateom" +DLG_Tab_Label_Leader="Vodiace znaky" +DLG_Tab_Label_New="Nastavenie novho tabultora" DLG_Tab_Label_Position="Pozcia" DLG_Tab_Label_TabPosition="Pozcia tabultora:" -DLG_Tab_Label_TabToClear="Tabultory na odstrnenie:" +DLG_Tab_Label_TabToClear="Odstrni tabultory:" DLG_Tab_Radio_Bar="S iarou" DLG_Tab_Radio_Center="Na stred" DLG_Tab_Radio_Dash="&3 ----------" -DLG_Tab_Radio_Decimal="Desatinn" +DLG_Tab_Radio_Decimal="des. iarka" DLG_Tab_Radio_Dot="&2 .........." -DLG_Tab_Radio_Left="av" -DLG_Tab_Radio_NoAlign="Ni" -DLG_Tab_Radio_None="&1 iadny" -DLG_Tab_Radio_Right="Prav" -DLG_Tab_Radio_Underline="&4 __________" +DLG_Tab_Radio_Left="vavo" +DLG_Tab_Radio_NoAlign="iadny" +DLG_Tab_Radio_None="&1 iadne" +DLG_Tab_Radio_Right="vpravo" +DLG_Tab_Radio_Underline="&4 _____" DLG_Tab_TabTitle="Tabultory" -DLG_ToggleCase_FirstUpperCase="Prv psmeno vek" +DLG_ToggleCase_FirstUpperCase="Zaiaton psmen vek" DLG_ToggleCase_LowerCase="mal psmen" -DLG_ToggleCase_SentenceCase="Vek/mal psmen vo vete" -DLG_ToggleCase_Title="Zmeni mal/velk psmen" -DLG_ToggleCase_TitleCase="Mal/Vek psmen v nadpise" -DLG_ToggleCase_ToggleCase="zmeni vekos" -DLG_ToggleCase_UpperCase="VEK PSMEN" -DLG_WordCount_Auto_Update=" Automaticky pota" -DLG_WordCount_Characters_No="Znakov (bez medzier):" -DLG_WordCount_Characters_Sp="Znakov (vrtane medzier):" +DLG_ToggleCase_SentenceCase="Vek psmen vo na zaiatku vety" +DLG_ToggleCase_Title="Zmeni mal/vek psmen" +DLG_ToggleCase_TitleCase="Vek psmen" +DLG_ToggleCase_ToggleCase="zmeni mal/vek psmen" +DLG_ToggleCase_UpperCase="VEK PSMEN" +DLG_WordCount_Auto_Update="Automaticky prepotava slov" +DLG_WordCount_Characters_No="Znakov bez medzier:" +DLG_WordCount_Characters_Sp="Znakov s medzerami:" DLG_WordCount_Lines="Riadkov:" DLG_WordCount_Pages="Strn:" DLG_WordCount_Paragraphs="Odsekov:" -DLG_WordCount_Statistics="tatistika:" +DLG_WordCount_Statistics="tatistika:" DLG_WordCount_Update_Rate="Seknd medzi aktualizciami" DLG_WordCount_WordCountTitle="Poet slov" DLG_WordCount_Words="Poet slov:" -DLG_WordCount_Words_No_Notes="Poet slov (bez poznmky pod iarou a koncovej poznmky):" +DLG_WordCount_Words_No_Notes="Slov bez pozn. pod . a konc. p.:" FIELD_Application="Aplikcia" FIELD_Application_BuildId="Id vytvorenia" -FIELD_Application_CompileDate="Datum kompilcie" +FIELD_Application_CompileDate="Dtum kompilcie" FIELD_Application_CompileTime="as kompilcie" -FIELD_Application_Filename="Nzov souboru" -FIELD_Application_MailMerge="Hromadn korepondencia" -FIELD_Application_Options="Voby pre tvorbu" -FIELD_Application_Target="Cie pre tvorbu" +FIELD_Application_Filename="Nzov sboru" +FIELD_Application_MailMerge="Hromadn korepondencia" +FIELD_Application_Options="Voby pre tvorbu" +FIELD_Application_Target="Cie pre tvorbu" FIELD_DateTime_AMPM="AM/PM" FIELD_DateTime_Custom="Vlastn as/dtum" FIELD_DateTime_DDMMYY="dd/mm/yy" @@ -1077,14 +1076,14 @@ FIELD_DateTime_Wkday="Pracovn de" FIELD_Datetime_CurrentDate="Aktulny dtum" FIELD_Datetime_CurrentTime="Aktulny as" -FIELD_Document_Contributor="Prispievate" +FIELD_Document_Contributor="Prispel(-a)" FIELD_Document_Coverage="Dosah" FIELD_Document_Creator="Vytvoril" FIELD_Document_Date="Dtum" -FIELD_Document_Description="Popis" -FIELD_Document_Keywords="Kov slov" +FIELD_Document_Description="Vlastnosti" +FIELD_Document_Keywords="Kov slov" FIELD_Document_Language="Jazyk" -FIELD_Document_Publisher="Vydavate" +FIELD_Document_Publisher="Vydavate" FIELD_Document_Rights="Prva" FIELD_Document_Subject="Predmet" FIELD_Document_Title="Nzov" @@ -1097,78 +1096,76 @@ FIELD_Numbers_FootnoteReference="Odkaz na poznmku pod iarou" FIELD_Numbers_LineCount="Poet riadkov" FIELD_Numbers_ListLabel="Nzov zoznamu" -FIELD_Numbers_NbspCount="Poet znakov (bez medzier)" +FIELD_Numbers_NbspCount="Poet znakov bez medzier" FIELD_Numbers_PageNumber="slo strany" FIELD_Numbers_PageReference="Odkaz na stranu" FIELD_Numbers_PagesCount="Poet strn" FIELD_Numbers_ParaCount="Poet odsekov" FIELD_Numbers_TOCListLabel="Nadpis obsahu" FIELD_Numbers_TOCPageNumber="Strana s obsahom" -FIELD_Numbers_TableSumCols="Sta riadok tabuky" -FIELD_Numbers_TableSumRows="Sta stpec tabuky" +FIELD_Numbers_TableSumCols="Sta riadok tabuky" +FIELD_Numbers_TableSumRows="Sta stpec tabuky" FIELD_Numbers_WordCount="Poet slov" FIELD_PieceTable_MartinTest="Martinov test" FIELD_PieceTable_Test="Kevinov test" FIELD_Type_Datetime="Dtum a as" FIELD_Type_Document="Dokument" FIELD_Type_Numbers="sla" -FIELD_Type_PieceTable="Tabuka" -FirstLineIndentStatus="Odsadenie prvho iadka [%s]" +FIELD_Type_PieceTable="Tabuka" +FirstLineIndentStatus="Odsadenie prvho riadka [%s]" FooterStatus="Pta [%s]" HeaderStatus="Zhlavie [%s]" InsertModeFieldINS="INS" InsertModeFieldOVR="OVR" -LeftIndentStatus="av odsadenie [%s]" -LeftIndentTextIndentStatus="av odsadenie [%s] Odsadenie prvho iadku [%s]" -LeftMarginStatus="av okraj [%s]" -MENU_LABEL_ALIGN="&Zarovna" -MENU_LABEL_ALIGN_CENTER="&Na stred" -MENU_LABEL_ALIGN_JUSTIFY="&Do bloku" -MENU_LABEL_ALIGN_LEFT="&Vavo" -MENU_LABEL_ALIGN_RIGHT="V&pravo" -MENU_LABEL_DELETE_ANNOTATION="&Zmaza oznaen text" -MENU_LABEL_EDIT="&Upravi" -MENU_LABEL_EDIT_ANNOTATION="Upr&avi poznmku/vysvetlvku" -MENU_LABEL_EDIT_CLEAR="Od&strni" -MENU_LABEL_EDIT_COPY="&Koprova" -MENU_LABEL_EDIT_COPYEMBED="Koprova objekt" -MENU_LABEL_EDIT_COPYIMAGE="Koprova obrzok" -MENU_LABEL_EDIT_COPY_FRAME="Koprova textov rm" -MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION="Koprova u&miestnenie odkazu" -MENU_LABEL_EDIT_CUT="&Vybra" -MENU_LABEL_EDIT_CUTEMBED="Predmet" -MENU_LABEL_EDIT_CUTIMAGE="Vystrihn obrzok" -MENU_LABEL_EDIT_CUT_FRAME="Vystrihn textov rm" -MENU_LABEL_EDIT_DELETEEMBED="Odstrni objekt" -MENU_LABEL_EDIT_DELETEFRAME="Odstrni textov rmec" -MENU_LABEL_EDIT_DELETEIMAGE="Odstrni obrzok" -MENU_LABEL_EDIT_EDITFOOTER="Upravi ptu" -MENU_LABEL_EDIT_EDITHEADER="Upravit zhlavie" -MENU_LABEL_EDIT_FIND="Nj&s" +LeftIndentStatus="av odsadenie [%s]" +LeftIndentTextIndentStatus="av odsadenie [%s] Odsadenie prvho riadka [%s]" +LeftMarginStatus="av okraj [%s]" +MENU_LABEL_ALIGN="&Zarovna" +MENU_LABEL_ALIGN_CENTER="&na stred" +MENU_LABEL_ALIGN_JUSTIFY="&do bloku" +MENU_LABEL_ALIGN_LEFT="&vavo" +MENU_LABEL_ALIGN_RIGHT="v&pravo" +MENU_LABEL_EDIT="&Upravi" +MENU_LABEL_EDIT_CLEAR="Od&strni" +MENU_LABEL_EDIT_COPY="&Koprova" +MENU_LABEL_EDIT_COPYEMBED="Koprova objekt" +MENU_LABEL_EDIT_COPYIMAGE="Koprova obrzok" +MENU_LABEL_EDIT_COPY_FRAME="Koprova textov rm" +MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION="Koprova u&miestnenie odkazu" +MENU_LABEL_EDIT_CUT="&Vybra" +MENU_LABEL_EDIT_CUTEMBED="Vystrihn objekt" +MENU_LABEL_EDIT_CUTIMAGE="Vystrihn obrzok" +MENU_LABEL_EDIT_CUT_FRAME="Vystrihn textov rm" +MENU_LABEL_EDIT_DELETEEMBED="Odstrni objekt" +MENU_LABEL_EDIT_DELETEFRAME="Odstrni textov rm" +MENU_LABEL_EDIT_DELETEIMAGE="Odstrni obrzok" +MENU_LABEL_EDIT_EDITFOOTER="Upravi ptu" +MENU_LABEL_EDIT_EDITHEADER="Upravi zhlavie" +MENU_LABEL_EDIT_FIND="Nj&s" MENU_LABEL_EDIT_GOTO="&Cho na" MENU_LABEL_EDIT_LATEXEQUATION="Uprav matematick vraz" -MENU_LABEL_EDIT_PASTE="V&loi" -MENU_LABEL_EDIT_PASTE_SPECIAL="Vloi ne&formtovan" +MENU_LABEL_EDIT_PASTE="V&loi" +MENU_LABEL_EDIT_PASTE_SPECIAL="Vloi ne&formtovan" MENU_LABEL_EDIT_REDO="Z&nova" -MENU_LABEL_EDIT_REMOVEFOOTER="Odstrni ptu" -MENU_LABEL_EDIT_REMOVEHEADER="Odstrni zhlavie" -MENU_LABEL_EDIT_REPLACE="Nah&radi" -MENU_LABEL_EDIT_SELECTALL="Vybr&a vetko" -MENU_LABEL_EDIT_SELECT_FRAME="Vybra textov rm" -MENU_LABEL_EDIT_UNDO="&Sp" +MENU_LABEL_EDIT_REMOVEFOOTER="Odstrni ptu" +MENU_LABEL_EDIT_REMOVEHEADER="Odstrni zhlavie" +MENU_LABEL_EDIT_REPLACE="Nah&radi" +MENU_LABEL_EDIT_SELECTALL="Vybr&a vetko" +MENU_LABEL_EDIT_SELECT_FRAME="Vybra textov rm" +MENU_LABEL_EDIT_UNDO="&Sp" MENU_LABEL_FILE="&Sbor" -MENU_LABEL_FILE_CLOSE="&Zavrie" +MENU_LABEL_FILE_CLOSE="&Zatvori" MENU_LABEL_FILE_EXIT="&Koniec" -MENU_LABEL_FILE_EXPORT="&Uloi kpiu" -MENU_LABEL_FILE_IMPORT="Otvori kp&iu" -MENU_LABEL_FILE_IMPORTSTYLES="&Importovat tly" +MENU_LABEL_FILE_EXPORT="&Uloi kpiu" +MENU_LABEL_FILE_IMPORT="Otvori kp&iu" +MENU_LABEL_FILE_IMPORTSTYLES="&Importova tly" MENU_LABEL_FILE_NEW="&Nov" -MENU_LABEL_FILE_NEW_USING_TEMPLATE="Nov pomocou a&blny" -MENU_LABEL_FILE_OPEN="&Otvori" +MENU_LABEL_FILE_NEW_USING_TEMPLATE="Vytvori nov pomocou a&blny" +MENU_LABEL_FILE_OPEN="&Otvori" MENU_LABEL_FILE_PAGESETUP="Na&stavenia strany" MENU_LABEL_FILE_PRINT="&Tla" -MENU_LABEL_FILE_PRINT_DIRECTLY="&Tlai hne" -MENU_LABEL_FILE_PRINT_PREVIEW="Nhad pre &tla" +MENU_LABEL_FILE_PRINT_DIRECTLY="&Tlai ihne" +MENU_LABEL_FILE_PRINT_PREVIEW="Ukka pre &tla" MENU_LABEL_FILE_PROPERTIES="&Vlastnosti" MENU_LABEL_FILE_RECENT="Pos&ledn sbory" MENU_LABEL_FILE_RECENT_1="&1 %s" @@ -1180,69 +1177,69 @@ MENU_LABEL_FILE_RECENT_7="&7 %s" MENU_LABEL_FILE_RECENT_8="&8 %s" MENU_LABEL_FILE_RECENT_9="&9 %s" -MENU_LABEL_FILE_REVERT="&Vrti se nasp" -MENU_LABEL_FILE_SAVE="&Uloi" -MENU_LABEL_FILE_SAVEAS="Uloi &ako" -MENU_LABEL_FILE_SAVEEMBED="Uloi sbor ako" -MENU_LABEL_FILE_SAVEIMAGE="Uloi obrzok &ako" -MENU_LABEL_FILE_SAVE_TEMPLATE="Uloi a&blnu" +MENU_LABEL_FILE_REVERT="&Vrti sa sp" +MENU_LABEL_FILE_SAVE="&Uloi" +MENU_LABEL_FILE_SAVEAS="Uloi &ako" +MENU_LABEL_FILE_SAVEEMBED="Uloi sbor ako" +MENU_LABEL_FILE_SAVEIMAGE="Uloi obrzok &ako" +MENU_LABEL_FILE_SAVE_TEMPLATE="Uloi a&blnu" MENU_LABEL_FMT="Formtovanie te&xtu" MENU_LABEL_FMT_BACKGROUND="Pozadie strany" MENU_LABEL_FMT_BACKGROUND_PAGE_COLOR="Fa&rba strany" -MENU_LABEL_FMT_BACKGROUND_PAGE_IMAGE="Obrzok pre stranu" -MENU_LABEL_FMT_BOLD="&Tun" -MENU_LABEL_FMT_BORDERS="Okraje a tienovanie" -MENU_LABEL_FMT_BULLETS="O&drky a slovanie" +MENU_LABEL_FMT_BACKGROUND_PAGE_IMAGE="vybra obrzok ako pozadie strany" +MENU_LABEL_FMT_BOLD="&tun" +MENU_LABEL_FMT_BORDERS="Okraje a tieovanie" +MENU_LABEL_FMT_BULLETS="O&drky a slovanie" MENU_LABEL_FMT_COLUMNS="&Stpce" -MENU_LABEL_FMT_DIRECTION="&Obojsmernos" -MENU_LABEL_FMT_DIRECTION_DD_RTL="RTL &Odsek" -MENU_LABEL_FMT_DIRECTION_DOCD_RTL="&Dokument" -MENU_LABEL_FMT_DIRECTION_DO_LTR="Text z zava doprava" -MENU_LABEL_FMT_DIRECTION_DO_RTL="Text sp&rava doava" -MENU_LABEL_FMT_DIRECTION_SD_RTL="Vber" +MENU_LABEL_FMT_DIRECTION="&Smer textu" +MENU_LABEL_FMT_DIRECTION_DD_RTL="&odsek sprava doava" +MENU_LABEL_FMT_DIRECTION_DOCD_RTL="&dokument" +MENU_LABEL_FMT_DIRECTION_DO_LTR="text &zava doprava" +MENU_LABEL_FMT_DIRECTION_DO_RTL="text sp&rava doava" +MENU_LABEL_FMT_DIRECTION_SD_RTL="&Vber" MENU_LABEL_FMT_DOCUMENT="&Dokument" -MENU_LABEL_FMT_EMBED="Formt tabuky" +MENU_LABEL_FMT_EMBED="Formt tabuky" MENU_LABEL_FMT_FONT="&Psmo" -MENU_LABEL_FMT_FOOTNOTES="Poznmka pod iarou a koncov poznmka" +MENU_LABEL_FMT_FOOTNOTES="Poznmky pod iarou a koncov poznmky" MENU_LABEL_FMT_FRAME="Textov rm" MENU_LABEL_FMT_HDRFTR="Zhlavie/pta" -MENU_LABEL_FMT_IMAGE="&Obrzok" -MENU_LABEL_FMT_ITALIC="&Kurzva" -MENU_LABEL_FMT_LANGUAGE="Nastavi &jazyk" -MENU_LABEL_FMT_OVERLINE="P&od iarou" -MENU_LABEL_FMT_PARAGRAPH="&Odsek" -MENU_LABEL_FMT_POSIMAGE="&Obrzok" -MENU_LABEL_FMT_SETPOSIMAGE="Automaticky umiestni obrzok na stranu" -MENU_LABEL_FMT_STRIKE="Prekrt&nutie" -MENU_LABEL_FMT_STYLE="t&l" -MENU_LABEL_FMT_STYLE_DEFINE="&Vytvori a upravova tly" -MENU_LABEL_FMT_STYLIST="ty&lista" -MENU_LABEL_FMT_SUBSCRIPT="&Doln index" -MENU_LABEL_FMT_SUPERSCRIPT="Ho&rn index" +MENU_LABEL_FMT_IMAGE="O&brzok" +MENU_LABEL_FMT_ITALIC="&kurzva" +MENU_LABEL_FMT_LANGUAGE="Nastavi &jazyk" +MENU_LABEL_FMT_OVERLINE="i&ara nad" +MENU_LABEL_FMT_PARAGRAPH="Od&sek" +MENU_LABEL_FMT_POSIMAGE="O&brzok" +MENU_LABEL_FMT_SETPOSIMAGE="Automaticky vloi obrzok" +MENU_LABEL_FMT_STRIKE="Prekrt&nut" +MENU_LABEL_FMT_STYLE="t&l" +MENU_LABEL_FMT_STYLE_DEFINE="&Vytvori a upravova tly" +MENU_LABEL_FMT_STYLIST="&Zoznam tlov" +MENU_LABEL_FMT_SUBSCRIPT="&doln index" +MENU_LABEL_FMT_SUPERSCRIPT="ho&rn index" MENU_LABEL_FMT_TABLEOFCONTENTS="Obsah" MENU_LABEL_FMT_TABS="&Tabultory" -MENU_LABEL_FMT_TOGGLECASE="Z&meni mal/vek psmen" -MENU_LABEL_FMT_UNDERLINE="&Podtiarknutie" +MENU_LABEL_FMT_TOGGLECASE="Z&meni mal/vek psmen" +MENU_LABEL_FMT_UNDERLINE="&podiarknut" MENU_LABEL_FORMAT="F&ormt" -MENU_LABEL_GOTO_ANNOTATION="&Cho na anotciu" MENU_LABEL_HELP="&Npoveda" MENU_LABEL_HELP_ABOUT="O programe &%s" MENU_LABEL_HELP_ABOUT_GNOMEOFFICE="O G&NOME Office" -MENU_LABEL_HELP_CHECKVER="&Vyhada akutualizcie" +MENU_LABEL_HELP_CHECKVER="&Vyhada akutualizcie" MENU_LABEL_HELP_CONTENTS="&Obsah npovedy" -MENU_LABEL_HELP_CREDITS="Spo&lupracovali" -MENU_LABEL_HELP_INDEX="&vod npovedy" -MENU_LABEL_HELP_REPORT_BUG="Nahlsi &chybu" -MENU_LABEL_HELP_SEARCH="&Hada v npovede" -MENU_LABEL_INSERT_BOOKMARK="Zlo&ka" +MENU_LABEL_HELP_CREDITS="Spo&lupracoval(-i)" +MENU_LABEL_HELP_INDEX="&vod k npovede" +MENU_LABEL_HELP_REPORT_BUG="Nahlsi &chybu" +MENU_LABEL_HELP_SEARCH="&Hada v npovede" +MENU_LABEL_INSERT_ANNOTATION="Odsadenie" +MENU_LABEL_INSERT_BOOKMARK="Zlo&ka" MENU_LABEL_INSERT_BREAK="&Zlom" MENU_LABEL_INSERT_CLIPART="&Clip Art" MENU_LABEL_INSERT_DATETIME="&Dtum a as" -MENU_LABEL_INSERT_DELETE_HYPERLINK="Z&mazat odkaz" -MENU_LABEL_INSERT_DIRECTIONMARKER="&Smerov znaka" -MENU_LABEL_INSERT_DIRECTIONMARKER_LRM="&LRM" -MENU_LABEL_INSERT_DIRECTIONMARKER_RLM="&RLM" -MENU_LABEL_INSERT_EDIT_HYPERLINK="U&pravi hypertextov odkaz" +MENU_LABEL_INSERT_DELETE_HYPERLINK="Z&maza odkaz" +MENU_LABEL_INSERT_DIRECTIONMARKER="Znaku &pre smer textu" +MENU_LABEL_INSERT_DIRECTIONMARKER_LRM="&zava doprava" +MENU_LABEL_INSERT_DIRECTIONMARKER_RLM="&sprava doava" +MENU_LABEL_INSERT_EDIT_HYPERLINK="U&pravi hypertextov odkaz" MENU_LABEL_INSERT_ENDNOTE="&Koncov poznmka" MENU_LABEL_INSERT_EQUATION="Matematick vraz" MENU_LABEL_INSERT_EQUATION_FILE="Zo sboru" @@ -1251,18 +1248,18 @@ MENU_LABEL_INSERT_FILE="&Sbor" MENU_LABEL_INSERT_FOOTER="Pta" MENU_LABEL_INSERT_FOOTNOTE="&Poznmka pod iarou" -MENU_LABEL_INSERT_GOTO_HYPERLINK="P&rejs na odkaz" +MENU_LABEL_INSERT_GOTO_HYPERLINK="P&rejs na odkaz" MENU_LABEL_INSERT_GRAPHIC="O&brzok" MENU_LABEL_INSERT_HEADER="Zhlavie" MENU_LABEL_INSERT_HYPERLINK="Hypertextov &odkaz" -MENU_LABEL_INSERT_MAILMERGE="Pole &hromadnej korepondencie" +MENU_LABEL_INSERT_MAILMERGE="Pole &hromadnej korepondencie" MENU_LABEL_INSERT_PAGENO="s&la strn" MENU_LABEL_INSERT_SYMBOL="&Symbol" MENU_LABEL_INSERT_TABLEOFCONTENTS="Obsah" MENU_LABEL_INSERT_TEXTBOX="Textov rm" -MENU_LABEL_OPEN_TEMPLATE="Otvori ablnu" +MENU_LABEL_OPEN_TEMPLATE="Otvori ablnu" MENU_LABEL_SPELL_ADD="&Pridaj do slovnka" -MENU_LABEL_SPELL_IGNOREALL="&Ignorovat vetko" +MENU_LABEL_SPELL_IGNOREALL="Pr&eskoi vdy" MENU_LABEL_SPELL_SUGGEST_1="%s" MENU_LABEL_SPELL_SUGGEST_2="%s" MENU_LABEL_SPELL_SUGGEST_3="%s" @@ -1272,113 +1269,109 @@ MENU_LABEL_SPELL_SUGGEST_7="%s" MENU_LABEL_SPELL_SUGGEST_8="%s" MENU_LABEL_SPELL_SUGGEST_9="%s" -MENU_LABEL_TABLE="T&abuka" -MENU_LABEL_TABLE_AUTOFIT="&Automaticky prispsobi tabuku" -MENU_LABEL_TABLE_DELETE="Z&maza" -MENU_LABEL_TABLE_DELETECOLUMN="Odstrni &stpec" -MENU_LABEL_TABLE_DELETEROW="Odstrni ria&dok" -MENU_LABEL_TABLE_DELETETABLE="Odstrni ta&buku" -MENU_LABEL_TABLE_DELETE_CELLS="B&unky" -MENU_LABEL_TABLE_DELETE_COLUMNS="&Stpec" -MENU_LABEL_TABLE_DELETE_ROWS="R&iadok" -MENU_LABEL_TABLE_DELETE_TABLE="&Tabuka" -MENU_LABEL_TABLE_FORMAT="&Formt tabuky" -MENU_LABEL_TABLE_HEADING_ROWS_REPEAT="Opakovat riadok ako nadpis" -MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE="Odstrni riadok ako nadpis" -MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS="Nastavi riadok ako nadpis" -MENU_LABEL_TABLE_INSERTCOLUMN="Vloi st&pce" -MENU_LABEL_TABLE_INSERTROW="Vloi ria&dky" -MENU_LABEL_TABLE_INSERTTABLE="Vloi &tabuku" -MENU_LABEL_TABLE_INSERT_CELLS="B&unky" -MENU_LABEL_TABLE_INSERT_COLUMNS_AFTER="Stpcov do&prava" -MENU_LABEL_TABLE_INSERT_COLUMNS_BEFORE="Stpcov do&ava" -MENU_LABEL_TABLE_INSERT_ROWS_AFTER="Riadky &za" -MENU_LABEL_TABLE_INSERT_ROWS_BEFORE="dky &pred" -MENU_LABEL_TABLE_INSERT_SUMCOLS="Set riadka" -MENU_LABEL_TABLE_INSERT_SUMROWS="Set stpca" -MENU_LABEL_TABLE_INSERT_TABLE="&Tabuka" -MENU_LABEL_TABLE_MERGE_CELLS="S&poji bunky" +MENU_LABEL_TABLE="T&abuka" +MENU_LABEL_TABLE_AUTOFIT="&Automaticky prispsobi tabuku" +MENU_LABEL_TABLE_DELETE="Z&maza" +MENU_LABEL_TABLE_DELETECOLUMN="Odstrni &stpec" +MENU_LABEL_TABLE_DELETEROW="Odstrni ria&dok" +MENU_LABEL_TABLE_DELETETABLE="Odstrni ta&buku" +MENU_LABEL_TABLE_DELETE_CELLS="b&unky" +MENU_LABEL_TABLE_DELETE_COLUMNS="&stpec" +MENU_LABEL_TABLE_DELETE_ROWS="r&iadok" +MENU_LABEL_TABLE_DELETE_TABLE="&tabuku" +MENU_LABEL_TABLE_FORMAT="&Formt tabuky" +MENU_LABEL_TABLE_HEADING_ROWS_REPEAT="Opakova riadok ako nadpis" +MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE="Odstrni riadok ako nadpis" +MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS="Nastavi riadok ako nadpis" +MENU_LABEL_TABLE_INSERTCOLUMN="Vloi st&pce" +MENU_LABEL_TABLE_INSERTROW="Vloi ria&dky" +MENU_LABEL_TABLE_INSERTTABLE="Vloi &tabuku" +MENU_LABEL_TABLE_INSERT_CELLS="b&unky" +MENU_LABEL_TABLE_INSERT_COLUMNS_AFTER="stpce v&pravo" +MENU_LABEL_TABLE_INSERT_COLUMNS_BEFORE="stpce v&avo" +MENU_LABEL_TABLE_INSERT_ROWS_AFTER="Riadky &pod" +MENU_LABEL_TABLE_INSERT_ROWS_BEFORE="Riadky &nad" +MENU_LABEL_TABLE_INSERT_SUMCOLS="Sta riadok" +MENU_LABEL_TABLE_INSERT_SUMROWS="Sta stpec" +MENU_LABEL_TABLE_INSERT_TABLE="&tabuku" +MENU_LABEL_TABLE_MERGE_CELLS="S&poji bunky" MENU_LABEL_TABLE_SELECT="&Ozna" -MENU_LABEL_TABLE_SELECT_CELL="&Bunka" -MENU_LABEL_TABLE_SELECT_COLUMN="S&tpcov" -MENU_LABEL_TABLE_SELECT_ROW="R&iadok" -MENU_LABEL_TABLE_SELECT_TABLE="&Tabuka" -MENU_LABEL_TABLE_SORT="&Zoradi tabulku" -MENU_LABEL_TABLE_SORTCOLSASCEND="Zoradi stpce vzostupne" -MENU_LABEL_TABLE_SORTCOLSDESCEND="Zoradi stpce zostupne" -MENU_LABEL_TABLE_SORTROWSASCEND="Zoradi riadky vzostupne" -MENU_LABEL_TABLE_SORTROWSDESCEND="Zoradi riadky zostupne" -MENU_LABEL_TABLE_SPLIT_CELLS="S&poji bunky" -MENU_LABEL_TABLE_SPLIT_TABLE="Rozdel&i tabuku" -MENU_LABEL_TABLE_TABLETOTEXT="Zmeni tabuku na text" -MENU_LABEL_TABLE_TABLETOTEXTCOMMAS="Oddeli iarkou" -MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS="Oddeli iarkou a tabultormi" -MENU_LABEL_TABLE_TABLETOTEXTTABS="Oddeli tabultormi" -MENU_LABEL_TABLE_TEXTTOTABLE="Zmeni text na tabuku" -MENU_LABEL_TABLE_TEXTTOTABLE_ALL="Rozdli text na medzery, iarky alebo tabultory." -MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES="Rozdeli text na iarky alebo tabultory" +MENU_LABEL_TABLE_SELECT_CELL="&bunku" +MENU_LABEL_TABLE_SELECT_COLUMN="s&tpec" +MENU_LABEL_TABLE_SELECT_ROW="r&iadok" +MENU_LABEL_TABLE_SELECT_TABLE="&tabuku" +MENU_LABEL_TABLE_SORT="&Zoradi tabuku" +MENU_LABEL_TABLE_SORTCOLSASCEND="Zoradi stpce vzostupne" +MENU_LABEL_TABLE_SORTCOLSDESCEND="Zoradi stpce zostupne" +MENU_LABEL_TABLE_SORTROWSASCEND="Zoradi riadky vzostupne" +MENU_LABEL_TABLE_SORTROWSDESCEND="Zoradi riadky zostupne" +MENU_LABEL_TABLE_SPLIT_CELLS="R&ozdeli bunky" +MENU_LABEL_TABLE_SPLIT_TABLE="Rozdel&i tabuku" +MENU_LABEL_TABLE_TABLETOTEXT="Zmeni tabuku na text" +MENU_LABEL_TABLE_TABLETOTEXTCOMMAS="oddeli iarkami" +MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS="oddeli iarkami a tabultormi" +MENU_LABEL_TABLE_TABLETOTEXTTABS="oddeli tabultormi" +MENU_LABEL_TABLE_TEXTTOTABLE="Zmeni text na tabuku" +MENU_LABEL_TABLE_TEXTTOTABLE_ALL="Rozdeli text pri medzerch, iarkch alebo tabultoroch." +MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES="Rozdeli text na iarkami alebo tabultory" MENU_LABEL_TOOLS="&Nstroje" -MENU_LABEL_TOOLS_ANNOTATIONS="Odsadenie" -MENU_LABEL_TOOLS_ANNOTATIONS_INSERT="Odsadenie" -MENU_LABEL_TOOLS_ANNOTATIONS_INSERT_FROMSEL="Odstrni oznaen as" -MENU_LABEL_TOOLS_ANNOTATIONS_TOGGLE_DISPLAY="&Zobrazi stavov litu" -MENU_LABEL_TOOLS_AUTOSPELL="&Automaticky kontrolova pravopis" +MENU_LABEL_TOOLS_AUTOSPELL="&Automaticky kontrolova preklepy" MENU_LABEL_TOOLS_HISTORY="&Histria dokumentu" -MENU_LABEL_TOOLS_HISTORY_PURGE="&Vyma histriu" -MENU_LABEL_TOOLS_HISTORY_SHOW="Zobrazi &histriu" +MENU_LABEL_TOOLS_HISTORY_PURGE="&vyma histriu" +MENU_LABEL_TOOLS_HISTORY_SHOW="zobrazi &histriu" MENU_LABEL_TOOLS_LANGUAGE="&Jazyk" -MENU_LABEL_TOOLS_MAILMERGE="&Hromadn korepondencia" -MENU_LABEL_TOOLS_OPTIONS="Pred&voby" +MENU_LABEL_TOOLS_MAILMERGE="&Hromadn korepondencia" +MENU_LABEL_TOOLS_OPTIONS="Na&stavenia" MENU_LABEL_TOOLS_PLUGINS="&Moduly" -MENU_LABEL_TOOLS_REVISIONS="&Zmeny v texte" -MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION="&Prija zmenu v texte" -MENU_LABEL_TOOLS_REVISIONS_AUTO="Spravova &cel histriu" -MENU_LABEL_TOOLS_REVISIONS_COMPARE_DOCUMENTS="Po&rovna dokumenty" -MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT="Njs &aliu zmenu" -MENU_LABEL_TOOLS_REVISIONS_FIND_PREV="Njs &predchdzajcu zmenu" -MENU_LABEL_TOOLS_REVISIONS_MARK="&Oznaova zmeny v texte poas psania" -MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION="Zaznamena n&ov zmenu v texte" -MENU_LABEL_TOOLS_REVISIONS_PURGE="Vy&maza zmeny textu" -MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION="&Odmietnu zmenu v texte" -MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL="Vybra &zmenu v texte zo zoznamu" -MENU_LABEL_TOOLS_REVISIONS_SHOW="Zobrazi &revzie" -MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER="Zobrazi dokument p&o zmench v texte" -MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV="Zobrazi dokument po pre&dchdzajcich zmench textu" -MENU_LABEL_TOOLS_REVISIONS_SHOW_BEFORE="Zobrazi dokument &pred zmenami v texte" +MENU_LABEL_TOOLS_REVISIONS="Z&meny v texte (revzie)" +MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION="&Prija zmenu v texte" +MENU_LABEL_TOOLS_REVISIONS_AUTO="uklada &cel histriu" +MENU_LABEL_TOOLS_REVISIONS_COMPARE_DOCUMENTS="po&rovna dokumenty" +MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT="njs &aliu zmenu" +MENU_LABEL_TOOLS_REVISIONS_FIND_PREV="njs &predchdzajcu zmenu" +MENU_LABEL_TOOLS_REVISIONS_MARK="&oznaova zmeny v texte poas psania" +MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION="Zaznamena n&ov zmenu v texte" +MENU_LABEL_TOOLS_REVISIONS_PURGE="Vy&maza zmeny textu" +MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION="&odmietnu zmenu v texte" +MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL="Vybra &zmenu v texte zo zoznamu" +MENU_LABEL_TOOLS_REVISIONS_SHOW="zobrazi &zmeny textu" +MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER="zobrazi dokument &po zmench v texte" +MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV="zobrazi dokument po pre&dchdzajcich zmench textu" +MENU_LABEL_TOOLS_REVISIONS_SHOW_BEFORE="zobrazi dokument &pred zmenami v texte" MENU_LABEL_TOOLS_SCRIPTS="S&kripty" -MENU_LABEL_TOOLS_SPELL="&Skontrolova preklepy" +MENU_LABEL_TOOLS_SPELL="&Skontrolova preklepy" MENU_LABEL_TOOLS_SPELLING="&Kontrola preklepov" -MENU_LABEL_TOOLS_SPELLPREFS="V&oby kontroly preklepov" +MENU_LABEL_TOOLS_SPELLPREFS="V&oby kontroly preklepov" MENU_LABEL_TOOLS_WORDCOUNT="Poet &slov" -MENU_LABEL_TOOLTIP_INSERT_EQUATION="Vloi matematick vraz" -MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE="Vlo MathML zo sboru" -MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX="Vloi matematick vraz z vrazu programu Latex" -MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT="Zm&eni na pvodn rozmiestnenie" +MENU_LABEL_TOOLTIP_INSERT_EQUATION="Vloi matematick vraz" +MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE="Vlo MathML zo sboru" +MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX="Vloi matematick vraz z vrazu programu Latex" +MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT="Zm&eni na pvodn rozmiestnenie" MENU_LABEL_VIEW_FULLSCREEN="&Cel obrazovka" MENU_LABEL_VIEW_HEADFOOT="&Zhlavie a pta" -MENU_LABEL_VIEW_LOCKSTYLES="Do&voli nstroje na pravu textu" -MENU_LABEL_VIEW_LOCK_TB_LAYOUT="Zamkn &rozmiestnenie" +MENU_LABEL_VIEW_LOCKSTYLES="Do&voli nstroje na pravu textu" +MENU_LABEL_VIEW_LOCK_TB_LAYOUT="Zamkn &rozmiestnenie" MENU_LABEL_VIEW_NORMAL="&Normlne rozmiestnenie" -MENU_LABEL_VIEW_PRINT="&Rozmiestnenie pre tla" -MENU_LABEL_VIEW_RULER="Zobrazi &pravtko" -MENU_LABEL_VIEW_SHOWPARA="Zobrazi for&mtovacie znaky" -MENU_LABEL_VIEW_STATUSBAR="&Zobrazi stavov litu" +MENU_LABEL_VIEW_PRINT="Zob&razenie pre tla" +MENU_LABEL_VIEW_RULER="Zobrazi &pravtko" +MENU_LABEL_VIEW_SHOWPARA="Zobrazi for&mtovacie znaky" +MENU_LABEL_VIEW_STATUSBAR="&Zobrazi stavov panel" MENU_LABEL_VIEW_TB_1="&1 %s" MENU_LABEL_VIEW_TB_2="&2 %s" MENU_LABEL_VIEW_TB_3="&3 %s" MENU_LABEL_VIEW_TB_4="&4 %s" MENU_LABEL_VIEW_TOOLBARS="Z&oznam nstrojov" -MENU_LABEL_VIEW_WEB="Roz&miestnenie pre web" +MENU_LABEL_VIEW_WEB="Zobrazenie pre &web" MENU_LABEL_VIEW_ZOOM="&Lupa" -MENU_LABEL_VIEW_ZOOM_100="Zvi na &100%" -MENU_LABEL_VIEW_ZOOM_200="Zvi na &200%" -MENU_LABEL_VIEW_ZOOM_50="Zvi na &50%" -MENU_LABEL_VIEW_ZOOM_75="Zvi na &75%" +MENU_LABEL_VIEW_ZOOM_100="zvi na &100%" +MENU_LABEL_VIEW_ZOOM_200="zvi na &200%" +MENU_LABEL_VIEW_ZOOM_50="zvi na &50%" +MENU_LABEL_VIEW_ZOOM_75="zvi na &75%" MENU_LABEL_VIEW_ZOOM_MENU="&Lupa" -MENU_LABEL_VIEW_ZOOM_WHOLE="&Cel strana" -MENU_LABEL_VIEW_ZOOM_WIDTH="rku s&trany" -MENU_LABEL_WEB_SAVEASWEB="Uloi &webov strnku" -MENU_LABEL_WEB_WEBPREVIEW="V okne &webovho prehliadaa" +MENU_LABEL_VIEW_ZOOM_WHOLE="&Cel strana/1 okno" +MENU_LABEL_VIEW_ZOOM_WIDTH="Na rku o&brazovky" +MENU_LABEL_WEB_SAVEASWEB="Uloi &webov strnku" +MENU_LABEL_WEB_WEBPREVIEW="V okne &webovho prehadvaa" MENU_LABEL_WINDOW="&Dokumenty" MENU_LABEL_WINDOW_1="&1 %s" MENU_LABEL_WINDOW_2="&2 %s" @@ -1394,53 +1387,51 @@ MENU_LABEL__BOGUS1__=" " MENU_LABEL__BOGUS2__=" " MENU_STATUSLINE_ALIGN=" " -MENU_STATUSLINE_ALIGN_CENTER="Zarovnanie odseku na stred" -MENU_STATUSLINE_ALIGN_JUSTIFY="Zarovnn odseku do bloku" -MENU_STATUSLINE_ALIGN_LEFT="Zarovnanie odseku doava" -MENU_STATUSLINE_ALIGN_RIGHT="Zarovnn odseku napravo" -MENU_STATUSLINE_DELETE_ANNOTATION="Odstrni oznaenou oblast" +MENU_STATUSLINE_ALIGN_CENTER="Zarovn odsek na stred" +MENU_STATUSLINE_ALIGN_JUSTIFY="Zarovn odseku do bloku" +MENU_STATUSLINE_ALIGN_LEFT="Zarovnan odsek doava" +MENU_STATUSLINE_ALIGN_RIGHT="Zarovn odsek doprava" MENU_STATUSLINE_EDIT=" " -MENU_STATUSLINE_EDIT_ANNOTATION="Uprav odsadenie" -MENU_STATUSLINE_EDIT_CLEAR="Odstrni oznaen as" -MENU_STATUSLINE_EDIT_COPY="Skopruje oznaen asti do schrnky" -MENU_STATUSLINE_EDIT_COPYEMBED="Vloit zabudovan objekt" -MENU_STATUSLINE_EDIT_COPYIMAGE="Ulo kpiu obrzku do schrnky" -MENU_STATUSLINE_EDIT_COPY_FRAME="Zkopruje textov rm do schrnky" -MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION="Koprova hypertextov odkaz" -MENU_STATUSLINE_EDIT_CUT="Presunie oznaen asti do schrnky" -MENU_STATUSLINE_EDIT_CUTEMBED="Vloi zabudovan objekt" -MENU_STATUSLINE_EDIT_CUTIMAGE="Odstrni obrzok a ulo ho do schrnky" +MENU_STATUSLINE_EDIT_CLEAR="Odstrni oznaen text" +MENU_STATUSLINE_EDIT_COPY="Skopruje oznaen text do schrnky" +MENU_STATUSLINE_EDIT_COPYEMBED="Skopruje objekt vloen z inho programu do schrnky" +MENU_STATUSLINE_EDIT_COPYIMAGE="Ulo kpiu obrzka do schrnky" +MENU_STATUSLINE_EDIT_COPY_FRAME="Skopruje textov rm do schrnky" +MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION="Skopruje hypertextov odkaz" +MENU_STATUSLINE_EDIT_CUT="Presunie oznaen text do schrnky" +MENU_STATUSLINE_EDIT_CUTEMBED="Skopruje objekt vloen z inho programu a odstrni ho z dokumentu" +MENU_STATUSLINE_EDIT_CUTIMAGE="Odstrni obrzok a ulo ho do schrnky" MENU_STATUSLINE_EDIT_CUT_FRAME="Skopruje textov rm do schrnky a odstrni ho z dokumentu" -MENU_STATUSLINE_EDIT_DELETEEMBED="Vloi zabudovan objekt" +MENU_STATUSLINE_EDIT_DELETEEMBED="Odstrni objekt z inho programu" MENU_STATUSLINE_EDIT_DELETEFRAME="Odstrni textov rm z dokumentu" MENU_STATUSLINE_EDIT_DELETEIMAGE="Odstrni obrzok z dokumentu" -MENU_STATUSLINE_EDIT_EDITFOOTER="Uprav ptu na aktulnej strane" -MENU_STATUSLINE_EDIT_EDITHEADER="Uprav zhlavie na aktulnej strane" -MENU_STATUSLINE_EDIT_FIND="Njs urit text" -MENU_STATUSLINE_EDIT_GOTO="Presun kurzoru na poadovan stranu" +MENU_STATUSLINE_EDIT_EDITFOOTER="Uprav ptu na tejto strane" +MENU_STATUSLINE_EDIT_EDITHEADER="Uprav zhlavie na tento strane" +MENU_STATUSLINE_EDIT_FIND="Njs urit text" +MENU_STATUSLINE_EDIT_GOTO="Presun kurzoru na poadovan stranu" MENU_STATUSLINE_EDIT_LATEXEQUATION="Matematick vraz programu Latex" -MENU_STATUSLINE_EDIT_PASTE="Vlo obsah schrnky" -MENU_STATUSLINE_EDIT_PASTE_SPECIAL="Vlo neupraven obsah schrnky" +MENU_STATUSLINE_EDIT_PASTE="Vlo obsah schrnky" +MENU_STATUSLINE_EDIT_PASTE_SPECIAL="Vlo neupraven obsah schrnky" MENU_STATUSLINE_EDIT_REDO="Znovu vykon odvolan pravu" MENU_STATUSLINE_EDIT_REMOVEFOOTER="Odstrni ptu na tejto strane " MENU_STATUSLINE_EDIT_REMOVEHEADER="Odstrni z dokumentu zhlavie na tejto strane" MENU_STATUSLINE_EDIT_REPLACE="Nahrad urit text inm" -MENU_STATUSLINE_EDIT_SELECTALL="Vybere cel dokument" -MENU_STATUSLINE_EDIT_SELECT_FRAME="Vybere textov rm" -MENU_STATUSLINE_EDIT_UNDO="Sp pravy" +MENU_STATUSLINE_EDIT_SELECTALL="Vyberie cel dokument" +MENU_STATUSLINE_EDIT_SELECT_FRAME="Vyberie textov rm" +MENU_STATUSLINE_EDIT_UNDO="Sp pravy" MENU_STATUSLINE_FILE=" " -MENU_STATUSLINE_FILE_CLOSE="Zavrie dokument" -MENU_STATUSLINE_FILE_EXIT="Zavre vetky okna a ukon aplikciu" -MENU_STATUSLINE_FILE_EXPORT="Ulo dokument bezo zmeny nzvu" -MENU_STATUSLINE_FILE_IMPORT="Otvore dokument vytvorenm kpie" -MENU_STATUSLINE_FILE_IMPORTSTYLES="Vykon prevod definci tlov z dokumentu" -MENU_STATUSLINE_FILE_NEW="Vytvor nov dokument" +MENU_STATUSLINE_FILE_CLOSE="Zatvor tento dokument" +MENU_STATUSLINE_FILE_EXIT="Zatvor vetky okna a ukon program" +MENU_STATUSLINE_FILE_EXPORT="Ulo dokument bezo zmeny nzvu" +MENU_STATUSLINE_FILE_IMPORT="Otvor dokument vytvorenm kpie" +MENU_STATUSLINE_FILE_IMPORTSTYLES="Vykon prevod definci tlov z dokumentu" +MENU_STATUSLINE_FILE_NEW="Vytvorte nov dokument" MENU_STATUSLINE_FILE_NEW_USING_TEMPLATE="Vytvor nov dokument zo ablny" -MENU_STATUSLINE_FILE_OPEN="Otvori existujc dokument" +MENU_STATUSLINE_FILE_OPEN="Otvori existujci dokument" MENU_STATUSLINE_FILE_PAGESETUP="Zmen nastavenie tlae" MENU_STATUSLINE_FILE_PRINT="Vytla cel dokument" MENU_STATUSLINE_FILE_PRINT_DIRECTLY="Vytla cez vntorn PS ovlada" -MENU_STATUSLINE_FILE_PRINT_PREVIEW="Nhad na dokument pred tlaou" +MENU_STATUSLINE_FILE_PRINT_PREVIEW="Uke dokument pred tlaou" MENU_STATUSLINE_FILE_PROPERTIES="Nastav vlastnosti pre meta-data" MENU_STATUSLINE_FILE_RECENT="Otvorte naposledy otvoren dokument" MENU_STATUSLINE_FILE_RECENT_1="Otvor tento dokument" @@ -1452,166 +1443,163 @@ MENU_STATUSLINE_FILE_RECENT_7="Otvor tento dokument" MENU_STATUSLINE_FILE_RECENT_8="Otvor tento dokument" MENU_STATUSLINE_FILE_RECENT_9="Otvor tento dokument" -MENU_STATUSLINE_FILE_REVERT="Vrti sbor do stavu po poslednom uloen" -MENU_STATUSLINE_FILE_SAVE="Ulo dokument" -MENU_STATUSLINE_FILE_SAVEAS="Uloi dokument pod inm nzvom" -MENU_STATUSLINE_FILE_SAVEEMBED="Vloi zabudovan objekt" -MENU_STATUSLINE_FILE_SAVEIMAGE="Ulo vybran obrzok do sboru" -MENU_STATUSLINE_FILE_SAVE_TEMPLATE="Ulo dokument ako ablnu" +MENU_STATUSLINE_FILE_REVERT="Vrti sbor do stavu po poslednom uloen" +MENU_STATUSLINE_FILE_SAVE="Ulo dokument" +MENU_STATUSLINE_FILE_SAVEAS="Ulo dokument pod inm nzvom" +MENU_STATUSLINE_FILE_SAVEEMBED="Ulo objekt z inho programu" +MENU_STATUSLINE_FILE_SAVEIMAGE="Ulo vybran obrzok do sboru" +MENU_STATUSLINE_FILE_SAVE_TEMPLATE="Ulo dokument ako ablnu" MENU_STATUSLINE_FMT=" " MENU_STATUSLINE_FMT_BACKGROUND="Zmen farbu pozadia v dokumente" MENU_STATUSLINE_FMT_BACKGROUND_PAGE_COLOR="Zmen farbu strany v dokumente" MENU_STATUSLINE_FMT_BACKGROUND_PAGE_IMAGE="Nastav obrzok ako pozadie strany" -MENU_STATUSLINE_FMT_BOLD="Nastavenie tunho psma pre vybran as" -MENU_STATUSLINE_FMT_BORDERS="Nastavi okraje a tienovanie oznaenmu textu" -MENU_STATUSLINE_FMT_BOTTOMLINE="iara pod textom (zmena)" -MENU_STATUSLINE_FMT_BULLETS="Prida nebo zmeni odrky a slovanie vybranho odseku" +MENU_STATUSLINE_FMT_BOLD="Zmen psmo vybranej asti na tun" +MENU_STATUSLINE_FMT_BORDERS="Nastavte okraje a tieovanie oznaenmu textu" +MENU_STATUSLINE_FMT_BOTTOMLINE="Zobraz/zmae iaru pod textom" +MENU_STATUSLINE_FMT_BULLETS="Pridajte alebo upravte odrky a slovanie odseku" MENU_STATUSLINE_FMT_COLUMNS="Zmen poet stpcov" MENU_STATUSLINE_FMT_DIRECTION="Zmen vlastnosti smeru textu" -MENU_STATUSLINE_FMT_DIRECTION_DD_RTL="Zmen prevldajc smer psma odseku na sprava doava" -MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL="Zmen prevldajc smer psma v dokumente na sprava doava" -MENU_STATUSLINE_FMT_DIRECTION_DO_LTR="Prednastav smer textu zava doprava" -MENU_STATUSLINE_FMT_DIRECTION_DO_RTL="Prednastav smer textu sprava doava" -MENU_STATUSLINE_FMT_DIRECTION_SD_RTL="Zmen prevldajc smer psma kapitoly na sprava doava" -MENU_STATUSLINE_FMT_DOCUMENT="Nastav vlastnosti dokumentu, ako vekos strany a okraja" -MENU_STATUSLINE_FMT_EMBED="Vloi zabudovan objekt" +MENU_STATUSLINE_FMT_DIRECTION_DD_RTL="Zmen prevldajci smer psma odseku na sprava doava" +MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL="Zmen prevldajci smer psma v dokumente na sprava doava" +MENU_STATUSLINE_FMT_DIRECTION_DO_LTR="Nastav smer textu zava doprava" +MENU_STATUSLINE_FMT_DIRECTION_DO_RTL="Pouije smer textu sprava doava" +MENU_STATUSLINE_FMT_DIRECTION_SD_RTL="Zmen prevldajci smer psma kapitoly na sprava doava" +MENU_STATUSLINE_FMT_DOCUMENT="Nastav vlastnosti dokumentu ako vekos strany a okraja" +MENU_STATUSLINE_FMT_EMBED="Vlote objekt z inho programu" MENU_STATUSLINE_FMT_FONT="Zmen psmo vybranho textu" -MENU_STATUSLINE_FMT_FOOTNOTES="Nastav typy poznmok pod arou a koncovch poznmok" +MENU_STATUSLINE_FMT_FOOTNOTES="Nastav typy poznmok pod iarou a koncovch poznmok" MENU_STATUSLINE_FMT_FRAME="Zmen vlastnosti textovho rmu" MENU_STATUSLINE_FMT_HDRFTR="Nastav typy zhlav a piat" -MENU_STATUSLINE_FMT_IMAGE="Zmen vekos obrzku" -MENU_STATUSLINE_FMT_ITALIC="Nastavenie kurzvy pre vybran as" -MENU_STATUSLINE_FMT_LANGUAGE="Zmen jazyk vybranho textu" -MENU_STATUSLINE_FMT_OVERLINE="Nastavenie iary nad textom (zmena)" -MENU_STATUSLINE_FMT_PARAGRAPH="Zmen formt vybranho odseku" -MENU_STATUSLINE_FMT_POSIMAGE="Zmen formt obrzku" +MENU_STATUSLINE_FMT_IMAGE="Zmen vekos obrzka" +MENU_STATUSLINE_FMT_ITALIC="Zmen psmo vo vybranej asti textu na kurzvu" +MENU_STATUSLINE_FMT_LANGUAGE="Zmete jazyk vybranho textu" +MENU_STATUSLINE_FMT_OVERLINE="Nad oznaenm textom sa zobraz/zmizne iara" +MENU_STATUSLINE_FMT_PARAGRAPH="Zmen vlastnosti vybranho odseku" +MENU_STATUSLINE_FMT_POSIMAGE="Zmen formt obrzka" MENU_STATUSLINE_FMT_SETPOSIMAGE="Nastavte presn pozciu pre tento obrzok" -MENU_STATUSLINE_FMT_STRIKE="Prekrtnutie psma vo vybranej asti" -MENU_STATUSLINE_FMT_STYLE="Definuje alebo aplikuje tl na vber" -MENU_STATUSLINE_FMT_STYLE_DEFINE="Definuje alebo aplikuje tl na vber" -MENU_STATUSLINE_FMT_STYLIST="Zmen psmo dokumentu pomocou tlu" -MENU_STATUSLINE_FMT_SUBSCRIPT="Zmen psmo v oznaenej asti na doln index (zmena)" -MENU_STATUSLINE_FMT_SUPERSCRIPT="Zmen psmo v oznaenej asti na horn index (zmena)" -MENU_STATUSLINE_FMT_TABLEOFCONTENTS="Nastav typy a tly pre obsah" +MENU_STATUSLINE_FMT_STRIKE="Prekrtne text vo vybranej asti" +MENU_STATUSLINE_FMT_STYLE="Vyberte alebo upravte tl pre oznaen text" +MENU_STATUSLINE_FMT_STYLE_DEFINE="Vyberte alebo upravte tl pre oznaen text" +MENU_STATUSLINE_FMT_STYLIST="Zmen psmo dokumentu pomocou tlu" +MENU_STATUSLINE_FMT_SUBSCRIPT="Zmen psmo v oznaenej asti na doln index" +MENU_STATUSLINE_FMT_SUPERSCRIPT="Zmen psmo v oznaenej asti na horn index" +MENU_STATUSLINE_FMT_TABLEOFCONTENTS="Nastav typy a tly obsahu" MENU_STATUSLINE_FMT_TABS="Nastavenie tabultorov" -MENU_STATUSLINE_FMT_TOGGLECASE="Zmen vekos psma vybranho textu" -MENU_STATUSLINE_FMT_TOPLINE="iara nad textom (zmena)" -MENU_STATUSLINE_FMT_UNDERLINE="Podiarknutie psma vo vybranej asti" +MENU_STATUSLINE_FMT_TOGGLECASE="Zmen znaky vo vybranom texte na mal/vek" +MENU_STATUSLINE_FMT_TOPLINE="Vo vybratej asti sa nad textom zobraz/zmizne iara" +MENU_STATUSLINE_FMT_UNDERLINE="Psmo vo vybranej asti sa podiarkne" MENU_STATUSLINE_FORMAT=" " -MENU_STATUSLINE_GOTO_ANNOTATION="Cho na anotciu" MENU_STATUSLINE_HELP=" " MENU_STATUSLINE_HELP_ABOUT="Zobraz informcie o programe, slo verzie a autorsk prva" MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE="O projekte GNOME Office" -MENU_STATUSLINE_HELP_CHECKVER="Vyhada na internete noviu verziu AbiWordu" +MENU_STATUSLINE_HELP_CHECKVER="Vyhad na internete novie verzie AbiWordu" MENU_STATUSLINE_HELP_CONTENTS="Zobraz obsah npovedy" MENU_STATUSLINE_HELP_CREDITS="Zobraz zoznam spolupracovnkov" MENU_STATUSLINE_HELP_INDEX="Zobraz register npovedy" -MENU_STATUSLINE_HELP_REPORT_BUG="Nahlste chybu a pomte Abiwordu, aby sa stal ete lepm programom" -MENU_STATUSLINE_HELP_SEARCH="Vyhad npovedu k slovu..." +MENU_STATUSLINE_HELP_REPORT_BUG="Nahlste chybu v programe a pomte Abiwordu, aby sa stal ete lepm" +MENU_STATUSLINE_HELP_SEARCH="Vyhad npovedu k slovu..." MENU_STATUSLINE_INSERT=" " -MENU_STATUSLINE_INSERT_BOOKMARK="Vlo zloku" -MENU_STATUSLINE_INSERT_BREAK="Vlo zlom strnky, stpca alebo sekcie" -MENU_STATUSLINE_INSERT_CLIPART="Vlo obrzok prvok Clipart" -MENU_STATUSLINE_INSERT_DATETIME="Vlo as a(-lebo) dtum" +MENU_STATUSLINE_INSERT_ANNOTATION="Vlo poznmku na koniec" +MENU_STATUSLINE_INSERT_BOOKMARK="Vlo zloku" +MENU_STATUSLINE_INSERT_BREAK="Vlo zlom strnky, stpca alebo sekcie" +MENU_STATUSLINE_INSERT_CLIPART="Vlo obrzok prvok Clipart" +MENU_STATUSLINE_INSERT_DATETIME="Vlo as a/lebo dtum" MENU_STATUSLINE_INSERT_DELETE_HYPERLINK="Odstrni hypertextov odkaz" -MENU_STATUSLINE_INSERT_DIRECTIONMARKER="Do dokumentu vlo znaku smru Unicode" -MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM="Vlo znaku pre smer textu zava doprava (LRM)" -MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM="Vlo znaku pre smer textu sprava doava (RLM)" +MENU_STATUSLINE_INSERT_DIRECTIONMARKER="Vlo znaku zmeny smeru Unicode" +MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM="Vlo znaku pre smer textu zava doprava (LRM)" +MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM="Vlo znaku pre smer textu sprava doava (RLM)" MENU_STATUSLINE_INSERT_EDIT_HYPERLINK="Uprav hypertextov odkaz" -MENU_STATUSLINE_INSERT_ENDNOTE="Vlo koncov poznmku" -MENU_STATUSLINE_INSERT_FIELD="Vlo potan pole" -MENU_STATUSLINE_INSERT_FILE="Vlo obsah inho sboru" -MENU_STATUSLINE_INSERT_FOOTER="Vlo ptu" -MENU_STATUSLINE_INSERT_FOOTNOTE="Vlo koncov poznmku" +MENU_STATUSLINE_INSERT_ENDNOTE="Vlo koncov poznmku" +MENU_STATUSLINE_INSERT_FIELD="Vlo potan pole" +MENU_STATUSLINE_INSERT_FILE="Vlo obsah inho sboru" +MENU_STATUSLINE_INSERT_FOOTER="Vlo ptu" +MENU_STATUSLINE_INSERT_FOOTNOTE="Vlo koncov poznmku" MENU_STATUSLINE_INSERT_GOTO_HYPERLINK="Prejde na hypertextov odkaz" MENU_STATUSLINE_INSERT_GRAPHIC="Vlo existujci obrzok z inho sboru" -MENU_STATUSLINE_INSERT_HEADER="Vlo zhlavie" -MENU_STATUSLINE_INSERT_HYPERLINK="Vlo hypertextov odkaz" -MENU_STATUSLINE_INSERT_MAILMERGE="Vlo pole hromadnej korepondencie" -MENU_STATUSLINE_INSERT_PAGENO="Vlo automatick slovan strn" -MENU_STATUSLINE_INSERT_SYMBOL="Vlo symbol alebo in pecilny znak" -MENU_STATUSLINE_INSERT_TABLEOFCONTENTS="Vloi obsah vytvoren z nadpisov" -MENU_STATUSLINE_INSERT_TEXTBOX="Vlo textov rm" +MENU_STATUSLINE_INSERT_HEADER="Vlo zhlavie" +MENU_STATUSLINE_INSERT_HYPERLINK="Vlo hypertextov odkaz" +MENU_STATUSLINE_INSERT_MAILMERGE="Vlo pole hromadnej korepondencie" +MENU_STATUSLINE_INSERT_PAGENO="Vlo automatick slovanie strn" +MENU_STATUSLINE_INSERT_SYMBOL="Vlo symbol alebo in pecilny znak" +MENU_STATUSLINE_INSERT_TABLEOFCONTENTS="Vloi obsah vytvoren z nadpisov" +MENU_STATUSLINE_INSERT_TEXTBOX="Vlo textov rm" MENU_STATUSLINE_OPEN_TEMPLATE=" " -MENU_STATUSLINE_SPELL_ADD="Prida toto slovo do uivateskho slovnka" -MENU_STATUSLINE_SPELL_IGNOREALL="Ignorova vetky vskyty tohto slova v dokumente" -MENU_STATUSLINE_SPELL_SUGGEST_1="Zmen na toto navrhovan slovo" -MENU_STATUSLINE_SPELL_SUGGEST_2="Zmen na toto navrhovan slovo" -MENU_STATUSLINE_SPELL_SUGGEST_3="Zmen na toto navrhovan slovo" -MENU_STATUSLINE_SPELL_SUGGEST_4="Zmen na toto navrhovan slovo" -MENU_STATUSLINE_SPELL_SUGGEST_5="Zmen na toto navrhovan slovo" -MENU_STATUSLINE_SPELL_SUGGEST_6="Zmen na toto navrhovan slovo" -MENU_STATUSLINE_SPELL_SUGGEST_7="Zmen na toto navrhovan slovo" -MENU_STATUSLINE_SPELL_SUGGEST_8="Zmen na toto navrhovan slovo" -MENU_STATUSLINE_SPELL_SUGGEST_9="Zmen na toto navrhovan slovo" -MENU_STATUSLINE_TABLE_AUTOFIT="Automatick vypanie tabuky" +MENU_STATUSLINE_SPELL_ADD="Prid toto slovo do uvateskho slovnka" +MENU_STATUSLINE_SPELL_IGNOREALL="Vdy presko toto slovo v dokumente" +MENU_STATUSLINE_SPELL_SUGGEST_1="Zmen na toto slovo" +MENU_STATUSLINE_SPELL_SUGGEST_2="Zmen na toto slovo" +MENU_STATUSLINE_SPELL_SUGGEST_3="Zmen na toto slovo" +MENU_STATUSLINE_SPELL_SUGGEST_4="Zmen na toto slovo" +MENU_STATUSLINE_SPELL_SUGGEST_5="Zmen na toto slovo" +MENU_STATUSLINE_SPELL_SUGGEST_6="Zmen na toto slovo" +MENU_STATUSLINE_SPELL_SUGGEST_7="Zmen na toto slovo" +MENU_STATUSLINE_SPELL_SUGGEST_8="Zmen na toto slovo" +MENU_STATUSLINE_SPELL_SUGGEST_9="Zmen na toto slovo" +MENU_STATUSLINE_TABLE_AUTOFIT="Automatick tabuka" MENU_STATUSLINE_TABLE_DELETECOLUMN="Odstrni stpec" MENU_STATUSLINE_TABLE_DELETEROW="Odstrni riadok" -MENU_STATUSLINE_TABLE_DELETETABLE="Odstrni tabuku" +MENU_STATUSLINE_TABLE_DELETETABLE="Odstrni tabuku" MENU_STATUSLINE_TABLE_DELETE_CELLS="Odstrni bunky" MENU_STATUSLINE_TABLE_DELETE_COLUMNS="Odstrni stpec" MENU_STATUSLINE_TABLE_DELETE_ROWS="Odstrni riadok" -MENU_STATUSLINE_TABLE_DELETE_TABLE="Odstrni tabuku" -MENU_STATUSLINE_TABLE_FORMAT="Formt tabuky" -MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT="Opakuje riadok ako nadpis na kadej strane" +MENU_STATUSLINE_TABLE_DELETE_TABLE="Odstrni tabuku" +MENU_STATUSLINE_TABLE_FORMAT="Formt tabuky" +MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT="Zopakuje riadok ako nadpis na kadej strane" MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE="Odstrni riadok ako nadpis strany" -MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS="Nastav riadok ako nadpis na kadej strane" -MENU_STATUSLINE_TABLE_INSERTCOLUMN="Vlo stpec napravo" -MENU_STATUSLINE_TABLE_INSERTROW="Vlo riadok pod aktulny" -MENU_STATUSLINE_TABLE_INSERTTABLE="Vlo tabuku" -MENU_STATUSLINE_TABLE_INSERT_CELLS="Vlo bunky" -MENU_STATUSLINE_TABLE_INSERT_COLUMNS_AFTER="Vlo stpec napravo" -MENU_STATUSLINE_TABLE_INSERT_COLUMNS_BEFORE="Vlo stpec naavo" -MENU_STATUSLINE_TABLE_INSERT_ROWS_AFTER="Vlo riadok pod aktulny" -MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE="Vlo riadok nad aktulny" -MENU_STATUSLINE_TABLE_INSERT_SUMCOLS="Vlo set dka v tabuke" -MENU_STATUSLINE_TABLE_INSERT_SUMROWS="Vlo set stpca v tabuke" -MENU_STATUSLINE_TABLE_INSERT_TABLE="Vlo tabuku" +MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS="Nastav riadok ako nadpis na kadej strane" +MENU_STATUSLINE_TABLE_INSERTCOLUMN="Vlo stpec napravo" +MENU_STATUSLINE_TABLE_INSERTROW="Vlo riadok pod aktulny" +MENU_STATUSLINE_TABLE_INSERTTABLE="Vlo tabuku" +MENU_STATUSLINE_TABLE_INSERT_CELLS="Vlo bunky" +MENU_STATUSLINE_TABLE_INSERT_COLUMNS_AFTER="Vlo stpec napravo" +MENU_STATUSLINE_TABLE_INSERT_COLUMNS_BEFORE="Vlo stpec naavo" +MENU_STATUSLINE_TABLE_INSERT_ROWS_AFTER="Vlo riadok pod aktulny" +MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE="Vlo riadok nad aktulny" +MENU_STATUSLINE_TABLE_INSERT_SUMCOLS="Vlo set riadka v tabuke" +MENU_STATUSLINE_TABLE_INSERT_SUMROWS="Vlo set stpca v tabuke" +MENU_STATUSLINE_TABLE_INSERT_TABLE="Vlo tabuku" MENU_STATUSLINE_TABLE_MERGE_CELLS="Zlenie buniek" -MENU_STATUSLINE_TABLE_SELECT_CELL="Vybere bunku" -MENU_STATUSLINE_TABLE_SELECT_COLUMN="Vybere stpec" -MENU_STATUSLINE_TABLE_SELECT_ROW="Vybere riadok" -MENU_STATUSLINE_TABLE_SELECT_TABLE="Vybere tabuku" -MENU_STATUSLINE_TABLE_SORT="Zorad tabuku" -MENU_STATUSLINE_TABLE_SORTCOLSASCEND="Zorad stpce vzostupne poda vybranho riadka" -MENU_STATUSLINE_TABLE_SORTCOLSDESCEND="Zorad stpce zotupne poda vybranho riadka" -MENU_STATUSLINE_TABLE_SORTROWSASCEND="Zorad riadky vzostupne poda vybranho stpca" -MENU_STATUSLINE_TABLE_SORTROWSDESCEND="Zorad riadky zostupne poda vybranho stpca" +MENU_STATUSLINE_TABLE_SELECT_CELL="Vyberie bunku" +MENU_STATUSLINE_TABLE_SELECT_COLUMN="Vyberie stpec" +MENU_STATUSLINE_TABLE_SELECT_ROW="Vyberie riadok" +MENU_STATUSLINE_TABLE_SELECT_TABLE="Vyberie tabuku" +MENU_STATUSLINE_TABLE_SORT="Zorad tabuku" +MENU_STATUSLINE_TABLE_SORTCOLSASCEND="Zorad stpce vzostupne poda vybranho riadka" +MENU_STATUSLINE_TABLE_SORTCOLSDESCEND="Zorad stpce zostupne poda vybranho riadka" +MENU_STATUSLINE_TABLE_SORTROWSASCEND="Zorad riadky vzostupne poda vybranho stpca" +MENU_STATUSLINE_TABLE_SORTROWSDESCEND="Zorad riadky zostupne poda vybranho stpca" MENU_STATUSLINE_TABLE_SPLIT_CELLS="Rozdel bunky" -MENU_STATUSLINE_TABLE_SPLIT_TABLE="Rozdel tabuku" -MENU_STATUSLINE_TABLE_TABLETOTEXT="Zmen tabuku na text" -MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS="Oddel poloky v tabuke iarkou" -MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS="Oddel poloky v tabuke iarkou a tabultormi" -MENU_STATUSLINE_TABLE_TABLETOTEXTTABS="Oddel poloky v tabuke tabultormi" -MENU_STATUSLINE_TABLE_TEXTTOTABLE="Zmen vybran text na tabuku" -MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL="Rozdelenie oddeovami vrtane medzier" -MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES="Rozdelenie oddeovami okrem medzier" +MENU_STATUSLINE_TABLE_SPLIT_TABLE="Rozdel tabuku" +MENU_STATUSLINE_TABLE_TABLETOTEXT="Zmen tabuku na text" +MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS="Oddel text v tabuke iarkami" +MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS="Oddel text v tabuke iarkami a tabultormi" +MENU_STATUSLINE_TABLE_TABLETOTEXTTABS="Oddel text v tabuke tabultormi" +MENU_STATUSLINE_TABLE_TEXTTOTABLE="Zmen vybran text na tabuku" +MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL="Rozdelenie pri oddeovaoch vrtane medzier" +MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES="Rozdelenie pri oddeovaoch okrem medzier" MENU_STATUSLINE_TOOLS=" " -MENU_STATUSLINE_TOOLS_ANNOTATIONS="Sprva zmien v dokumente" -MENU_STATUSLINE_TOOLS_ANNOTATIONS_INSERT="Vlo poznmku na koniec" -MENU_STATUSLINE_TOOLS_ANNOTATIONS_INSERT_FROMSEL="Zmen vybran text na tabulku" -MENU_STATUSLINE_TOOLS_ANNOTATIONS_TOGGLE_DISPLAY="Zobraz/skryje formtovacie znaky" -MENU_STATUSLINE_TOOLS_AUTOSPELL="Automaticky kontrolova preklepy v dokumente" +MENU_STATUSLINE_TOOLS_AUTOSPELL="Automaticky kontrolova preklepy v dokumente" MENU_STATUSLINE_TOOLS_HISTORY="Zobraz histriu aktulneho dokumentu" -MENU_STATUSLINE_TOOLS_HISTORY_PURGE="Odstrni z dokumentu cel jeho histriu" +MENU_STATUSLINE_TOOLS_HISTORY_PURGE="Z dokumentu odstrni cel jeho histriu" MENU_STATUSLINE_TOOLS_HISTORY_SHOW="Zobraz histriu dokumentu" -MENU_STATUSLINE_TOOLS_LANGUAGE="Zmen jazyk vybranho textu" -MENU_STATUSLINE_TOOLS_MAILMERGE="Hromadn korepondencia" -MENU_STATUSLINE_TOOLS_OPTIONS="Nastavenie monost" +MENU_STATUSLINE_TOOLS_LANGUAGE="Zmete jazyk vybranho textu" +MENU_STATUSLINE_TOOLS_MAILMERGE="Hromadn korepondencia" +MENU_STATUSLINE_TOOLS_OPTIONS="Nastavenia" MENU_STATUSLINE_TOOLS_PLUGINS="Sprva modulov" -MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION="Prija navrhovan zmenu" -MENU_STATUSLINE_TOOLS_REVISIONS_AUTO="Nech vetky zmeny v dokumente" -MENU_STATUSLINE_TOOLS_REVISIONS_COMPARE_DOCUMENTS="Porovn aktulny dokument s inm dokumentom" -MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT="Njs daliu viditen zmenu dokumentu" -MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV="Njs predchdzajcu viditen zmenu dokumentu" -MENU_STATUSLINE_TOOLS_REVISIONS_MARK="Oznaova zmeny poas psania" -MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS="Zli in dokument s aktulnym pomocou znaiek zmien textu" -MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION="Zaa iniu zmenu od aktulnej" -MENU_STATUSLINE_TOOLS_REVISIONS_PURGE="Z dokumentu odstrni vetky informcie o zmench v texte" +MENU_STATUSLINE_TOOLS_REVISIONS="Sprva zmien v dokumente" +MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION="Prjme navrhovan zmenu" +MENU_STATUSLINE_TOOLS_REVISIONS_AUTO="Ponech vetky zmeny v dokumente" +MENU_STATUSLINE_TOOLS_REVISIONS_COMPARE_DOCUMENTS="Porovn tento dokument s inm" +MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT="Njde aliu viditen zmenu dokumentu" +MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV="Njde predchdzajcu viditen zmenu dokumentu" +MENU_STATUSLINE_TOOLS_REVISIONS_MARK="Oznaova zmeny poas psania" +MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS="Zli in dokument s aktulnym pomocou znaiek zmeny textu" +MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION="Zaa odlin zmenu od aktulnej" +MENU_STATUSLINE_TOOLS_REVISIONS_PURGE="Z dokumentu odstrni vetky informcie o zmench v texte" MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION="Odstrni navrhovan zmenu" -MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL="Vyberte zmenu v texte, ktor chcete zobrazi" +MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL="Vyberte zmenu v texte, ktor chcete zobrazi" MENU_STATUSLINE_TOOLS_REVISIONS_SHOW="Zobraz zmeny v texte aktulneho dokumentu" -MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER="Zobraz dokument po zmench textu" +MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER="Zobraz dokument po zmench v texte" MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTERPREV="Zobraz dokument po predchdzajcich zmench v texte" MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_BEFORE="Zobraz dokument pred zmenami v texte" MENU_STATUSLINE_TOOLS_SCRIPTS="Spust pomocn skripty" @@ -1621,31 +1609,31 @@ MENU_STATUSLINE_TOOLS_WORDCOUNT="Zist poet slov v dokumente" MENU_STATUSLINE_VIEW=" " MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT="Vrti rozmiestnenie panelov s nstrojmi do pvodnho stavu" -MENU_STATUSLINE_VIEW_FULLSCREEN="Zobraz dokument na cel obrazovku" -MENU_STATUSLINE_VIEW_HEADFOOT="Uprav text v zhlav a pte na kadej strane" -MENU_STATUSLINE_VIEW_LOCKSTYLES="Dovoli formtovanie len pomocou tlov" -MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT="Zamkne rozmiestnenie panelov s nstrojmi" +MENU_STATUSLINE_VIEW_FULLSCREEN="Cel stranu zobraz v jednom okne" +MENU_STATUSLINE_VIEW_HEADFOOT="Uprav text v zhlav a pte na kadej strane" +MENU_STATUSLINE_VIEW_LOCKSTYLES="Dovol formtovanie len pomocou tlov" +MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT="Zamkne zobrazenie panelov s nstrojmi" MENU_STATUSLINE_VIEW_NORMAL="Normlne zobrazenie" -MENU_STATUSLINE_VIEW_PRINT="Rozmestnenie pri tlai" -MENU_STATUSLINE_VIEW_RULER="Zobraz alebo skryje pravtko" -MENU_STATUSLINE_VIEW_SHOWPARA="Zobraz znaky, ktor sa nedaj vytlai" -MENU_STATUSLINE_VIEW_STATUSBAR="Zobraz alebo skryje stavov panel" -MENU_STATUSLINE_VIEW_TB_1="Zobraz alebo skryje panel s nstrojmi" -MENU_STATUSLINE_VIEW_TB_2="Zobraz alebo skryje panel s nstrojmi" -MENU_STATUSLINE_VIEW_TB_3="Zobraz alebo skryje panel s nstrojmi" -MENU_STATUSLINE_VIEW_TB_4="Zobraz alebo skryje panel s nstrojmi" +MENU_STATUSLINE_VIEW_PRINT="Rozmiestnenie pri tlai" +MENU_STATUSLINE_VIEW_RULER="Zobraz/skryje pravtko" +MENU_STATUSLINE_VIEW_SHOWPARA="Zobraz znaky, ktor sa nedaj vytlai" +MENU_STATUSLINE_VIEW_STATUSBAR="Zobraz/skryje stavov panel" +MENU_STATUSLINE_VIEW_TB_1="Zobraz/skryje panel s nstrojmi" +MENU_STATUSLINE_VIEW_TB_2="Zobraz/skryje panel s nstrojmi" +MENU_STATUSLINE_VIEW_TB_3="Zobraz/skryje panel s nstrojmi" +MENU_STATUSLINE_VIEW_TB_4="Zobraz/skryje panel s nstrojmi" MENU_STATUSLINE_VIEW_TOOLBARS=" " -MENU_STATUSLINE_VIEW_WEB="Umiestnenie webu" -MENU_STATUSLINE_VIEW_ZOOM="Zmenenie alebo zvenie zobrazenia dokumentu" -MENU_STATUSLINE_VIEW_ZOOM_100="Zv na 100%" -MENU_STATUSLINE_VIEW_ZOOM_200="Zv na 200%" -MENU_STATUSLINE_VIEW_ZOOM_50="Zv na 50%" -MENU_STATUSLINE_VIEW_ZOOM_75="Zv na 75%" -MENU_STATUSLINE_VIEW_ZOOM_MENU="Zmenenie alebo zvenie zobrazenia dokumentu" -MENU_STATUSLINE_VIEW_ZOOM_WHOLE="Zv na cel stranu" -MENU_STATUSLINE_VIEW_ZOOM_WIDTH="Zv na rku strany" -MENU_STATUSLINE_WEB_SAVEASWEB="Zobraz dokument ako webovou strnku" -MENU_STATUSLINE_WEB_WEBPREVIEW="Zobraz dokument ako webovou strnku" +MENU_STATUSLINE_VIEW_WEB="Webov zobrazenie" +MENU_STATUSLINE_VIEW_ZOOM="Zmen alebo zv zobrazenia dokumentu" +MENU_STATUSLINE_VIEW_ZOOM_100="Zv na 100%" +MENU_STATUSLINE_VIEW_ZOOM_200="Zv na 200%" +MENU_STATUSLINE_VIEW_ZOOM_50="Zv na 50%" +MENU_STATUSLINE_VIEW_ZOOM_75="Zv na 75%" +MENU_STATUSLINE_VIEW_ZOOM_MENU="Zmen alebo zv zobrazenia dokumentu" +MENU_STATUSLINE_VIEW_ZOOM_WHOLE="Cel stranu zobraz v jednom okne" +MENU_STATUSLINE_VIEW_ZOOM_WIDTH="Zv na rku strany" +MENU_STATUSLINE_WEB_SAVEASWEB="Uke dokument ako webovou strnku" +MENU_STATUSLINE_WEB_WEBPREVIEW="Uke dokument ako webovou strnku" MENU_STATUSLINE_WINDOW=" " MENU_STATUSLINE_WINDOW_1="Zobraz tento dokument" MENU_STATUSLINE_WINDOW_2="Zobraz tento dokument" @@ -1656,254 +1644,254 @@ MENU_STATUSLINE_WINDOW_7="Zobraz tento dokument" MENU_STATUSLINE_WINDOW_8="Zobraz tento dokument" MENU_STATUSLINE_WINDOW_9="Zobraz tento dokument" -MENU_STATUSLINE_WINDOW_MORE="Zobraz zoznam vetkch dokumentov" -MENU_STATUSLINE_WINDOW_NEW="Otvor dalie okno pre dokument" +MENU_STATUSLINE_WINDOW_MORE="Zobraz zoznam vetkch dokumentov" +MENU_STATUSLINE_WINDOW_NEW="Otvor alie okno pre dokument" MENU_STATUSLINE__BOGUS1__=" " MENU_STATUSLINE__BOGUS2__=" " MSG_AfterRestartNew="Zmeny sa prejavia len ak znova spustte AbiWord alebo vytvorte nov dokument." MSG_AutoMerge="Automatick zlenie" -MSG_AutoRevisionOffWarning="Ste si ist, e nechcete spravova cel histriu? Ak budete pokraova, nebudete sa mc vrti k predchdzajcim verzim dokumentu." -MSG_BookmarkNotFound="Zloka "%s" nebola v tomto dokumente njden." -MSG_CHECK_PRINT_MODE="Zhlavia a pty mono vytvra a upravova len v reime zobrazenia pre tla. Aby sa vm dokument takto zobrazil, chote do menu Zobrazi a Tiskov nhled. Chcete teraz vstoupit do reimu Nhledu na tisk?" -MSG_ConfirmSave="Uloi zmeny do dokumentu %s pred ukonenm?" -MSG_ConfirmSaveSecondary="Ak neulote zmeny, stratia sa." -MSG_DefaultDirectionChg="Zmenili ste pvodn smer." -MSG_DirectionModeChg="Zmenili ste smer." -MSG_DlgNotImp="Funkcia %s ete nie je implementovan. Ak ste programtor, mete doplni kd %s, riadok %d a posla patch na: \tabiword-dev@abisource.com In, prosm, bute trpezliv." +MSG_AutoRevisionOffWarning="Ste si ist, e si nechcete uklada cel histriu? Ak budete pokraova, nebudete sa mc vrti k predchdzajcim verzim dokumentu." +MSG_BookmarkNotFound="Zloka "%s" sa v tomto dokumente nenala." +MSG_CHECK_PRINT_MODE="Zhlavia a pty mono vytvra a upravova len v zobrazeni pre tla. Aby sa vm dokument takto zobrazil, chote do menu Zobrazi a Ukka pred tlaou. Chcete prejs do zobrazenia ukky pred tlaou teraz?" +MSG_ConfirmSave="Mm pred ukonenm uloi zmeny do dokumentu %s?" +MSG_ConfirmSaveSecondary="Ak neulote zmeny, stratia sa." +MSG_DefaultDirectionChg="Zmenili ste pvodn smer textu." +MSG_DirectionModeChg="Zmenili ste reim smeru textu." +MSG_DlgNotImp="Funkcia %s ete nie je implementovan. Ak ste programtor, pokojne mete doplni kd %s, riadok %d a posla patch na: \tabiword-dev@abisource.com In, prosm, bute trpezliv." MSG_EmptySelection="Aktulny vber je przdny" MSG_Exception="Vyskytla sa kritick chyba. Abiword sa zatvor. Aktulny dokument bol uloen na disk s prponou ".saved"." MSG_HiddenRevisions="V dokumente boli uroben zmeny, ktor teraz nevidno. Viac o prci so zmenami v texte njdete v dokumentcii k programu AbiWord." -MSG_HyperlinkCrossesBoundaries="Text, ku ktormu m by pripojen hypertextov odkaz, mus by napsan v jednom odseku." -MSG_HyperlinkNoBookmark="Varovanie: zadan zloka [%s] neexistuje." -MSG_HyperlinkNoSelection="Pred vloenm hypertextovho odkazu muste najprv oznai as textu." -MSG_IE_BogusDocument="Abiword neme otvori sbor %s. Asi je to neplatn dokument" -MSG_IE_CouldNotOpen="Sbor %s sa ned otvori na zpis" -MSG_IE_CouldNotWrite="Do sboru %s sa ned zapisova" -MSG_IE_FakeType="Sbor %s nie je typom sboru, akm by mal by" -MSG_IE_FileNotFound="Sbor %s sa nenaiel" -MSG_IE_NoMemory="Na otvorenie sboru %s nie je dos pamte" +MSG_HyperlinkCrossesBoundaries="Text, ku ktormu m by pripojen hypertextov odkaz, mus by napsan v jednom odseku." +MSG_HyperlinkNoBookmark="Varovanie: zadan zloka [%s] neexistuje." +MSG_HyperlinkNoSelection="Pred vloenm hypertextovho odkazu muste oznai as textu." +MSG_IE_BogusDocument="Abiword neme otvori sbor %s. Asi ide o neplatn dokument" +MSG_IE_CouldNotOpen="Sbor %s sa ned otvori na psanie" +MSG_IE_CouldNotWrite="Do sboru %s sa ned psa" +MSG_IE_FakeType="Sbor %s nie je typom sboru, akm by mal by" +MSG_IE_FileNotFound="Sbor %s sa nenaiel" +MSG_IE_NoMemory="Na otvorenie sboru %s nie je dos pamte" MSG_IE_UnknownType="Sbor %s je neznmym typom sboru" -MSG_IE_UnsupportedType="Sbor %s nie je podporovanm typem sboru" +MSG_IE_UnsupportedType="Sbor %s nie je podporovanm typom sboru" MSG_ImportError="Chyba pri importe sboru %s." -MSG_NoBreakInsideFrame="Do textovho rmu sa ned vloi zlom" -MSG_NoBreakInsideTable="Do tabuky sa ned vloi zlom" -MSG_OpenFailed="Sbor %s sa nepodarilo uloi." -MSG_PrintStatus="Tlam stranu %d z %d" +MSG_NoBreakInsideFrame="Do textovho rmu sa ned vloi zlom" +MSG_NoBreakInsideTable="Do tabuky sa ned vloi zlom" +MSG_OpenFailed="Sbor %s sa nepodarilo uloi." +MSG_PrintStatus="Tlam stranu %d z(o) %d" MSG_PrintingDoc="Tlam dokument..." -MSG_QueryExit="Zavrie vetky okna a skoni?" -MSG_RevertBuffer="Vrti sa k uloenmu sboru %s?" -MSG_RevertFile="Vrti sbor do stavu pred poslednm uloenm?" -MSG_SaveFailed="Sbor %s sa nepodarilo uloi." -MSG_SaveFailedExport="Sbor %s sa nepodarilo uloi." -MSG_SaveFailedName="Sbor %s sa nepodarilo uloi: nesprvne meno" -MSG_SaveFailedWrite="Sbor %s se nepodarilo uloi." +MSG_QueryExit="Mm zatvori vetky okna a skoni?" +MSG_RevertBuffer="Vrti sa k uloenmu sboru %s?" +MSG_RevertFile="Vrti sbor do stavu pred poslednm uloenm?" +MSG_SaveFailed="Sbor %s sa nepodarilo uloi." +MSG_SaveFailedExport="Chyba pri pokuse uloi sbor %s." +MSG_SaveFailedName="Sbor %s sa nepodarilo uloi: nesprvne meno" +MSG_SaveFailedWrite="Pri pokuse uloi sbor %s sa vyskytla chyba zpisu." MSG_SpellDone="Kontrola preklepov je dokonen." -MSG_SpellSelectionDone="Abiword dokonil kontrolu vybranho textu." -PRINT_CANNOTSTARTPRINTJOB="Nemono spusti tlaov lohu" -PageInfoField="Strana: %d/%d" +MSG_SpellSelectionDone="Abiword dokonil kontrolu vo vybranej asti textu." +PRINT_CANNOTSTARTPRINTJOB="Nemono spusti tlaov lohu" +PageInfoField="Strana: %d z/o %d" RightIndentStatus="Prav odsadenie [%s]" RightMarginStatus="Prav okraj [%s]" -SCRIPT_CANTRUN="Chyba pri span skriptu %s" -SCRIPT_NOSCRIPTS="Nenali sa iadne skripty" +SCRIPT_CANTRUN="Chyba pri span skriptu %s" +SCRIPT_NOSCRIPTS="Nenali sa iadne skripty" TB_Embedded="slovan" -TB_Extra="Extra" +TB_Extra="al" TB_Format="Formt" -TB_Simple="Vzorka" -TB_Standard="tandardn" +TB_Simple="Jednoduch" +TB_Standard="tandardn" TOC_TocHeading="Obsah" TOOLBAR_LABEL_1COLUMN="1 stpec" TOOLBAR_LABEL_2COLUMN="2 stpce" TOOLBAR_LABEL_3COLUMN="3 stpce" -TOOLBAR_LABEL_ADD_COLUMN="Prida stpec za" -TOOLBAR_LABEL_ADD_ROW="Prida riadok za" +TOOLBAR_LABEL_ADD_COLUMN="Pridajte stpec za" +TOOLBAR_LABEL_ADD_ROW="Prida riadok za" TOOLBAR_LABEL_ALIGN_CENTER="Na stred" TOOLBAR_LABEL_ALIGN_JUSTIFY="Do bloku" -TOOLBAR_LABEL_ALIGN_LEFT="av" -TOOLBAR_LABEL_ALIGN_RIGHT="Prav" +TOOLBAR_LABEL_ALIGN_LEFT="vavo" +TOOLBAR_LABEL_ALIGN_RIGHT="vpravo" TOOLBAR_LABEL_COLOR_BACK="Zvraznenie" TOOLBAR_LABEL_COLOR_FORE="Farba psma" -TOOLBAR_LABEL_DELETE_COLUMN="Odstrni stpec" -TOOLBAR_LABEL_DELETE_ROW="Odstrni riadok" -TOOLBAR_LABEL_DOUBLE_SPACE="Dvojit medzery" -TOOLBAR_LABEL_EDIT_COPY="Koprova" -TOOLBAR_LABEL_EDIT_CUT="Vystrihn" -TOOLBAR_LABEL_EDIT_FOOTER="Upravi ptu" -TOOLBAR_LABEL_EDIT_HEADER="Upravit zhlavie" -TOOLBAR_LABEL_EDIT_PASTE="Vloi" +TOOLBAR_LABEL_DELETE_COLUMN="Odstrni stpec" +TOOLBAR_LABEL_DELETE_ROW="Odstrni riadok" +TOOLBAR_LABEL_DOUBLE_SPACE="Dvojit riadkovanie" +TOOLBAR_LABEL_EDIT_COPY="Koprova" +TOOLBAR_LABEL_EDIT_CUT="Vystrihn" +TOOLBAR_LABEL_EDIT_FOOTER="Upravi ptu" +TOOLBAR_LABEL_EDIT_HEADER="Upravi zhlavie" +TOOLBAR_LABEL_EDIT_PASTE="Vloi" TOOLBAR_LABEL_EDIT_REDO="Znovu" -TOOLBAR_LABEL_EDIT_REMOVEFOOTER="Odstrni ptu" -TOOLBAR_LABEL_EDIT_REMOVEHEADER="Odstrni zhlavie" -TOOLBAR_LABEL_EDIT_UNDO="Sp" +TOOLBAR_LABEL_EDIT_REMOVEFOOTER="Odstrni ptu" +TOOLBAR_LABEL_EDIT_REMOVEHEADER="Odstrni zhlavie" +TOOLBAR_LABEL_EDIT_UNDO="Sp" TOOLBAR_LABEL_FILE_NEW="Nov" -TOOLBAR_LABEL_FILE_OPEN="Otvori" -TOOLBAR_LABEL_FILE_PRINT_PREVIEW="Nhad pre tla" -TOOLBAR_LABEL_FILE_SAVE="Uloi" -TOOLBAR_LABEL_FILE_SAVEAS="Uloi ako" +TOOLBAR_LABEL_FILE_OPEN="Otvori" +TOOLBAR_LABEL_FILE_PRINT_PREVIEW="Ukka pre tla" +TOOLBAR_LABEL_FILE_SAVE="Uloi" +TOOLBAR_LABEL_FILE_SAVEAS="Uloi ako" TOOLBAR_LABEL_FMTPAINTER="Formt kresby" -TOOLBAR_LABEL_FMT_BOOKMARK="Vloi zloku" -TOOLBAR_LABEL_FMT_CHOOSE="Farba psma" -TOOLBAR_LABEL_FMT_DIR_OVERRIDE_LTR="Poui smer textu zava doprava" -TOOLBAR_LABEL_FMT_DIR_OVERRIDE_RTL="Poui smer textu sprava doava" +TOOLBAR_LABEL_FMT_BOOKMARK="Vloi zloku" +TOOLBAR_LABEL_FMT_CHOOSE="Vybra psmo" +TOOLBAR_LABEL_FMT_DIR_OVERRIDE_LTR="Poui smer textu zava doprava" +TOOLBAR_LABEL_FMT_DIR_OVERRIDE_RTL="Poui smer textu sprava doava" TOOLBAR_LABEL_FMT_DOM_DIRECTION="Smer odseku" -TOOLBAR_LABEL_FMT_HYPERLINK="Vloi hypertextov odkaz" -TOOLBAR_LABEL_FMT_SIZE="Vekos psma" -TOOLBAR_LABEL_FMT_STYLE="tl" +TOOLBAR_LABEL_FMT_HYPERLINK="Vloi hypertextov odkaz" +TOOLBAR_LABEL_FMT_SIZE="Vekos psma" +TOOLBAR_LABEL_FMT_STYLE="tl" TOOLBAR_LABEL_HELP="Npoveda" -TOOLBAR_LABEL_IMG="Vloi obrzok" -TOOLBAR_LABEL_INDENT="Zvit odsadenie" +TOOLBAR_LABEL_IMG="Vloi obrzok" +TOOLBAR_LABEL_INDENT="Zvi odsadenie" TOOLBAR_LABEL_INSERT_SYMBOL="Symbol" -TOOLBAR_LABEL_INSERT_TABLE="Vloi tabuku" -TOOLBAR_LABEL_LISTS_BULLETS="Odrky" +TOOLBAR_LABEL_INSERT_TABLE="Vloi tabuku" +TOOLBAR_LABEL_LISTS_BULLETS="Odrky" TOOLBAR_LABEL_LISTS_NUMBERS="slovanie" -TOOLBAR_LABEL_MENU="" +TOOLBAR_LABEL_MENU="Ponuka" TOOLBAR_LABEL_MERGEABOVE="Zli nad" TOOLBAR_LABEL_MERGEBELOW="Zli pod" -TOOLBAR_LABEL_MERGELEFT="Zli vlevo" -TOOLBAR_LABEL_MERGERIGHT="Zli vpravo" +TOOLBAR_LABEL_MERGELEFT="Zli vavo" +TOOLBAR_LABEL_MERGERIGHT="Zli vpravo" TOOLBAR_LABEL_MERGE_CELLS="Zli bunky" -TOOLBAR_LABEL_MIDDLE_SPACE="Riadkovanie 1.5" -TOOLBAR_LABEL_PARA_0BEFORE="Ni pred" +TOOLBAR_LABEL_MIDDLE_SPACE="Riadkovanie 1,5" +TOOLBAR_LABEL_PARA_0BEFORE="iadny pred" TOOLBAR_LABEL_PARA_12BEFORE="12 bodov pred" -TOOLBAR_LABEL_SCRIPT_PLAY="Spustit skript" +TOOLBAR_LABEL_SCRIPT_PLAY="Spusti skript" TOOLBAR_LABEL_SINGLE_SPACE="Jednoduch riadkovanie" TOOLBAR_LABEL_SPELLCHECK="Kontrola preklepov" -TOOLBAR_LABEL_SPLIT_CELLS="Rozdeli bunky" -TOOLBAR_LABEL_UNINDENT="Zmeni odsadenie" +TOOLBAR_LABEL_SPLIT_CELLS="Rozdeli bunky" +TOOLBAR_LABEL_UNINDENT="Zmeni odsadenie" TOOLBAR_LABEL_VIEW_FULL_SCREEN="&Cel obrazovka" -TOOLBAR_LABEL_VIEW_SHOWPARA="Zobrazi vetko" +TOOLBAR_LABEL_VIEW_SHOWPARA="Zobrazi vetko" TOOLBAR_STATUSLINE_1COLUMN="1 stpec" TOOLBAR_STATUSLINE_2COLUMN="2 stpce" TOOLBAR_STATUSLINE_3COLUMN="3 stpce" -TOOLBAR_STATUSLINE_ADD_COLUMN="Prida stpec do tabuky za aktulny" -TOOLBAR_STATUSLINE_ADD_ROW="Prida riadok do tabuky za aktulny" +TOOLBAR_STATUSLINE_ADD_COLUMN="Pridajte stpec za aktulny" +TOOLBAR_STATUSLINE_ADD_ROW="Pridajte riadok za aktulny" TOOLBAR_STATUSLINE_ALIGN_CENTER="Zarovnanie na stred" -TOOLBAR_STATUSLINE_ALIGN_JUSTIFY="Zarovnnie odseku do bloku" -TOOLBAR_STATUSLINE_ALIGN_LEFT="av zarovnanie" -TOOLBAR_STATUSLINE_ALIGN_RIGHT="Zarovnanie vpravo" +TOOLBAR_STATUSLINE_ALIGN_JUSTIFY="Zarovn odsek do bloku" +TOOLBAR_STATUSLINE_ALIGN_LEFT="Zarovnanie doava" +TOOLBAR_STATUSLINE_ALIGN_RIGHT="Zarovn text doprava" TOOLBAR_STATUSLINE_COLOR_BACK="Zvraznenie" TOOLBAR_STATUSLINE_COLOR_FORE="Farba psma" -TOOLBAR_STATUSLINE_DELETE_COLUMN="Odstrni tento stpec z tabuky" -TOOLBAR_STATUSLINE_DELETE_ROW="Odstrni tento riadok z tabuky" -TOOLBAR_STATUSLINE_DOUBLE_SPACE="Dvojit medzery" -TOOLBAR_STATUSLINE_EDIT_COPY="Koprova" -TOOLBAR_STATUSLINE_EDIT_CUT="Vystrihn" -TOOLBAR_STATUSLINE_EDIT_FOOTER="Upravi ptu" -TOOLBAR_STATUSLINE_EDIT_HEADER="Upravit zhlavie" -TOOLBAR_STATUSLINE_EDIT_PASTE="Vloi" -TOOLBAR_STATUSLINE_EDIT_REDO="Sp pravy" -TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER="Odstrni ptu" -TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER="Odstrni zhlavie" -TOOLBAR_STATUSLINE_EDIT_UNDO="Sp pravy" -TOOLBAR_STATUSLINE_FILE_NEW="Vytvor nov dokument" -TOOLBAR_STATUSLINE_FILE_OPEN="Otvori existujc dokument" -TOOLBAR_STATUSLINE_FILE_PRINT="Vytla dokument" -TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW="Nhad na dokument pred tlaou" -TOOLBAR_STATUSLINE_FILE_SAVE="Ulo dokument" -TOOLBAR_STATUSLINE_FILE_SAVEAS="Uloi dokument pod inm nzvom" -TOOLBAR_STATUSLINE_FMTPAINTER="Poui na vybran text formtovn zkoprovan z pedchadzajceho odseku" -TOOLBAR_STATUSLINE_FMT_BOOKMARK="Vlo zloku" -TOOLBAR_STATUSLINE_FMT_CHOOSE="Vybrat psmo" -TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR="Nastav smer textu zava doprava" -TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_RTL="Nastav smer textu sprava doava" -TOOLBAR_STATUSLINE_FMT_DOM_DIRECTION="Zmen prevldajc smer odseku" -TOOLBAR_STATUSLINE_FMT_HYPERLINK="Vlo hypertextov odkaz" -TOOLBAR_STATUSLINE_FMT_SIZE="Vekos psma" -TOOLBAR_STATUSLINE_FMT_STYLE="tl" +TOOLBAR_STATUSLINE_DELETE_COLUMN="Odstrni tento stpec z tabuky" +TOOLBAR_STATUSLINE_DELETE_ROW="Odstrni tento riadok z tabuky" +TOOLBAR_STATUSLINE_DOUBLE_SPACE="Dvojit riadkovanie" +TOOLBAR_STATUSLINE_EDIT_COPY="Koprova" +TOOLBAR_STATUSLINE_EDIT_CUT="Vystrihn" +TOOLBAR_STATUSLINE_EDIT_FOOTER="Upravi ptu" +TOOLBAR_STATUSLINE_EDIT_HEADER="Upravi zhlavie" +TOOLBAR_STATUSLINE_EDIT_PASTE="Vloi" +TOOLBAR_STATUSLINE_EDIT_REDO="Sp pravy" +TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER="Odstrni ptu" +TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER="Odstrni zhlavie" +TOOLBAR_STATUSLINE_EDIT_UNDO="Sp pravy" +TOOLBAR_STATUSLINE_FILE_NEW="Vytvorte nov dokument" +TOOLBAR_STATUSLINE_FILE_OPEN="Otvori existujci dokument" +TOOLBAR_STATUSLINE_FILE_PRINT="Vytla cel dokument" +TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW="Uke dokument pred tlaou" +TOOLBAR_STATUSLINE_FILE_SAVE="Ulo dokument" +TOOLBAR_STATUSLINE_FILE_SAVEAS="Ulo dokument pod inm nzvom" +TOOLBAR_STATUSLINE_FMTPAINTER="Na vybran text poui formtovanie skoprovan z predchdzajceho odseku" +TOOLBAR_STATUSLINE_FMT_BOOKMARK="Vlo zloku" +TOOLBAR_STATUSLINE_FMT_CHOOSE="Vyberte psmo" +TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR="Nastav smer textu na zava doprava" +TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_RTL="Nastav smer textu na sprava doava" +TOOLBAR_STATUSLINE_FMT_DOM_DIRECTION="Zmen prevldajci smer odseku" +TOOLBAR_STATUSLINE_FMT_HYPERLINK="Vlo hypertextov odkaz" +TOOLBAR_STATUSLINE_FMT_SIZE="Vekos psma" +TOOLBAR_STATUSLINE_FMT_STYLE="tl" TOOLBAR_STATUSLINE_HELP="Npoveda" -TOOLBAR_STATUSLINE_IMG="Do dokumentu vlo obrzok" -TOOLBAR_STATUSLINE_INDENT="Zvit odsadenie" -TOOLBAR_STATUSLINE_INSERT_SYMBOL="Vlo symbol" -TOOLBAR_STATUSLINE_INSERT_TABLE="Vlo nov tabuku" -TOOLBAR_STATUSLINE_LISTS_BULLETS="Odrky" +TOOLBAR_STATUSLINE_IMG="Do dokumentu vlo obrzok" +TOOLBAR_STATUSLINE_INDENT="Zvi odsadenie" +TOOLBAR_STATUSLINE_INSERT_SYMBOL="Vlo symbol" +TOOLBAR_STATUSLINE_INSERT_TABLE="Vlo nov tabuku" +TOOLBAR_STATUSLINE_LISTS_BULLETS="Odrky" TOOLBAR_STATUSLINE_LISTS_NUMBERS="slovanie" -TOOLBAR_STATUSLINE_MENU="" +TOOLBAR_STATUSLINE_MENU="Ponuka" TOOLBAR_STATUSLINE_MERGEABOVE="Spoj s bunkou nad" TOOLBAR_STATUSLINE_MERGEBELOW="Spoj s bunkou pod" -TOOLBAR_STATUSLINE_MERGELEFT="Spoj s bunkou naavo" +TOOLBAR_STATUSLINE_MERGELEFT="Spoj s bunkou naavo" TOOLBAR_STATUSLINE_MERGERIGHT="Spoj s bunkou napravo" TOOLBAR_STATUSLINE_MERGE_CELLS="Zli bunky" -TOOLBAR_STATUSLINE_MIDDLE_SPACE="1.5 medzery" -TOOLBAR_STATUSLINE_PARA_0BEFORE="Medzera pred: iadna" -TOOLBAR_STATUSLINE_PARA_12BEFORE="Medzera pred: 12 bod" +TOOLBAR_STATUSLINE_MIDDLE_SPACE="riadkovanie 1,5" +TOOLBAR_STATUSLINE_PARA_0BEFORE="Medzera pred: iadna" +TOOLBAR_STATUSLINE_PARA_12BEFORE="Medzera pred: 12 bodov" TOOLBAR_STATUSLINE_SCRIPT_PLAY="Spust pomocn skripty" TOOLBAR_STATUSLINE_SINGLE_SPACE="Jednoduch riadkovanie" -TOOLBAR_STATUSLINE_SPELLCHECK="Zkontroluje preklepy v dokumente" +TOOLBAR_STATUSLINE_SPELLCHECK="Skontroluje preklepy v dokumente" TOOLBAR_STATUSLINE_SPLIT_CELLS="Rozdel tto bunku" -TOOLBAR_STATUSLINE_UNINDENT="Zmeni odsadenie" +TOOLBAR_STATUSLINE_UNINDENT="Zmeni odsadenie" TOOLBAR_STATUSLINE_VIEW_FULL_SCREEN="&Cel obrazovka" TOOLBAR_STATUSLINE_VIEW_SHOWPARA="Zobraz/skryje formtovacie znaky" TOOLBAR_TOOLTIP_1COLUMN="1 stpec" TOOLBAR_TOOLTIP_2COLUMN="2 stpce" TOOLBAR_TOOLTIP_3COLUMN="3 stpce" -TOOLBAR_TOOLTIP_ADD_COLUMN="Prida stpec do tabuky za aktulny" -TOOLBAR_TOOLTIP_ADD_ROW="Prida riadok do tabuky za aktulny" +TOOLBAR_TOOLTIP_ADD_COLUMN="Pridajte stpec za aktulny" +TOOLBAR_TOOLTIP_ADD_ROW="Pridajte riadok za aktulny" TOOLBAR_TOOLTIP_ALIGN_CENTER="Zarovnanie na stred" -TOOLBAR_TOOLTIP_ALIGN_JUSTIFY="Zarovnnie odseku do bloku" -TOOLBAR_TOOLTIP_ALIGN_LEFT="av zarovnanie" -TOOLBAR_TOOLTIP_ALIGN_RIGHT="Zarovnanie vpravo" +TOOLBAR_TOOLTIP_ALIGN_JUSTIFY="Zarovn odsek do bloku" +TOOLBAR_TOOLTIP_ALIGN_LEFT="Zarovnanie doava" +TOOLBAR_TOOLTIP_ALIGN_RIGHT="Zarovn text doprava" TOOLBAR_TOOLTIP_COLOR_BACK="Zvraznenie" TOOLBAR_TOOLTIP_COLOR_FORE="Farba psma" -TOOLBAR_TOOLTIP_DELETE_COLUMN="Odstrni tento stpec z tabuky" -TOOLBAR_TOOLTIP_DELETE_ROW="Odstrni tento riadok z tabuky" -TOOLBAR_TOOLTIP_DOUBLE_SPACE="Dvojit medzery" -TOOLBAR_TOOLTIP_EDIT_COPY="Koprova" -TOOLBAR_TOOLTIP_EDIT_CUT="Vystrihn" -TOOLBAR_TOOLTIP_EDIT_FOOTER="Upravi ptu" -TOOLBAR_TOOLTIP_EDIT_HEADER="Upravit zhlavie" -TOOLBAR_TOOLTIP_EDIT_PASTE="Vloi" -TOOLBAR_TOOLTIP_EDIT_REDO="Sp pravy" -TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER="Odstrni ptu" -TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER="Odstrni zhlavie" -TOOLBAR_TOOLTIP_EDIT_UNDO="Sp pravy" -TOOLBAR_TOOLTIP_FILE_NEW="Vytvor nov dokument" -TOOLBAR_TOOLTIP_FILE_OPEN="Otvori existujc dokument" -TOOLBAR_TOOLTIP_FILE_PRINT="Vytla dokument" -TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW="Nhad na dokument pred tlaou" -TOOLBAR_TOOLTIP_FILE_SAVE="Ulo dokument" -TOOLBAR_TOOLTIP_FILE_SAVEAS="Uloi dokument pod inm nzvom" -TOOLBAR_TOOLTIP_FMTPAINTER="Poui na vybran text formtovn zkoprovan z pedchadzajceho odseku" -TOOLBAR_TOOLTIP_FMT_BOOKMARK="Vlo zloku" +TOOLBAR_TOOLTIP_DELETE_COLUMN="Odstrni tento stpec z tabuky" +TOOLBAR_TOOLTIP_DELETE_ROW="Odstrni tento riadok z tabuky" +TOOLBAR_TOOLTIP_DOUBLE_SPACE="Dvojit riadkovanie" +TOOLBAR_TOOLTIP_EDIT_COPY="Koprova" +TOOLBAR_TOOLTIP_EDIT_CUT="Vystrihn" +TOOLBAR_TOOLTIP_EDIT_FOOTER="Upravi ptu" +TOOLBAR_TOOLTIP_EDIT_HEADER="Upravi zhlavie" +TOOLBAR_TOOLTIP_EDIT_PASTE="Vloi" +TOOLBAR_TOOLTIP_EDIT_REDO="Sp pravy" +TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER="Odstrni ptu" +TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER="Odstrni zhlavie" +TOOLBAR_TOOLTIP_EDIT_UNDO="Sp pravy" +TOOLBAR_TOOLTIP_FILE_NEW="Vytvorte nov dokument" +TOOLBAR_TOOLTIP_FILE_OPEN="Otvori existujci dokument" +TOOLBAR_TOOLTIP_FILE_PRINT="Vytla cel dokument" +TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW="Uke dokument pred tlaou" +TOOLBAR_TOOLTIP_FILE_SAVE="Ulo dokument" +TOOLBAR_TOOLTIP_FILE_SAVEAS="Ulo dokument pod inm nzvom" +TOOLBAR_TOOLTIP_FMTPAINTER="Na vybran text poui formtovanie skoprovan z predchdzajceho odseku" +TOOLBAR_TOOLTIP_FMT_BOOKMARK="Vlo zloku" TOOLBAR_TOOLTIP_FMT_CHOOSE="Vber psma" -TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR="Nastav smer textu zava doprava" -TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_RTL="Nastav smer textu sprava doava" -TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION="Zmen prevldajc smer odseku" -TOOLBAR_TOOLTIP_FMT_HYPERLINK="Vlo hypertextov odkaz" -TOOLBAR_TOOLTIP_FMT_SIZE="Vekos psma" -TOOLBAR_TOOLTIP_FMT_STYLE="tl" +TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR="Nastav smer textu na zava doprava" +TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_RTL="Nastav smer textu na sprava doava" +TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION="Zmen prevldajci smer odseku" +TOOLBAR_TOOLTIP_FMT_HYPERLINK="Vlo hypertextov odkaz" +TOOLBAR_TOOLTIP_FMT_SIZE="Vekos psma" +TOOLBAR_TOOLTIP_FMT_STYLE="tl" TOOLBAR_TOOLTIP_HELP="Npoveda" -TOOLBAR_TOOLTIP_IMG="Do dokumentu vlo obrzok" -TOOLBAR_TOOLTIP_INDENT="Zvit odsadenie" -TOOLBAR_TOOLTIP_INSERT_SYMBOL="Vlo symbol" -TOOLBAR_TOOLTIP_INSERT_TABLE="Vlo nov tabuku" -TOOLBAR_TOOLTIP_LISTS_BULLETS="Odrky" +TOOLBAR_TOOLTIP_IMG="Do dokumentu vlo obrzok" +TOOLBAR_TOOLTIP_INDENT="Zvi odsadenie" +TOOLBAR_TOOLTIP_INSERT_SYMBOL="Vlo symbol" +TOOLBAR_TOOLTIP_INSERT_TABLE="Vlo nov tabuku" +TOOLBAR_TOOLTIP_LISTS_BULLETS="Odrky" TOOLBAR_TOOLTIP_LISTS_NUMBERS="slovanie" -TOOLBAR_TOOLTIP_MENU="" +TOOLBAR_TOOLTIP_MENU="Ponuka" TOOLBAR_TOOLTIP_MERGEABOVE="Spoj s bunkou nad" TOOLBAR_TOOLTIP_MERGEBELOW="Spoj s bunkou pod" -TOOLBAR_TOOLTIP_MERGELEFT="Spoj s bunkou naavo" +TOOLBAR_TOOLTIP_MERGELEFT="Spoj s bunkou naavo" TOOLBAR_TOOLTIP_MERGERIGHT="Spoj s bunkou napravo" TOOLBAR_TOOLTIP_MERGE_CELLS="Zli bunky" -TOOLBAR_TOOLTIP_MIDDLE_SPACE="1.5 medzery" -TOOLBAR_TOOLTIP_PARA_0BEFORE="Medzera pred: iadna" -TOOLBAR_TOOLTIP_PARA_12BEFORE="Medzera pred: 12 bod" +TOOLBAR_TOOLTIP_MIDDLE_SPACE="riadkovanie 1,5" +TOOLBAR_TOOLTIP_PARA_0BEFORE="Medzera pred: iadna" +TOOLBAR_TOOLTIP_PARA_12BEFORE="Medzera pred: 12 bodov" TOOLBAR_TOOLTIP_SCRIPT_PLAY="Spust pomocn skripty" TOOLBAR_TOOLTIP_SINGLE_SPACE="Jednoduch riadkovanie" -TOOLBAR_TOOLTIP_SPELLCHECK="Zkontroluje preklepy v dokumente" +TOOLBAR_TOOLTIP_SPELLCHECK="Skontroluje preklepy v dokumente" TOOLBAR_TOOLTIP_SPLIT_CELLS="Rozdel tto bunku" -TOOLBAR_TOOLTIP_UNINDENT="Zmeni odsadenie" +TOOLBAR_TOOLTIP_UNINDENT="Zmeni odsadenie" TOOLBAR_TOOLTIP_VIEW_FULL_SCREEN="&Cel obrazovka" TOOLBAR_TOOLTIP_VIEW_SHOWPARA="Zobraz/skryje formtovacie znaky" TabStopStatus="Rozmiestnenie tabultorov [%s]" TabToggleBarTab="Panel s tabultormi" -TabToggleCenterTab="Centrovac tabultor" -TabToggleDecimalTab="Tabultor pre desatinn sla" -TabToggleLeftTab="av tabultor" +TabToggleCenterTab="Stredov tabultor" +TabToggleDecimalTab="Tabultor na desatinn sla" +TabToggleLeftTab="av tabultor" TabToggleRightTab="Prav tabultor" TopMarginStatus="Horn okraj [%s]" -WINDOWS_COMCTL_WARNING="AbiWord je vyroben pre nov verziu systmovho sboru COMCTL32.DLL, ktor nemte (COMCTL32.DLL verzia 4.72 alebo nov). Ako vyriei tento problm, vysvetuje rubrika FAQ na webovej strnke AbiSource. \thttp://www.abisource.com Program pouva mete, ale niektor nstroje vm mu chba." -WINDOWS_NEED_UNICOWS="Program AbiWord potrebuje sbor %s.dll Prosm, navtvte strnku http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdkredist.htm a naintalujte ho." +WINDOWS_COMCTL_WARNING="AbiWord je vyroben pre nov verziu systmovho sboru COMCTL32.DLL, ktor nemte (COMCTL32.DLL, verzia 4.72 alebo nov). Ako vyriei tento problm, vysvetuje rubrika FAQ na strnke AbiSource. \thttp://www.abisource.com Program pouva mete, ale niektor nstroje vm mu chba." +WINDOWS_NEED_UNICOWS="Program AbiWord potrebuje sbor %s.dll Prosm, navtvte strnku http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdkredist.htm a naintalujte si ho." WORD_PassInvalid="Nesprvne heslo" -WORD_PassRequired="Treba zada heslo, toto je chrnenn dokument" +WORD_PassRequired="Treba zada heslo, toto je chrnenn dokument" /> diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/strings/zh-CN.strings /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/strings/zh-CN.strings --- abiword-2.6.2/abiword/user/wp/strings/zh-CN.strings 2008-04-06 17:00:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/strings/zh-CN.strings 2009-07-15 16:56:23.000000000 +0100 @@ -13,6 +13,8 @@ DLG_ABOUT_Title="关于 %s" DLG_Apply="应用" DLG_Break_Insert="插入" +DLG_CLIPART_Error="无法加载美工图案" +DLG_CLIPART_Loading="美工图案" DLG_CLIPART_Title="美工图案" DLG_Cancel="取消" DLG_Close="关闭" @@ -21,7 +23,7 @@ DLG_Delete="删除" DLG_DocComparison_Content="正文:" DLG_DocComparison_Different="差异" -DLG_DocComparison_Diverging="在%S的d%版本后分割" +DLG_DocComparison_Diverging="在%s的%d版本后分割" DLG_DocComparison_DivergingPos="在文件 %d后分割" DLG_DocComparison_DocsCompared="比较后的文件" DLG_DocComparison_Fmt="格式:" @@ -38,6 +40,7 @@ DLG_FOSA_ALLDOCS="全部文件" DLG_FOSA_ALLIMAGES="全部图像文件" DLG_FOSA_ExportTitle="导出文件" +DLG_FOSA_ExtensionDoesNotMatch="给定的文件扩展名与文件类型不匹配。仍然使用这个文件名么?" DLG_FOSA_FileInsertMath="插入MathML文件:" DLG_FOSA_FileInsertObject="插入嵌入对象文件:" DLG_FOSA_FileOpenTypeLabel="打开文件的格式:" @@ -79,7 +82,7 @@ DLG_History_List_Title="版本历史" DLG_History_Path="文件名称:" DLG_History_Version="版本:" -DLG_History_Version_AutoRevisioned="自动修正" +DLG_History_Version_AutoRevisioned="自动修订" DLG_History_Version_Started="创建" DLG_History_Version_Version="版本" DLG_History_WindowLabel="文件历史" @@ -117,7 +120,7 @@ DLG_LISTDOCS_Heading1="从列表中选择文件" DLG_LISTDOCS_Title="已打开文件" DLG_Lists_Box_List="方框列表" -DLG_Lists_Bullet_List="小圆点列表" +DLG_Lists_Bullet_List="项目列表" DLG_Lists_Dashed_List="横线列表" DLG_Lists_Diamond_List="菱形列表" DLG_Lists_Font="字体:" @@ -173,7 +176,7 @@ DLG_Password_Title="请输入密码" DLG_QNXMB_No="否" DLG_QNXMB_Yes="是" -DLG_Remove_Icon="您想把这个图标从工具栏移除吗?" +DLG_Remove_Icon="您想把这个图标从工具栏删除吗?" DLG_Restore="恢复" DLG_Select="选择" DLG_Show="显示" @@ -209,7 +212,7 @@ DLG_UFS_TransparencyCheck="设定不用文本背景颜色" DLG_UFS_UnderlineCheck="下划线" DLG_ULANG_AvailableLanguages="可用的语言" -DLG_ULANG_DefaultLangChkbox="为这份文件设为默认" +DLG_ULANG_DefaultLangChkbox="设为该文件的默认语言" DLG_ULANG_DefaultLangLabel="默认语言:" DLG_ULANG_LangLabel="选译语言:" DLG_ULANG_LangTitle="语言设定" @@ -334,7 +337,11 @@ LANG_AR_SA="阿拉伯文 (沙特阿拉伯)" LANG_AST_ES="阿斯图里文 (西班牙)" LANG_AS_IN="阿萨姆文" +LANG_AYC_BO="艾马拉语 (Oruro)" +LANG_AYM_BO="艾马拉语 (La Paz)" +LANG_AYR="中艾马拉语" LANG_BE_BY="白俄罗斯语" +LANG_BE_LATIN="白俄罗斯语" LANG_BG_BG="保加利亚文" LANG_BN_IN="孟加拉文" LANG_BR_FR="布列塔尼文" @@ -409,8 +416,11 @@ LANG_PA_IN="旁遮普语(Gurmukhi)" LANG_PA_PK="旁遮普语(Shahmukhi)" LANG_PL_PL="波兰文" +LANG_PS="粘贴" LANG_PT_BR="葡萄牙文 (巴西)" LANG_PT_PT="葡萄牙文 (葡萄牙)" +LANG_QUH_BO="盖丘亚语 (3 元音)" +LANG_QUL_BO="盖丘亚语 (5 元音)" LANG_QU_BO="盖丘亚语" LANG_RO_RO="罗马尼亚文" LANG_RU_RU="俄文 (俄罗斯)" @@ -432,6 +442,7 @@ LANG_UR_PK="乌尔都语(巴基斯坦)" LANG_UZ_UZ="乌兹别克语" LANG_VI_VN="越南文" +LANG_WO_SN="沃洛夫语 (塞内加尔)" LANG_YI="意第绪文" LANG_ZH_CN="中文 (中国大陆)" LANG_ZH_HK="中文 (香港)" @@ -446,13 +457,13 @@ MENU_STATUSLINE_TABLE_DELETE="删除" MENU_STATUSLINE_TABLE_INSERT="插入" MENU_STATUSLINE_TABLE_SELECT="选择" -MSG_AutoRevision="自动修正" +MSG_AutoRevision="自动修订" MSG_BuildingDoc="生成文件:" -MSG_HistoryConfirmSave="你应该在继续之前把更变保存到文件,现在保存吗?" -MSG_HistoryNoRestore="AbiWord无法完整的保存版本%d的文件, 因为缺少这个版本信息。" -MSG_HistoryPartRestore1="AbiWord无法完整的保存版本%d的文件, 因为这个版本信息不完全。" +MSG_HistoryConfirmSave="你应该在继续之前把修改保存到文件 %s,现在保存吗?" +MSG_HistoryNoRestore="AbiWord无法恢复到版本%d,因为这个版本信息不存在。" +MSG_HistoryPartRestore1="AbiWord无法完全恢复到版本%d,因为这个版本信息不完全。" MSG_HistoryPartRestore2="能够完整保存的版本是 %d. 你要用这个版本保存吗? 要部分保存版本 %d,选择不。" -MSG_HistoryPartRestore3="不管怎么样都要继续,就按OK" +MSG_HistoryPartRestore3="按OK继续," MSG_HistoryPartRestore4="要退出恢复的尝试,按取消" MSG_ImportingDoc="正在导入文件..." MSG_NoUndo="这个操作没有完成,你确定你要进行吗?" @@ -460,7 +471,7 @@ SPELL_CANTLOAD_DLL="AbiWord无法找到拼写文件 %s.dll 请从http://aspell.net/win32/Aspell下载并安装它" STYLE_BLOCKTEXT="屏蔽文本" STYLE_BOXLIST="方框列表" -STYLE_BULLETLIST="小圆点列表" +STYLE_BULLETLIST="项目列表" STYLE_CHAPHEADING="章标题" STYLE_DASHEDLIST="横线列表" STYLE_DIAMONLIST="菱形列表" @@ -495,6 +506,7 @@ STYLE_TRIANGLELIST="三角列表" STYLE_UPPERCASTELIST="大写英文字母列表" STYLE_UPPERROMANLIST="大写罗马数字列表" +TB_ClearBackground="清除背景颜色" TB_Font_Symbol="符号" TB_InsertNewTable="插入表格" TB_Table="表格 " @@ -574,17 +586,17 @@ DLG_DateTime_AvailableFormats_Capital="可用格式" DLG_DateTime_DateTimeTitle="插入日期与时间" DLG_FR_FindLabel="寻找目标(&N):" -DLG_FR_FindNextButton="寻找下一个(&F)" -DLG_FR_FindTitle="寻找" -DLG_FR_FinishedFind="AbiWord已经搜索完了文档。" -DLG_FR_FinishedReplace="AbiWord已经完成了文档的搜索和%d处替换。" -DLG_FR_MatchCase="大小写须相符(&M)" +DLG_FR_FindNextButton="查找下一个(&F)" +DLG_FR_FindTitle="查找" +DLG_FR_FinishedFind="AbiWord已经完成文档搜索。" +DLG_FR_FinishedReplace="AbiWord已经完成文档搜索和%d处替换。" +DLG_FR_MatchCase="大小写匹配(&M)" DLG_FR_ReplaceAllButton="全部替换(&A)" DLG_FR_ReplaceButton="替换(&R)" DLG_FR_ReplaceTitle="替换" DLG_FR_ReplaceWithLabel="替换为(&P):" -DLG_FR_ReverseFind="反向寻找(&V)" -DLG_FR_WholeWord="全文(&W)" +DLG_FR_ReverseFind="反向查找(&V)" +DLG_FR_WholeWord="整个单词(&W)" DLG_Field_FieldTitle="插入字段" DLG_Field_FieldTitle_Capital="插入字段" DLG_Field_Fields="字段(&F):" @@ -627,7 +639,7 @@ DLG_FormatTOC_DetailsTabPage="空格与页码" DLG_FormatTOC_DetailsTop="标签定义" DLG_FormatTOC_DispStyle="显示样式:" -DLG_FormatTOC_FillStyle="填写样式:" +DLG_FormatTOC_FillStyle="填充样式:" DLG_FormatTOC_General="一般" DLG_FormatTOC_HasHeading="设置标题(&H)" DLG_FormatTOC_HasLabel="带标签(&A)" @@ -635,7 +647,7 @@ DLG_FormatTOC_HeadingText="标题文本(&E):" DLG_FormatTOC_Indent="缩进(&N)" DLG_FormatTOC_InheritLabel="继承标签(&I)" -DLG_FormatTOC_LayoutDetails="页面细节" +DLG_FormatTOC_LayoutDetails="布局细节" DLG_FormatTOC_Level1="1级" DLG_FormatTOC_Level2="2级" DLG_FormatTOC_Level3="3级" @@ -707,14 +719,14 @@ DLG_ListRevisions_Column2Label="日期" DLG_ListRevisions_Column3Label="说明" DLG_ListRevisions_Label1="存在的修订:" -DLG_ListRevisions_LevelZero="(隐藏所有修订)" +DLG_ListRevisions_LevelZero="(显示所有修订)" DLG_ListRevisions_Title="选择修订" DLG_Lists_Align="文本对齐:" -DLG_Lists_Apply_Current="应用至目前列表" +DLG_Lists_Apply_Current="应用至当前列表" DLG_Lists_Arabic_List="阿拉伯列表" DLG_Lists_ButtonFont="字体..." DLG_Lists_Cur_Change_Start="变更目前列表" -DLG_Lists_Current_Font="当前字型" +DLG_Lists_Current_Font="当前字体" DLG_Lists_Current_List_Label="当前列表标签" DLG_Lists_Current_List_Type="当前列表类型" DLG_Lists_Customize="自订列表" @@ -751,9 +763,9 @@ DLG_MailMerge_Insert_No_Colon="字段名称" DLG_MailMerge_MailMergeTitle="插入邮件合并字段" DLG_MailMerge_OpenFile="打开文件(&O)" -DLG_MarkRevisions_Check1Label="继续前一个修正 (number %d)" +DLG_MarkRevisions_Check1Label="继续前一个修订 (number %d)" DLG_MarkRevisions_Check2Label="开始新修订版" -DLG_MarkRevisions_Comment2Label="与修正有关的说明" +DLG_MarkRevisions_Comment2Label="与修订有关的说明" DLG_MarkRevisions_Title="标记修订" DLG_MergeCellsTitle="合并单元格" DLG_MergeCells_Above="向上合并" @@ -774,11 +786,11 @@ DLG_MetaData_TAB_General="一般" DLG_MetaData_TAB_Permission="许可" DLG_MetaData_TAB_Summary="摘要" -DLG_MetaData_Title="文件属性" +DLG_MetaData_Title="文档属性" DLG_NEW_Choose="选择" DLG_NEW_Create="从模板新建文件" DLG_NEW_NoFile="没有文件" -DLG_NEW_Open="打开已存在的文件" +DLG_NEW_Open="打开已有文件" DLG_NEW_StartEmpty="新建空白文件" DLG_NEW_Tab1="文字处理" DLG_NEW_Tab1_FAX1="新建传真" @@ -798,14 +810,14 @@ DLG_Options_Label_Both="文字和图标" DLG_Options_Label_CheckAllowCustomToolbars="允许自订工具栏" DLG_Options_Label_CheckAutoLoadPlugins="自动加载所有找到的插件" -DLG_Options_Label_CheckEnableSmoothScrolling="启动平滑滚动" +DLG_Options_Label_CheckEnableSmoothScrolling="启用平滑滚动" DLG_Options_Label_CheckWhiteForTransparent="允许白色以外的屏幕颜色" DLG_Options_Label_ChooseForTransparent="选择屏幕颜色" DLG_Options_Label_ColorChooserLabel="选择 AbiWord 的屏幕颜色" DLG_Options_Label_CustomDict="custom.dic" DLG_Options_Label_DefaultPageSize="预设页面大小" DLG_Options_Label_DirectionRtl="预设文字左右方向" -DLG_Options_Label_Documents="文件" +DLG_Options_Label_Documents="文档" DLG_Options_Label_FileExtension="文件扩展:" DLG_Options_Label_General="一般" DLG_Options_Label_Grammar="自动检查语法" @@ -814,19 +826,18 @@ DLG_Options_Label_Hide="隐藏" DLG_Options_Label_Icons="图标" DLG_Options_Label_Ignore="略过" -DLG_Options_Label_InvalidRangeForAutoSave="你应该在1到120之间选择自动保存的频率" +DLG_Options_Label_InvalidRangeForAutoSave="自动保存的频率应该在1到120之间" DLG_Options_Label_LangSettings="语言设定" DLG_Options_Label_Language="语言" -DLG_Options_Label_Layout="页面设置" +DLG_Options_Label_Layout="页面布局" DLG_Options_Label_Look="按钮样式" DLG_Options_Label_Minutes="分钟" DLG_Options_Label_PrefsAutoSave="自动保存这个方案(&A)" DLG_Options_Label_PrefsCurrentScheme="目前偏好的方案(&C)" DLG_Options_Label_Schemes="偏好设定方案" -DLG_Options_Label_ShowSplash="程序启动时显示 AbiWord 欢迎画面" DLG_Options_Label_SmartQuotesEnable="启用智能引号(&E)" -DLG_Options_Label_SpellAutoReplace="自动修改拼错了的单词" -DLG_Options_Label_SpellCheckAsType="自动拼写检查(&P)" +DLG_Options_Label_SpellAutoReplace="自动替换拼错了的单词" +DLG_Options_Label_SpellCheckAsType="输入时拼写检查(&P)" DLG_Options_Label_SpellCustomDict="自订词典:" DLG_Options_Label_SpellDictionaries="词典" DLG_Options_Label_SpellHideErrors="隐藏文件中的拼写错误(&S)" @@ -891,7 +902,7 @@ DLG_PageSetup_Page="页面" DLG_PageSetup_Paper="纸张..." DLG_PageSetup_Paper_Size="纸张大小(&Z):" -DLG_PageSetup_Percent="正常大小的%" +DLG_PageSetup_Percent="正常大小的 %" DLG_PageSetup_Portrait="直印(&P)" DLG_PageSetup_Right="右(&R):" DLG_PageSetup_Scale="比例缩放..." @@ -964,7 +975,7 @@ DLG_Styles_ErrBlankName="样式名称不能留空" DLG_Styles_ErrNoStyle="未选择样式 所以不能修改" DLG_Styles_ErrNotTitle1="样式名称 - " -DLG_Styles_ErrNotTitle2=" - 已保留。 您不能用这个名称。请选择另一个。 " +DLG_Styles_ErrNotTitle2=" - 已保留。 您不能使用这个名称。请选择另一个。 " DLG_Styles_ErrStyleBuiltin="不能修改内定的样式" DLG_Styles_ErrStyleCantDelete="不能删除这个样式" DLG_Styles_ErrStyleNot="这个样式不存在 所以不能修改" @@ -991,13 +1002,13 @@ DLG_Styles_New="新增..." DLG_Styles_NewTitle="新样式" DLG_Styles_ParaPrev="段落预览" -DLG_Styles_RemoveButton="移除" -DLG_Styles_RemoveLab="从样式中移除属性" +DLG_Styles_RemoveButton="删除" +DLG_Styles_RemoveLab="从样式中删除属性" DLG_Styles_StylesLocked="禁止除样式以外的所有格式命令" DLG_Styles_StylesTitle="样式" DLG_Stylist_FootnoteStyles="注释样式" DLG_Stylist_HeadingStyles="标题样式" -DLG_Stylist_ListStyles="样式列表" +DLG_Stylist_ListStyles="列表样式" DLG_Stylist_MiscStyles="其它样式" DLG_Stylist_Styles="样式" DLG_Stylist_Title="样式" @@ -1098,7 +1109,7 @@ FIELD_PieceTable_MartinTest="边界测试" FIELD_PieceTable_Test="Kevins 测试" FIELD_Type_Datetime="日期及时间" -FIELD_Type_Document="文件" +FIELD_Type_Document="文档" FIELD_Type_Numbers="数字" FIELD_Type_PieceTable="表格" FirstLineIndentStatus="第一行缩进 [%s]" @@ -1120,7 +1131,7 @@ MENU_LABEL_EDIT_COPYEMBED="复制对象" MENU_LABEL_EDIT_COPYIMAGE="复制图像" MENU_LABEL_EDIT_COPY_FRAME="复制文本框" -MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION="复制超级链接的地址(&O)" +MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION="复制超链接的地址(&O)" MENU_LABEL_EDIT_CUT="剪切(&T)" MENU_LABEL_EDIT_CUTEMBED="剪切对象" MENU_LABEL_EDIT_CUTIMAGE="剪切图像" @@ -1130,14 +1141,14 @@ MENU_LABEL_EDIT_DELETEIMAGE="删除图像" MENU_LABEL_EDIT_EDITFOOTER="编辑页脚" MENU_LABEL_EDIT_EDITHEADER="编辑页眉" -MENU_LABEL_EDIT_FIND="寻找(&F)" +MENU_LABEL_EDIT_FIND="查找(&F)" MENU_LABEL_EDIT_GOTO="转到(&G)" MENU_LABEL_EDIT_LATEXEQUATION="编辑公式" MENU_LABEL_EDIT_PASTE="粘贴(&P)" MENU_LABEL_EDIT_PASTE_SPECIAL="无格式粘贴(&S)" MENU_LABEL_EDIT_REDO="重做(&R)" -MENU_LABEL_EDIT_REMOVEFOOTER="移除页脚" -MENU_LABEL_EDIT_REMOVEHEADER="移除页眉" +MENU_LABEL_EDIT_REMOVEFOOTER="删除页脚" +MENU_LABEL_EDIT_REMOVEHEADER="删除页眉" MENU_LABEL_EDIT_REPLACE="替换(&E)" MENU_LABEL_EDIT_SELECTALL="全选" MENU_LABEL_EDIT_SELECT_FRAME="选择文本框" @@ -1219,11 +1230,12 @@ MENU_LABEL_HELP_INDEX="帮助介绍(&I)" MENU_LABEL_HELP_REPORT_BUG="报告程序错误(&B)" MENU_LABEL_HELP_SEARCH="搜寻帮助(&S)" +MENU_LABEL_INSERT_ANNOTATION="注解" MENU_LABEL_INSERT_BOOKMARK="书签(&K)" MENU_LABEL_INSERT_BREAK="分隔符(&B)" MENU_LABEL_INSERT_CLIPART="美工图案(&C)" MENU_LABEL_INSERT_DATETIME="日期及时间(&T)" -MENU_LABEL_INSERT_DELETE_HYPERLINK="删除超级链接(&D)" +MENU_LABEL_INSERT_DELETE_HYPERLINK="删除超链接(&D)" MENU_LABEL_INSERT_DIRECTIONMARKER="文本方向标记(&D)" MENU_LABEL_INSERT_DIRECTIONMARKER_LRM="从左到右标记(&L)" MENU_LABEL_INSERT_DIRECTIONMARKER_RLM="从右到左标记(&R)" @@ -1239,7 +1251,7 @@ MENU_LABEL_INSERT_GOTO_HYPERLINK="转到超链接(&J)" MENU_LABEL_INSERT_GRAPHIC="图片(&P)" MENU_LABEL_INSERT_HEADER="页眉" -MENU_LABEL_INSERT_HYPERLINK="超级链接(&H)" +MENU_LABEL_INSERT_HYPERLINK="超链接(&H)" MENU_LABEL_INSERT_MAILMERGE="邮件合并域(&M)" MENU_LABEL_INSERT_PAGENO="页码(&U)" MENU_LABEL_INSERT_SYMBOL="符号(&M)" @@ -1258,7 +1270,7 @@ MENU_LABEL_SPELL_SUGGEST_8="%s" MENU_LABEL_SPELL_SUGGEST_9="%s" MENU_LABEL_TABLE="表格(&A)" -MENU_LABEL_TABLE_AUTOFIT="自动填充表格(&A)" +MENU_LABEL_TABLE_AUTOFIT="自动调整表格(&A)" MENU_LABEL_TABLE_DELETE="删除(&D)" MENU_LABEL_TABLE_DELETECOLUMN="删除列(&L)" MENU_LABEL_TABLE_DELETEROW="删除行(&W)" @@ -1269,7 +1281,7 @@ MENU_LABEL_TABLE_DELETE_TABLE="表格(&T)" MENU_LABEL_TABLE_FORMAT="设定表格格式(&F)" MENU_LABEL_TABLE_HEADING_ROWS_REPEAT="重复此行作为标题" -MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE="移除标题行" +MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE="删除标题行" MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS="把这一行设定为标题" MENU_LABEL_TABLE_INSERTCOLUMN="插入列(&C)" MENU_LABEL_TABLE_INSERTROW="插入行(&R)" @@ -1296,15 +1308,15 @@ MENU_LABEL_TABLE_SPLIT_CELLS="拆分单元格(&P)" MENU_LABEL_TABLE_SPLIT_TABLE="拆分表格(&T)" MENU_LABEL_TABLE_TABLETOTEXT="将表格转换为文本" -MENU_LABEL_TABLE_TABLETOTEXTCOMMAS="以逗号分割" -MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS="依逗号和标签分割" -MENU_LABEL_TABLE_TABLETOTEXTTABS="依跳格分割" +MENU_LABEL_TABLE_TABLETOTEXTCOMMAS="以逗号分隔" +MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS="以逗号和制表符分隔" +MENU_LABEL_TABLE_TABLETOTEXTTABS="依制表符分隔" MENU_LABEL_TABLE_TEXTTOTABLE="将文本转换为表格" MENU_LABEL_TABLE_TEXTTOTABLE_ALL="在标点和空格处拆分文本" MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES="在标点处拆分文本" MENU_LABEL_TOOLS="工具(&T)" MENU_LABEL_TOOLS_AUTOSPELL="自动检查拼写(&A)" -MENU_LABEL_TOOLS_HISTORY="文件历史(&D)" +MENU_LABEL_TOOLS_HISTORY="文档历史(&D)" MENU_LABEL_TOOLS_HISTORY_PURGE="删除历史(&P)" MENU_LABEL_TOOLS_HISTORY_SHOW="显示历史(&S)" MENU_LABEL_TOOLS_LANGUAGE="语言(&L)" @@ -1315,14 +1327,13 @@ MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION="接受修订(&A)" MENU_LABEL_TOOLS_REVISIONS_AUTO="保存全部历史(&M)" MENU_LABEL_TOOLS_REVISIONS_COMPARE_DOCUMENTS="比较文件(&C)" -MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT="查找下一个修正" -MENU_LABEL_TOOLS_REVISIONS_FIND_PREV="查找上一个修正" -MENU_LABEL_TOOLS_REVISIONS_MARK="输入时检查(&M)" -MENU_LABEL_TOOLS_REVISIONS_MERGE_DOCUMENTS="合并文件(&E)" +MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT="查找下一个修订" +MENU_LABEL_TOOLS_REVISIONS_FIND_PREV="查找上一个修订" +MENU_LABEL_TOOLS_REVISIONS_MARK="输入时标记修订(&M)" MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION="开始新修订版(&W)" -MENU_LABEL_TOOLS_REVISIONS_PURGE="清理修正(&U)" -MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION="放弃修正(&R)" -MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL="选择修正(&S)" +MENU_LABEL_TOOLS_REVISIONS_PURGE="清理修订(&U)" +MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION="放弃修订(&R)" +MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL="选择修订(&S)" MENU_LABEL_TOOLS_REVISIONS_SHOW="显示修订(&H)" MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER="显示修订后的文档(&F)" MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV="显示前一次修正后的文档(&P)" @@ -1335,22 +1346,22 @@ MENU_LABEL_TOOLTIP_INSERT_EQUATION="插入公式" MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE="从文件中插入MathML公式" MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX="从LaTeX中插入公式" -MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT="恢复到默认的模式(&R)" +MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT="恢复到默认的布局(&R)" MENU_LABEL_VIEW_FULLSCREEN="全屏幕(&U)" MENU_LABEL_VIEW_HEADFOOT="页眉/页脚(&H)" -MENU_LABEL_VIEW_LOCKSTYLES="启动格式化工具(&F)" +MENU_LABEL_VIEW_LOCKSTYLES="启用格式化工具(&F)" MENU_LABEL_VIEW_LOCK_TB_LAYOUT="版面设定(&L)" -MENU_LABEL_VIEW_NORMAL="标准模式(&N)" -MENU_LABEL_VIEW_PRINT="打印模式(&P)" +MENU_LABEL_VIEW_NORMAL="标准布局(&N)" +MENU_LABEL_VIEW_PRINT="打印布局(&P)" MENU_LABEL_VIEW_RULER="显示标尺(&R)" MENU_LABEL_VIEW_SHOWPARA="显示格式标记(&F)" -MENU_LABEL_VIEW_STATUSBAR="显示状态列(&S)" +MENU_LABEL_VIEW_STATUSBAR="显示状态行(&S)" MENU_LABEL_VIEW_TB_1="(&1) %s" MENU_LABEL_VIEW_TB_2="(&2) %s" MENU_LABEL_VIEW_TB_3="(&3) %s" MENU_LABEL_VIEW_TB_4="(&4) %s" MENU_LABEL_VIEW_TOOLBARS="工具栏(&T)" -MENU_LABEL_VIEW_WEB="网页模式(&W)" +MENU_LABEL_VIEW_WEB="网页布局(&W)" MENU_LABEL_VIEW_ZOOM="缩放(&Z)" MENU_LABEL_VIEW_ZOOM_100="缩放至 &100%" MENU_LABEL_VIEW_ZOOM_200="缩放至 &200%" @@ -1371,7 +1382,7 @@ MENU_LABEL_WINDOW_7="(&7) %s" MENU_LABEL_WINDOW_8="(&8) %s" MENU_LABEL_WINDOW_9="(&9) %s" -MENU_LABEL_WINDOW_MORE="其他文件(&M)" +MENU_LABEL_WINDOW_MORE="更多文件(&M)" MENU_LABEL_WINDOW_NEW="新窗口(&N)" MENU_LABEL__BOGUS1__=" " MENU_LABEL__BOGUS2__=" " @@ -1386,37 +1397,37 @@ MENU_STATUSLINE_EDIT_COPYEMBED="复制嵌入对象" MENU_STATUSLINE_EDIT_COPYIMAGE="保存图像备份到剪贴板" MENU_STATUSLINE_EDIT_COPY_FRAME="复制文本框到剪贴板" -MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION="复制超级链接地址" +MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION="复制超链接地址" MENU_STATUSLINE_EDIT_CUT="剪切到剪贴板" MENU_STATUSLINE_EDIT_CUTEMBED="剪切嵌入对象" -MENU_STATUSLINE_EDIT_CUTIMAGE="移除图像并备份到剪贴板中" +MENU_STATUSLINE_EDIT_CUTIMAGE="删除图像并备份到剪贴板中" MENU_STATUSLINE_EDIT_CUT_FRAME="剪切文本框" MENU_STATUSLINE_EDIT_DELETEEMBED="删除嵌入对象" -MENU_STATUSLINE_EDIT_DELETEFRAME="将此文本框从文件中移除" -MENU_STATUSLINE_EDIT_DELETEIMAGE="将此图像从文件中移除" +MENU_STATUSLINE_EDIT_DELETEFRAME="将此文本框从文件中删除" +MENU_STATUSLINE_EDIT_DELETEIMAGE="将此图像从文件中删除" MENU_STATUSLINE_EDIT_EDITFOOTER="编辑本页的页脚" MENU_STATUSLINE_EDIT_EDITHEADER="编辑本页的页眉" -MENU_STATUSLINE_EDIT_FIND="搜寻特定的文字" +MENU_STATUSLINE_EDIT_FIND="查找特定的文字" MENU_STATUSLINE_EDIT_GOTO="跳到新的插入点" MENU_STATUSLINE_EDIT_LATEXEQUATION="编辑Latex公式" MENU_STATUSLINE_EDIT_PASTE="将剪贴板上的内容贴到工作区" MENU_STATUSLINE_EDIT_PASTE_SPECIAL="插入未格式化的剪贴板内容" MENU_STATUSLINE_EDIT_REDO="重做以前复原了的编辑" -MENU_STATUSLINE_EDIT_REMOVEFOOTER="把本页的页脚从文件中移除" -MENU_STATUSLINE_EDIT_REMOVEHEADER="把本页的页眉从文件中移除" -MENU_STATUSLINE_EDIT_REPLACE="替换此文本为其它文本" +MENU_STATUSLINE_EDIT_REMOVEFOOTER="把本页的页脚从文件中删除" +MENU_STATUSLINE_EDIT_REMOVEHEADER="把本页的页眉从文件中删除" +MENU_STATUSLINE_EDIT_REPLACE="将此文本替换为其它文本" MENU_STATUSLINE_EDIT_SELECTALL="选取整个文件" MENU_STATUSLINE_EDIT_SELECT_FRAME="选取文本框" MENU_STATUSLINE_EDIT_UNDO="取消修改" MENU_STATUSLINE_FILE=" " -MENU_STATUSLINE_FILE_CLOSE="关闭此文件" +MENU_STATUSLINE_FILE_CLOSE="关闭此文档" MENU_STATUSLINE_FILE_EXIT="关闭这个应用程序所有窗口并离开" MENU_STATUSLINE_FILE_EXPORT="以原来的文件名称保存文件" MENU_STATUSLINE_FILE_IMPORT="以副本打开新文件" MENU_STATUSLINE_FILE_IMPORTSTYLES="从文件中导入样式定义" MENU_STATUSLINE_FILE_NEW="新建文件" MENU_STATUSLINE_FILE_NEW_USING_TEMPLATE="从模板新建文件" -MENU_STATUSLINE_FILE_OPEN="打开已存在的文件" +MENU_STATUSLINE_FILE_OPEN="打开已有文件" MENU_STATUSLINE_FILE_PAGESETUP="改变打印选项" MENU_STATUSLINE_FILE_PRINT="打印文件或其部份" MENU_STATUSLINE_FILE_PRINT_DIRECTLY="使用内部的 PS 驱动程序打印" @@ -1432,7 +1443,7 @@ MENU_STATUSLINE_FILE_RECENT_7="打开这份文件" MENU_STATUSLINE_FILE_RECENT_8="打开这份文件" MENU_STATUSLINE_FILE_RECENT_9="打开这份文件" -MENU_STATUSLINE_FILE_REVERT="把文件恢复至上一次保存时的状态" +MENU_STATUSLINE_FILE_REVERT="把文件恢复至上一次保存的状态" MENU_STATUSLINE_FILE_SAVE="保存这份文件" MENU_STATUSLINE_FILE_SAVEAS="将文件换名保存" MENU_STATUSLINE_FILE_SAVEEMBED="保存嵌入对象" @@ -1446,7 +1457,7 @@ MENU_STATUSLINE_FMT_BORDERS="向选定的区域添加边框及底纹设定" MENU_STATUSLINE_FMT_BOTTOMLINE="选区内加行底线 (切换)" MENU_STATUSLINE_FMT_BULLETS="在选中的段落中增加或修改项目符号和编号" -MENU_STATUSLINE_FMT_COLUMNS="改变字段数" +MENU_STATUSLINE_FMT_COLUMNS="改变栏数" MENU_STATUSLINE_FMT_DIRECTION="改变文本的方向" MENU_STATUSLINE_FMT_DIRECTION_DD_RTL="把本段落文字方向改为右到左" MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL="把本文档文本方向改为右到左" @@ -1455,26 +1466,26 @@ MENU_STATUSLINE_FMT_DIRECTION_SD_RTL="把本节文字方向改为右到左" MENU_STATUSLINE_FMT_DOCUMENT="设定您的文件的版面属性,例如纸张大小和边界" MENU_STATUSLINE_FMT_EMBED="格式化嵌入对象" -MENU_STATUSLINE_FMT_FONT="改变已选文字的字型" +MENU_STATUSLINE_FMT_FONT="改变选中文字的字体" MENU_STATUSLINE_FMT_FOOTNOTES="设定脚注及尾注类型" MENU_STATUSLINE_FMT_FRAME="改变文本框的属性" MENU_STATUSLINE_FMT_HDRFTR="设定页眉及页脚类型" MENU_STATUSLINE_FMT_IMAGE="改变这个图像的大小" MENU_STATUSLINE_FMT_ITALIC="使选取区字体变斜 (切换)" -MENU_STATUSLINE_FMT_LANGUAGE="改变已选文字的语言" +MENU_STATUSLINE_FMT_LANGUAGE="改变选中文字的语言" MENU_STATUSLINE_FMT_OVERLINE="在选取区加入上标线 (切换)" -MENU_STATUSLINE_FMT_PARAGRAPH="改变已选段落的格式" +MENU_STATUSLINE_FMT_PARAGRAPH="改变选中段落的格式" MENU_STATUSLINE_FMT_POSIMAGE="设定这个图像格式" MENU_STATUSLINE_FMT_SETPOSIMAGE="固定本图片" MENU_STATUSLINE_FMT_STRIKE="为选取区文字加删除线 (切换)" -MENU_STATUSLINE_FMT_STYLE="为选取区文字定义或套用样式" -MENU_STATUSLINE_FMT_STYLE_DEFINE="为选取区文字定义或套用样式" +MENU_STATUSLINE_FMT_STYLE="为选中文字定义或应用样式" +MENU_STATUSLINE_FMT_STYLE_DEFINE="为选中文字定义或应用样式" MENU_STATUSLINE_FMT_STYLIST="用样式设定你的文件" MENU_STATUSLINE_FMT_SUBSCRIPT="使选取区文字成为下标字 (切换)" MENU_STATUSLINE_FMT_SUPERSCRIPT="使选取区文字成为上标字 (切换)" MENU_STATUSLINE_FMT_TABLEOFCONTENTS="设定目录类型及样式" MENU_STATUSLINE_FMT_TABS="设定制表符" -MENU_STATUSLINE_FMT_TOGGLECASE="改变已选文字的大小写" +MENU_STATUSLINE_FMT_TOGGLECASE="改变选中文字的大小写" MENU_STATUSLINE_FMT_TOPLINE="选区内加行顶线 (切换)" MENU_STATUSLINE_FMT_UNDERLINE="在选取区加下划线(切换)" MENU_STATUSLINE_FORMAT=" " @@ -1488,6 +1499,7 @@ MENU_STATUSLINE_HELP_REPORT_BUG="报告程序错误,让AbiWord做得更好" MENU_STATUSLINE_HELP_SEARCH="在帮助中搜寻相关内容..." MENU_STATUSLINE_INSERT=" " +MENU_STATUSLINE_INSERT_ANNOTATION="插入注解" MENU_STATUSLINE_INSERT_BOOKMARK="插入书签" MENU_STATUSLINE_INSERT_BREAK="插入一个分页符、分栏符或分节符" MENU_STATUSLINE_INSERT_CLIPART="插入美工图案" @@ -1502,7 +1514,7 @@ MENU_STATUSLINE_INSERT_FILE="插入另一个文件的内容目录" MENU_STATUSLINE_INSERT_FOOTER="插入页脚" MENU_STATUSLINE_INSERT_FOOTNOTE="插入脚注" -MENU_STATUSLINE_INSERT_GOTO_HYPERLINK="转到超级链接" +MENU_STATUSLINE_INSERT_GOTO_HYPERLINK="转到超链接" MENU_STATUSLINE_INSERT_GRAPHIC="插入现有的文件中图片" MENU_STATUSLINE_INSERT_HEADER="插入页眉" MENU_STATUSLINE_INSERT_HYPERLINK="插入超级链接" @@ -1533,7 +1545,7 @@ MENU_STATUSLINE_TABLE_DELETE_TABLE="删除表格" MENU_STATUSLINE_TABLE_FORMAT="设定表格格式" MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT="换页时重复此行作为标题" -MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE="移除本页首行" +MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE="删除本页首行" MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS="把这一行设定为每一页出现的表格标题" MENU_STATUSLINE_TABLE_INSERTCOLUMN="插入一列到右边" MENU_STATUSLINE_TABLE_INSERTROW="向下插入行" @@ -1559,18 +1571,18 @@ MENU_STATUSLINE_TABLE_SPLIT_CELLS="拆分单元格" MENU_STATUSLINE_TABLE_SPLIT_TABLE="拆分表格" MENU_STATUSLINE_TABLE_TABLETOTEXT="从表格转换到文本" -MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS="依逗号分割表格项目" -MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS="依逗号和标签分割表格项目" -MENU_STATUSLINE_TABLE_TABLETOTEXTTABS="依标签分割表格项目" +MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS="以逗号分隔表格项目" +MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS="以逗号和标签分隔表格项目" +MENU_STATUSLINE_TABLE_TABLETOTEXTTABS="以制表符分隔表格项目" MENU_STATUSLINE_TABLE_TEXTTOTABLE="将选中的文本转换为表格" MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL="拆分所有的边界(包括空格)" MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES="拆分所有的边界(除了空格)" MENU_STATUSLINE_TOOLS=" " MENU_STATUSLINE_TOOLS_AUTOSPELL="自动为文件检查拼写" MENU_STATUSLINE_TOOLS_HISTORY="查看当前文件的历史" -MENU_STATUSLINE_TOOLS_HISTORY_PURGE="从文件中移除文档全部历史" +MENU_STATUSLINE_TOOLS_HISTORY_PURGE="从文件中删除文档全部历史" MENU_STATUSLINE_TOOLS_HISTORY_SHOW="查看文档历史" -MENU_STATUSLINE_TOOLS_LANGUAGE="改变已选文字的语言" +MENU_STATUSLINE_TOOLS_LANGUAGE="改变选中文字的语言" MENU_STATUSLINE_TOOLS_MAILMERGE="邮件合并" MENU_STATUSLINE_TOOLS_OPTIONS="设定偏好" MENU_STATUSLINE_TOOLS_PLUGINS="管理插件" @@ -1578,13 +1590,13 @@ MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION="接受建议的更改" MENU_STATUSLINE_TOOLS_REVISIONS_AUTO="保留每一页的更改" MENU_STATUSLINE_TOOLS_REVISIONS_COMPARE_DOCUMENTS="把当前文件与另一文件进行比较" -MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT="查找文件中下一个明显修正" -MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV="查找文件中上一个明显修正" +MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT="查找文件中下一个可见修订" +MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV="查找文件中上一个可见修订" MENU_STATUSLINE_TOOLS_REVISIONS_MARK="输入时标记修订" MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS="把另外的文件合并到当前文件" MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION="从当前的文本进行严谨的检查" -MENU_STATUSLINE_TOOLS_REVISIONS_PURGE="移除文档中所有的修订信息" -MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION="移除这个建议的更改" +MENU_STATUSLINE_TOOLS_REVISIONS_PURGE="删除文档中的所有修订信息" +MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION="删除这个建议的更改" MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL="选择哪一个你要看的修正" MENU_STATUSLINE_TOOLS_REVISIONS_SHOW="显示现在在文档中的修正" MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER="显示修正后的文档的样子" @@ -1596,10 +1608,10 @@ MENU_STATUSLINE_TOOLS_SPELLPREFS="设定您的拼写检查偏好" MENU_STATUSLINE_TOOLS_WORDCOUNT="计算本篇文章的字数" MENU_STATUSLINE_VIEW=" " -MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT="恢复工具栏的默认设置" +MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT="恢复工具栏的默认布局" MENU_STATUSLINE_VIEW_FULLSCREEN="以全屏幕模式查看文件" MENU_STATUSLINE_VIEW_HEADFOOT="编辑每一页的页眉/页脚" -MENU_STATUSLINE_VIEW_LOCKSTYLES="允许只用样式格式化" +MENU_STATUSLINE_VIEW_LOCKSTYLES="允许只用样式进行格式化" MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT="锁定当前工具栏的布局" MENU_STATUSLINE_VIEW_NORMAL="标准查看模式" MENU_STATUSLINE_VIEW_PRINT="打印模式" @@ -1638,20 +1650,20 @@ MENU_STATUSLINE__BOGUS2__=" " MSG_AfterRestartNew="这项变更要等到您重新启动 AbiWord 或打开新文件后才会生效。" MSG_AutoMerge="自动合并" -MSG_AutoRevisionOffWarning="你确认你不想保存全部的历史记录吗?如果你这样执行,你就不能够还原这个文档。" -MSG_BookmarkNotFound="在这份文件中找不到书签 "%s"" -MSG_CHECK_PRINT_MODE="页眉和页脚只能在打印模式中编辑 要进入这种模式,从菜单中选择查看->打印模式。 你现在要进入打印模式吗?" +MSG_AutoRevisionOffWarning="你确认不想保存全部的历史记录吗?如果你这样执行,你就不能将这个文档还原至早期版本。" +MSG_BookmarkNotFound="在文档中找不到书签 "%s"" +MSG_CHECK_PRINT_MODE="页眉和页脚只能在打印视图中创建和编辑 要进入这种模式,从菜单中选择查看->打印布局。 你现在要进入打印模式吗?" MSG_ConfirmSave="关闭文档 %s 之前保存?" MSG_ConfirmSaveSecondary="如果你不保存你的修改,他们将会丢失。" MSG_DefaultDirectionChg="您已改变了预设方向" MSG_DirectionModeChg="您已改变了方向模式" -MSG_DlgNotImp="%s 功能尚未写好。 如果您是一位程序设计师,欢迎您在 %s,第 %d 行加入程序代码, 并把补丁寄到: \tabiword-dev@abisource.com 否则,请您耐心等待了。" +MSG_DlgNotImp="%s 功能尚未实现。 如果您是一位程序员,欢迎您在 %s,第 %d 行加入程序代码, 并把补丁寄到: \tabiword-dev@abisource.com 否则,还请您耐心等待。" MSG_EmptySelection="当前选择为空" -MSG_Exception="发生致命错误,Abiword将要关闭了。 当前的文档已经被保存到了一".saved"扩展的文件。" -MSG_HiddenRevisions="这份文件包含有隐藏的修正。请参阅AbiWord关于处理修正的文档。" -MSG_HyperlinkCrossesBoundaries="超级链接所依附的文字必须在一段之内。" +MSG_Exception="发生致命错误,Abiword将要关闭了。 当前的文档已经被保存到一个扩展名为".saved"的文件。" +MSG_HiddenRevisions="这份文件包含有隐藏的修订。请参阅AbiWord关于处理修订的文档。" +MSG_HyperlinkCrossesBoundaries="超链接所依附的文字必须在一段之内。" MSG_HyperlinkNoBookmark="警告: 您提供的书签 [%s] 并不存在。" -MSG_HyperlinkNoSelection="您插入超级链接之前必须先选择文件的一部份。" +MSG_HyperlinkNoSelection="您插入超链接之前必须先选择文件的一部份。" MSG_IE_BogusDocument="AbiWord 不能打开 %s,它可能是一个无效的文件" MSG_IE_CouldNotOpen="不能打开%s 进行写入" MSG_IE_CouldNotWrite="不能写入文件 %s " @@ -1661,7 +1673,6 @@ MSG_IE_UnknownType="文件 %s 类型不明" MSG_IE_UnsupportedType="文件 %s 不属于目前支持的文件类型" MSG_ImportError="导入文件 %s 发生错误。" -MSG_MergeDocsNotRelated="您尝试合并的文件并不相关. AbiWord将尝试 合并它们,但是结果可能没有意义。" MSG_NoBreakInsideFrame="在文字框中无法插入间隔" MSG_NoBreakInsideTable="在表格中无法插入间隔" MSG_OpenFailed="不能打开文件 %s 。" @@ -1672,16 +1683,17 @@ MSG_RevertFile="把文件恢复到上次保存的状态?" MSG_SaveFailed="不能写入文件 %s 。" MSG_SaveFailedExport="保存 %s 时发生错误: 不能构建导出器" -MSG_SaveFailedName="保存 %s 时发生错误: 档名无效" +MSG_SaveFailedName="保存 %s 时发生错误: 文档名无效" MSG_SaveFailedWrite="保存 %s 时发生写入错误" -MSG_SpellDone="拼写检查已经完成了。" +MSG_SpellDone="拼写检查完成。" MSG_SpellSelectionDone="AbiWord完成检查选中的部分。" -PRINT_CANNOTSTARTPRINTJOB="不能开始打印工作" +PRINT_CANNOTSTARTPRINTJOB="不能开始打印任务" PageInfoField="第 %d 页 共 %d 页" RightIndentStatus="右缩进 [%s]" RightMarginStatus="右边界 [%s]" SCRIPT_CANTRUN="执行 %s 脚本时发生错误" SCRIPT_NOSCRIPTS="找不到任何脚本" +TB_Embedded="嵌入" TB_Extra="额外" TB_Format="格式" TB_Simple="简单" @@ -1707,8 +1719,8 @@ TOOLBAR_LABEL_EDIT_HEADER="编辑页眉" TOOLBAR_LABEL_EDIT_PASTE="粘贴" TOOLBAR_LABEL_EDIT_REDO="重做" -TOOLBAR_LABEL_EDIT_REMOVEFOOTER="移除页脚" -TOOLBAR_LABEL_EDIT_REMOVEHEADER="移除页眉" +TOOLBAR_LABEL_EDIT_REMOVEFOOTER="删除页脚" +TOOLBAR_LABEL_EDIT_REMOVEHEADER="删除页眉" TOOLBAR_LABEL_EDIT_UNDO="撤销" TOOLBAR_LABEL_FILE_NEW="新建" TOOLBAR_LABEL_FILE_OPEN="打开" @@ -1731,6 +1743,7 @@ TOOLBAR_LABEL_INSERT_TABLE="插入表格" TOOLBAR_LABEL_LISTS_BULLETS="项目符号" TOOLBAR_LABEL_LISTS_NUMBERS="项目编号" +TOOLBAR_LABEL_MENU="菜单" TOOLBAR_LABEL_MERGEABOVE="向上合并" TOOLBAR_LABEL_MERGEBELOW="向下合并" TOOLBAR_LABEL_MERGELEFT="向左合并" @@ -1749,8 +1762,8 @@ TOOLBAR_STATUSLINE_1COLUMN="一栏" TOOLBAR_STATUSLINE_2COLUMN="二栏" TOOLBAR_STATUSLINE_3COLUMN="三栏" -TOOLBAR_STATUSLINE_ADD_COLUMN="在当前列后向这个表格添加一列" -TOOLBAR_STATUSLINE_ADD_ROW="在当前行后向这个表格添加一行" +TOOLBAR_STATUSLINE_ADD_COLUMN="在表格的当前列后添加一列" +TOOLBAR_STATUSLINE_ADD_ROW="在表格的当前行后添加一行" TOOLBAR_STATUSLINE_ALIGN_CENTER="居中对齐" TOOLBAR_STATUSLINE_ALIGN_JUSTIFY="段落左右对齐" TOOLBAR_STATUSLINE_ALIGN_LEFT="左对齐" @@ -1765,17 +1778,17 @@ TOOLBAR_STATUSLINE_EDIT_FOOTER="编辑页脚" TOOLBAR_STATUSLINE_EDIT_HEADER="编辑页眉" TOOLBAR_STATUSLINE_EDIT_PASTE="粘贴" -TOOLBAR_STATUSLINE_EDIT_REDO="复原编辑" -TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER="移除页脚" -TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER="移除页眉" +TOOLBAR_STATUSLINE_EDIT_REDO="重做编辑" +TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER="删除页脚" +TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER="删除页眉" TOOLBAR_STATUSLINE_EDIT_UNDO="取消修改" TOOLBAR_STATUSLINE_FILE_NEW="新建文件" -TOOLBAR_STATUSLINE_FILE_OPEN="打开已存在的文件" +TOOLBAR_STATUSLINE_FILE_OPEN="打开已有文件" TOOLBAR_STATUSLINE_FILE_PRINT="打印文件" TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW="打印前先预览文件" TOOLBAR_STATUSLINE_FILE_SAVE="保存这份文件" TOOLBAR_STATUSLINE_FILE_SAVEAS="将文件换名保存" -TOOLBAR_STATUSLINE_FMTPAINTER="把原来复制的文段覆盖选中的文字" +TOOLBAR_STATUSLINE_FMTPAINTER="将之前复制文段的格式应用于选中的文字" TOOLBAR_STATUSLINE_FMT_BOOKMARK="插入书签到文件" TOOLBAR_STATUSLINE_FMT_CHOOSE="选择字体" TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR="强制文字从左到右方向" @@ -1791,6 +1804,7 @@ TOOLBAR_STATUSLINE_INSERT_TABLE="在文件中新建表格" TOOLBAR_STATUSLINE_LISTS_BULLETS="项目符号" TOOLBAR_STATUSLINE_LISTS_NUMBERS="项目编号" +TOOLBAR_STATUSLINE_MENU="菜单" TOOLBAR_STATUSLINE_MERGEABOVE="和上面的单元格合并" TOOLBAR_STATUSLINE_MERGEBELOW="和下面的单元格合并" TOOLBAR_STATUSLINE_MERGELEFT="和左边的单元格合并" @@ -1809,8 +1823,8 @@ TOOLBAR_TOOLTIP_1COLUMN="一栏" TOOLBAR_TOOLTIP_2COLUMN="二栏" TOOLBAR_TOOLTIP_3COLUMN="三栏" -TOOLBAR_TOOLTIP_ADD_COLUMN="在当前列后向这个表格添加一列" -TOOLBAR_TOOLTIP_ADD_ROW="在当前行后向这个表格添加一行" +TOOLBAR_TOOLTIP_ADD_COLUMN="在表格的当前列后添加一列" +TOOLBAR_TOOLTIP_ADD_ROW="在表格的当前行后添加一行" TOOLBAR_TOOLTIP_ALIGN_CENTER="居中对齐" TOOLBAR_TOOLTIP_ALIGN_JUSTIFY="段落左右对齐" TOOLBAR_TOOLTIP_ALIGN_LEFT="左对齐" @@ -1825,17 +1839,17 @@ TOOLBAR_TOOLTIP_EDIT_FOOTER="编辑页脚" TOOLBAR_TOOLTIP_EDIT_HEADER="编辑页眉" TOOLBAR_TOOLTIP_EDIT_PASTE="粘贴" -TOOLBAR_TOOLTIP_EDIT_REDO="复原编辑" -TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER="移除页脚" -TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER="移除页眉" +TOOLBAR_TOOLTIP_EDIT_REDO="重做编辑" +TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER="删除页脚" +TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER="删除页眉" TOOLBAR_TOOLTIP_EDIT_UNDO="取消修改" TOOLBAR_TOOLTIP_FILE_NEW="新建文件" -TOOLBAR_TOOLTIP_FILE_OPEN="打开已存在的文件" +TOOLBAR_TOOLTIP_FILE_OPEN="打开已有文件" TOOLBAR_TOOLTIP_FILE_PRINT="打印文件" TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW="打印前先预览文件" TOOLBAR_TOOLTIP_FILE_SAVE="保存这份文件" TOOLBAR_TOOLTIP_FILE_SAVEAS="将文件换名保存" -TOOLBAR_TOOLTIP_FMTPAINTER="把原来复制的文段覆盖选中的文字" +TOOLBAR_TOOLTIP_FMTPAINTER="将之前复制文段的格式应用于选中的文字" TOOLBAR_TOOLTIP_FMT_BOOKMARK="插入书签到文件" TOOLBAR_TOOLTIP_FMT_CHOOSE="选择字体" TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR="强制文字从左到右方向" @@ -1851,6 +1865,7 @@ TOOLBAR_TOOLTIP_INSERT_TABLE="在文件中新建表格" TOOLBAR_TOOLTIP_LISTS_BULLETS="项目符号" TOOLBAR_TOOLTIP_LISTS_NUMBERS="项目编号" +TOOLBAR_TOOLTIP_MENU="菜单" TOOLBAR_TOOLTIP_MERGEABOVE="和上面的单元格合并" TOOLBAR_TOOLTIP_MERGEBELOW="和下面的单元格合并" TOOLBAR_TOOLTIP_MERGELEFT="和左边的单元格合并" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/templates/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/templates/GNUmakefile.in --- abiword-2.6.2/abiword/user/wp/templates/GNUmakefile.in 2008-04-06 22:26:21.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/templates/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,7 +54,6 @@ $(top_srcdir)/ac-helpers/abi-popt.m4 \ $(top_srcdir)/ac-helpers/abi-scandir-select.m4 \ $(top_srcdir)/ac-helpers/abi-spell.m4 \ - $(top_srcdir)/ac-helpers/abi-thread.m4 \ $(top_srcdir)/ac-helpers/abi-types.m4 \ $(top_srcdir)/ac-helpers/abi-wv.m4 \ $(top_srcdir)/ac-helpers/abi-xft.m4 \ @@ -203,8 +202,6 @@ PLUGIN_LIST = @PLUGIN_LIST@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ RANLIB = @RANLIB@ -SCRIPT_CFLAGS = @SCRIPT_CFLAGS@ -SCRIPT_LIBS = @SCRIPT_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SPELL_CFLAGS = @SPELL_CFLAGS@ @@ -284,6 +281,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ templatesdir = $(ABIWORD_DATADIR)/templates @@ -358,8 +356,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword/user/wp/templates/normal.awt-de_CH /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword/user/wp/templates/normal.awt-de_CH --- abiword-2.6.2/abiword/user/wp/templates/normal.awt-de_CH 2008-04-06 17:00:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword/user/wp/templates/normal.awt-de_CH 2009-07-15 16:56:23.000000000 +0100 @@ -1,6 +1,6 @@ - + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/en-US/howto/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/en-US/howto/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/en-US/howto/Makefile.in 2008-04-06 22:25:35.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/en-US/howto/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/en-US/howto @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/en-US/info/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/en-US/info/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/en-US/info/Makefile.in 2008-04-06 22:25:35.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/en-US/info/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/en-US/info @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/en-US/interface/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/en-US/interface/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/en-US/interface/Makefile.in 2008-04-06 22:25:35.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/en-US/interface/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/en-US/interface @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/en-US/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/en-US/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/en-US/Makefile.in 2008-04-06 22:25:35.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/en-US/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -137,6 +137,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = \ @@ -174,8 +175,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -309,8 +310,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -335,8 +336,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -346,13 +347,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/en-US/plugins/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/en-US/plugins/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/en-US/plugins/Makefile.in 2008-04-06 22:25:35.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/en-US/plugins/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/en-US/plugins @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/en-US/problems/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/en-US/problems/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/en-US/problems/Makefile.in 2008-04-06 22:25:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/en-US/problems/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/en-US/problems @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/en-US/tutorial/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/en-US/tutorial/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/en-US/tutorial/Makefile.in 2008-04-06 22:25:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/en-US/tutorial/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/en-US/tutorial @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/fr-FR/howto/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/howto/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/fr-FR/howto/Makefile.in 2008-04-06 22:25:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/howto/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/fr-FR/howto @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/fr-FR/info/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/info/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/fr-FR/info/Makefile.in 2008-04-06 22:25:37.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/info/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/fr-FR/info @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/fr-FR/interface/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/interface/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/fr-FR/interface/Makefile.in 2008-04-06 22:25:37.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/interface/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/fr-FR/interface @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/fr-FR/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/fr-FR/Makefile.in 2008-04-06 22:25:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -137,6 +137,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = \ @@ -174,8 +175,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -309,8 +310,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -335,8 +336,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -346,13 +347,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/fr-FR/plugins/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/plugins/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/fr-FR/plugins/Makefile.in 2008-04-06 22:25:37.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/plugins/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/fr-FR/plugins @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/fr-FR/problems/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/problems/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/fr-FR/problems/Makefile.in 2008-04-06 22:25:37.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/problems/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/en-US/problems @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/fr-FR/tutorial/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/tutorial/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/fr-FR/tutorial/Makefile.in 2008-04-06 22:25:38.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/fr-FR/tutorial/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/fr-FR/tutorial @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/Makefile.in 2008-04-06 22:25:34.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -125,6 +125,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = en-US \ @@ -138,8 +139,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -239,8 +240,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -265,8 +266,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -276,13 +277,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/pl-PL/howto/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/howto/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/pl-PL/howto/Makefile.in 2008-04-06 22:25:38.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/howto/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/pl-PL/howto @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/pl-PL/info/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/info/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/pl-PL/info/Makefile.in 2008-04-06 22:25:38.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/info/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/pl-PL/info @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/pl-PL/interface/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/interface/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/pl-PL/interface/Makefile.in 2008-04-06 22:25:38.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/interface/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/pl-PL/interface @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/pl-PL/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/pl-PL/Makefile.in 2008-04-06 22:25:38.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -137,6 +137,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = \ @@ -174,8 +175,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -309,8 +310,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -335,8 +336,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -346,13 +347,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/pl-PL/plugins/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/plugins/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/pl-PL/plugins/Makefile.in 2008-04-06 22:25:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/plugins/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/pl-PL/plugins @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/pl-PL/problems/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/problems/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/pl-PL/problems/Makefile.in 2008-04-06 22:25:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/problems/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/pl-PL/problems @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/ABW/pl-PL/tutorial/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/tutorial/Makefile.in --- abiword-2.6.2/abiword-docs/ABW/pl-PL/tutorial/Makefile.in 2008-04-06 22:25:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/ABW/pl-PL/tutorial/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/pl-PL/tutorial @@ -152,8 +153,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/aclocal.m4 /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/aclocal.m4 --- abiword-2.6.2/abiword-docs/aclocal.m4 2008-04-06 22:25:21.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/aclocal.m4 2009-07-15 16:56:23.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,10 +11,13 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +[m4_warning([this file was generated for autoconf 2.63. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # @@ -84,16 +87,14 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -137,9 +138,9 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -174,7 +175,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,7 +190,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -203,10 +204,12 @@ # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.2])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -264,13 +267,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -375,16 +378,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -485,13 +489,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -508,7 +512,7 @@ # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- @@ -604,7 +608,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/configure /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/configure --- abiword-2.6.2/abiword-docs/configure 2008-04-06 22:25:40.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/configure 2009-07-15 16:56:23.000000000 +0100 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for abiword-docs 2.6.2. +# Generated by GNU Autoconf 2.63 for abiword-docs 2.6.8. # # Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -17,7 +17,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -39,17 +39,45 @@ 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=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -65,8 +93,6 @@ # 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. @@ -89,7 +115,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -102,17 +128,10 @@ PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -134,7 +153,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -160,7 +179,7 @@ as_have_required=no fi - if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } @@ -242,7 +261,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -263,7 +282,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -343,10 +362,10 @@ 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+"$@"} + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi @@ -415,9 +434,10 @@ 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 + echo Please tell bug-autoconf@gnu.org about your system, + echo including any error possibly output before this message. + echo This can help us improve future autoconf versions. + echo Configuration will now proceed without shell functions. } @@ -453,7 +473,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_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 @@ -481,7 +501,6 @@ *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -494,19 +513,22 @@ rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -531,10 +553,10 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -574,77 +596,81 @@ # Identity of this package. PACKAGE_NAME='abiword-docs' PACKAGE_TARNAME='abiword-docs' -PACKAGE_VERSION='2.6.2' -PACKAGE_STRING='abiword-docs 2.6.2' +PACKAGE_VERSION='2.6.8' +PACKAGE_STRING='abiword-docs 2.6.8' PACKAGE_BUGREPORT='http://www.abisource.com/' -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 -am__isrc -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 -PKG_CONFIG -ABIWORD_EXTRAS_DEPS_CFLAGS -ABIWORD_EXTRAS_DEPS_LIBS -ABIWORD_EXTRAS_PKGDATADIR -ABIWORD +ac_subst_vars='LTLIBOBJS LIBOBJS -LTLIBOBJS' +ABIWORD +ABIWORD_EXTRAS_PKGDATADIR +ABIWORD_EXTRAS_DEPS_LIBS +ABIWORD_EXTRAS_DEPS_CFLAGS +PKG_CONFIG +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +' ac_precious_vars='build_alias host_alias target_alias @@ -657,6 +683,8 @@ # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -755,13 +783,21 @@ datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -774,13 +810,21 @@ dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -971,22 +1015,38 @@ ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1006,7 +1066,7 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -1015,16 +1075,16 @@ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1033,22 +1093,38 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 { (exit 1); exit 1; }; } fi -# Be sure to have absolute directory names. +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 + { (exit 1); exit 1; }; } ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; } done @@ -1063,7 +1139,7 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1079,10 +1155,10 @@ 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 + { $as_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 + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 { (exit 1); exit 1; }; } @@ -1090,12 +1166,12 @@ if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1122,12 +1198,12 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. @@ -1154,7 +1230,7 @@ # 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 abiword-docs 2.6.2 to adapt to many kinds of systems. +\`configure' configures abiword-docs 2.6.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1176,9 +1252,9 @@ Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1188,25 +1264,25 @@ For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/abiword-docs] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/abiword-docs] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1220,7 +1296,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of abiword-docs 2.6.2:";; + short | recursive ) echo "Configuration of abiword-docs 2.6.8:";; esac cat <<\_ACEOF @@ -1243,15 +1319,17 @@ if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_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/ ;; @@ -1287,7 +1365,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1296,11 +1374,11 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -abiword-docs configure 2.6.2 -generated by GNU Autoconf 2.61 +abiword-docs configure 2.6.8 +generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1310,8 +1388,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by abiword-docs $as_me 2.6.2, which was -generated by GNU Autoconf 2.61. Invocation command line was +It was created by abiword-docs $as_me 2.6.8, which was +generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -1347,7 +1425,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -1382,7 +1460,7 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; @@ -1434,11 +1512,12 @@ 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;} ;; + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -1468,9 +1547,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -1485,9 +1564,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1503,8 +1582,8 @@ echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -1546,21 +1625,24 @@ # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do + test "x$ac_site_file" = xNONE && continue 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;} + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi @@ -1570,16 +1652,16 @@ # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1593,29 +1675,38 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1625,10 +1716,12 @@ fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1682,8 +1775,8 @@ 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;} + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1709,11 +1802,12 @@ # 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; } +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -1742,17 +1836,29 @@ # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -1765,8 +1871,8 @@ INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1776,8 +1882,8 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1800,9 +1906,9 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} { (exit 1); exit 1; }; } fi @@ -1813,26 +1919,23 @@ # Ok. : else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! +$as_echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } test "$program_prefix" != NONE && 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" -# Double any \ or $. echo might interpret backslashes. +# Double any \ or $. # 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 -f conftest.sed +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1843,15 +1946,15 @@ am_missing_run="$MISSING --run " else am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin @@ -1886,8 +1989,8 @@ MKDIR_P="$ac_install_sh -d" fi fi -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -echo "${ECHO_T}$MKDIR_P" >&6; } +{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" case $mkdir_p in @@ -1899,10 +2002,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -1915,7 +2018,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -1926,22 +2029,23 @@ fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "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 x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_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 + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF SHELL = /bin/sh @@ -1958,12 +2062,12 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -1982,8 +2086,8 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi fi @@ -2000,7 +2104,7 @@ # Define the identity of the package. PACKAGE='abiword-docs' - VERSION='2.6.2' + VERSION='2.6.8' cat >>confdefs.h <<_ACEOF @@ -2038,10 +2142,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -2054,7 +2158,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2065,11 +2169,11 @@ fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2078,10 +2182,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -2094,7 +2198,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2105,11 +2209,11 @@ 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; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -2117,12 +2221,8 @@ 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;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -2153,10 +2253,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -2171,7 +2271,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2183,11 +2283,11 @@ 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; } + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2196,10 +2296,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -2214,7 +2314,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2226,11 +2326,11 @@ 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; } + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -2238,12 +2338,8 @@ 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;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -2255,14 +2351,14 @@ 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; } + { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } PKG_CONFIG="" fi @@ -2271,44 +2367,40 @@ abi_pkg='abiword-2.6' pkg_failed=no -{ echo "$as_me:$LINENO: checking for ABIWORD_EXTRAS_DEPS" >&5 -echo $ECHO_N "checking for ABIWORD_EXTRAS_DEPS... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for ABIWORD_EXTRAS_DEPS" >&5 +$as_echo_n "checking for ABIWORD_EXTRAS_DEPS... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$ABIWORD_EXTRAS_DEPS_CFLAGS"; then - pkg_cv_ABIWORD_EXTRAS_DEPS_CFLAGS="$ABIWORD_EXTRAS_DEPS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 +if test -n "$ABIWORD_EXTRAS_DEPS_CFLAGS"; then + pkg_cv_ABIWORD_EXTRAS_DEPS_CFLAGS="$ABIWORD_EXTRAS_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 ($PKG_CONFIG --exists --print-errors " "$abi_pkg" ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_ABIWORD_EXTRAS_DEPS_CFLAGS=`$PKG_CONFIG --cflags " "$abi_pkg" " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$ABIWORD_EXTRAS_DEPS_LIBS"; then - pkg_cv_ABIWORD_EXTRAS_DEPS_LIBS="$ABIWORD_EXTRAS_DEPS_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 +if test -n "$ABIWORD_EXTRAS_DEPS_LIBS"; then + pkg_cv_ABIWORD_EXTRAS_DEPS_LIBS="$ABIWORD_EXTRAS_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 ($PKG_CONFIG --exists --print-errors " "$abi_pkg" ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_ABIWORD_EXTRAS_DEPS_LIBS=`$PKG_CONFIG --libs " "$abi_pkg" " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -2321,14 +2413,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ABIWORD_EXTRAS_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " "$abi_pkg" "` + ABIWORD_EXTRAS_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " "$abi_pkg" " 2>&1` else - ABIWORD_EXTRAS_DEPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " "$abi_pkg" "` + ABIWORD_EXTRAS_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors " "$abi_pkg" " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ABIWORD_EXTRAS_DEPS_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements ( \"$abi_pkg\" ) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ( \"$abi_pkg\" ) were not met: $ABIWORD_EXTRAS_DEPS_PKG_ERRORS @@ -2339,7 +2431,7 @@ and ABIWORD_EXTRAS_DEPS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements ( \"$abi_pkg\" ) were not met: +$as_echo "$as_me: error: Package requirements ( \"$abi_pkg\" ) were not met: $ABIWORD_EXTRAS_DEPS_PKG_ERRORS @@ -2352,7 +2444,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -2362,7 +2456,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -2372,12 +2466,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else ABIWORD_EXTRAS_DEPS_CFLAGS=$pkg_cv_ABIWORD_EXTRAS_DEPS_CFLAGS ABIWORD_EXTRAS_DEPS_LIBS=$pkg_cv_ABIWORD_EXTRAS_DEPS_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ABIWORD_EXTRAS_PKGDATADIR=`$PKG_CONFIG --variable=pkgdatadir $abi_pkg` @@ -2386,10 +2480,10 @@ # Extract the first word of "abiword", so it can be a program name with args. set dummy abiword; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ABIWORD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ABIWORD"; then ac_cv_prog_ABIWORD="$ABIWORD" # Let the user override the test. @@ -2402,7 +2496,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ABIWORD="abiword" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2413,19 +2507,19 @@ fi ABIWORD=$ac_cv_prog_ABIWORD if test -n "$ABIWORD"; then - { echo "$as_me:$LINENO: result: $ABIWORD" >&5 -echo "${ECHO_T}$ABIWORD" >&6; } + { $as_echo "$as_me:$LINENO: result: $ABIWORD" >&5 +$as_echo "$ABIWORD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ABIWORD" == "x"; then - { { echo "$as_me:$LINENO: error: abiword not found in PATH" >&5 -echo "$as_me: error: abiword not found in PATH" >&2;} + { { $as_echo "$as_me:$LINENO: error: abiword not found in PATH" >&5 +$as_echo "$as_me: error: abiword not found in PATH" >&2;} { (exit 1); exit 1; }; } fi @@ -2458,11 +2552,12 @@ 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;} ;; + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -2495,12 +2590,12 @@ 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;} + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -2517,6 +2612,12 @@ # take arguments), then branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} t clear :clear s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g @@ -2546,7 +2647,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` + ac_i=`$as_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" @@ -2559,11 +2660,12 @@ : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -2576,7 +2678,7 @@ SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -2586,7 +2688,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -2608,17 +2710,45 @@ 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=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -2634,8 +2764,6 @@ # 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. @@ -2658,7 +2786,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -2671,17 +2799,10 @@ PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -2703,7 +2824,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -2754,7 +2875,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_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 @@ -2782,7 +2903,6 @@ *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -2795,19 +2915,22 @@ rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -2832,10 +2955,10 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -2857,8 +2980,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by abiword-docs $as_me 2.6.2, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by abiword-docs $as_me 2.6.8, which was +generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -2871,26 +2994,33 @@ _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [FILE]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE Configuration files: $config_files @@ -2898,13 +3028,13 @@ Report bugs to ." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -abiword-docs config.status 2.6.2 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +abiword-docs config.status 2.6.8 +configured by $0, generated by GNU Autoconf 2.63, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -2912,11 +3042,12 @@ srcdir='$srcdir' INSTALL='$INSTALL' MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -2938,21 +3069,24 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ac_need_defaults=false;; --he | --h | --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 + -*) { $as_echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -2971,30 +3105,32 @@ fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -3024,8 +3160,8 @@ "ABW/pl-PL/problems/Makefile") CONFIG_FILES="$CONFIG_FILES ABW/pl-PL/problems/Makefile" ;; "ABW/pl-PL/tutorial/Makefile") CONFIG_FILES="$CONFIG_FILES ABW/pl-PL/tutorial/Makefile" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done @@ -3064,130 +3200,143 @@ (umask 077 && mkdir "$tmp") } || { - echo "$me: cannot create a temporary directory in ." >&2 + $as_echo "$as_me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF +ac_cr=' ' +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$tmp/subs1.awk" && +_ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 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 -am__isrc!$am__isrc$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 -PKG_CONFIG!$PKG_CONFIG$ac_delim -ABIWORD_EXTRAS_DEPS_CFLAGS!$ABIWORD_EXTRAS_DEPS_CFLAGS$ac_delim -ABIWORD_EXTRAS_DEPS_LIBS!$ABIWORD_EXTRAS_DEPS_LIBS$ac_delim -ABIWORD_EXTRAS_PKGDATADIR!$ABIWORD_EXTRAS_PKGDATADIR$ac_delim -ABIWORD!$ABIWORD$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; 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;} + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_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 +rm -f conf$$subs.sh -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\).*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\).*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +$as_echo "$as_me: error: could not setup config files machinery" >&2;} + { (exit 1); exit 1; }; } +_ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and @@ -3204,19 +3353,21 @@ }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" -for ac_tag in :F $CONFIG_FILES +eval set X " :F $CONFIG_FILES " +shift +for ac_tag 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;} + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; @@ -3245,26 +3396,38 @@ [\\/$]*) 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;} + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} { (exit 1); exit 1; }; };; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + ac_file_inputs="$ac_file_inputs '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + configure_input='Generated from '` + $as_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;} + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$tmp/stdin" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; esac ;; esac @@ -3274,7 +3437,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -3300,7 +3463,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -3309,7 +3472,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -3330,17 +3493,17 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_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/ ;; @@ -3385,12 +3548,13 @@ esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -3399,13 +3563,14 @@ /@infodir@/p /@localedir@/p /@mandir@/p -' $ac_file_inputs` in +' +case `eval "sed -n \"\$ac_sed_dataroot\" $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;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g @@ -3419,15 +3584,16 @@ # 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 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -3438,21 +3604,28 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } 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' + { $as_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' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; @@ -3467,6 +3640,11 @@ chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -3488,6 +3666,10 @@ # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi echo " diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/configure.ac /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/configure.ac --- abiword-2.6.2/abiword-docs/configure.ac 2008-04-06 22:24:07.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/configure.ac 2009-07-15 16:56:23.000000000 +0100 @@ -1,5 +1,5 @@ -AC_INIT([abiword-docs],[2.6.2],[http://www.abisource.com/]) +AC_INIT([abiword-docs],[2.6.8],[http://www.abisource.com/]) AM_INIT_AUTOMAKE PKG_PROG_PKG_CONFIG diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/install-sh /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/install-sh --- abiword-2.6.2/abiword-docs/install-sh 2008-04-06 21:20:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/install-sh 2009-07-15 16:56:23.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-10-14.15 +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} if test -z "$doit"; then doit_exec=exec else @@ -58,34 +58,49 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' -posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 +chgrpcmd= chmodcmd=$chmodprog chowncmd= -chgrpcmd= -stripcmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" +stripcmd= + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -95,65 +110,55 @@ In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) shift - continue;; + -c) ;; + + -C) copy_on_change=true;; - -d) dir_arg=true - shift - continue;; + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - shift - shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - continue;; + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; @@ -165,21 +170,22 @@ *) break;; esac + shift done -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dstarg"; then + if test -n "$dst_arg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" + set fnord "$@" "$dst_arg" shift # fnord fi shift # arg - dstarg=$arg + dst_arg=$arg done fi @@ -224,7 +230,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src ;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -242,22 +248,22 @@ exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dstarg + dst=$dst_arg # Protect names starting with `-'. case $dst in - -*) dst=./$dst ;; + -*) dst=./$dst;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -378,26 +384,19 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; esac - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac + eval "$initialize_posix_glob" oIFS=$IFS IFS=/ - $posix_glob && set -f + $posix_glob set -f set fnord $dstdir shift - $posix_glob && set +f + $posix_glob set +f IFS=$oIFS prefixes= @@ -459,41 +458,54 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ - || { - echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - } || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 trap '' 0 fi diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-docs/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-docs/Makefile.in --- abiword-2.6.2/abiword-docs/Makefile.in 2008-04-06 22:25:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-docs/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -139,6 +139,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ABW @@ -260,8 +261,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -286,8 +287,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -297,13 +298,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -374,6 +374,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -400,6 +404,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -550,7 +556,7 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-extras/aclocal.m4 /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-extras/aclocal.m4 --- abiword-2.6.2/abiword-extras/aclocal.m4 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/abiword-extras/aclocal.m4 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +[m4_warning([this file was generated for autoconf 2.63. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -87,16 +87,14 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -140,9 +138,9 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -177,7 +175,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -192,7 +190,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -206,12 +204,12 @@ # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl +[AM_AUTOMAKE_VERSION([1.10.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -461,19 +459,28 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 4 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do +[# Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +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. @@ -805,13 +812,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -828,7 +835,7 @@ # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-extras/clipart/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-extras/clipart/Makefile.in --- abiword-2.6.2/abiword-extras/clipart/Makefile.in 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/abiword-extras/clipart/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -136,6 +136,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ clipartdir = $(ABIWORD_EXTRAS_PKGDATADIR)/clipart @@ -176,8 +177,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-extras/configure /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-extras/configure --- abiword-2.6.2/abiword-extras/configure 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/abiword-extras/configure 2009-07-15 16:56:23.000000000 +0100 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for abiword-extras 2.6.2. +# Generated by GNU Autoconf 2.63 for abiword-extras 2.6.8. # # Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -17,7 +17,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -39,17 +39,45 @@ 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=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -65,8 +93,6 @@ # 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. @@ -89,7 +115,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -102,17 +128,10 @@ PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -134,7 +153,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -160,7 +179,7 @@ as_have_required=no fi - if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } @@ -242,7 +261,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -263,7 +282,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -343,10 +362,10 @@ 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+"$@"} + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi @@ -415,9 +434,10 @@ 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 + echo Please tell bug-autoconf@gnu.org about your system, + echo including any error possibly output before this message. + echo This can help us improve future autoconf versions. + echo Configuration will now proceed without shell functions. } @@ -453,7 +473,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_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 @@ -481,7 +501,6 @@ *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -494,19 +513,22 @@ rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -531,10 +553,10 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -574,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='abiword-extras' PACKAGE_TARNAME='abiword-extras' -PACKAGE_VERSION='2.6.2' -PACKAGE_STRING='abiword-extras 2.6.2' +PACKAGE_VERSION='2.6.8' +PACKAGE_STRING='abiword-extras 2.6.8' PACKAGE_BUGREPORT='http://www.abisource.com/' # Factoring default headers for most tests. @@ -614,93 +636,98 @@ # include #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 -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 -am__isrc -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 -PKG_CONFIG -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 -CPP -GREP -EGREP -BIGENDIAN_TRUE -BIGENDIAN_FALSE -ABIWORD_EXTRAS_DEPS_CFLAGS -ABIWORD_EXTRAS_DEPS_LIBS -ABIWORD_EXTRAS_PKGDATADIR +ac_subst_vars='LTLIBOBJS LIBOBJS -LTLIBOBJS' +ABIWORD_EXTRAS_PKGDATADIR +ABIWORD_EXTRAS_DEPS_LIBS +ABIWORD_EXTRAS_DEPS_CFLAGS +BIGENDIAN_FALSE +BIGENDIAN_TRUE +EGREP +GREP +CPP +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +PKG_CONFIG +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_dependency_tracking +' ac_precious_vars='build_alias host_alias target_alias @@ -718,6 +745,8 @@ # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -816,13 +845,21 @@ datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -835,13 +872,21 @@ dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1032,22 +1077,38 @@ ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1067,7 +1128,7 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -1076,16 +1137,16 @@ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1094,22 +1155,38 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 { (exit 1); exit 1; }; } fi -# Be sure to have absolute directory names. +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 + { (exit 1); exit 1; }; } ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; } done @@ -1124,7 +1201,7 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1140,10 +1217,10 @@ 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 + { $as_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 + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 { (exit 1); exit 1; }; } @@ -1151,12 +1228,12 @@ if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1183,12 +1260,12 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. @@ -1215,7 +1292,7 @@ # 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 abiword-extras 2.6.2 to adapt to many kinds of systems. +\`configure' configures abiword-extras 2.6.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1237,9 +1314,9 @@ Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1249,25 +1326,25 @@ For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/abiword-extras] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/abiword-extras] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1281,11 +1358,12 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of abiword-extras 2.6.2:";; + short | recursive ) echo "Configuration of abiword-extras 2.6.8:";; esac cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build @@ -1317,15 +1395,17 @@ if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_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/ ;; @@ -1361,7 +1441,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1370,11 +1450,11 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -abiword-extras configure 2.6.2 -generated by GNU Autoconf 2.61 +abiword-extras configure 2.6.8 +generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1384,8 +1464,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by abiword-extras $as_me 2.6.2, which was -generated by GNU Autoconf 2.61. Invocation command line was +It was created by abiword-extras $as_me 2.6.8, which was +generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -1421,7 +1501,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -1456,7 +1536,7 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; @@ -1508,11 +1588,12 @@ 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;} ;; + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -1542,9 +1623,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -1559,9 +1640,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1577,8 +1658,8 @@ echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -1620,21 +1701,24 @@ # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do + test "x$ac_site_file" = xNONE && continue 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;} + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi @@ -1644,16 +1728,16 @@ # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1667,29 +1751,38 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1699,10 +1792,12 @@ fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1756,8 +1851,8 @@ 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;} + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1783,11 +1878,12 @@ # 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; } +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -1816,17 +1912,29 @@ # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -1839,8 +1947,8 @@ INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1850,8 +1958,8 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1874,9 +1982,9 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} { (exit 1); exit 1; }; } fi @@ -1887,26 +1995,23 @@ # Ok. : else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! +$as_echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } test "$program_prefix" != NONE && 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" -# Double any \ or $. echo might interpret backslashes. +# Double any \ or $. # 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 -f conftest.sed +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1917,15 +2022,15 @@ am_missing_run="$MISSING --run " else am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin @@ -1960,8 +2065,8 @@ MKDIR_P="$ac_install_sh -d" fi fi -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -echo "${ECHO_T}$MKDIR_P" >&6; } +{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" case $mkdir_p in @@ -1973,10 +2078,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -1989,7 +2094,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2000,22 +2105,23 @@ fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "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 x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_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 + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF SHELL = /bin/sh @@ -2032,12 +2138,12 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2056,8 +2162,8 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi fi @@ -2074,7 +2180,7 @@ # Define the identity of the package. PACKAGE='abiword-extras' - VERSION='2.6.2' + VERSION='2.6.8' cat >>confdefs.h <<_ACEOF @@ -2112,10 +2218,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -2128,7 +2234,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2139,11 +2245,11 @@ fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2152,10 +2258,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -2168,7 +2274,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2179,11 +2285,11 @@ 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; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -2191,12 +2297,8 @@ 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;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -2227,10 +2329,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -2245,7 +2347,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2257,11 +2359,11 @@ 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; } + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2270,10 +2372,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -2288,7 +2390,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2300,11 +2402,11 @@ 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; } + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -2312,12 +2414,8 @@ 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;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -2329,14 +2427,14 @@ 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; } + { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } PKG_CONFIG="" fi @@ -2353,8 +2451,8 @@ .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; } +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none @@ -2381,8 +2479,8 @@ fi -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. @@ -2411,10 +2509,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2427,7 +2525,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2438,11 +2536,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2451,10 +2549,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2467,7 +2565,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2478,11 +2576,11 @@ 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; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2490,12 +2588,8 @@ 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;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2508,10 +2602,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2524,7 +2618,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2535,11 +2629,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2548,10 +2642,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2569,7 +2663,7 @@ continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2592,11 +2686,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2607,10 +2701,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2623,7 +2717,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2634,11 +2728,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2651,10 +2745,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2667,7 +2761,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2678,11 +2772,11 @@ 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; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2694,12 +2788,8 @@ 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;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2709,44 +2799,50 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF @@ -2765,27 +2861,22 @@ } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # 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; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# 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. +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + 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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done @@ -2796,10 +2887,11 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # 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' @@ -2810,7 +2902,7 @@ do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most @@ -2837,25 +2929,27 @@ ac_file='' fi -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables +$as_echo "$as_me: error: C compiler cannot create executables See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } + { (exit 77); exit 77; }; }; } fi ac_exeext=$ac_cv_exeext # 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; } +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&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 @@ -2864,49 +2958,53 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. +$as_echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi fi fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # 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; } +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -2915,31 +3013,33 @@ 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 | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +$as_echo "$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; } +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2962,40 +3062,43 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then 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 | *.map | *.inf ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +$as_echo "$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; } +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3021,20 +3124,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -3044,15 +3148,19 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -3079,20 +3187,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CFLAGS="" @@ -3117,20 +3226,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_c_werror_flag=$ac_save_c_werror_flag @@ -3156,20 +3266,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3184,8 +3295,8 @@ 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$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 @@ -3201,10 +3312,10 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC @@ -3275,20 +3386,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3304,15 +3416,15 @@ # 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; } ;; + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac @@ -3324,10 +3436,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -3415,8 +3527,8 @@ fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -3436,15 +3548,15 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -3476,20 +3588,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -3513,13 +3626,14 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err @@ -3527,7 +3641,7 @@ # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -3552,8 +3666,8 @@ else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3581,20 +3695,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -3618,13 +3733,14 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err @@ -3632,7 +3748,7 @@ # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -3648,11 +3764,13 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi ac_ext=c @@ -3662,42 +3780,37 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ 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 +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else + if test -z "$GREP"; then 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 + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"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" + $as_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` @@ -3712,74 +3825,60 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done done done - -done IFS=$as_save_IFS - - -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;} + if test -z "$ac_cv_path_GREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} { (exit 1); exit 1; }; } -fi - + 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +$as_echo "$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; } +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$EGREP"; then 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 + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"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" + $as_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` @@ -3794,40 +3893,31 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done done done - -done IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + if test -z "$ac_cv_path_EGREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} { (exit 1); exit 1; }; } -fi - + 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3854,20 +3944,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no @@ -3959,37 +4050,40 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (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_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi +rm -rf conftest.dSYM 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -4011,11 +4105,11 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.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; } +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4033,20 +4127,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" @@ -4054,12 +4149,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -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 +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -4067,28 +4165,78 @@ done -{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } + + { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } if test "${ac_cv_c_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else - # See if sys/param.h defines the BYTE_ORDER macro. -cat >conftest.$ac_ext <<_ACEOF + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + # Check for potential -arch flags. It is not universal unless + # there are some -arch flags. Note that *ppc* also matches + # ppc64. This check is also rather less than ideal. + case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( + *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; + esac +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include + #include int main () { -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ - && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) - bogus endian macros -#endif +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif ; return 0; @@ -4100,33 +4248,34 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then # It does; now see whether it defined to BIG_ENDIAN or not. -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include + #include int main () { #if BYTE_ORDER != BIG_ENDIAN - not big endian -#endif + not big endian + #endif ; return 0; @@ -4138,20 +4287,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_c_bigendian=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_c_bigendian=no @@ -4159,29 +4309,31 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # It does not; compile a test program. -if test "$cross_compiling" = yes; then - # try to guess the endianness by grepping values into an object file - ac_cv_c_bigendian=unknown - cat >conftest.$ac_ext <<_ACEOF + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } +#include + int main () { - _ascii (); _ebcdic (); +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif + ; return 0; } @@ -4192,30 +4344,139 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +#ifndef _BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then ac_cv_c_bigendian=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_bigendian=no fi -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then + # Try to guess by grepping values from an object file. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; + +int +main () +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -4234,14 +4495,14 @@ main () { - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; ; return 0; @@ -4253,55 +4514,62 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (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_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_bigendian=no else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_bigendian=yes fi +rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + fi fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } -case $ac_cv_c_bigendian in - yes) +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + cat >>confdefs.h <<\_ACEOF +#define WORDS_BIGENDIAN 1 +_ACEOF +;; #( + no) + ;; #( + universal) cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 +#define AC_APPLE_UNIVERSAL_BUILD 1 _ACEOF - ;; - no) - ;; - *) - { { echo "$as_me:$LINENO: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} + + ;; #( + *) + { { $as_echo "$as_me:$LINENO: error: unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +$as_echo "$as_me: error: unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} { (exit 1); exit 1; }; } ;; -esac + esac if test "x$ac_cv_c_bigendian" = "xyes" ; then BIGENDIAN_TRUE= @@ -4312,47 +4580,43 @@ fi -abi_pkg='abiword' +abi_pkg='abiword-2.6' pkg_failed=no -{ echo "$as_me:$LINENO: checking for ABIWORD_EXTRAS_DEPS" >&5 -echo $ECHO_N "checking for ABIWORD_EXTRAS_DEPS... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for ABIWORD_EXTRAS_DEPS" >&5 +$as_echo_n "checking for ABIWORD_EXTRAS_DEPS... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$ABIWORD_EXTRAS_DEPS_CFLAGS"; then - pkg_cv_ABIWORD_EXTRAS_DEPS_CFLAGS="$ABIWORD_EXTRAS_DEPS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 +if test -n "$ABIWORD_EXTRAS_DEPS_CFLAGS"; then + pkg_cv_ABIWORD_EXTRAS_DEPS_CFLAGS="$ABIWORD_EXTRAS_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 ($PKG_CONFIG --exists --print-errors " "$abi_pkg" ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_ABIWORD_EXTRAS_DEPS_CFLAGS=`$PKG_CONFIG --cflags " "$abi_pkg" " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$ABIWORD_EXTRAS_DEPS_LIBS"; then - pkg_cv_ABIWORD_EXTRAS_DEPS_LIBS="$ABIWORD_EXTRAS_DEPS_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 +if test -n "$ABIWORD_EXTRAS_DEPS_LIBS"; then + pkg_cv_ABIWORD_EXTRAS_DEPS_LIBS="$ABIWORD_EXTRAS_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 ($PKG_CONFIG --exists --print-errors " "$abi_pkg" ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_ABIWORD_EXTRAS_DEPS_LIBS=`$PKG_CONFIG --libs " "$abi_pkg" " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -4365,14 +4629,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ABIWORD_EXTRAS_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " "$abi_pkg" "` + ABIWORD_EXTRAS_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " "$abi_pkg" " 2>&1` else - ABIWORD_EXTRAS_DEPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " "$abi_pkg" "` + ABIWORD_EXTRAS_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors " "$abi_pkg" " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ABIWORD_EXTRAS_DEPS_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements ( \"$abi_pkg\" ) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ( \"$abi_pkg\" ) were not met: $ABIWORD_EXTRAS_DEPS_PKG_ERRORS @@ -4383,7 +4647,7 @@ and ABIWORD_EXTRAS_DEPS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements ( \"$abi_pkg\" ) were not met: +$as_echo "$as_me: error: Package requirements ( \"$abi_pkg\" ) were not met: $ABIWORD_EXTRAS_DEPS_PKG_ERRORS @@ -4396,7 +4660,9 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -4406,7 +4672,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -4416,12 +4682,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else ABIWORD_EXTRAS_DEPS_CFLAGS=$pkg_cv_ABIWORD_EXTRAS_DEPS_CFLAGS ABIWORD_EXTRAS_DEPS_LIBS=$pkg_cv_ABIWORD_EXTRAS_DEPS_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ABIWORD_EXTRAS_PKGDATADIR=`$PKG_CONFIG --variable=pkgdatadir $abi_pkg` @@ -4457,11 +4723,12 @@ 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;} ;; + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -4494,12 +4761,12 @@ 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;} + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -4516,6 +4783,12 @@ # take arguments), then branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} t clear :clear s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g @@ -4545,7 +4818,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` + ac_i=`$as_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" @@ -4557,33 +4830,35 @@ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. +$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi + if test -z "${BIGENDIAN_TRUE}" && test -z "${BIGENDIAN_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BIGENDIAN\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"BIGENDIAN\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BIGENDIAN\" was never defined. +$as_echo "$as_me: error: conditional \"BIGENDIAN\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -4596,7 +4871,7 @@ SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -4606,7 +4881,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -4628,17 +4903,45 @@ 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=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -4654,8 +4957,6 @@ # 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. @@ -4678,7 +4979,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -4691,17 +4992,10 @@ PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -4723,7 +5017,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -4774,7 +5068,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_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 @@ -4802,7 +5096,6 @@ *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -4815,19 +5108,22 @@ rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -4852,10 +5148,10 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -4877,8 +5173,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by abiword-extras $as_me 2.6.2, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by abiword-extras $as_me 2.6.8, which was +generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4891,27 +5187,34 @@ _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_commands="$ac_config_commands" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [FILE]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE Configuration files: $config_files @@ -4922,13 +5225,13 @@ Report bugs to ." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -abiword-extras config.status 2.6.2 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +abiword-extras config.status 2.6.8 +configured by $0, generated by GNU Autoconf 2.63, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -4936,11 +5239,12 @@ srcdir='$srcdir' INSTALL='$INSTALL' MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -4962,21 +5266,24 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ac_need_defaults=false;; --he | --h | --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 + -*) { $as_echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -4995,27 +5302,29 @@ fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # @@ -5023,7 +5332,7 @@ _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -5035,8 +5344,8 @@ "dictionary/Makefile") CONFIG_FILES="$CONFIG_FILES dictionary/Makefile" ;; "templates/Makefile") CONFIG_FILES="$CONFIG_FILES templates/Makefile" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done @@ -5076,150 +5385,143 @@ (umask 077 && mkdir "$tmp") } || { - echo "$me: cannot create a temporary directory in ." >&2 + $as_echo "$as_me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF +ac_cr=' ' +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi +echo 'BEGIN {' >"$tmp/subs1.awk" && +_ACEOF + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 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 -am__isrc!$am__isrc$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 -PKG_CONFIG!$PKG_CONFIG$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 -CPP!$CPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -BIGENDIAN_TRUE!$BIGENDIAN_TRUE$ac_delim -BIGENDIAN_FALSE!$BIGENDIAN_FALSE$ac_delim -ABIWORD_EXTRAS_DEPS_CFLAGS!$ABIWORD_EXTRAS_DEPS_CFLAGS$ac_delim -ABIWORD_EXTRAS_DEPS_LIBS!$ABIWORD_EXTRAS_DEPS_LIBS$ac_delim -ABIWORD_EXTRAS_PKGDATADIR!$ABIWORD_EXTRAS_PKGDATADIR$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; 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;} + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_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 +rm -f conf$$subs.sh -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\).*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\).*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +$as_echo "$as_me: error: could not setup config files machinery" >&2;} + { (exit 1); exit 1; }; } +_ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and @@ -5236,19 +5538,21 @@ }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" -for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS +eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS" +shift +for ac_tag 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;} + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; @@ -5277,26 +5581,38 @@ [\\/$]*) 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;} + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} { (exit 1); exit 1; }; };; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + ac_file_inputs="$ac_file_inputs '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + configure_input='Generated from '` + $as_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;} + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$tmp/stdin" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; esac ;; esac @@ -5306,7 +5622,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -5332,7 +5648,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -5341,7 +5657,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -5362,17 +5678,17 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_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/ ;; @@ -5417,12 +5733,13 @@ esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -5431,13 +5748,14 @@ /@infodir@/p /@localedir@/p /@mandir@/p -' $ac_file_inputs` in +' +case `eval "sed -n \"\$ac_sed_dataroot\" $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;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g @@ -5451,15 +5769,16 @@ # 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 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -5470,32 +5789,48 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } 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' + { $as_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' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +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. @@ -5511,7 +5846,7 @@ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -echo X"$mf" | +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -5555,7 +5890,7 @@ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$file" | +$as_echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -5581,7 +5916,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -5590,7 +5925,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -5611,8 +5946,8 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" @@ -5629,6 +5964,11 @@ chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -5650,6 +5990,10 @@ # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi echo " diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-extras/configure.ac /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-extras/configure.ac --- abiword-2.6.2/abiword-extras/configure.ac 2008-04-06 22:23:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-extras/configure.ac 2009-07-15 16:56:23.000000000 +0100 @@ -1,5 +1,5 @@ -AC_INIT([abiword-extras],[2.6.2],[http://www.abisource.com/]) +AC_INIT([abiword-extras],[2.6.8],[http://www.abisource.com/]) AM_INIT_AUTOMAKE PKG_PROG_PKG_CONFIG diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-extras/dictionary/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-extras/dictionary/Makefile.in --- abiword-2.6.2/abiword-extras/dictionary/Makefile.in 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/abiword-extras/dictionary/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -136,6 +136,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ dictionarydir = $(ABIWORD_EXTRAS_PKGDATADIR)/dictionary @@ -156,8 +157,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-extras/install-sh /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-extras/install-sh --- abiword-2.6.2/abiword-extras/install-sh 2008-04-06 21:21:20.000000000 +0100 +++ abiword-2.6.8repack2/abiword-extras/install-sh 2009-07-15 16:56:23.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-10-14.15 +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} if test -z "$doit"; then doit_exec=exec else @@ -58,34 +58,49 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' -posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 +chgrpcmd= chmodcmd=$chmodprog chowncmd= -chgrpcmd= -stripcmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" +stripcmd= + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -95,65 +110,55 @@ In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) shift - continue;; + -c) ;; + + -C) copy_on_change=true;; - -d) dir_arg=true - shift - continue;; + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - shift - shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - continue;; + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; @@ -165,21 +170,22 @@ *) break;; esac + shift done -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dstarg"; then + if test -n "$dst_arg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" + set fnord "$@" "$dst_arg" shift # fnord fi shift # arg - dstarg=$arg + dst_arg=$arg done fi @@ -224,7 +230,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src ;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -242,22 +248,22 @@ exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dstarg + dst=$dst_arg # Protect names starting with `-'. case $dst in - -*) dst=./$dst ;; + -*) dst=./$dst;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -378,26 +384,19 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; esac - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac + eval "$initialize_posix_glob" oIFS=$IFS IFS=/ - $posix_glob && set -f + $posix_glob set -f set fnord $dstdir shift - $posix_glob && set +f + $posix_glob set +f IFS=$oIFS prefixes= @@ -459,41 +458,54 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ - || { - echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - } || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 trap '' 0 fi diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-extras/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-extras/Makefile.in --- abiword-2.6.2/abiword-extras/Makefile.in 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/abiword-extras/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -155,6 +155,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = clipart dictionary templates @@ -277,7 +278,7 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-extras/templates/Makefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-extras/templates/Makefile.in --- abiword-2.6.2/abiword-extras/templates/Makefile.in 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/abiword-extras/templates/Makefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -136,6 +136,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ templatesdir = $(ABIWORD_EXTRAS_PKGDATADIR)/templates @@ -160,8 +161,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/acinclude.m4 /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/acinclude.m4 --- abiword-2.6.2/abiword-plugins/acinclude.m4 2008-04-06 22:37:21.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/acinclude.m4 2009-07-15 16:56:23.000000000 +0100 @@ -178,21 +178,36 @@ # -# Checks for the collaborate.abisource.com service backend +# Checks for the abicollab.net service backend # -AC_ARG_WITH(abicollab-service-backend,[ --with-abicollab-service-backend enable the collaborate.abisource.com service backend for abicollab],[ +AC_ARG_WITH(abicollab-service-backend,[ --with-abicollab-service-backend enable the abicollab.net service backend for abicollab; NOTE to packagers: do NOT enable this, the service is not publically available yet],[ AC_CHECK_HEADERS(asio.hpp,[ - ABI_PLUGIN_REPORT([abicollab collaborate.abisource.com support: yes]) abicollab_handler_service=yes - ],[ ABI_PLUGIN_REPORT([abicollab collaborate.abisource.com support: no, asio >= 0.3.8rc1 required]) + ],[ ABI_PLUGIN_REPORT([abicollab abicollab.net support: no, asio >= 0.3.8rc1 required]) ]) + + if test "x$abicollab_handler_service" = "xyes" ; then + PKG_CHECK_MODULES(ABICOLLAB_SOUP, [libsoup-2.2 >= 2.2.100],[ + ABI_PLUGIN_REPORT([abicollab abicollab.net support: yes]) + abicollab_handler_service=yes + ],[ PKG_CHECK_MODULES(ABICOLLAB_SOUP, [libsoup-2.4 >= 2.4.1],[ + ABICOLLAB_SOUP_CFLAGS+=-DSOUP24 + ABI_PLUGIN_REPORT([abicollab abicollab.net support: yes]) + abicollab_handler_service=yes + ],[ + ABI_PLUGIN_REPORT([abicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required]) + abicollab_handler_service=no + ]) + ]) + fi + ],[ - ABI_PLUGIN_REPORT([abicollab collaborate.abisource.com support: no]) + ABI_PLUGIN_REPORT([abicollab abicollab.net support: no]) abicollab_handler_service=no ]) if test "x$abicollab_handler_service" = "xyes" ; then - ABICOLLAB_SERVICE_CPPFLAGS="-DABICOLLAB_HANDLER_SERVICE $ABICOLLAB_ASIO_CPPFLAGS" - ABICOLLAB_SERVICE_LIBS="-lpthread" + ABICOLLAB_SERVICE_CPPFLAGS="-DABICOLLAB_HANDLER_SERVICE $ABICOLLAB_ASIO_CPPFLAGS $ABICOLLAB_SOUP_CFLAGS" + ABICOLLAB_SERVICE_LIBS="-lpthread $ABICOLLAB_SOUP_LIBS" fi AC_SUBST(ABICOLLAB_SERVICE_CPPFLAGS) AC_SUBST(ABICOLLAB_SERVICE_LIBS) @@ -305,38 +320,6 @@ dnl= # this file is executed as a shell script dnl= dnl= # 1. abi_plugin_macro is the name of the main macro defined here: -dnl= abi_plugin_macro="ABIPGN_ABIDASH" -dnl= -dnl= # 2. abi_plugin_files is the list of files that configure must generate: -dnl= abi_plugin_files="GNUmakefile xp/GNUmakefile" -dnl= -dnl= # 3. abi_plugin_desc is a short description of the plugin -dnl= abi_plugin_desc="Interface with dashboard" -dnl= -dnl= # 4. abi_plugin_enable - whether plugin should be enabled by default -dnl= abi_plugin_enable="no" -dnl= -dnl= return -dnl= ########################################################################## - - -AC_DEFUN([ABIPGN_ABIDASH],[ - - abi_plugin_disable=yes - -if test $abi_plugin_disable = no; then - ABI_PLUGIN_REPORT([abidash: okay]) -else - ABI_PLUGIN_REPORT([abidash: disabled]) -fi - -]) - -dnl= ########################################################################## -dnl= # abiword-plugins: autogen.sh header -dnl= # this file is executed as a shell script -dnl= -dnl= # 1. abi_plugin_macro is the name of the main macro defined here: dnl= abi_plugin_macro="ABIPGN_ABIGIMP" dnl= dnl= # 2. abi_plugin_files is the list of files that configure must generate: @@ -1610,9 +1593,10 @@ dnl= dnl= # 1. abi_plugin_macro is the name of the main macro defined here: dnl= abi_plugin_macro="ABIPGN_LATEX" +dnl= abi_plugin_macro_end="ABIPGN_LATEX_END" dnl= dnl= # 2. abi_plugin_files is the list of files that configure must generate: -dnl= abi_plugin_files="GNUmakefile xp/GNUmakefile" +dnl= abi_plugin_files="GNUmakefile xp/GNUmakefile xsltml/GNUmakefile" dnl= dnl= # 3. abi_plugin_desc is a short description of the plugin dnl= abi_plugin_desc="" @@ -1627,8 +1611,42 @@ ABI_PLUGIN_REPORT([latex: okay]) +libxslt_req='libxslt' + +# use libxslt if detected +PKG_CHECK_EXISTS([ $libxslt_req ], +[ + abi_cv_libxslt="yes" +], [ + abi_cv_libxslt="no" +]) + +if test "$abi_cv_libxslt" == "yes"; then + PKG_CHECK_MODULES(LIBXSLT,[$libxslt_req]) + LATEX_CFLAGS="$LATEX_CFLAGS "'${LIBXSLT_CFLAGS}'" -DHAVE_LIBXSLT" + LATEX_LIBS="$LATEX_LIBS "'${LIBXSLT_LIBS}' + ABI_PLUGIN_REPORT([latex: equation export enabled]) +else + ABI_PLUGIN_REPORT([latex: equation export disabled]) +fi + +LATEX_CFLAGS="$LATEX_CFLAGS "'${PLUGIN_CFLAGS}' +LATEX_LIBS="$LATEX_LIBS "'${PLUGIN_LIBS}' + +if test "$enable_latex_builtin" == "yes"; then + LATEX_CFLAGS="$LATEX_CFLAGS -DABI_PLUGIN_BUILTIN" +fi + +AC_SUBST([LATEX_CFLAGS]) +AC_SUBST([LATEX_LIBS]) + ]) +AC_DEFUN([ABIPGN_LATEX_END],[ + +AM_CONDITIONAL(HAVE_LIBXSLT, test "x$abi_cv_libxslt" = "xyes") + +]) dnl= ########################################################################## dnl= # abiword-plugins: autogen.sh header dnl= # this file is executed as a shell script @@ -1789,7 +1807,7 @@ dnl= abi_plugin_macro="ABIPGN_OPENXML" dnl= dnl= # 2. abi_plugin_files is the list of files that configure must generate: -dnl= abi_plugin_files="GNUmakefile common/GNUmakefile common/xp/GNUmakefile imp/GNUmakefile imp/xp/GNUmakefile" +dnl= abi_plugin_files="GNUmakefile common/GNUmakefile common/xp/GNUmakefile exp/GNUmakefile exp/xp/GNUmakefile imp/GNUmakefile imp/xp/GNUmakefile" dnl= dnl= # 3. abi_plugin_desc is a short description of the plugin dnl= abi_plugin_desc="Plugin to allow AbiWord to read OpenXML .docx files" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/aclocal.m4 /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/aclocal.m4 --- abiword-2.6.2/abiword-plugins/aclocal.m4 2008-04-06 22:37:31.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/aclocal.m4 2009-07-15 16:56:23.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,108 +11,196 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +[m4_warning([this file was generated for autoconf 2.63. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +]) -# serial 51 AC_PROG_LIBTOOL +# serial 56 LT_INIT -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +LIBTOOL_DEPS="$ltmain" # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' AC_SUBST(LIBTOOL)dnl -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL +_LT_SETUP +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +m4_defun([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl - +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR +_LT_CHECK_OBJDIR -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -_LT_AC_PROG_ECHO_BACKSLASH +m4_require([_LT_TAG_COMPILER])dnl +_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -128,6462 +216,7758 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' # Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] +double_quote_subst='s/\([["`\\]]\)/\\\1/g' # Sed substitution to delay expansion of an escaped shell variable in a # double_quote_subst'ed string. delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + # Sed substitution to avoid accidental globbing in evaled expressions no_glob_subst='s/\*/\\\*/g' -# Constants: -rm="rm -f" - # Global variables: -default_ofile=libtool +ofile=libtool can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" -AC_CHECK_TOOL(AR, ar, false) -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) +with_gnu_ld="$lt_cv_prog_gnu_ld" old_CC="$CC" old_CFLAGS="$CFLAGS" # Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - _LT_CC_BASENAME([$compiler]) # Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC + _LT_PATH_MAGIC fi ;; esac -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -enable_win32_dll=yes, enable_win32_dll=no) - -AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP -AC_ARG_WITH([pic], - [AC_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) -test -z "$pic_mode" && pic_mode=default -# Use C for the default configuration in the libtool script -tagname= -AC_LIBTOOL_LANG_C_CONFIG -_LT_AC_TAGCONFIG -])# AC_LIBTOOL_SETUP +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from `configure', and `config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# `config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain="$ac_aux_dir/ltmain.sh" +])# _LT_PROG_LTMAIN -# _LT_AC_SYS_COMPILER -# ------------------- -AC_DEFUN([_LT_AC_SYS_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the `libtool' +# label. -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_AC_SYS_COMPILER +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) ]) -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_COMPILER_BOILERPLATE +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_LINKER_BOILERPLATE -# _LT_AC_SYS_LIBPATH_AIX -# ---------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_AC_SYS_LIBPATH_AIX +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) -# _LT_AC_SHELL_INIT(ARG) -# ---------------------- -AC_DEFUN([_LT_AC_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_AC_SHELL_INIT +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) -# _LT_AC_PROG_ECHO_BACKSLASH -# -------------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -[_LT_AC_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) -echo=${ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null 2>&1 && unset CDPATH -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags="_LT_TAGS"dnl +]) - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) -AC_SUBST(ECHO) -])])# _LT_AC_PROG_ECHO_BACKSLASH +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) -# _LT_AC_LOCK -# ----------- -AC_DEFUN([_LT_AC_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + + +# _LT_CONFIG_COMMANDS +# ------------------- +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into `config.status', and then the shell code to quote escape them in +# for loops in `config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; - *ELF-64*) - HPUX_IA64_MODE="64" + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ;; esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; +done -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - libsuff=64 - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - 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" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; - esac + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ;; esac - fi - rm -rf conftest* - ;; +done -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) +# Fix-up fallback echo if it was mangled by the above quoting rules. +case \$lt_ECHO in +*'\\\[$]0 --fallback-echo"')dnl " + lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` ;; - ]) esac -need_locks="$enable_libtool_lock" +_LT_OUTPUT_LIBTOOL_INIT +]) -])# _LT_AC_LOCK +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +cat >"$CONFIG_LT" <<_LTEOF +#! $SHELL +# Generated by $as_me. +# Run this file to recreate a libtool stub with the current configuration. + +lt_cl_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AS_SHELL_SANITIZE +_AS_PREPARE -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED]) -AC_CACHE_CHECK([$1], [$2], - [$2=no - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - 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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $rm conftest* -]) +exec AS_MESSAGE_FD>&1 +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD + +lt_cl_help="\ +\`$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. + +Usage: $[0] [[OPTIONS]] + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + +Report bugs to ." + +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. + +Copyright (C) 2008 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." -if test x"[$]$2" = xyes; then - ifelse([$5], , :, [$5]) -else - ifelse([$6], , :, [$6]) -fi -])# AC_LIBTOOL_COMPILER_OPTION +while test $[#] != 0 +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try \`$[0] --help' for more information.]) ;; -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ------------------------------------------------------------ -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" -]) + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try \`$[0] --help' for more information.]) ;; + esac + shift +done -if test x"[$]$2" = xyes; then - ifelse([$4], , :, [$4]) -else - ifelse([$5], , :, [$5]) +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null fi -])# AC_LIBTOOL_LINKER_OPTION +_LTEOF +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +if test "$no_create" != yes; then + lt_cl_success=: + test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" + exec AS_MESSAGE_LOG_FD>/dev/null + $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false + exec AS_MESSAGE_LOG_FD>>config.log + $lt_cl_success || AS_EXIT(1) +fi +])# LT_OUTPUT -# AC_LIBTOOL_SYS_MAX_CMD_LEN -# -------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -[# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +_LT_COPYING +_LT_LIBTOOL_TAGS - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; +_LT_EOF - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF ;; esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -])# AC_LIBTOOL_SYS_MAX_CMD_LEN + _LT_PROG_LTMAIN -# _LT_AC_CHECK_DLFCN -# ------------------ -AC_DEFUN([_LT_AC_CHECK_DLFCN], -[AC_CHECK_HEADERS(dlfcn.h)dnl -])# _LT_AC_CHECK_DLFCN - + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# --------------------------------------------------------------------- -AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -#include + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) - exit (status); -}] -EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_AC_TRY_DLOPEN_SELF +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG -# AC_LIBTOOL_DLOPEN_SELF -# ---------------------- -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG + +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +])# _LT_COMPILER_BOILERPLATE - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +])# _LT_LINKER_BOILERPLATE - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; +# _LT_REQUIRED_DARWIN_CHECKS +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; esac -fi -])# AC_LIBTOOL_DLOPEN_SELF - - -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -# --------------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* ]) -])# AC_LIBTOOL_PROG_CC_C_O - -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -# ----------------------------------------- -# Check to see if we can do hard links to lock some files if needed -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl -hard_links="nottested" -if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - 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 - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn +# _LT_DARWIN_LINKER_FEATURES +# -------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + m4_if([$1], [CXX], +[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no fi -else - need_locks=no -fi -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS - +]) -# AC_LIBTOOL_OBJDIR -# ----------------- -AC_DEFUN([AC_LIBTOOL_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -])# AC_LIBTOOL_OBJDIR +# _LT_SYS_MODULE_PATH_AIX +# ----------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +])# _LT_SYS_MODULE_PATH_AIX -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -# ---------------------------------------------- -# Check hardcoding attributes. -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_AC_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], +[ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) +$1 +AC_DIVERT_POP +])# _LT_SHELL_INIT - # We can hardcode non-existant directories. - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_AC_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_AC_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- +# Add some code to the start of the generated configure script which +# will find an echo command which doesn't interpret backslashes. +m4_defun([_LT_PROG_ECHO_BACKSLASH], +[_LT_SHELL_INIT([ +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} +case X$lt_ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; +esac -# AC_LIBTOOL_SYS_LIB_STRIP -# ------------------------ -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -[striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -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" - AC_MSG_RESULT([yes]) +ECHO=${lt_ECHO-echo} +if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! + : 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" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) + # Restart under the correct shell. + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + +if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift + cat <<_LT_EOF +[$]* +_LT_EOF + exit 0 fi -])# AC_LIBTOOL_SYS_LIB_STRIP +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# AC_LIBTOOL_SYS_DYNAMIC_LINKER -# ----------------------------- -# PORTME Fill in your ld.so characteristics -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -m4_if($1,[],[ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +if test -z "$lt_ECHO"; then + if test "X${echo_test_string+set}" != Xset; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if { echo_test_string=`eval $cmd`; } 2>/dev/null && + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null + then + break + fi + done fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`echo $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" -aix4* | aix5*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : + if test "X$ECHO" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + ECHO='print -r' + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} else - can_build_shared=no + # Try using printf. + ECHO='printf %s\n' + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "[$]0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} + else + # Oops. We lost completely, so just stick with echo. + ECHO=echo + fi + fi fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' fi - shlibpath_var=LIBPATH fi - ;; +fi -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +lt_ECHO=$ECHO +if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +fi -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; +AC_SUBST(lt_ECHO) +]) +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], + [An echo program that does not interpret backslashes]) +])# _LT_PROG_ECHO_BACKSLASH -bsdi[[45]]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH + fi + rm -rf conftest* ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' +*-*-irix6*) + # Find out which ABI we are using. + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* ;; -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* ;; -freebsd1*) - dynamic_linker=no +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + 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" + fi ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[123]]*) objformat=aout ;; - *) objformat=elf ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; esac fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac + rm -rf conftest* ;; +esac -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; +need_locks="$enable_libtool_lock" +])# _LT_ENABLE_LOCK -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[AC_CHECK_TOOL(AR, ar, false) +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1]) + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +])# _LT_CMD_OLD_ARCHIVE -interix[[3-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + 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. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $RM conftest* +]) -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; +if test x"[$]$2" = xyes; then + m4_if([$5], , :, [$5]) +else + m4_if([$6], , :, [$6]) +fi +])# _LT_COMPILER_OPTION -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + + +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" +]) - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi +if test x"[$]$2" = xyes; then + m4_if([$4], , :, [$4]) +else + m4_if([$5], , :, [$5]) +fi +])# _LT_LINKER_OPTION - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring="ABCD" -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; -rdos*) - dynamic_linker=no - ;; + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +]) +if test -n $lt_cv_sys_max_cmd_len ; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) fi -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN -# _LT_AC_TAGCONFIG -# ---------------- -AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - AC_MSG_WARN([output file `$ofile' does not exist]) - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) - else - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi - fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in - "") ;; - *) AC_MSG_ERROR([invalid tag name: $tagname]) - ;; - esac +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_LIBTOOL_LANG_CXX_CONFIG - else - tagname="" - fi - ;; +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "$cross_compiling" = yes; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +[#line __oline__ "configure" +#include "confdefs.h" - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - AC_LIBTOOL_LANG_F77_CONFIG - else - tagname="" - fi - ;; +#if HAVE_DLFCN_H +#include +#endif - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - AC_LIBTOOL_LANG_GCJ_CONFIG - else - tagname="" - fi - ;; +#include - RC) - AC_LIBTOOL_LANG_RC_CONFIG - ;; +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif - *) - AC_MSG_ERROR([Unsupported tag name: $tagname]) - ;; - esac +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } else - rm -f "${ofile}T" - AC_MSG_ERROR([unable to update list of available tagged configurations.]) + puts (dlerror ()); + + return status; +}] +_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 fi fi -])# _LT_AC_TAGCONFIG - +rm -fr conftest* +])# _LT_TRY_DLOPEN_SELF -# AC_LIBTOOL_DLOPEN -# ----------------- -# enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_DLOPEN +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= -# AC_LIBTOOL_WIN32_DLL -# -------------------- -# declare package support for building win32 DLLs -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_WIN32_DLL + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; -# AC_ENABLE_SHARED([DEFAULT]) -# --------------------------- -# implement the --enable-shared flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([shared], - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -])# AC_ENABLE_SHARED - + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; -# AC_DISABLE_SHARED -# ----------------- -# set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no) -])# AC_DISABLE_SHARED + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) + ]) + ]) + ;; + esac -# AC_ENABLE_STATIC([DEFAULT]) -# --------------------------- -# implement the --enable-static flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([static], - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]AC_ENABLE_STATIC_DEFAULT) -])# AC_ENABLE_STATIC + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -# AC_DISABLE_STATIC -# ----------------- -# set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no) -])# AC_DISABLE_STATIC + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" -# AC_ENABLE_FAST_INSTALL([DEFAULT]) -# --------------------------------- -# implement the --enable-fast-install flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([fast-install], - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -])# AC_ENABLE_FAST_INSTALL + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi -# AC_DISABLE_FAST_INSTALL -# ----------------------- -# set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no) -])# AC_DISABLE_FAST_INSTALL + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac -# AC_LIBTOOL_PICMODE([MODE]) -# -------------------------- -# implement the --with-pic flag -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default) -])# AC_LIBTOOL_PICMODE + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF + +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) -# AC_PROG_EGREP -# ------------- -# This is predefined starting with Autoconf 2.54, so this conditional -# definition can be removed once we require Autoconf 2.54 or later. -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) -])]) +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +]) +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O -# AC_PATH_TOOL_PREFIX -# ------------------- -# find a file program which can recognize shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="ifelse([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- +# Check to see if we can do hard links to lock some files if needed +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) +hard_links="nottested" +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + 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 + AC_MSG_RESULT([$hard_links]) + if test "$hard_links" = no; then + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + need_locks=warn + fi else - AC_MSG_RESULT(no) + need_locks=no fi -])# AC_PATH_TOOL_PREFIX +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS -# AC_PATH_MAGIC -# ------------- -# find a file program which can recognize a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs fi -])# AC_PATH_MAGIC +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", + [Define to the sub-directory in which libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR -# AC_PROG_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH([gnu-ld], - [AC_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no]) -AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- +# Check hardcoding attributes. +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + # Linking always hardcodes the temporary library directory. + _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || + test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH + + +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +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" + AC_MSG_RESULT([yes]) +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" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi ;; *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown + AC_MSG_RESULT([no]) ;; esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 /dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - IFS="$lt_save_ifs" + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` else - lt_cv_path_LD="$LD" # Let the user override the test with a path. + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) -LD="$lt_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_PROG_LD_GNU -])# AC_PROG_LD +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown -# AC_PROG_LD_GNU -# -------------- -AC_DEFUN([AC_PROG_LD_GNU], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' else - reload_cmds='$LD$reload_flag -o $output$reload_objs' + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ;; -esac -])# AC_PROG_LD_RELOAD_FLAG + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; -# AC_DEPLIBS_CHECK_METHOD -# ----------------------- -# how to check for library dependencies -# -- PORTME fill in with the dynamic library characteristics -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognize dependent libraries], -lt_cv_deplibs_check_method, -[lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix4* | aix5*) - lt_cv_deplibs_check_method=pass_all +bsdi[[45]]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs ;; -beos*) - lt_cv_deplibs_check_method=pass_all - ;; +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no -bsdi[[45]]*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH ;; -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH ;; -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all +freebsd1*) + dynamic_linker=no ;; freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` else - lt_cv_deplibs_check_method=pass_all + case $host_os in + freebsd[[123]]*) objformat=aout ;; + *) objformat=elf ;; + esac fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac ;; gnu*) - lt_cv_deplibs_check_method=pass_all + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes ;; -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no case $host_cpu in ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' ;; esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' ;; interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes ;; irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' ;; -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; -nto-qnx*) - lt_cv_deplibs_check_method=unknown +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' ;; openbsd*) - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + shlibpath_overrides_runpath=yes fi ;; +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; rdos*) - lt_cv_deplibs_check_method=pass_all + dynamic_linker=no ;; solaris*) - lt_cv_deplibs_check_method=pass_all + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes ;; sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; esac ;; +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no ;; esac -]) -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 -])# AC_DEPLIBS_CHECK_METHOD +AC_MSG_RESULT([$dynamic_linker]) +test "$dynamic_linker" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi -# AC_PROG_NM -# ---------- -# find the pathname to a BSD-compatible name lister -AC_DEFUN([AC_PROG_NM], -[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi]) -NM="$lt_cv_path_NM" -])# AC_PROG_NM +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], + [Run-time system search path for libraries]) +])# _LT_SYS_DYNAMIC_LINKER -# AC_CHECK_LIBM -# ------------- -# check for math library -AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + +# _LT_PATH_TOOL_PREFIX(TOOL) +# -------------------------- +# find a file program which can recognize shared library +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -])# AC_CHECK_LIBM + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$1; then + lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -# (note the single quotes!). If your package is not flat and you're not -# using automake, define top_builddir and top_srcdir appropriately in -# the Makefiles. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_CONVENIENCE +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac]) +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl installable library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# and an installed libltdl is not found, it is assumed to be `libltdl'. -# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and top_srcdir -# appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, lt_dlinit, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + +# _LT_PATH_MAGIC +# -------------- +# find a file program which can recognize a shared library +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLINCL= + MAGIC_CMD=: fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_INSTALLABLE - +fi +])# _LT_PATH_MAGIC -# AC_LIBTOOL_CXX -# -------------- -# enable support for C++ libraries -AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) -])# AC_LIBTOOL_CXX +# LT_PATH_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl -# _LT_AC_LANG_CXX -# --------------- -AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -])# _LT_AC_LANG_CXX +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no])dnl -# _LT_AC_PROG_CXXCPP -# ------------------ -AC_DEFUN([_LT_AC_PROG_CXXCPP], -[ -AC_REQUIRE([AC_PROG_CXX]) -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) fi -])# _LT_AC_PROG_CXXCPP - -# AC_LIBTOOL_F77 -# -------------- -# enable support for Fortran 77 libraries -AC_DEFUN([AC_LIBTOOL_F77], -[AC_REQUIRE([_LT_AC_LANG_F77]) -])# AC_LIBTOOL_F77 +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; -# Object file extension for compiled C test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext +cegcc) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; -_LT_AC_SYS_COMPILER +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF - -# Report which library types will actually be built -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi +# This must be Linux ELF. +linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all ;; -aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no +netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' fi - ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) + ;; -AC_LIBTOOL_CONFIG($1) +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_C_CONFIG +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; -# AC_LIBTOOL_LANG_CXX_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -[AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; -# Dependencies to place before and after the object being linked: -_LT_AC_TAGVAR(predep_objects, $1)= -_LT_AC_TAGVAR(postdep_objects, $1)= -_LT_AC_TAGVAR(predeps, $1)= -_LT_AC_TAGVAR(postdeps, $1)= -_LT_AC_TAGVAR(compiler_lib_search_path, $1)= +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; -# Source file extension for C++ test sources. -ac_ext=cpp +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; -# Object file extension for compiled C++ test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; -# Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) +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 -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method == "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +# LT_PATH_NM +# ---------- +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" else - $as_unset lt_cv_prog_gnu_ld -fi -if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} +fi]) +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" else - $as_unset lt_cv_path_LD + # Didn't find any BSD compatible name lister, look for dumpbin. + AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) + AC_SUBST([DUMPBIN]) + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -else - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -fi +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM + +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) -if test "$GXX" = yes; then - # Set up default GNU C++ configuration - AC_PROG_LD +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi +if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -else - GXX=no - with_gnu_ld=no - wlarc= + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) fi +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI -# PORTME: fill in a description of your system's C++ link characteristics -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -_LT_AC_TAGVAR(ld_shlibs, $1)=yes + +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl + +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Define system-specific variables. case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + rm -f "$nlist"T fi - fi - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi else - _LT_AC_TAGVAR(ld_shlibs, $1)=no + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD fi - ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi - ;; + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - freebsd-elf*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - ;; - gnu*) - ;; - hpux9*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + 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 + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi + +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) +]) # _LT_CMD_GLOBAL_SYMBOLS + + +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= + +AC_MSG_CHECKING([for $compiler option to produce PIC]) +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + amigaos*) case $host_cpu in - hppa*64*|ia64*) ;; - *) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. ;; - esac - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; esac - ;; - interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; - esac - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc*) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC*) - # Portland Group C++ compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; esac ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - m88k*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ ;; - esac - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - osf3*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi + linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC*) + # IBM XL 8.0 on PPC + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; + esac ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + lynxos*) ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + m88k*) ;; - esac - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; *) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; - esac - fi + esac ;; - esac - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + psos*) ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac ;; - esac - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) ;; *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ;; esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -esac -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_AC_TAGVAR(GCC, $1)="$GXX" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_POSTDEP_PREDEP($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - -AC_LIBTOOL_CONFIG($1) + fi +], +[ + if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -AC_LANG_POP -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -])# AC_LIBTOOL_LANG_CXX_CONFIG + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------------------ -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - # - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes + linux* | k*bsd*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xl*) + # IBM XL C 8.0/Fortran 10.1 on PPC + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + esac + ;; + esac ;; - esac - if test "$solaris_use_stlport4" != yes; then - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - esac - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; -case " $_LT_AC_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac -])# AC_LIBTOOL_POSTDEP_PREDEP + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; -# AC_LIBTOOL_LANG_F77_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -[AC_REQUIRE([AC_PROG_F77]) -AC_LANG_PUSH(Fortran 77) + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="\ - subroutine t - return - end -" + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; -# Code to be used in simple link tests -lt_simple_link_test_code="\ - program t - end -" + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE + sysv4*MP*) + if test -d /usr/nec ;then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${F77-"f77"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac fi - ;; +]) +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; esac -AC_MSG_RESULT([$enable_shared]) +AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -_LT_AC_TAGVAR(GCC, $1)="$G77" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - -AC_LIBTOOL_CONFIG($1) +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_F77_CONFIG +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC -# AC_LIBTOOL_LANG_GCJ_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -[AC_LANG_SAVE +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= -# Source file extension for Java test sources. -ac_ext=java + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac -# Object file extension for compiled Java test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext + _LT_TAGVAR(ld_shlibs, $1)=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE +_LT_EOF + fi + ;; -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${GCJ-"gcj"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -AC_LIBTOOL_CONFIG($1) + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_GCJ_CONFIG + gnu* | linux* | tpf* | k*bsd*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag= + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi -# AC_LIBTOOL_LANG_RC_CONFIG -# ------------------------- -# Ensure that the configuration vars for the Windows resource compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -[AC_LANG_SAVE + case $cc_basename in + xlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Source file extension for RC test sources. -ac_ext=rc + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; -# Object file extension for compiled RC test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${RC-"windres"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -AC_LIBTOOL_CONFIG($1) + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_RC_CONFIG +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -# AC_LIBTOOL_CONFIG([TAGNAME]) -# ---------------------------- -# If TAGNAME is not passed, then create an initial libtool script -# with a default configuration from the untagged config vars. Otherwise -# add code to config.status for appending the configuration named by -# TAGNAME from the matching tagged config vars. -AC_DEFUN([AC_LIBTOOL_CONFIG], -[# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - _LT_AC_TAGVAR(compiler, $1) \ - _LT_AC_TAGVAR(CC, $1) \ - _LT_AC_TAGVAR(LD, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ - _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ - _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ - _LT_AC_TAGVAR(old_archive_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ - _LT_AC_TAGVAR(predep_objects, $1) \ - _LT_AC_TAGVAR(postdep_objects, $1) \ - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ - _LT_AC_TAGVAR(postuninstall_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ - _LT_AC_TAGVAR(allow_undefined_flag, $1) \ - _LT_AC_TAGVAR(no_undefined_flag, $1) \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ - _LT_AC_TAGVAR(hardcode_automatic, $1) \ - _LT_AC_TAGVAR(module_cmds, $1) \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) \ - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ - _LT_AC_TAGVAR(fix_srcfile_path, $1) \ - _LT_AC_TAGVAR(exclude_expsyms, $1) \ - _LT_AC_TAGVAR(include_expsyms, $1); do - - case $var in - _LT_AC_TAGVAR(old_archive_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ - _LT_AC_TAGVAR(archive_cmds, $1) | \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(module_cmds, $1) | \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi ;; esac - done - case $lt_echo in - *'\[$]0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` - ;; - esac + if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; -ifelse([$1], [], - [cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - AC_MSG_NOTICE([creating $ofile])], - [cfgfile="$ofile"]) - - cat <<__EOF__ >> "$cfgfile" -ifelse([$1], [], -[#! $SHELL + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac -# A sed program that does not truncate output. -SED=$lt_SED + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -# The names of the tagged configurations supported by this script. -available_tags= + if test "$GCC" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi -# ### BEGIN LIBTOOL CONFIG], -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; -# Whether or not to build static libraries. -build_old_libs=$enable_static + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) + freebsd1*) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# An echo program that does not interpret backslashes. -echo=$lt_echo + hpux9*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; -# A C compiler. -LTCC=$lt_LTCC + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# A language-specific compiler. -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -# Is the compiler the GNU C compiler? -with_gcc=$_LT_AC_TAGVAR(GCC, $1) + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; -# An ERE matcher. -EGREP=$lt_EGREP + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE(int foo(void) {}, + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + ) + LDFLAGS="$save_LDFLAGS" + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; -# The linker used to build libraries. -LD=$lt_[]_LT_AC_TAGVAR(LD, $1) + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Whether we need hard or soft links. -LN_S=$lt_LN_S + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP + *nto* | *qnx*) + ;; -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" + osf3*) + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; -# Used on cygwin: assembler. -AS="$AS" + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -# The name of the directory that contains temporary libtool files. -objdir=$objdir + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; -# How to pass a linker flag through the compiler. -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Object file suffix (normally "o"). -objext="$ac_objext" + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Old archive suffix (normally "a"). -libext="$libext" + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; -# Executable file suffix (normally ""). -exeext="$exeext" + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' -# Additional compiler flags for building library objects. -pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -pic_mode=$pic_mode + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -# Must we lock files when doing compilation? -need_locks=$lt_need_locks + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac -# Do we need a version for libraries? -need_version=$need_version + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -# Whether dlopen is supported. -dlopen_support=$enable_dlopen +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # 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. + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) + ;; + esac + fi + ;; +esac -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], + [[If ld is used when linking, flag to hardcode $libdir into a binary + during linking. This must work even if $libdir does not exist]]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting ${shlibpath_var} if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [fix_srcfile_path], [1], + [Fix the shell variable $srcfile for the compiler]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# Ensure that the configuration variables for a C compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC="$CC" +AC_LANG_PUSH(C) -# Library versioning type. -version_type=$version_type +# Source file extension for C test sources. +ac_ext=c -# Format of library name prefix. -libname_spec=$lt_libname_spec +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + + # Report which library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) -# Commands used to build and install a shared archive. -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) + _LT_CONFIG($1) +fi +AC_LANG_POP +CC="$lt_save_CC" +])# _LT_LANG_C_CONFIG -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +# _LT_PROG_CXX +# ------------ +# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ +# compiler, we have our own version here. +m4_defun([_LT_PROG_CXX], +[ +pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) +AC_PROG_CXX +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_CXX -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_CXX], []) -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[AC_REQUIRE([_LT_PROG_CXX])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) +# Source file extension for C++ test sources. +ac_ext=cpp -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + if test "$GXX" = yes; then + # Set up default GNU C++ configuration -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + LT_PATH_LD -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= -# This is the shared library runtime path variable. -runpath_var=$runpath_var + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi -# This is the shared library path variable. -shlibpath_var=$shlibpath_var + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath + else + GXX=no + with_gnu_ld=no + wlarc= + fi -# How to hardcode a shared library path into an executable. -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) + freebsd[[12]]*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path + gnu*) + ;; -# Set to yes if exported symbols are required. -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -# The commands to list exported symbols. -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; -# Symbols that must always be exported. -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) + linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 will use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac -ifelse([$1],[], -[# ### END LIBTOOL CONFIG], -[# ### END LIBTOOL TAG CONFIG: $tagname]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -__EOF__ + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -ifelse([$1],[], [ - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + xl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -]) -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi -])# AC_LIBTOOL_CONFIG + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=echo + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac - AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -# --------------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([LT_AC_PROG_SED]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + output_verbose_link_cmd='echo' -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -linux* | k*bsd*-gnu) - if test "$host_cpu" = ia64; then - symcode='[[ABCDGIRSTW]]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; - # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; - # Check to see that the pipe works correctly. - pipe_works=no + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; - rm -f conftest* - cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif + _LT_TAGVAR(GCC, $1)="$GXX" + _LT_TAGVAR(LD, $1)="$LD" -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[[]] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -f conftest* conftst* +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF ]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - 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 - AC_MSG_RESULT(failed) +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case $p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + else + prev= + fi + + if test "$pre_test_object_deps_done" = no; then + case $p in + -L* | -R*) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)="${prev}${p}" + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi + ;; + + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)="$p" + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)="$p" + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe else - AC_MSG_RESULT(ok) + echo "libtool.m4: error: problem compiling $1 test program" fi -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +$RM -f confest.$objext -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -# --------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; -AC_MSG_CHECKING([for $compiler option to produce PIC]) - ifelse([$1],[CXX],[ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + esac + + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes ;; esac - else + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac +]) + +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS + + +# _LT_PROG_F77 +# ------------ +# Since AC_PROG_F77 is broken, in that it returns the empty string +# if there is no fortran compiler, we have our own version here. +m4_defun([_LT_PROG_F77], +[ +pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) +AC_PROG_F77 +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_F77 + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_F77], []) + + +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a Fortran 77 compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_REQUIRE([_LT_PROG_F77])dnl +AC_LANG_PUSH(Fortran 77) + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_F77" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + CC=${F77-"f77"} + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. case $host_os in - aix4* | aix5*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - icpc* | ecpc*) - # Intel C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC*) - # Portland Group C++ compiler. - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$G77" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" +fi # test "$_lt_disable_F77" != yes + +AC_LANG_POP +])# _LT_LANG_F77_CONFIG + + +# _LT_PROG_FC +# ----------- +# Since AC_PROG_FC is broken, in that it returns the empty string +# if there is no fortran compiler, we have our own version here. +m4_defun([_LT_PROG_FC], +[ +pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) +AC_PROG_FC +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_FC + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_FC], []) + + +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for a Fortran compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_REQUIRE([_LT_PROG_FC])dnl +AC_LANG_PUSH(Fortran) + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} + +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_FC" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + CC=${FC-"f95"} + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; esac - fi -], -[ - if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + AC_MSG_RESULT([$enable_shared]) - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" +fi # test "$_lt_disable_FC" != yes - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; +AC_LANG_POP +])# _LT_LANG_FC_CONFIG - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; +# Source file extension for Java test sources. +ac_ext=java - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC="$lt_save_CC" +])# _LT_LANG_GCJ_CONFIG + + +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC="$lt_save_CC" +])# _LT_LANG_RC_CONFIG + + +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) + + +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) +]) + + +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + + +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED + +m4_ifndef([AC_PROG_SED], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # + +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) - hpux9* | hpux10* | hpux11*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - irix5* | irix6* | nonstopux*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +AC_MSG_RESULT([$xsi_shell]) +_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) + +AC_MSG_CHECKING([whether the shell understands "+="]) +lt_shell_append=no +( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +AC_MSG_RESULT([$lt_shell_append]) +_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - newsos6) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - esac - ;; - esac - ;; +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES - osf3* | osf4* | osf5*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - rdos*) - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; +# _LT_PROG_XSI_SHELLFNS +# --------------------- +# Bourne and XSI compatible variants of some useful shell functions. +m4_defun([_LT_PROG_XSI_SHELLFNS], +[case $xsi_shell in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac +} - solaris*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} - sunos4*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" +} - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +func_stripname () +{ + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} +} - sysv4*MP*) - if test -d /usr/nec ;then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} - unicos*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} - uts4*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $[*] )) +} - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" +_LT_EOF ;; -esac + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" -# -# Check to make sure the static flag actually works. -# -wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -]) +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -# ------------------------------------ -# See if the linker supports building shared libraries. -AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix4* | aix5*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)= - _LT_AC_TAGVAR(archive_expsym_cmds, $1)= - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown - _LT_AC_TAGVAR(hardcode_automatic, $1)=no - _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_AC_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - _LT_CC_BASENAME([$compiler]) - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; +dnl func_dirname_and_basename +dnl A portable version of this function is already defined in general.m4sh +dnl so there is no need for it here. + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; esac +} - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' +# sed scripts: +my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +my_sed_long_arg='1s/^-[[^=]]*=//' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +} - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +} -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` +} -EOF - fi - ;; +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "$[@]"` +} - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +} - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +_LT_EOF +esac - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' +case $lt_shell_append in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$[1]+=\$[2]" +} +_LT_EOF + ;; + *) + cat << \_LT_EOF >> "$cfgfile" - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$[1]=\$$[1]\$[2]" +} - interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; +_LT_EOF + ;; + esac +]) - gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. - if test $supports_anon_versioning = yes; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +# serial 6 ltoptions.m4 - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option `$2'])])[]dnl +]) -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + - sunos4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + ]) +])# _LT_SET_OPTIONS - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - # see comment about different semantics on the GNU ld section - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `dlopen' option into LT_INIT's first parameter.]) +]) - bsdi[[45]]*) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi - ;; +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes - dgux*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; +test -z "$AS" && AS=as +_LT_DECL([], [AS], [0], [Assembler program])dnl - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +])# win32-dll - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `win32-dll' option into LT_INIT's first parameter.]) +]) - hpux9*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=yes +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the `shared' and +# `disable-shared' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) - case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - newsos6) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the `static' and +# `disable-static' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC - os2*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - osf3*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) - # Both c and cxx compiler support -rpath directly - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - solaris*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - sysv4) - case $host_vendor in - sni) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - sysv4.3*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the `fast-install' +# and `disable-fast-install' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - fi - ;; +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `fast-install' option into LT_INIT's first parameter.]) +]) - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `disable-fast-install' option into LT_INIT's first parameter.]) +]) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# LT_INIT options. +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) - uts4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC + +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `pic-only' option into LT_INIT's first parameter.]) ]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) + +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Do we need to explicitly link libc? +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 # -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_AC_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # 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. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +# serial 6 ltsugar.m4 - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) - then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac -])# AC_LIBTOOL_PROG_LD_SHLIBS +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) -# _LT_AC_FILE_LTDLL_C -# ------------------- -# Be careful that the start marker always follows a newline. -AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include -# #undef WIN32_LEAN_AND_MEAN -# #include -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ -])# _LT_AC_FILE_LTDLL_C +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) -# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -# --------------------------------- -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59 which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) -# old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -# This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL]) +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS) -]) -AC_DEFUN([LT_AC_PROG_RC], -[AC_CHECK_TOOL(RC, windres, no) -]) +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) -# Cheap backport of AS_EXECUTABLE_P and required macros -# from Autoconf 2.59; we should not use $as_executable_p directly. +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) -# _AS_TEST_PREPARE -# ---------------- -m4_ifndef([_AS_TEST_PREPARE], -[m4_defun([_AS_TEST_PREPARE], -[if test -x / >/dev/null 2>&1; then - as_executable_p='test -x' -else - as_executable_p='test -f' -fi -])])# _AS_TEST_PREPARE -# AS_EXECUTABLE_P -# --------------- -# Check whether a file is executable. -m4_ifndef([AS_EXECUTABLE_P], -[m4_defun([AS_EXECUTABLE_P], -[AS_REQUIRE([_AS_TEST_PREPARE])dnl -$as_executable_p $1[]dnl -])])# AS_EXECUTABLE_P +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -# LT_AC_PROG_SED -# -------------- -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -AC_DEFUN([LT_AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl ]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) + +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# Generated from ltversion.in. + +# serial 3012 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.2.6]) +m4_define([LT_PACKAGE_REVISION], [1.3012]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.2.6' +macro_revision='1.3012' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) ]) +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 4 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # # Copyright © 2004 Scott James Remnant . @@ -6652,16 +8036,14 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -6705,9 +8087,9 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -6742,7 +8124,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6757,7 +8139,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -6771,10 +8153,12 @@ # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.2])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -7024,19 +8408,28 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 4 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do +[# Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +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. @@ -7046,7 +8439,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -7094,13 +8487,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -7205,16 +8598,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -7388,13 +8782,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -7411,7 +8805,7 @@ # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- @@ -7507,7 +8901,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/config.guess /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/config.guess --- abiword-2.6.2/abiword-plugins/config.guess 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/config.guess 2009-07-16 17:24:14.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-07-22' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -532,7 +532,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -799,6 +799,9 @@ EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -833,7 +836,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -954,8 +964,8 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -1474,9 +1484,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/config.sub /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/config.sub --- abiword-2.6.2/abiword-plugins/config.sub 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/config.sub 2009-07-16 17:24:14.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-06-28' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -369,10 +369,14 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -443,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -668,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -813,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -1021,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/configure /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/configure --- abiword-2.6.2/abiword-plugins/configure 2008-04-06 22:38:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/configure 2009-07-15 16:56:23.000000000 +0100 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for abiword-plugins 2.6.2. +# Generated by GNU Autoconf 2.63 for abiword-plugins 2.6.8. # # Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -17,7 +17,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -39,17 +39,45 @@ 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=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -65,8 +93,6 @@ # 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. @@ -89,7 +115,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -102,17 +128,10 @@ PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -134,7 +153,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -160,7 +179,7 @@ as_have_required=no fi - if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } @@ -242,7 +261,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -263,7 +282,7 @@ 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 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -343,10 +362,10 @@ 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+"$@"} + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi @@ -415,9 +434,10 @@ 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 + echo Please tell bug-autoconf@gnu.org about your system, + echo including any error possibly output before this message. + echo This can help us improve future autoconf versions. + echo Configuration will now proceed without shell functions. } @@ -453,7 +473,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_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 @@ -481,7 +501,6 @@ *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -494,19 +513,22 @@ rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -531,10 +553,10 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -555,22 +577,22 @@ # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -case X$ECHO in +case X$lt_ECHO in X*--fallback-echo) # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` ;; esac -echo=${ECHO-echo} +ECHO=${lt_ECHO-echo} if test "X$1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. shift elif test "X$1" = X--fallback-echo; then # Avoid inline document here, it may be left over : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! : else # Restart under the correct shell. @@ -580,9 +602,9 @@ if test "X$1" = X--fallback-echo; then # used as fallback echo shift - cat </dev/null 2>&1 && unset CDPATH -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi +if test -z "$lt_ECHO"; then + if test "X${echo_test_string+set}" != Xset; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if { echo_test_string=`eval $cmd`; } 2>/dev/null && + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null + then + break + fi + done + fi -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$dir/echo" + break + fi + done IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL $0 --fallback-echo" + if test "X$ECHO" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + ECHO='print -r' + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} else - # maybe with a smaller string... - prev=: + # Try using printf. + ECHO='printf %s\n' + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + ECHO="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null + then + break + fi + prev="$cmd" + done - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + ECHO=echo + fi + fi fi fi fi fi -fi # Copy echo and quote the copy suitably for passing to libtool from # the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +lt_ECHO=$ECHO +if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi -tagnames=${tagnames+${tagnames},}CXX - -tagnames=${tagnames+${tagnames},}F77 - exec 7<&0 &1 # Name of the host. @@ -728,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='abiword-plugins' PACKAGE_TARNAME='abiword-plugins' -PACKAGE_VERSION='2.6.2' -PACKAGE_STRING='abiword-plugins 2.6.2' +PACKAGE_VERSION='2.6.8' +PACKAGE_STRING='abiword-plugins 2.6.8' PACKAGE_BUGREPORT='http://bugzilla.abisource.com/' ac_unique_file="ac-helpers/abi-plugin-init.m4" @@ -769,4897 +786,2600 @@ # include #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 -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 -PKG_CONFIG -GLIB_CFLAGS -GLIB_LIBS -GNOME_CFLAGS -GNOME_LIBS -NAUTILUS_CFLAGS -NAUTILUS_LIBS -GTK_CFLAGS -GTK_LIBS -PLATFORM_CPPFLAGS -PLATFORM_LDFLAGS -BUILD_PLATFORM_COCOA_TRUE -BUILD_PLATFORM_COCOA_FALSE -BUILD_PLATFORM_GNOME_TRUE -BUILD_PLATFORM_GNOME_FALSE -BUILD_PLATFORM_QNX_TRUE -BUILD_PLATFORM_QNX_FALSE -ABI_PLUGIN_DEBUG_TRUE -ABI_PLUGIN_DEBUG_FALSE -ABI_CPPFLAGS -ABI_CFLAGS -ABI_LIBS -ABI_PLUGIN_DIR -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -CPP -GREP -EGREP -LIBPNG_CFLAGS -LIBPNG_LIBS -LIBPNG_PEERDIR -CXX -CXXFLAGS -ac_ct_CXX -AWK -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -LN_S -SET_MAKE -am__isrc -CYGPATH_W -PACKAGE -VERSION -ACLOCAL -AUTOCONF -AUTOMAKE -AUTOHEADER -MAKEINFO -install_sh -STRIP -INSTALL_STRIP_PROGRAM -mkdir_p -am__leading_dot -AMTAR -am__tar -am__untar -DEPDIR -am__include -am__quote -AMDEP_TRUE -AMDEP_FALSE -AMDEPBACKSLASH -CCDEPMODE -am__fastdepCC_TRUE -am__fastdepCC_FALSE -CXXDEPMODE -am__fastdepCXX_TRUE -am__fastdepCXX_FALSE -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -SED -ECHO -AR -RANLIB -CXXCPP -F77 -FFLAGS -ac_ct_F77 -LIBTOOL -_abi_libxml2_CFLAGS -_abi_libxml2_LIBS -ABICOLLAB_LIBXML2_CPPFLAGS -ABICOLLAB_LIBXML2_LIBS -BOOST_CPPFLAGS -BOOST_LDFLAGS -ABICOLLAB_FAKE_CPPFLAGS -ABICOLLAB_FAKE_LIBS -_abi_loudmouth_CFLAGS -_abi_loudmouth_LIBS -ABICOLLAB_XMPP_CPPFLAGS -ABICOLLAB_XMPP_LIBS -ABICOLLAB_TCP_CPPFLAGS -ABICOLLAB_TCP_LIBS -_abi_dbus_CFLAGS -_abi_dbus_LIBS -_abi_dbus_glib_CFLAGS -_abi_dbus_glib_LIBS -ABICOLLAB_SUGAR_CPPFLAGS -ABICOLLAB_SUGAR_LIBS -ABICOLLAB_SERVICE_CPPFLAGS -ABICOLLAB_SERVICE_LIBS -ABICOLLAB_HANDLER_FAKE_TRUE -ABICOLLAB_HANDLER_FAKE_FALSE -ABICOLLAB_HANDLER_XMPP_TRUE -ABICOLLAB_HANDLER_XMPP_FALSE -ABICOLLAB_HANDLER_TCP_TRUE -ABICOLLAB_HANDLER_TCP_FALSE -ABICOLLAB_HANDLER_SUGAR_TRUE -ABICOLLAB_HANDLER_SUGAR_FALSE -ABICOLLAB_HANDLER_SERVICE_TRUE -ABICOLLAB_HANDLER_SERVICE_FALSE -_abi_glib_CFLAGS -_abi_glib_LIBS -ABI_COMMAND_CPPFLAGS -ABI_COMMAND_LDFLAGS -GOFFICE_CFLAGS -GOFFICE_LIBS -_abi_grammar_CFLAGS -_abi_grammar_LIBS -ABI_GRAMMAR_CPPFLAGS -ABI_GRAMMAR_LDFLAGS -MATHVIEW_CFLAGS -MATHVIEW_LIBS -LEX -LEX_OUTPUT_ROOT -LEXLIB -YACC -YFLAGS -GNOMESCAN_CFLAGS -GNOMESCAN_LIBS -PKGAIKSAURUS_CFLAGS -PKGAIKSAURUS_LIBS -PKGGAIKSAURUS_CFLAGS -PKGGAIKSAURUS_LIBS -ABI_AIKSAURUS_CPPFLAGS -ABI_AIKSAURUS_LDFLAGS -BUILD_GNU_REGEX_TRUE -BUILD_GNU_REGEX_FALSE -_abi_gda_CFLAGS -_abi_gda_LIBS -ABI_GDA_CPPFLAGS -ABI_GDA_LDFLAGS -_abi_gtk_CFLAGS -_abi_gtk_LIBS -ABI_GDICT_CPPFLAGS -ABI_GDICT_LDFLAGS -LOADBINDINGS_CPPFLAGS -LOADBINDINGS_LDFLAGS -_abi_ots_CFLAGS -_abi_ots_LIBS -ABI_OTS_CPPFLAGS -ABI_OTS_LDFLAGS -PRESENTATION_CPPFLAGS -PRESENTATION_LDFLAGS -abi_tools -ABI_BMP_CPPFLAGS -ABI_BMP_LDFLAGS -ABI_JPEG_CPPFLAGS -ABI_JPEG_LDFLAGS -_abi_librsvg_CFLAGS -_abi_librsvg_LIBS -LIBRSVG_CPPFLAGS -LIBRSVG_LDFLAGS -abi_libwmf_config -ABI_WMF_CPPFLAGS -ABI_WMF_LDFLAGS -_abi_libwpg_CFLAGS -_abi_libwpg_LIBS -LIBWPG_CPPFLAGS -LIBWPG_LDFLAGS -abi_wp_impexp_graphics -ABI_DOCBOOK_CPPFLAGS -ABI_DOCBOOK_LDFLAGS -ABI_HANCOM_CPPFLAGS -ABI_HANCOM_LDFLAGS -ABI_OPENDOCUMENT_CPPFLAGS -ABI_OPENDOCUMENT_LDFLAGS -ABI_OPENWRITER_CPPFLAGS -ABI_OPENWRITER_LDFLAGS -_abi_openxml_CFLAGS -_abi_openxml_LIBS -ABI_OPENXML_CPPFLAGS -ABI_OPENXML_LDFLAGS -psiconvconfig -ABI_PSION_CPPFLAGS -ABI_PSION_LDFLAGS -ABI_SDW_CPPFLAGS -ABI_SDW_LDFLAGS -_abi_wordperfect_CFLAGS -_abi_wordperfect_LIBS -_abi_msworks_CFLAGS -_abi_msworks_LIBS -WORDPERFECT_CPPFLAGS -WORDPERFECT_LDFLAGS -LIBXML2_CFLAGS -LIBXML2_LIBS -ABI_XHTML_CPPFLAGS -ABI_XHTML_LDFLAGS -ABI_XHTML_MHT_TRUE -ABI_XHTML_MHT_FALSE -ABI_XHTML_TIDY_TRUE -ABI_XHTML_TIDY_FALSE -ABI_XHTML_XML2_TRUE -ABI_XHTML_XML2_FALSE -abi_wp_impexp -abi_wp_scripts +ac_subst_vars='LTLIBOBJS LIBOBJS -LTLIBOBJS' -ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias -PKG_CONFIG -GLIB_CFLAGS -GLIB_LIBS -GNOME_CFLAGS -GNOME_LIBS -NAUTILUS_CFLAGS -NAUTILUS_LIBS -GTK_CFLAGS -GTK_LIBS -ABI_CFLAGS -ABI_LIBS -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CPP -LIBPNG_CFLAGS -LIBPNG_LIBS -CXX -CXXFLAGS -CCC -CXXCPP -F77 -FFLAGS -_abi_libxml2_CFLAGS -_abi_libxml2_LIBS -_abi_loudmouth_CFLAGS -_abi_loudmouth_LIBS -_abi_dbus_CFLAGS -_abi_dbus_LIBS -_abi_dbus_glib_CFLAGS -_abi_dbus_glib_LIBS -_abi_glib_CFLAGS -_abi_glib_LIBS -GOFFICE_CFLAGS -GOFFICE_LIBS -_abi_grammar_CFLAGS -_abi_grammar_LIBS -MATHVIEW_CFLAGS -MATHVIEW_LIBS -YACC -YFLAGS -GNOMESCAN_CFLAGS -GNOMESCAN_LIBS -PKGAIKSAURUS_CFLAGS -PKGAIKSAURUS_LIBS -PKGGAIKSAURUS_CFLAGS -PKGGAIKSAURUS_LIBS -_abi_gda_CFLAGS -_abi_gda_LIBS -_abi_gtk_CFLAGS -_abi_gtk_LIBS -_abi_ots_CFLAGS -_abi_ots_LIBS -_abi_librsvg_CFLAGS -_abi_librsvg_LIBS -_abi_libwpg_CFLAGS -_abi_libwpg_LIBS -_abi_openxml_CFLAGS -_abi_openxml_LIBS -_abi_wordperfect_CFLAGS -_abi_wordperfect_LIBS -_abi_msworks_CFLAGS -_abi_msworks_LIBS +abi_wp_scripts +abi_wp_impexp +ABI_XHTML_XML2_FALSE +ABI_XHTML_XML2_TRUE +ABI_XHTML_TIDY_FALSE +ABI_XHTML_TIDY_TRUE +ABI_XHTML_MHT_FALSE +ABI_XHTML_MHT_TRUE +ABI_XHTML_LDFLAGS +ABI_XHTML_CPPFLAGS +LIBXML2_LIBS LIBXML2_CFLAGS -LIBXML2_LIBS' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_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 - ac_prev= - continue - fi - - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute directory names. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures abiword-plugins 2.6.2 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/abiword-plugins] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of abiword-plugins 2.6.2:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-Cocoa Disable Cocoa build if on Darwin - --enable-gnome Turn on gnome ---enable-bundles - --enable-debug Use debug settings (default: no) ---enable-libabiword, link against libabiword - --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-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --disable-all disable all plugins by default - --disable-abicollab - --enable-abicollab-fake-backend AbiCollab Fake backend (default: no, for debugging purposes only) - --enable-abicollab-record-always Always record AbiCollab sessions (default: no) - --disable-abicommand - --disable-abidash - --disable-abigimp - --disable-abigoffice - --disable-abigrammar - --disable-abimathview - --disable-abiscan - --disable-aiksaurus - --disable-babelfish - --disable-develop - --disable-freetranslation - --disable-gda - --disable-gdict - --disable-google - --disable-loadbindings - --disable-ots - --disable-presentation - --disable-urldict - --disable-wikipedia - --disable-bmp - --disable-jpeg - --disable-librsvg - --disable-win32native - --disable-wmf - --disable-wpg - --disable-applix - --disable-clarisworks - --disable-docbook - --disable-eml - --disable-hancom - --disable-hrtext - --disable-iscii-text - --disable-kword - --disable-latex - --disable-mif - --disable-mswrite - --disable-nroff - --disable-OpenDocument - --disable-OpenWriter - --disable-OpenXML - --disable-opml - --disable-passepartout - --disable-pdb - --disable-pdf - --disable-psion - --disable-sdw - --disable-t602 - --disable-wml - --disable-wordperfect - --disable-xhtml - --disable-xsl-fo - --disable-shell - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-abiword=DIR AbiWord source is in DIR - --with-fink add /sw/... to CPP/LDFLAGS (Mac OSX) - --with-darwinports add /opt/local/... to CPP/LDFLAGS (Mac OSX) - --with-abiports add /opt/abi/... to CPP/LDFLAGS (Mac OSX) - --with-builtin-plugins build plugins for linking to abi - --with-AbiWordExec=PATH (only for Darwin gtk+ builds) - --with-libpng=DIR use libpng in DIR - --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] - --without-abicollab - --with-boost[=DIR] use boost (default is yes) - it is possible to - specify the root directory for boost (optional) - --with-asio=DIR use ASIO in DIR - --with-abicollab-sugar-backend enable the Sugar backend for abicollab - --with-abicollab-service-backend enable the collaborate.abisource.com service backend for abicollab - --without-abicommand - --without-abidash - --without-abigimp - --without-abigoffice - --without-abigrammar - --without-abimathview - --without-abiscan - --without-aiksaurus - --with-Aiksaurus=DIR Aiksaurus library in DIR - --without-babelfish - --without-develop - --without-freetranslation - --without-gda - --without-gdict - --without-google - --without-loadbindings - --without-ots - --without-presentation - --without-urldict - --without-wikipedia - --without-bmp - --without-jpeg - --without-librsvg - --without-win32native - --without-wmf - --with-libwmf=DIR Use libwmf in DIR - --without-wpg - --without-applix - --without-clarisworks - --without-docbook - --without-eml - --without-hancom - --without-hrtext - --without-iscii-text - --without-kword - --without-latex - --without-mif - --without-mswrite - --without-nroff - --without-OpenDocument - --without-OpenWriter - --without-OpenXML - --without-opml - --without-passepartout - --without-pdb - --without-pdf - --without-psion - --with-psiconv-config=DIR use psiconv-config in DIR - --without-sdw - --without-t602 - --without-wml - --without-wordperfect - --without-xhtml - --with-inter7eps=DIR inter7 EPS library in DIR - --with-libtidy=DIR tidy library in DIR - --without-xsl-fo - --without-shell - -Some influential environment variables: - PKG_CONFIG path to pkg-config utility - GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config - GLIB_LIBS linker flags for GLIB, overriding pkg-config - GNOME_CFLAGS - C compiler flags for GNOME, overriding pkg-config - GNOME_LIBS linker flags for GNOME, overriding pkg-config - NAUTILUS_CFLAGS - C compiler flags for NAUTILUS, overriding pkg-config - NAUTILUS_LIBS - linker flags for NAUTILUS, overriding pkg-config - GTK_CFLAGS C compiler flags for GTK, overriding pkg-config - GTK_LIBS linker flags for GTK, overriding pkg-config - ABI_CFLAGS C compiler flags for ABI, overriding pkg-config - ABI_LIBS linker flags for ABI, overriding pkg-config - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor - LIBPNG_CFLAGS - C compiler flags for LIBPNG, overriding pkg-config - LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor - F77 Fortran 77 compiler command - FFLAGS Fortran 77 compiler flags - _abi_libxml2_CFLAGS - C compiler flags for _abi_libxml2, overriding pkg-config - _abi_libxml2_LIBS - linker flags for _abi_libxml2, overriding pkg-config - _abi_loudmouth_CFLAGS - C compiler flags for _abi_loudmouth, overriding pkg-config - _abi_loudmouth_LIBS - linker flags for _abi_loudmouth, overriding pkg-config - _abi_dbus_CFLAGS - C compiler flags for _abi_dbus, overriding pkg-config - _abi_dbus_LIBS - linker flags for _abi_dbus, overriding pkg-config - _abi_dbus_glib_CFLAGS - C compiler flags for _abi_dbus_glib, overriding pkg-config - _abi_dbus_glib_LIBS - linker flags for _abi_dbus_glib, overriding pkg-config - _abi_glib_CFLAGS - C compiler flags for _abi_glib, overriding pkg-config - _abi_glib_LIBS - linker flags for _abi_glib, overriding pkg-config - GOFFICE_CFLAGS - C compiler flags for GOFFICE, overriding pkg-config - GOFFICE_LIBS - linker flags for GOFFICE, overriding pkg-config - _abi_grammar_CFLAGS - C compiler flags for _abi_grammar, overriding pkg-config - _abi_grammar_LIBS - linker flags for _abi_grammar, overriding pkg-config - MATHVIEW_CFLAGS - C compiler flags for MATHVIEW, overriding pkg-config - MATHVIEW_LIBS - linker flags for MATHVIEW, overriding pkg-config - YACC The `Yet Another C Compiler' implementation to use. Defaults to - the first program found out of: `bison -y', `byacc', `yacc'. - YFLAGS The list of arguments that will be passed by default to $YACC. - This script will default YFLAGS to the empty string to avoid a - default value of `-d' given by some make applications. - GNOMESCAN_CFLAGS - C compiler flags for GNOMESCAN, overriding pkg-config - GNOMESCAN_LIBS - linker flags for GNOMESCAN, overriding pkg-config - PKGAIKSAURUS_CFLAGS - C compiler flags for PKGAIKSAURUS, overriding pkg-config - PKGAIKSAURUS_LIBS - linker flags for PKGAIKSAURUS, overriding pkg-config - PKGGAIKSAURUS_CFLAGS - C compiler flags for PKGGAIKSAURUS, overriding pkg-config - PKGGAIKSAURUS_LIBS - linker flags for PKGGAIKSAURUS, overriding pkg-config - _abi_gda_CFLAGS - C compiler flags for _abi_gda, overriding pkg-config - _abi_gda_LIBS - linker flags for _abi_gda, overriding pkg-config - _abi_gtk_CFLAGS - C compiler flags for _abi_gtk, overriding pkg-config - _abi_gtk_LIBS - linker flags for _abi_gtk, overriding pkg-config - _abi_ots_CFLAGS - C compiler flags for _abi_ots, overriding pkg-config - _abi_ots_LIBS - linker flags for _abi_ots, overriding pkg-config - _abi_librsvg_CFLAGS - C compiler flags for _abi_librsvg, overriding pkg-config - _abi_librsvg_LIBS - linker flags for _abi_librsvg, overriding pkg-config - _abi_libwpg_CFLAGS - C compiler flags for _abi_libwpg, overriding pkg-config - _abi_libwpg_LIBS - linker flags for _abi_libwpg, overriding pkg-config - _abi_openxml_CFLAGS - C compiler flags for _abi_openxml, overriding pkg-config - _abi_openxml_LIBS - linker flags for _abi_openxml, overriding pkg-config - _abi_wordperfect_CFLAGS - C compiler flags for _abi_wordperfect, overriding pkg-config - _abi_wordperfect_LIBS - linker flags for _abi_wordperfect, overriding pkg-config - _abi_msworks_CFLAGS - C compiler flags for _abi_msworks, overriding pkg-config - _abi_msworks_LIBS - linker flags for _abi_msworks, overriding pkg-config - LIBXML2_CFLAGS - C compiler flags for LIBXML2, overriding pkg-config - LIBXML2_LIBS - linker flags for LIBXML2, overriding pkg-config - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to . -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -abiword-plugins configure 2.6.2 -generated by GNU Autoconf 2.61 - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by abiword-plugins $as_me 2.6.2, which was -generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" -else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" -fi -shift -for ac_site_file -do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - 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; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_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; } -else - { 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; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_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; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - 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 - -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; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { 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; } - PKG_CONFIG="" - fi - -fi - - abi_plugin_major="" - abi_plugin_minor="" - abi_plugin_micro="" - abi_plugin_source="" - abi_plugin_target="" - abi_plugin_version="" - - abi_plugin_topdir=`pwd` - rm -f $abi_plugin_topdir/plugin.status - - if test "x2.6.2" = "x" ; then - { { echo "$as_me:$LINENO: error: No AbiWord plugins version number!" >&5 -echo "$as_me: error: No AbiWord plugins version number!" >&2;} - { (exit 1); exit 1; }; } - fi - abi_plugin_version="2.6.2" - abi_plugin_major=`echo $abi_plugin_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - abi_plugin_minor=`echo $abi_plugin_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - abi_plugin_micro=`echo $abi_plugin_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - abi_plugin_version="$abi_plugin_major.$abi_plugin_minor.$abi_plugin_micro" - echo "" - echo "Configuring AbiWord plugins for Version $abi_plugin_version" - echo "" - - abi_hdr=src/af/util/xp/ut_types.h - { echo "$as_me:$LINENO: checking for AbiWord source" >&5 -echo $ECHO_N "checking for AbiWord source... $ECHO_C" >&6; } - -# Check whether --with-abiword was given. -if test "${with_abiword+set}" = set; then - withval=$with_abiword; - if test "x$withval" = "xno" ; then - { { echo "$as_me:$LINENO: error: * * * AbiWord sources are required for building plugins! * * *" >&5 -echo "$as_me: error: * * * AbiWord sources are required for building plugins! * * *" >&2;} - { (exit 1); exit 1; }; } - elif test "x$withval" = "xyes" ; then - { echo "$as_me:$LINENO: WARNING: * * * assuming peer directory for sources * * *" >&5 -echo "$as_me: WARNING: * * * assuming peer directory for sources * * *" >&2;} - else - if test -f "$withval/$abi_hdr" ; then - abi_plugin_source="$withval" - else - { { echo "$as_me:$LINENO: error: \"$withval is not a valid AbiWord source directory\"" >&5 -echo "$as_me: error: \"$withval is not a valid AbiWord source directory\"" >&2;} - { (exit 1); exit 1; }; } - fi - fi - -else - if test -f ../abiword/$abi_hdr; then - abi_plugin_source="../abiword" - elif test -f ../../abiword/$abi_hdr; then - # this is for 'make distcheck' - abi_plugin_source="../abiword" - elif test -f ../../../abiword/$abi_hdr; then - # this is for 'make distcheck' - abi_plugin_source="../../abiword" - else - { { echo "$as_me:$LINENO: error: can't find AbiWord source in peer; use --with-abiword=DIR" >&5 -echo "$as_me: error: can't find AbiWord source in peer; use --with-abiword=DIR" >&2;} - { (exit 1); exit 1; }; } - fi - -fi - - if test "x$abi_plugin_source" = "x" ; then - { { echo "$as_me:$LINENO: error: * * * unable to find AbiWord sources - which are required! * * *" >&5 -echo "$as_me: error: * * * unable to find AbiWord sources - which are required! * * *" >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: result: $abi_plugin_source" >&5 -echo "${ECHO_T}$abi_plugin_source" >&6; } - fi - case $abi_plugin_source in - /* | ?:/*) - # absolute path - ;; - *) - # relative path to the SOURCE dir - abi_plugin_source="\$(top_srcdir)/$abi_plugin_source" - ;; - esac - - if test "x$libdir" != 'x${exec_prefix}/lib'; then - abi_plugin_target="$libdir" - elif test "x$prefix" != "xNONE"; then - abi_plugin_target="$prefix/lib" - else - abi_plugin_target="/usr/local/lib" - fi - echo "" - echo "Installing plugins in $abi_plugin_target/abiword-$abi_plugin_major.$abi_plugin_minor/plugins" - echo "" - - export abi_plugin_major - export abi_plugin_minor - export abi_plugin_micro - export abi_plugin_source - export abi_plugin_target - export abi_plugin_version - export abi_plugin_topdir - - - -abi_platform=unix -abi_platf_be=unix - -PLATFORM_CPPFLAGS="" -PLATFORM_LDFLAGS="" - -xuname="x`uname`" - -# convenience option for building with fink installed on Darwin... -# - -# Check whether --with-fink was given. -if test "${with_fink+set}" = set; then - withval=$with_fink; - if test "x$withval" = "xyes"; then - CPPFLAGS="$CPPFLAGS -I/sw/include" - LDFLAGS="$LDFLAGS -L/sw/lib" - fi - -fi - - -# convenience option for building with DarwinPorts... -# - -# Check whether --with-darwinports was given. -if test "${with_darwinports+set}" = set; then - withval=$with_darwinports; - if test "x$withval" = "xyes"; then - CPPFLAGS="$CPPFLAGS -I/opt/local/include" - LDFLAGS="$LDFLAGS -L/opt/local/lib" - fi - -fi - - -# convenience option for building with abiports... -# - -# Check whether --with-abiports was given. -if test "${with_abiports+set}" = set; then - withval=$with_abiports; - if test "x$withval" = "xyes"; then - CPPFLAGS="$CPPFLAGS -I/opt/abi/include" - LDFLAGS="$LDFLAGS -L/opt/abi/lib" - fi - -fi - - -if test "$xuname" = "xQNX"; then - - -abi_platform=qnx -abi_platf_be=qnx - -if test "x$CC" = "x"; then - CC="qcc" - export CC -fi -if test "x$CXX" = "x"; then - if test "$OS_RELEASE" = "6.1.0"; then - CXX="QCC -Vgcc_ntox86" - else - CXX="QCC -Vgcc_ntox86_gpp" - fi - export CXX -fi - - -elif test "$xuname" = "xDarwin"; then - - -abi_platform=cocoa -abi_platf_be=unix - -# Check whether --enable-Cocoa was given. -if test "${enable_Cocoa+set}" = set; then - enableval=$enable_Cocoa; - if test "x$enableval" = "xno"; then - abi_platform=unix - fi - -fi - - -if test "$abi_platform" = "cocoa"; then - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for GLIB" >&5 -echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$GLIB_CFLAGS"; then - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - fribidi >= 0.10.4 - glib-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - fribidi >= 0.10.4 - glib-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags " - fribidi >= 0.10.4 - glib-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$GLIB_LIBS"; then - pkg_cv_GLIB_LIBS="$GLIB_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - fribidi >= 0.10.4 - glib-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - fribidi >= 0.10.4 - glib-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs " - fribidi >= 0.10.4 - glib-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - fribidi >= 0.10.4 - glib-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - "` - else - GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - fribidi >= 0.10.4 - glib-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - "` - fi - # Put the nasty error message in config.log where it belongs - echo "$GLIB_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements ( - fribidi >= 0.10.4 - glib-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - ) were not met: - -$GLIB_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GLIB_CFLAGS -and GLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements ( - fribidi >= 0.10.4 - glib-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - ) were not met: - -$GLIB_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GLIB_CFLAGS -and GLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GLIB_CFLAGS -and GLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GLIB_CFLAGS -and GLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS - GLIB_LIBS=$pkg_cv_GLIB_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi - - PLATFORM_CPPFLAGS="$GLIB_CFLAGS" - PLATFORM_LDFLAGS="$GLIB_LIBS" -fi - - -fi - -if test $abi_platform = unix; then - - -abi_platform=unix -abi_platf_be=unix - -# Check whether --enable-gnome was given. -if test "${enable_gnome+set}" = set; then - enableval=$enable_gnome; - if test "x$enableval" = "xyes"; then - abi_platform=gnome - fi - -fi - - -if test "$abi_platform" = "gnome"; then - NAUTILUS_CFLAGS="" - NAUTILUS_LIBS="" - - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for GNOME" >&5 -echo $ECHO_N "checking for GNOME... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$GNOME_CFLAGS"; then - pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - libbonobo-2.0 >= 2.0 - libgnomeui-2.0 >= 2.0 - libgnomeprint-2.2 >= 2.2.1 - libgnomeprintui-2.2 >= 2.2.1 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - libbonobo-2.0 >= 2.0 - libgnomeui-2.0 >= 2.0 - libgnomeprint-2.2 >= 2.2.1 - libgnomeprintui-2.2 >= 2.2.1 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - libbonobo-2.0 >= 2.0 - libgnomeui-2.0 >= 2.0 - libgnomeprint-2.2 >= 2.2.1 - libgnomeprintui-2.2 >= 2.2.1 - " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$GNOME_LIBS"; then - pkg_cv_GNOME_LIBS="$GNOME_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - libbonobo-2.0 >= 2.0 - libgnomeui-2.0 >= 2.0 - libgnomeprint-2.2 >= 2.2.1 - libgnomeprintui-2.2 >= 2.2.1 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - libbonobo-2.0 >= 2.0 - libgnomeui-2.0 >= 2.0 - libgnomeprint-2.2 >= 2.2.1 - libgnomeprintui-2.2 >= 2.2.1 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - libbonobo-2.0 >= 2.0 - libgnomeui-2.0 >= 2.0 - libgnomeprint-2.2 >= 2.2.1 - libgnomeprintui-2.2 >= 2.2.1 - " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - libbonobo-2.0 >= 2.0 - libgnomeui-2.0 >= 2.0 - libgnomeprint-2.2 >= 2.2.1 - libgnomeprintui-2.2 >= 2.2.1 - "` - else - GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - libbonobo-2.0 >= 2.0 - libgnomeui-2.0 >= 2.0 - libgnomeprint-2.2 >= 2.2.1 - libgnomeprintui-2.2 >= 2.2.1 - "` - fi - # Put the nasty error message in config.log where it belongs - echo "$GNOME_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements ( - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - libbonobo-2.0 >= 2.0 - libgnomeui-2.0 >= 2.0 - libgnomeprint-2.2 >= 2.2.1 - libgnomeprintui-2.2 >= 2.2.1 - ) were not met: - -$GNOME_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GNOME_CFLAGS -and GNOME_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements ( - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - libbonobo-2.0 >= 2.0 - libgnomeui-2.0 >= 2.0 - libgnomeprint-2.2 >= 2.2.1 - libgnomeprintui-2.2 >= 2.2.1 - ) were not met: - -$GNOME_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GNOME_CFLAGS -and GNOME_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GNOME_CFLAGS -and GNOME_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GNOME_CFLAGS -and GNOME_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS - GNOME_LIBS=$pkg_cv_GNOME_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for NAUTILUS" >&5 -echo $ECHO_N "checking for NAUTILUS... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$NAUTILUS_CFLAGS"; then - pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - libnautilus >= 2.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - libnautilus >= 2.0 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags " - libnautilus >= 2.0 - " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$NAUTILUS_LIBS"; then - pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - libnautilus >= 2.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - libnautilus >= 2.0 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs " - libnautilus >= 2.0 - " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - libnautilus >= 2.0 - "` - else - NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - libnautilus >= 2.0 - "` - fi - # Put the nasty error message in config.log where it belongs - echo "$NAUTILUS_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - _abi_gnome_nautilus=no - -elif test $pkg_failed = untried; then - _abi_gnome_nautilus=no - -else - NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS - NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - _abi_gnome_nautilus=yes - -fi - if test "x$_abi_gnome_nautilus" = "xyes"; then - NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS -DHAVE_NAUTILUS=1" - fi - - PLATFORM_CPPFLAGS="$NAUTILUS_CFLAGS $GNOME_CFLAGS -DHAVE_GNOME=1" - PLATFORM_LDFLAGS="$NAUTILUS_LIBS $GNOME_LIBS" -else - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for GTK" >&5 -echo $ECHO_N "checking for GTK... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - "` - else - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - "` - fi - # Put the nasty error message in config.log where it belongs - echo "$GTK_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements ( - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - ) were not met: - -$GTK_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GTK_CFLAGS -and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements ( - xft >= 2.0 - fontconfig >= 1.0 - fribidi >= 0.10.4 - gmodule-2.0 >= 2.0 - libgsf-1 >= 1.12.0 - gtk+-2.0 >= 2.0 - libglade-2.0 >= 2.0.0 - ) were not met: - -$GTK_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GTK_CFLAGS -and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GTK_CFLAGS -and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GTK_CFLAGS -and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - GTK_CFLAGS=$pkg_cv_GTK_CFLAGS - GTK_LIBS=$pkg_cv_GTK_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi - - PLATFORM_CPPFLAGS="$GTK_CFLAGS" - PLATFORM_LDFLAGS="$GTK_LIBS" -fi - - -fi - - - - - if test "$abi_platform" = "cocoa"; then - BUILD_PLATFORM_COCOA_TRUE= - BUILD_PLATFORM_COCOA_FALSE='#' -else - BUILD_PLATFORM_COCOA_TRUE='#' - BUILD_PLATFORM_COCOA_FALSE= -fi - - if test "$abi_platform" = "gnome"; then - BUILD_PLATFORM_GNOME_TRUE= - BUILD_PLATFORM_GNOME_FALSE='#' -else - BUILD_PLATFORM_GNOME_TRUE='#' - BUILD_PLATFORM_GNOME_FALSE= -fi - - if test "$abi_platform" = "qnx" ; then - BUILD_PLATFORM_QNX_TRUE= - BUILD_PLATFORM_QNX_FALSE='#' -else - BUILD_PLATFORM_QNX_TRUE='#' - BUILD_PLATFORM_QNX_FALSE= -fi - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="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; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - 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 +WORDPERFECT_LDFLAGS +WORDPERFECT_CPPFLAGS +_abi_msworks_LIBS +_abi_msworks_CFLAGS +_abi_wordperfect_LIBS +_abi_wordperfect_CFLAGS +ABI_SDW_LDFLAGS +ABI_SDW_CPPFLAGS +ABI_PSION_LDFLAGS +ABI_PSION_CPPFLAGS +psiconvconfig +ABI_OPENXML_LDFLAGS +ABI_OPENXML_CPPFLAGS +_abi_openxml_LIBS +_abi_openxml_CFLAGS +ABI_OPENWRITER_LDFLAGS +ABI_OPENWRITER_CPPFLAGS +ABI_OPENDOCUMENT_LDFLAGS +ABI_OPENDOCUMENT_CPPFLAGS +HAVE_LIBXSLT_FALSE +HAVE_LIBXSLT_TRUE +LATEX_LIBS +LATEX_CFLAGS +LIBXSLT_LIBS +LIBXSLT_CFLAGS +ABI_HANCOM_LDFLAGS +ABI_HANCOM_CPPFLAGS +ABI_DOCBOOK_LDFLAGS +ABI_DOCBOOK_CPPFLAGS +abi_wp_impexp_graphics +LIBWPG_LDFLAGS +LIBWPG_CPPFLAGS +_abi_libwpg_LIBS +_abi_libwpg_CFLAGS +ABI_WMF_LDFLAGS +ABI_WMF_CPPFLAGS +abi_libwmf_config +LIBRSVG_LDFLAGS +LIBRSVG_CPPFLAGS +_abi_librsvg_LIBS +_abi_librsvg_CFLAGS +ABI_JPEG_LDFLAGS +ABI_JPEG_CPPFLAGS +ABI_BMP_LDFLAGS +ABI_BMP_CPPFLAGS +abi_tools +PRESENTATION_LDFLAGS +PRESENTATION_CPPFLAGS +ABI_OTS_LDFLAGS +ABI_OTS_CPPFLAGS +_abi_ots_LIBS +_abi_ots_CFLAGS +LOADBINDINGS_LDFLAGS +LOADBINDINGS_CPPFLAGS +ABI_GDICT_LDFLAGS +ABI_GDICT_CPPFLAGS +_abi_gtk_LIBS +_abi_gtk_CFLAGS +ABI_GDA_LDFLAGS +ABI_GDA_CPPFLAGS +_abi_gda_LIBS +_abi_gda_CFLAGS +BUILD_GNU_REGEX_FALSE +BUILD_GNU_REGEX_TRUE +ABI_AIKSAURUS_LDFLAGS +ABI_AIKSAURUS_CPPFLAGS +PKGGAIKSAURUS_LIBS +PKGGAIKSAURUS_CFLAGS +PKGAIKSAURUS_LIBS +PKGAIKSAURUS_CFLAGS +GNOMESCAN_LIBS +GNOMESCAN_CFLAGS +YFLAGS +YACC +LEXLIB +LEX_OUTPUT_ROOT +LEX +MATHVIEW_LIBS +MATHVIEW_CFLAGS +ABI_GRAMMAR_LDFLAGS +ABI_GRAMMAR_CPPFLAGS +_abi_grammar_LIBS +_abi_grammar_CFLAGS +GOFFICE_LIBS +GOFFICE_CFLAGS +ABI_COMMAND_LDFLAGS +ABI_COMMAND_CPPFLAGS +_abi_glib_LIBS +_abi_glib_CFLAGS +ABICOLLAB_HANDLER_SERVICE_FALSE +ABICOLLAB_HANDLER_SERVICE_TRUE +ABICOLLAB_HANDLER_SUGAR_FALSE +ABICOLLAB_HANDLER_SUGAR_TRUE +ABICOLLAB_HANDLER_TCP_FALSE +ABICOLLAB_HANDLER_TCP_TRUE +ABICOLLAB_HANDLER_XMPP_FALSE +ABICOLLAB_HANDLER_XMPP_TRUE +ABICOLLAB_HANDLER_FAKE_FALSE +ABICOLLAB_HANDLER_FAKE_TRUE +ABICOLLAB_SERVICE_LIBS +ABICOLLAB_SERVICE_CPPFLAGS +ABICOLLAB_SOUP_LIBS +ABICOLLAB_SOUP_CFLAGS +ABICOLLAB_SUGAR_LIBS +ABICOLLAB_SUGAR_CPPFLAGS +_abi_dbus_glib_LIBS +_abi_dbus_glib_CFLAGS +_abi_dbus_LIBS +_abi_dbus_CFLAGS +ABICOLLAB_TCP_LIBS +ABICOLLAB_TCP_CPPFLAGS +ABICOLLAB_XMPP_LIBS +ABICOLLAB_XMPP_CPPFLAGS +_abi_loudmouth_LIBS +_abi_loudmouth_CFLAGS +ABICOLLAB_FAKE_LIBS +ABICOLLAB_FAKE_CPPFLAGS +BOOST_LDFLAGS +BOOST_CPPFLAGS +ABICOLLAB_LIBXML2_LIBS +ABICOLLAB_LIBXML2_CPPFLAGS +_abi_libxml2_LIBS +_abi_libxml2_CFLAGS +CXXCPP +OTOOL64 +OTOOL +LIPO +NMEDIT +DSYMUTIL +lt_ECHO +RANLIB +AR +OBJDUMP +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP +SED +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +LIBTOOL +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +am__untar +am__tar +AMTAR +am__leading_dot +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +SET_MAKE +LN_S +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +AWK +ac_ct_CXX +CXXFLAGS +CXX +LIBPNG_PEERDIR +LIBPNG_LIBS +LIBPNG_CFLAGS +EGREP +GREP +CPP +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +ABI_PLUGIN_DIR +ABI_LIBS +ABI_CFLAGS +ABI_CPPFLAGS +ABI_PLUGIN_DEBUG_FALSE +ABI_PLUGIN_DEBUG_TRUE +BUILD_PLATFORM_QNX_FALSE +BUILD_PLATFORM_QNX_TRUE +BUILD_PLATFORM_GNOME_FALSE +BUILD_PLATFORM_GNOME_TRUE +BUILD_PLATFORM_COCOA_FALSE +BUILD_PLATFORM_COCOA_TRUE +PLATFORM_LDFLAGS +PLATFORM_CPPFLAGS +GTK_LIBS +GTK_CFLAGS +NAUTILUS_LIBS +NAUTILUS_CFLAGS +GNOME_LIBS +GNOME_CFLAGS +GLIB_LIBS +GLIB_CFLAGS +PKG_CONFIG +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +with_abiword +with_fink +with_darwinports +with_abiports +enable_Cocoa +enable_gnome +enable_bundles +enable_debug +with_builtin_plugins +with_AbiWordExec +enable_libabiword +with_libpng +enable_dependency_tracking +enable_static +enable_shared +with_pic +enable_fast_install +with_gnu_ld +enable_libtool_lock +enable_all +enable_abicollab +with_abicollab +with_boost +with_asio +enable_abicollab_fake_backend +with_abicollab_sugar_backend +with_abicollab_service_backend +enable_abicollab_record_always +enable_abicommand +with_abicommand +enable_abigimp +with_abigimp +enable_abigoffice +with_abigoffice +enable_abigrammar +with_abigrammar +enable_abimathview +with_abimathview +enable_abiscan +with_abiscan +enable_aiksaurus +with_aiksaurus +with_Aiksaurus +enable_babelfish +with_babelfish +enable_develop +with_develop +enable_freetranslation +with_freetranslation +enable_gda +with_gda +enable_gdict +with_gdict +enable_google +with_google +enable_loadbindings +with_loadbindings +enable_ots +with_ots +enable_presentation +with_presentation +enable_urldict +with_urldict +enable_wikipedia +with_wikipedia +enable_bmp +with_bmp +enable_jpeg +with_jpeg +enable_librsvg +with_librsvg +enable_win32native +with_win32native +enable_wmf +with_wmf +with_libwmf +enable_wpg +with_wpg +enable_applix +with_applix +enable_clarisworks +with_clarisworks +enable_docbook +with_docbook +enable_eml +with_eml +enable_hancom +with_hancom +enable_hrtext +with_hrtext +enable_iscii_text +with_iscii_text +enable_kword +with_kword +enable_latex +with_latex +enable_mif +with_mif +enable_mswrite +with_mswrite +enable_nroff +with_nroff +enable_OpenDocument +with_OpenDocument +enable_OpenWriter +with_OpenWriter +enable_OpenXML +with_OpenXML +enable_opml +with_opml +enable_passepartout +with_passepartout +enable_pdb +with_pdb +enable_pdf +with_pdf +enable_psion +with_psion +with_psiconv_config +enable_sdw +with_sdw +enable_t602 +with_t602 +enable_wml +with_wml +enable_wordperfect +with_wordperfect +enable_xhtml +with_xhtml +with_inter7eps +with_libtidy +enable_xsl_fo +with_xsl_fo +enable_shell +with_shell +' + ac_precious_vars='build_alias +host_alias +target_alias +PKG_CONFIG +GLIB_CFLAGS +GLIB_LIBS +GNOME_CFLAGS +GNOME_LIBS +NAUTILUS_CFLAGS +NAUTILUS_LIBS +GTK_CFLAGS +GTK_LIBS +ABI_CFLAGS +ABI_LIBS +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +LIBPNG_CFLAGS +LIBPNG_LIBS +CXX +CXXFLAGS +CCC +CXXCPP +_abi_libxml2_CFLAGS +_abi_libxml2_LIBS +_abi_loudmouth_CFLAGS +_abi_loudmouth_LIBS +_abi_dbus_CFLAGS +_abi_dbus_LIBS +_abi_dbus_glib_CFLAGS +_abi_dbus_glib_LIBS +ABICOLLAB_SOUP_CFLAGS +ABICOLLAB_SOUP_LIBS +_abi_glib_CFLAGS +_abi_glib_LIBS +GOFFICE_CFLAGS +GOFFICE_LIBS +_abi_grammar_CFLAGS +_abi_grammar_LIBS +MATHVIEW_CFLAGS +MATHVIEW_LIBS +YACC +YFLAGS +GNOMESCAN_CFLAGS +GNOMESCAN_LIBS +PKGAIKSAURUS_CFLAGS +PKGAIKSAURUS_LIBS +PKGGAIKSAURUS_CFLAGS +PKGGAIKSAURUS_LIBS +_abi_gda_CFLAGS +_abi_gda_LIBS +_abi_gtk_CFLAGS +_abi_gtk_LIBS +_abi_ots_CFLAGS +_abi_ots_LIBS +_abi_librsvg_CFLAGS +_abi_librsvg_LIBS +_abi_libwpg_CFLAGS +_abi_libwpg_LIBS +LIBXSLT_CFLAGS +LIBXSLT_LIBS +_abi_openxml_CFLAGS +_abi_openxml_LIBS +_abi_wordperfect_CFLAGS +_abi_wordperfect_LIBS +_abi_msworks_CFLAGS +_abi_msworks_LIBS +LIBXML2_CFLAGS +LIBXML2_LIBS' -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -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 +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' - 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; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +ac_prev= +ac_dashdash= +for ac_option do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue fi -done -done -IFS=$as_save_IFS -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + 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. -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -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 + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + --config-cache | -C) + cache_file=config.cache ;; + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; - test -n "$ac_ct_CC" && break -done + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; - 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 + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -fi + -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 ;; -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; -int -main () -{ + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# 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; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# 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 + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; -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 - # 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 | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - 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= + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; -else - ac_file='' -fi + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; -ac_exeext=$ac_cv_exeext + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; -# 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; } -# 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' - { (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 - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# 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; } + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; -{ 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 - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -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 | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; -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; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; -int -main () -{ + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -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 conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; -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; } -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; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; -int -main () -{ -#ifndef __GNUC__ - choke me -#endif + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; - ac_compiler_gnu=no -fi + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; -int -main () -{ + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -int -main () -{ + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + --x) + # Obsolete; use --with-x. + with_x=yes ;; - 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. */ + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; -int -main () -{ + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } + ;; + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; -fi + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi + esac +done -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 + { (exit 1); exit 1; }; } ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +# Check all directory arguments for consistency. +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 - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } +done +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; - xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -esac +test "$silent" = yes && exec 6>/dev/null -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_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { $as_echo "$as_me: error: working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 - # Broken: fails on valid input. -continue -fi +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures abiword-plugins 2.6.8 to adapt to many kinds of systems. -rm -f conftest.err conftest.$ac_ext +Usage: $0 [OPTION]... [VAR=VALUE]... - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. - # Passes both tests. -ac_preproc_ok=: -break -fi +Defaults for the options are specified in brackets. -rm -f conftest.err conftest.$ac_ext +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] - done - ac_cv_prog_CPP=$CPP +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ 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 - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +For better control, use the options below. - # Broken: fails on valid input. -continue +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/abiword-plugins] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF fi -rm -f conftest.err conftest.$ac_ext +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of abiword-plugins 2.6.8:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-Cocoa Disable Cocoa build if on Darwin + --enable-gnome Turn on gnome +--enable-bundles + --enable-debug Use debug settings (default: no) +--enable-libabiword, link against libabiword + --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-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --disable-all disable all plugins by default + --disable-abicollab + --enable-abicollab-fake-backend AbiCollab Fake backend (default: no, for debugging purposes only) + --enable-abicollab-record-always Always record AbiCollab sessions (default: no) + --disable-abicommand + --disable-abigimp + --disable-abigoffice + --disable-abigrammar + --disable-abimathview + --disable-abiscan + --disable-aiksaurus + --disable-babelfish + --disable-develop + --disable-freetranslation + --disable-gda + --disable-gdict + --disable-google + --disable-loadbindings + --disable-ots + --disable-presentation + --disable-urldict + --disable-wikipedia + --disable-bmp + --disable-jpeg + --disable-librsvg + --disable-win32native + --disable-wmf + --disable-wpg + --disable-applix + --disable-clarisworks + --disable-docbook + --disable-eml + --disable-hancom + --disable-hrtext + --disable-iscii-text + --disable-kword + --disable-latex + --disable-mif + --disable-mswrite + --disable-nroff + --disable-OpenDocument + --disable-OpenWriter + --disable-OpenXML + --disable-opml + --disable-passepartout + --disable-pdb + --disable-pdf + --disable-psion + --disable-sdw + --disable-t602 + --disable-wml + --disable-wordperfect + --disable-xhtml + --disable-xsl-fo + --disable-shell + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-abiword=DIR AbiWord source is in DIR + --with-fink add /sw/... to CPP/LDFLAGS (Mac OSX) + --with-darwinports add /opt/local/... to CPP/LDFLAGS (Mac OSX) + --with-abiports add /opt/abi/... to CPP/LDFLAGS (Mac OSX) + --with-builtin-plugins build plugins for linking to abi + --with-AbiWordExec=PATH (only for Darwin gtk+ builds) + --with-libpng=DIR use libpng in DIR + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --without-abicollab + --with-boost[=DIR] use boost (default is yes) - it is possible to + specify the root directory for boost (optional) + --with-asio=DIR use ASIO in DIR + --with-abicollab-sugar-backend enable the Sugar backend for abicollab + --with-abicollab-service-backend enable the abicollab.net service backend for abicollab; NOTE to packagers: do NOT enable this, the service is not publically available yet + --without-abicommand + --without-abigimp + --without-abigoffice + --without-abigrammar + --without-abimathview + --without-abiscan + --without-aiksaurus + --with-Aiksaurus=DIR Aiksaurus library in DIR + --without-babelfish + --without-develop + --without-freetranslation + --without-gda + --without-gdict + --without-google + --without-loadbindings + --without-ots + --without-presentation + --without-urldict + --without-wikipedia + --without-bmp + --without-jpeg + --without-librsvg + --without-win32native + --without-wmf + --with-libwmf=DIR Use libwmf in DIR + --without-wpg + --without-applix + --without-clarisworks + --without-docbook + --without-eml + --without-hancom + --without-hrtext + --without-iscii-text + --without-kword + --without-latex + --without-mif + --without-mswrite + --without-nroff + --without-OpenDocument + --without-OpenWriter + --without-OpenXML + --without-opml + --without-passepartout + --without-pdb + --without-pdf + --without-psion + --with-psiconv-config=DIR use psiconv-config in DIR + --without-sdw + --without-t602 + --without-wml + --without-wordperfect + --without-xhtml + --with-inter7eps=DIR inter7 EPS library in DIR + --with-libtidy=DIR tidy library in DIR + --without-xsl-fo + --without-shell + +Some influential environment variables: + PKG_CONFIG path to pkg-config utility + GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config + GLIB_LIBS linker flags for GLIB, overriding pkg-config + GNOME_CFLAGS + C compiler flags for GNOME, overriding pkg-config + GNOME_LIBS linker flags for GNOME, overriding pkg-config + NAUTILUS_CFLAGS + C compiler flags for NAUTILUS, overriding pkg-config + NAUTILUS_LIBS + linker flags for NAUTILUS, overriding pkg-config + GTK_CFLAGS C compiler flags for GTK, overriding pkg-config + GTK_LIBS linker flags for GTK, overriding pkg-config + ABI_CFLAGS C compiler flags for ABI, overriding pkg-config + ABI_LIBS linker flags for ABI, overriding pkg-config + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + LIBPNG_CFLAGS + C compiler flags for LIBPNG, overriding pkg-config + LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config + CXX C++ compiler command + CXXFLAGS C++ compiler flags + CXXCPP C++ preprocessor + _abi_libxml2_CFLAGS + C compiler flags for _abi_libxml2, overriding pkg-config + _abi_libxml2_LIBS + linker flags for _abi_libxml2, overriding pkg-config + _abi_loudmouth_CFLAGS + C compiler flags for _abi_loudmouth, overriding pkg-config + _abi_loudmouth_LIBS + linker flags for _abi_loudmouth, overriding pkg-config + _abi_dbus_CFLAGS + C compiler flags for _abi_dbus, overriding pkg-config + _abi_dbus_LIBS + linker flags for _abi_dbus, overriding pkg-config + _abi_dbus_glib_CFLAGS + C compiler flags for _abi_dbus_glib, overriding pkg-config + _abi_dbus_glib_LIBS + linker flags for _abi_dbus_glib, overriding pkg-config + ABICOLLAB_SOUP_CFLAGS + C compiler flags for ABICOLLAB_SOUP, overriding pkg-config + ABICOLLAB_SOUP_LIBS + linker flags for ABICOLLAB_SOUP, overriding pkg-config + _abi_glib_CFLAGS + C compiler flags for _abi_glib, overriding pkg-config + _abi_glib_LIBS + linker flags for _abi_glib, overriding pkg-config + GOFFICE_CFLAGS + C compiler flags for GOFFICE, overriding pkg-config + GOFFICE_LIBS + linker flags for GOFFICE, overriding pkg-config + _abi_grammar_CFLAGS + C compiler flags for _abi_grammar, overriding pkg-config + _abi_grammar_LIBS + linker flags for _abi_grammar, overriding pkg-config + MATHVIEW_CFLAGS + C compiler flags for MATHVIEW, overriding pkg-config + MATHVIEW_LIBS + linker flags for MATHVIEW, overriding pkg-config + YACC The `Yet Another C Compiler' implementation to use. Defaults to + the first program found out of: `bison -y', `byacc', `yacc'. + YFLAGS The list of arguments that will be passed by default to $YACC. + This script will default YFLAGS to the empty string to avoid a + default value of `-d' given by some make applications. + GNOMESCAN_CFLAGS + C compiler flags for GNOMESCAN, overriding pkg-config + GNOMESCAN_LIBS + linker flags for GNOMESCAN, overriding pkg-config + PKGAIKSAURUS_CFLAGS + C compiler flags for PKGAIKSAURUS, overriding pkg-config + PKGAIKSAURUS_LIBS + linker flags for PKGAIKSAURUS, overriding pkg-config + PKGGAIKSAURUS_CFLAGS + C compiler flags for PKGGAIKSAURUS, overriding pkg-config + PKGGAIKSAURUS_LIBS + linker flags for PKGGAIKSAURUS, overriding pkg-config + _abi_gda_CFLAGS + C compiler flags for _abi_gda, overriding pkg-config + _abi_gda_LIBS + linker flags for _abi_gda, overriding pkg-config + _abi_gtk_CFLAGS + C compiler flags for _abi_gtk, overriding pkg-config + _abi_gtk_LIBS + linker flags for _abi_gtk, overriding pkg-config + _abi_ots_CFLAGS + C compiler flags for _abi_ots, overriding pkg-config + _abi_ots_LIBS + linker flags for _abi_ots, overriding pkg-config + _abi_librsvg_CFLAGS + C compiler flags for _abi_librsvg, overriding pkg-config + _abi_librsvg_LIBS + linker flags for _abi_librsvg, overriding pkg-config + _abi_libwpg_CFLAGS + C compiler flags for _abi_libwpg, overriding pkg-config + _abi_libwpg_LIBS + linker flags for _abi_libwpg, overriding pkg-config + LIBXSLT_CFLAGS + C compiler flags for LIBXSLT, overriding pkg-config + LIBXSLT_LIBS + linker flags for LIBXSLT, overriding pkg-config + _abi_openxml_CFLAGS + C compiler flags for _abi_openxml, overriding pkg-config + _abi_openxml_LIBS + linker flags for _abi_openxml, overriding pkg-config + _abi_wordperfect_CFLAGS + C compiler flags for _abi_wordperfect, overriding pkg-config + _abi_wordperfect_LIBS + linker flags for _abi_wordperfect, overriding pkg-config + _abi_msworks_CFLAGS + C compiler flags for _abi_msworks, overriding pkg-config + _abi_msworks_LIBS + linker flags for _abi_msworks, overriding pkg-config + LIBXML2_CFLAGS + C compiler flags for LIBXML2, overriding pkg-config + LIBXML2_LIBS + linker flags for LIBXML2, overriding pkg-config + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +Report bugs to . _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +ac_status=$? fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. -{ 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_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - 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;; + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - $ac_path_GREP_found && break 3 + 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 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done -done - -done -IFS=$as_save_IFS - - -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 +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +abiword-plugins configure 2.6.8 +generated by GNU Autoconf 2.63 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_EGREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. -fi +It was created by abiword-plugins $as_me 2.6.8, which was +generated by GNU Autoconf 2.63. Invocation command line was -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 + $ $0 $@ -else - ac_cv_path_EGREP=$EGREP -fi +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` - 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" +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -{ 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 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include +_ASUNAME -int -main () -{ +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" +done +IFS=$as_save_IFS - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +} >&5 - ac_cv_header_stdc=no -fi +cat >&5 <<_ACEOF -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. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +## ----------- ## +## Core tests. ## +## ----------- ## _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* -fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + esac + done +done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo -fi + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -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' - { (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: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------------- ## +## File substitutions. ## +## ------------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +done +ac_signal=0 +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h -fi -fi -{ 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 +# Predefined preprocessor variables. -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + ac_site_file1=$CONFIG_SITE +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi +done -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } fi -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 -_ACEOF -fi -done - abi_plugin_bundle=no - # Check whether --enable-bundles was given. -if test "${enable_bundles+set}" = set; then - enableval=$enable_bundles; - if test "x$enableval" != "xno"; then - abi_plugin_bundle=yes - fi -fi - abi_plugin_debug=no - # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then - enableval=$enable_debug; - if test "x$enableval" != "xno" ; then - abi_plugin_debug=yes - fi -fi - if test $abi_plugin_debug = yes ; then - abi_debug_build=yes - ABI_CPPFLAGS="-DDEBUG -DUT_DEBUG" - else - abi_debug_build=no - ABI_CPPFLAGS="-DNDEBUG" - fi - if test "x$abi_debug_build" = "xyes" ; then - ABI_PLUGIN_DEBUG_TRUE= - ABI_PLUGIN_DEBUG_FALSE='#' -else - ABI_PLUGIN_DEBUG_TRUE='#' - ABI_PLUGIN_DEBUG_FALSE= -fi - _abi_plugins_builtin=no -# Check whether --with-builtin_plugins was given. -if test "${with_builtin_plugins+set}" = set; then - withval=$with_builtin_plugins; - if test "$withval" != no; then - _abi_plugins_builtin=yes - fi -fi - if test $_abi_plugins_builtin = yes; then - ABI_CPPFLAGS="$ABI_CPPFLAGS -DABI_PLUGIN_BUILTIN=1" - fi - abi_includes="af/util/xp af/util/$abi_platf_be af/xap/xp af/ev/xp af/gr/xp text/fmt/xp text/ptbl/xp wp/impexp/xp wp/ap/xp other/spell/xp other/fribidi/xp other/ttftool/$abi_platf_be" - if test $abi_platform = gnome; then - abi_includes="$abi_includes af/xap/unix af/xap/unix/gnome af/ev/unix af/ev/unix/gnome af/gr/unix text/fmt/unix wp/ap/unix wp/ap/unix/gnome" - else - abi_includes="$abi_includes af/xap/$abi_platform af/ev/$abi_platform af/gr/$abi_platform text/fmt/unix wp/ap/$abi_platform" - fi - ABI_INCLUDES="" - for i in $abi_includes; do - ABI_INCLUDES="$ABI_INCLUDES -I$abi_plugin_source/src/$i" - done - ABI_CPPFLAGS="$ABI_CPPFLAGS $ABI_INCLUDES -DABI_PLUGIN_VERSION=\\\"$abi_plugin_version\\\" -DABI_PLUGIN_MAJOR=$abi_plugin_major -DABI_PLUGIN_MINOR=$abi_plugin_minor -DABI_PLUGIN_MICRO=$abi_plugin_micro -DABI_PLUGIN_SOURCE=1" -# Check whether --with-AbiWordExec was given. -if test "${with_AbiWordExec+set}" = set; then - withval=$with_AbiWordExec; - if test "x$withval" = "xyes"; then - { { echo "$as_me:$LINENO: error: --with-AbiWordExec=PATH please specify the AbiWord executable" >&5 -echo "$as_me: error: --with-AbiWordExec=PATH please specify the AbiWord executable" >&2;} - { (exit 1); exit 1; }; } - elif test "x$withval" != "xno"; then -PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -Xlinker -bundle_loader -Xlinker $withval" - fi -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 - ABI_CFLAGS= - ABI_LIBS= - abi_pkg='abiword-2.6' - # Check whether --enable-libabiword was given. -if test "${enable_libabiword+set}" = set; then - enableval=$enable_libabiword; -pkg_failed=no -{ echo "$as_me:$LINENO: checking for ABI" >&5 -echo $ECHO_N "checking for ABI... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$ABI_CFLAGS"; then - pkg_cv_ABI_CFLAGS="$ABI_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 - ($PKG_CONFIG --exists --print-errors " "$abi_pkg" ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_ABI_CFLAGS=`$PKG_CONFIG --cflags " "$abi_pkg" " 2>/dev/null` -else - pkg_failed=yes -fi - fi + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + 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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 else - pkg_failed=untried + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_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 - if test -n "$ABI_LIBS"; then - pkg_cv_ABI_LIBS="$ABI_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 - ($PKG_CONFIG --exists --print-errors " "$abi_pkg" ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_ABI_LIBS=`$PKG_CONFIG --libs " "$abi_pkg" " 2>/dev/null` -else - pkg_failed=yes -fi - fi + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - pkg_failed=untried + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -if test $pkg_failed = yes; then + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi else - _pkg_short_errors_supported=no + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi - if test $_pkg_short_errors_supported = yes; then - ABI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " "$abi_pkg" "` - else - ABI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " "$abi_pkg" "` - fi - # Put the nasty error message in config.log where it belongs - echo "$ABI_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements ( \"$abi_pkg\" ) were not met: +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi -$ABI_PKG_ERRORS +fi -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + abi_plugin_major="" + abi_plugin_minor="" + abi_plugin_micro="" + abi_plugin_source="" + abi_plugin_target="" + abi_plugin_version="" -Alternatively, you may set the environment variables ABI_CFLAGS -and ABI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements ( \"$abi_pkg\" ) were not met: + abi_plugin_topdir=`pwd` + rm -f $abi_plugin_topdir/plugin.status -$ABI_PKG_ERRORS + if test "x2.6.8" = "x" ; then + { { $as_echo "$as_me:$LINENO: error: No AbiWord plugins version number!" >&5 +$as_echo "$as_me: error: No AbiWord plugins version number!" >&2;} + { (exit 1); exit 1; }; } + fi + abi_plugin_version="2.6.8" + abi_plugin_major=`echo $abi_plugin_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + abi_plugin_minor=`echo $abi_plugin_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + abi_plugin_micro=`echo $abi_plugin_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + abi_plugin_version="$abi_plugin_major.$abi_plugin_minor.$abi_plugin_micro" + echo "" + echo "Configuring AbiWord plugins for Version $abi_plugin_version" + echo "" -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + abi_hdr=src/af/util/xp/ut_types.h + { $as_echo "$as_me:$LINENO: checking for AbiWord source" >&5 +$as_echo_n "checking for AbiWord source... " >&6; } -Alternatively, you may set the environment variables ABI_CFLAGS -and ABI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +# Check whether --with-abiword was given. +if test "${with_abiword+set}" = set; then + withval=$with_abiword; + if test "x$withval" = "xno" ; then + { { $as_echo "$as_me:$LINENO: error: * * * AbiWord sources are required for building plugins! * * *" >&5 +$as_echo "$as_me: error: * * * AbiWord sources are required for building plugins! * * *" >&2;} { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables ABI_CFLAGS -and ABI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. + elif test "x$withval" = "xyes" ; then + { $as_echo "$as_me:$LINENO: WARNING: * * * assuming peer directory for sources * * *" >&5 +$as_echo "$as_me: WARNING: * * * assuming peer directory for sources * * *" >&2;} + else + if test -f "$withval/$abi_hdr" ; then + abi_plugin_source="$withval" + else + { { $as_echo "$as_me:$LINENO: error: \"$withval is not a valid AbiWord source directory\"" >&5 +$as_echo "$as_me: error: \"$withval is not a valid AbiWord source directory\"" >&2;} + { (exit 1); exit 1; }; } + fi + fi -To get pkg-config, see . -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +else + if test -f ../abiword/$abi_hdr; then + abi_plugin_source="../abiword" + elif test -f ../../abiword/$abi_hdr; then + # this is for 'make distcheck' + abi_plugin_source="../abiword" + elif test -f ../../../abiword/$abi_hdr; then + # this is for 'make distcheck' + abi_plugin_source="../../abiword" + else + { { $as_echo "$as_me:$LINENO: error: can't find AbiWord source in peer; use --with-abiword=DIR" >&5 +$as_echo "$as_me: error: can't find AbiWord source in peer; use --with-abiword=DIR" >&2;} + { (exit 1); exit 1; }; } + fi -Alternatively, you may set the environment variables ABI_CFLAGS -and ABI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +fi -To get pkg-config, see . -See \`config.log' for more details." >&2;} + if test "x$abi_plugin_source" = "x" ; then + { { $as_echo "$as_me:$LINENO: error: * * * unable to find AbiWord sources - which are required! * * *" >&5 +$as_echo "$as_me: error: * * * unable to find AbiWord sources - which are required! * * *" >&2;} { (exit 1); exit 1; }; } -else - ABI_CFLAGS=$pkg_cv_ABI_CFLAGS - ABI_LIBS=$pkg_cv_ABI_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi + else + { $as_echo "$as_me:$LINENO: result: $abi_plugin_source" >&5 +$as_echo "$abi_plugin_source" >&6; } + fi + case $abi_plugin_source in + /* | ?:/*) + # absolute path + ;; + *) + # relative path to the SOURCE dir + abi_plugin_source="\$(top_srcdir)/$abi_plugin_source" + ;; + esac -fi + if test "x$libdir" != 'x${exec_prefix}/lib'; then + abi_plugin_target="$libdir" + elif test "x$prefix" != "xNONE"; then + abi_plugin_target="$prefix/lib" + else + abi_plugin_target="/usr/local/lib" + fi + echo "" + echo "Installing plugins in $abi_plugin_target/abiword-$abi_plugin_major.$abi_plugin_minor/plugins" + echo "" + export abi_plugin_major + export abi_plugin_minor + export abi_plugin_micro + export abi_plugin_source + export abi_plugin_target + export abi_plugin_version + export abi_plugin_topdir - ABI_PLUGIN_DIR="$abi_plugin_target/abiword-2.6/plugins" +abi_platform=unix +abi_platf_be=unix +PLATFORM_CPPFLAGS="" +PLATFORM_LDFLAGS="" - { echo "$as_me:$LINENO: checking for putenv" >&5 -echo $ECHO_N "checking for putenv... $ECHO_C" >&6; } -if test "${ac_cv_func_putenv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define putenv to an innocuous variant, in case declares putenv. - For example, HP-UX 11i declares gettimeofday. */ -#define putenv innocuous_putenv +xuname="x`uname`" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char putenv (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +# convenience option for building with fink installed on Darwin... +# -#ifdef __STDC__ -# include -#else -# include -#endif +# Check whether --with-fink was given. +if test "${with_fink+set}" = set; then + withval=$with_fink; + if test "x$withval" = "xyes"; then + CPPFLAGS="$CPPFLAGS -I/sw/include" + LDFLAGS="$LDFLAGS -L/sw/lib" + fi -#undef putenv +fi -/* 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 -char putenv (); -/* 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_putenv || defined __stub___putenv -choke me -#endif -int -main () -{ -return putenv (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_putenv=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# convenience option for building with DarwinPorts... +# + +# Check whether --with-darwinports was given. +if test "${with_darwinports+set}" = set; then + withval=$with_darwinports; + if test "x$withval" = "xyes"; then + CPPFLAGS="$CPPFLAGS -I/opt/local/include" + LDFLAGS="$LDFLAGS -L/opt/local/lib" + fi - ac_cv_func_putenv=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + +# convenience option for building with abiports... +# + +# Check whether --with-abiports was given. +if test "${with_abiports+set}" = set; then + withval=$with_abiports; + if test "x$withval" = "xyes"; then + CPPFLAGS="$CPPFLAGS -I/opt/abi/include" + LDFLAGS="$LDFLAGS -L/opt/abi/lib" + fi + fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_putenv" >&5 -echo "${ECHO_T}$ac_cv_func_putenv" >&6; } -if test $ac_cv_func_putenv = yes; then - abi_putenv=maybe -else - abi_putenv=no + + +if test "$xuname" = "xQNX"; then + + +abi_platform=qnx +abi_platf_be=qnx + +if test "x$CC" = "x"; then + CC="qcc" + export CC +fi +if test "x$CXX" = "x"; then + if test "$OS_RELEASE" = "6.1.0"; then + CXX="QCC -Vgcc_ntox86" + else + CXX="QCC -Vgcc_ntox86_gpp" + fi + export CXX fi - { echo "$as_me:$LINENO: checking for setenv" >&5 -echo $ECHO_N "checking for setenv... $ECHO_C" >&6; } -if test "${ac_cv_func_setenv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define setenv to an innocuous variant, in case declares setenv. - For example, HP-UX 11i declares gettimeofday. */ -#define setenv innocuous_setenv -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setenv (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +elif test "$xuname" = "xDarwin"; then -#ifdef __STDC__ -# include -#else -# include -#endif -#undef setenv +abi_platform=cocoa +abi_platf_be=unix -/* 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 -char setenv (); -/* 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_setenv || defined __stub___setenv -choke me -#endif +# Check whether --enable-Cocoa was given. +if test "${enable_Cocoa+set}" = set; then + enableval=$enable_Cocoa; + if test "x$enableval" = "xno"; then + abi_platform=unix + fi -int -main () -{ -return setenv (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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 +fi + + +if test "$abi_platform" = "cocoa"; then + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5 +$as_echo_n "checking for GLIB... " >&6; } + +if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + fribidi >= 0.10.4 + glib-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + fribidi >= 0.10.4 + glib-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + ") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_setenv=yes + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags " + fribidi >= 0.10.4 + glib-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + " 2>/dev/null` else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_setenv=no + pkg_failed=yes fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + else + pkg_failed=untried fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_setenv" >&5 -echo "${ECHO_T}$ac_cv_func_setenv" >&6; } -if test $ac_cv_func_setenv = yes; then - abi_setenv=maybe +if test -n "$GLIB_LIBS"; then + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + fribidi >= 0.10.4 + glib-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + fribidi >= 0.10.4 + glib-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs " + fribidi >= 0.10.4 + glib-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + " 2>/dev/null` else - abi_setenv=no + pkg_failed=yes +fi + else + pkg_failed=untried fi - if test $abi_putenv = no -a $abi_setenv = no; then - { { echo "$as_me:$LINENO: error: * * * neither setenv nor putenv found! * * *" >&5 -echo "$as_me: error: * * * neither setenv nor putenv found! * * *" >&2;} - { (exit 1); exit 1; }; } - fi - if test $abi_setenv = no; then -cat >>confdefs.h <<\_ACEOF -#define SETENV_MISSING 1 -_ACEOF +if test $pkg_failed = yes; then - elif test $abi_putenv = maybe; then - _abi_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $WARNING_CFLAGS" +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + fribidi >= 0.10.4 + glib-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + " 2>&1` + else + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors " + fribidi >= 0.10.4 + glib-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: checking whether setenv declared in stdlib.h (for us)" >&5 -echo $ECHO_N "checking whether setenv declared in stdlib.h (for us)... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + { { $as_echo "$as_me:$LINENO: error: Package requirements ( + fribidi >= 0.10.4 + glib-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + ) were not met: -#include -float setenv (int); +$GLIB_PKG_ERRORS -int -main () -{ +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -/* if this program fails then setenv isn't declared in stdlib.h - * or at least not for the flags we're using... - */ +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +$as_echo "$as_me: error: Package requirements ( + fribidi >= 0.10.4 + glib-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + ) were not met: - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +$GLIB_PKG_ERRORS -cat >>confdefs.h <<\_ACEOF -#define SETENV_MISSING 1 -_ACEOF +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + + PLATFORM_CPPFLAGS="$GLIB_CFLAGS" + PLATFORM_LDFLAGS="$GLIB_LIBS" +fi - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test $abi_platform = unix; then - CPPFLAGS=$_abi_cppflags - fi +abi_platform=unix +abi_platf_be=unix -for ac_header in strings.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -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 -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; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Check whether --enable-gnome was given. +if test "${enable_gnome+set}" = set; then + enableval=$enable_gnome; + if test "x$enableval" = "xyes"; then + abi_platform=gnome + fi - ac_header_compiler=no fi -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; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -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 +if test "$abi_platform" = "gnome"; then + NAUTILUS_CFLAGS="" + NAUTILUS_LIBS="" + + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for GNOME" >&5 +$as_echo_n "checking for GNOME... " >&6; } + +if test -n "$GNOME_CFLAGS"; then + pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + libbonobo-2.0 >= 2.0 + libgnomeui-2.0 >= 2.0 + libgnomeprint-2.2 >= 2.2.1 + libgnomeprintui-2.2 >= 2.2.1 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + libbonobo-2.0 >= 2.0 + libgnomeui-2.0 >= 2.0 + libgnomeprint-2.2 >= 2.2.1 + libgnomeprintui-2.2 >= 2.2.1 + ") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + libbonobo-2.0 >= 2.0 + libgnomeui-2.0 >= 2.0 + libgnomeprint-2.2 >= 2.2.1 + libgnomeprintui-2.2 >= 2.2.1 + " 2>/dev/null` else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GNOME_LIBS"; then + pkg_cv_GNOME_LIBS="$GNOME_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + libbonobo-2.0 >= 2.0 + libgnomeui-2.0 >= 2.0 + libgnomeprint-2.2 >= 2.2.1 + libgnomeprintui-2.2 >= 2.2.1 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + libbonobo-2.0 >= 2.0 + libgnomeui-2.0 >= 2.0 + libgnomeprint-2.2 >= 2.2.1 + libgnomeprintui-2.2 >= 2.2.1 + ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + libbonobo-2.0 >= 2.0 + libgnomeui-2.0 >= 2.0 + libgnomeprint-2.2 >= 2.2.1 + libgnomeprintui-2.2 >= 2.2.1 + " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -rm -f conftest.err conftest.$ac_ext -{ 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 - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -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 -## --------------------------------------------- ## -## Report this to http://bugzilla.abisource.com/ ## -## --------------------------------------------- ## -_ASBOX - ) | 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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - eval "$as_ac_Header=\$ac_header_preproc" + _pkg_short_errors_supported=no fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + if test $_pkg_short_errors_supported = yes; then + GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + libbonobo-2.0 >= 2.0 + libgnomeui-2.0 >= 2.0 + libgnomeprint-2.2 >= 2.2.1 + libgnomeprintui-2.2 >= 2.2.1 + " 2>&1` + else + GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + libbonobo-2.0 >= 2.0 + libgnomeui-2.0 >= 2.0 + libgnomeprint-2.2 >= 2.2.1 + libgnomeprintui-2.2 >= 2.2.1 + " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GNOME_PKG_ERRORS" >&5 -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + { { $as_echo "$as_me:$LINENO: error: Package requirements ( + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + libbonobo-2.0 >= 2.0 + libgnomeui-2.0 >= 2.0 + libgnomeprint-2.2 >= 2.2.1 + libgnomeprintui-2.2 >= 2.2.1 + ) were not met: -fi +$GNOME_PKG_ERRORS -done +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. +Alternatively, you may set the environment variables GNOME_CFLAGS +and GNOME_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +$as_echo "$as_me: error: Package requirements ( + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + libbonobo-2.0 >= 2.0 + libgnomeui-2.0 >= 2.0 + libgnomeprint-2.2 >= 2.2.1 + libgnomeprintui-2.2 >= 2.2.1 + ) were not met: +$GNOME_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. +Alternatively, you may set the environment variables GNOME_CFLAGS +and GNOME_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -abi_wv_png="" -abi_found_libpng="no" +Alternatively, you may set the environment variables GNOME_CFLAGS +and GNOME_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. -ABI_LIBPNG_DIR="" +To get pkg-config, see . +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -# Check whether --with-libpng was given. -if test "${with_libpng+set}" = set; then - withval=$with_libpng; - if test "$withval" = "no"; then - { { echo "$as_me:$LINENO: error: * * * libpng is required by AbiWord * * *" >&5 -echo "$as_me: error: * * * libpng is required by AbiWord * * *" >&2;} - { (exit 1); exit 1; }; } - elif test "$withval" = "yes"; then - abi_libpng=check - elif test "$withval" = "peer"; then - abi_libpng=peer - else - abi_libpng=sys - ABI_LIBPNG_DIR="$withval" - abi_wv_png="--with-png=$withval" - fi +Alternatively, you may set the environment variables GNOME_CFLAGS +and GNOME_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } else - abi_libpng=check - + GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS + GNOME_LIBS=$pkg_cv_GNOME_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + : fi - -if test $abi_libpng = check; then - pkg_failed=no -{ echo "$as_me:$LINENO: checking for LIBPNG" >&5 -echo $ECHO_N "checking for LIBPNG... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for NAUTILUS" >&5 +$as_echo_n "checking for NAUTILUS... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$LIBPNG_CFLAGS"; then - pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5 - ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5 +if test -n "$NAUTILUS_CFLAGS"; then + pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + libnautilus >= 2.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + libnautilus >= 2.0 + ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng12" 2>/dev/null` + pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags " + libnautilus >= 2.0 + " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$LIBPNG_LIBS"; then - pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5 - ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5 +if test -n "$NAUTILUS_LIBS"; then + pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + libnautilus >= 2.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + libnautilus >= 2.0 + ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng12" 2>/dev/null` + pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs " + libnautilus >= 2.0 + " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -5672,245 +3392,266 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng12"` + NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + libnautilus >= 2.0 + " 2>&1` else - LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng12"` + NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors " + libnautilus >= 2.0 + " 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LIBPNG_PKG_ERRORS" >&5 + echo "$NAUTILUS_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - abi_libpng=check + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + _abi_gnome_nautilus=no elif test $pkg_failed = untried; then - abi_libpng=check + _abi_gnome_nautilus=no else - LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS - LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - - abi_libpng=pkg - abi_png=sys + NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS + NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + _abi_gnome_nautilus=yes fi -fi - -if test $abi_libpng = peer; then - abi_png=peer -elif test $abi_libpng != pkg; then - if test $abi_libpng = sys; then - _abi_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS -I$ABI_LIBPNG_DIR/include" + if test "x$_abi_gnome_nautilus" = "xyes"; then + NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS -DHAVE_NAUTILUS=1" fi - if test "${ac_cv_header_png_h+set}" = set; then - { echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking png.h usability" >&5 -echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi + PLATFORM_CPPFLAGS="$NAUTILUS_CFLAGS $GNOME_CFLAGS -DHAVE_GNOME=1" + PLATFORM_LDFLAGS="$NAUTILUS_LIBS $GNOME_LIBS" +else -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; } +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for GTK" >&5 +$as_echo_n "checking for GTK... " >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking png.h presence" >&5 -echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -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 +if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + ") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + " 2>/dev/null` else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + pkg_failed=yes fi - -rm -f conftest.err conftest.$ac_ext -{ 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 - yes:no: ) - { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------------- ## -## Report this to http://bugzilla.abisource.com/ ## -## --------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + else + pkg_failed=untried +fi +if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + " 2>/dev/null` else - ac_cv_header_png_h=$ac_header_preproc + pkg_failed=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6; } - + else + pkg_failed=untried fi -if test $ac_cv_header_png_h = yes; then - abi_png=sys -else - if test $abi_libpng = sys; then - { { echo "$as_me:$LINENO: error: * * * libpng not found in system location * * *" >&5 -echo "$as_me: error: * * * libpng not found in system location * * *" >&2;} - { (exit 1); exit 1; }; } - fi - abi_png=peer +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + " 2>&1` + else + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors " + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 + { { $as_echo "$as_me:$LINENO: error: Package requirements ( + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + ) were not met: - if test $abi_libpng = sys; then - CPPFLAGS="$_abi_cppflags" - fi -fi +$GTK_PKG_ERRORS -LIBPNG_PEERDIR="`cd ..; pwd`/libpng" +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -if test $abi_png = peer; then - { echo "$as_me:$LINENO: checking for libpng in peer directory" >&5 -echo $ECHO_N "checking for libpng in peer directory... $ECHO_C" >&6; } - if test -d ../libpng; then - if test -r ../libpng/pngconf.h; then - { 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: error: unable to use peer libpng - libpng/pngconf.h not found" >&5 -echo "$as_me: error: unable to use peer libpng - libpng/pngconf.h not found" >&2;} - { (exit 1); exit 1; }; } - fi - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: unable to use libpng - no peer found" >&5 -echo "$as_me: error: unable to use libpng - no peer found" >&2;} +Alternatively, you may set the environment variables GTK_CFLAGS +and GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +$as_echo "$as_me: error: Package requirements ( + xft >= 2.0 + fontconfig >= 1.0 + fribidi >= 0.10.4 + gmodule-2.0 >= 2.0 + libgsf-1 >= 1.12.0 + gtk+-2.0 >= 2.0 + libglade-2.0 >= 2.0.0 + ) were not met: + +$GTK_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTK_CFLAGS +and GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} { (exit 1); exit 1; }; } - fi +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. - abi_libpng_message="peer libpng" - LIBPNG_CFLAGS='-I$(top_srcdir)/../libpng' - LIBPNG_LIBS='$(top_srcdir)/../libpng/libpng.a' +Alternatively, you may set the environment variables GTK_CFLAGS +and GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - PEERDIRS="${PEERDIRS} ${LIBPNG_PEERDIR}" - PEERS="${PEERS} libpng" +To get pkg-config, see . +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. - abi_wv_cppflags="$abi_wv_cppflags -I$LIBPNG_PEERDIR" +Alternatively, you may set the environment variables GTK_CFLAGS +and GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } else - if test $abi_libpng = sys; then - abi_libpng_message="libpng in -L$ABI_LIBPNG_DIR/lib -lpng" - LIBPNG_CFLAGS="-I$ABI_LIBPNG_DIR/include" - LIBPNG_LIBS="-L$ABI_LIBPNG_DIR/lib -lpng" - elif test $abi_libpng = pkg; then - abi_libpng_message="libpng in $LIBPNG_LIBS" - abi_wv_cppflags="$abi_wv_cppflags $LIBPNG_CFLAGS" - else - abi_libpng_message="libpng in -lpng" - LIBPNG_CFLAGS="" - LIBPNG_LIBS="-lpng" - fi + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + + PLATFORM_CPPFLAGS="$GTK_CFLAGS" + PLATFORM_LDFLAGS="$GTK_LIBS" +fi + + fi + if test "$abi_platform" = "cocoa"; then + BUILD_PLATFORM_COCOA_TRUE= + BUILD_PLATFORM_COCOA_FALSE='#' +else + BUILD_PLATFORM_COCOA_TRUE='#' + BUILD_PLATFORM_COCOA_FALSE= +fi + + if test "$abi_platform" = "gnome"; then + BUILD_PLATFORM_GNOME_TRUE= + BUILD_PLATFORM_GNOME_FALSE='#' +else + BUILD_PLATFORM_GNOME_TRUE='#' + BUILD_PLATFORM_GNOME_FALSE= +fi + if test "$abi_platform" = "qnx" ; then + BUILD_PLATFORM_QNX_TRUE= + BUILD_PLATFORM_QNX_FALSE='#' +else + BUILD_PLATFORM_QNX_TRUE='#' + BUILD_PLATFORM_QNX_FALSE= +fi -# Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5919,10 +3660,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -5935,7 +3676,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5946,11 +3687,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5959,10 +3700,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -5975,7 +3716,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5986,11 +3727,11 @@ 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; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -5998,12 +3739,8 @@ 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;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -6016,10 +3753,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -6032,7 +3769,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6043,11 +3780,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6056,10 +3793,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -6077,7 +3814,7 @@ continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6100,11 +3837,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6115,10 +3852,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -6131,7 +3868,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6142,11 +3879,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6159,10 +3896,10 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -6175,92 +3912,344 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + +# Provide some information about the compiler. +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +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 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# 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. +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # 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 | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + 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= -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@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 - + ac_file='' fi +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +if test -z "$ac_file"; then + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH +$as_echo "$as_me: error: C compiler cannot create executables See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 77); exit 77; }; }; } +fi -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in +ac_exeext=$ac_cv_exeext + +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&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' + { (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 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi + fi +fi +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&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_compiler -v >&5") 2>&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +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 | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi + +rm -f conftest$ac_cv_exeext +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +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_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + 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 | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi -{ 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; } +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6286,20 +4275,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -6309,15 +4299,19 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -6344,20 +4338,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CFLAGS="" @@ -6382,20 +4377,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_c_werror_flag=$ac_save_c_werror_flag @@ -6421,20 +4417,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -6449,8 +4446,8 @@ 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$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 @@ -6466,10 +4463,10 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC @@ -6530,82 +4527,191 @@ return 0; } _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +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 +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +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 nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +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_compile") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg + }; then + # Broken: success on invalid input. +continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - + # Passes both tests. +ac_preproc_ok=: +break fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC +rm -f conftest.err conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; - xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -esac + done + ac_cv_prog_CPP=$CPP -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_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + CPP=$ac_cv_prog_CPP else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc @@ -6632,20 +4738,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -6669,13 +4776,14 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err @@ -6683,7 +4791,7 @@ # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -6697,297 +4805,364 @@ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then - break + : +else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_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 + if test -z "$ac_cv_path_GREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } + fi +else + ac_cv_path_GREP=$GREP +fi + fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_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 - ac_cv_prog_CPP=$CPP + done +done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable egrep 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 - CPP=$ac_cv_prog_CPP +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then + $as_echo_n "(cached) " >&6 else - ac_cv_prog_CPP=$CPP + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no +fi + +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. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + fi -{ 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 - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error +#include + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue + ac_cv_header_stdc=no fi +rm -f conftest* -rm -f conftest.err conftest.$ac_ext +fi - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest$ac_exeext +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_cpp conftest.$ac_ext") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break +( exit $ac_status ) +ac_cv_header_stdc=no fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 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 - -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 -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; } -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_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; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF - test -n "$CXX" && break - done fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - 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; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_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; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi +# On IRIX 5.3, sys/types and inttypes.h are conflicting. - test -n "$ac_ct_CXX" && break -done - 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 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -6995,648 +5170,1004 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes + eval "$as_ac_Header=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -{ 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 -{ 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 + +done + + + + abi_plugin_bundle=no + # Check whether --enable-bundles was given. +if test "${enable_bundles+set}" = set; then + enableval=$enable_bundles; + if test "x$enableval" != "xno"; then + abi_plugin_bundle=yes + fi + +fi + + + abi_plugin_debug=no + # Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then + enableval=$enable_debug; + if test "x$enableval" != "xno" ; then + abi_plugin_debug=yes + fi + +fi + + if test $abi_plugin_debug = yes ; then + abi_debug_build=yes + ABI_CPPFLAGS="-DDEBUG -DUT_DEBUG" + else + abi_debug_build=no + ABI_CPPFLAGS="-DNDEBUG" + fi + if test "x$abi_debug_build" = "xyes" ; then + ABI_PLUGIN_DEBUG_TRUE= + ABI_PLUGIN_DEBUG_FALSE='#' else - 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 -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + ABI_PLUGIN_DEBUG_TRUE='#' + ABI_PLUGIN_DEBUG_FALSE= +fi -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 + _abi_plugins_builtin=no + +# Check whether --with-builtin_plugins was given. +if test "${with_builtin_plugins+set}" = set; then + withval=$with_builtin_plugins; + if test "$withval" != no; then + _abi_plugins_builtin=yes + fi + +fi + + if test $_abi_plugins_builtin = yes; then + ABI_CPPFLAGS="$ABI_CPPFLAGS -DABI_PLUGIN_BUILTIN=1" + fi + + abi_includes="af/util/xp af/util/$abi_platf_be af/xap/xp af/ev/xp af/gr/xp text/fmt/xp text/ptbl/xp wp/impexp/xp wp/ap/xp other/spell/xp other/fribidi/xp other/ttftool/$abi_platf_be" + if test $abi_platform = gnome; then + abi_includes="$abi_includes af/xap/unix af/xap/unix/gnome af/ev/unix af/ev/unix/gnome af/gr/unix text/fmt/unix wp/ap/unix wp/ap/unix/gnome" + else + abi_includes="$abi_includes af/xap/$abi_platform af/ev/$abi_platform af/gr/$abi_platform text/fmt/unix wp/ap/$abi_platform" + fi + ABI_INCLUDES="" + for i in $abi_includes; do + ABI_INCLUDES="$ABI_INCLUDES -I$abi_plugin_source/src/$i" + done + + ABI_CPPFLAGS="$ABI_CPPFLAGS $ABI_INCLUDES -DABI_PLUGIN_VERSION=\\\"$abi_plugin_version\\\" -DABI_PLUGIN_MAJOR=$abi_plugin_major -DABI_PLUGIN_MINOR=$abi_plugin_minor -DABI_PLUGIN_MICRO=$abi_plugin_micro -DABI_PLUGIN_SOURCE=1" + + + +# Check whether --with-AbiWordExec was given. +if test "${with_AbiWordExec+set}" = set; then + withval=$with_AbiWordExec; + if test "x$withval" = "xyes"; then + { { $as_echo "$as_me:$LINENO: error: --with-AbiWordExec=PATH please specify the AbiWord executable" >&5 +$as_echo "$as_me: error: --with-AbiWordExec=PATH please specify the AbiWord executable" >&2;} + { (exit 1); exit 1; }; } + elif test "x$withval" != "xno"; then + + +PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -Xlinker -bundle_loader -Xlinker $withval" + + + fi + +fi + + + ABI_CFLAGS= + ABI_LIBS= + abi_pkg='abiword-2.6' + # Check whether --enable-libabiword was given. +if test "${enable_libabiword+set}" = set; then + enableval=$enable_libabiword; + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for ABI" >&5 +$as_echo_n "checking for ABI... " >&6; } + +if test -n "$ABI_CFLAGS"; then + pkg_cv_ABI_CFLAGS="$ABI_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 + ($PKG_CONFIG --exists --print-errors " "$abi_pkg" ") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ABI_CFLAGS=`$PKG_CONFIG --cflags " "$abi_pkg" " 2>/dev/null` else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ABI_LIBS"; then + pkg_cv_ABI_LIBS="$ABI_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \"\$abi_pkg\" \"") >&5 + ($PKG_CONFIG --exists --print-errors " "$abi_pkg" ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ABI_LIBS=`$PKG_CONFIG --libs " "$abi_pkg" " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ABI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " "$abi_pkg" " 2>&1` + else + ABI_PKG_ERRORS=`$PKG_CONFIG --print-errors " "$abi_pkg" " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ABI_PKG_ERRORS" >&5 + + { { $as_echo "$as_me:$LINENO: error: Package requirements ( \"$abi_pkg\" ) were not met: + +$ABI_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables ABI_CFLAGS +and ABI_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +$as_echo "$as_me: error: Package requirements ( \"$abi_pkg\" ) were not met: + +$ABI_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables ABI_CFLAGS +and ABI_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables ABI_CFLAGS +and ABI_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables ABI_CFLAGS +and ABI_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +else + ABI_CFLAGS=$pkg_cv_ABI_CFLAGS + ABI_LIBS=$pkg_cv_ABI_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + +fi + + + + + ABI_PLUGIN_DIR="$abi_plugin_target/abiword-2.6/plugins" + + + { $as_echo "$as_me:$LINENO: checking for putenv" >&5 +$as_echo_n "checking for putenv... " >&6; } +if test "${ac_cv_func_putenv+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define putenv to an innocuous variant, in case declares putenv. + For example, HP-UX 11i declares gettimeofday. */ +#define putenv innocuous_putenv + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char putenv (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef putenv + +/* 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 +char putenv (); +/* 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_putenv || defined __stub___putenv +choke me +#endif int main () { - +return putenv (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +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_compile") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_putenv=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF + ac_cv_func_putenv=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_putenv" >&5 +$as_echo "$ac_cv_func_putenv" >&6; } +if test "x$ac_cv_func_putenv" = x""yes; then + abi_putenv=maybe +else + abi_putenv=no +fi + + { $as_echo "$as_me:$LINENO: checking for setenv" >&5 +$as_echo_n "checking for setenv... " >&6; } +if test "${ac_cv_func_setenv+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define setenv to an innocuous variant, in case declares setenv. + For example, HP-UX 11i declares gettimeofday. */ +#define setenv innocuous_setenv + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char setenv (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef setenv + +/* 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 +char setenv (); +/* 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_setenv || defined __stub___setenv +choke me +#endif int main () { - +return setenv (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +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_compile") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_setenv=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_func_setenv=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext 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 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_setenv" >&5 +$as_echo "$ac_cv_func_setenv" >&6; } +if test "x$ac_cv_func_setenv" = x""yes; then + abi_setenv=maybe else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi + abi_setenv=no 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 -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; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_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; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + if test $abi_putenv = no -a $abi_setenv = no; then + { { $as_echo "$as_me:$LINENO: error: * * * neither setenv nor putenv found! * * *" >&5 +$as_echo "$as_me: error: * * * neither setenv nor putenv found! * * *" >&2;} + { (exit 1); exit 1; }; } + fi + if test $abi_setenv = no; then +cat >>confdefs.h <<\_ACEOF +#define SETENV_MISSING 1 +_ACEOF - test -n "$AWK" && break -done + elif test $abi_putenv = maybe; then + _abi_cppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $WARNING_CFLAGS" -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } -fi + { $as_echo "$as_me:$LINENO: checking whether setenv declared in stdlib.h (for us)" >&5 +$as_echo_n "checking whether setenv declared in stdlib.h (for us)... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -# 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. +#include +float setenv (int); +int +main () +{ -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; +/* if this program fails then setenv isn't declared in stdlib.h + * or at least not for the flags we're using... + */ + + ; + 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 -done -IFS=$as_save_IFS +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +cat >>confdefs.h <<\_ACEOF +#define SETENV_MISSING 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + CPPFLAGS=$_abi_cppflags + fi -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } +for ac_header in strings.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 fi - -{ 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 +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -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;; +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_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 -rm -f conftest.make -fi -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= +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -am__api_version='1.10' +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -{ 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 -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then + ac_header_preproc=no +fi - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } - test "$2" = conftest.file - ) -then - # Ok. - : +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## --------------------------------------------- ## +## Report this to http://bugzilla.abisource.com/ ## +## --------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + eval "$as_ac_Header=\$ac_header_preproc" fi -{ 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" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - 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 -f conftest.sed +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done done -IFS=$as_save_IFS + + + + + +abi_wv_png="" +abi_found_libpng="no" + +ABI_LIBPNG_DIR="" + +# Check whether --with-libpng was given. +if test "${with_libpng+set}" = set; then + withval=$with_libpng; + if test "$withval" = "no"; then + { { $as_echo "$as_me:$LINENO: error: * * * libpng is required by AbiWord * * *" >&5 +$as_echo "$as_me: error: * * * libpng is required by AbiWord * * *" >&2;} + { (exit 1); exit 1; }; } + elif test "$withval" = "yes"; then + abi_libpng=check + elif test "$withval" = "peer"; then + abi_libpng=peer + else + abi_libpng=sys + ABI_LIBPNG_DIR="$withval" + abi_wv_png="--with-png=$withval" + fi + +else + abi_libpng=check fi - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" - fi + +if test $abi_libpng = check; then + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for LIBPNG" >&5 +$as_echo_n "checking for LIBPNG... " >&6; } + +if test -n "$LIBPNG_CFLAGS"; then + pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5 + ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng12" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBPNG_LIBS"; then + pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5 + ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng12" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -echo "${ECHO_T}$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - am__leading_dot=_ + _pkg_short_errors_supported=no fi -rmdir .tst 2>/dev/null + if test $_pkg_short_errors_supported = yes; then + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng12" 2>&1` + else + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng12" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBPNG_PKG_ERRORS" >&5 -DEPDIR="${am__leading_dot}deps" + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + abi_libpng=check -ac_config_commands="$ac_config_commands depfiles" +elif test $pkg_failed = untried; then + abi_libpng=check +else + LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS + LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + abi_libpng=pkg + abi_png=sys -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.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; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi fi - -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval=$enable_dependency_tracking; +if test $abi_libpng = peer; then + abi_png=peer +elif test $abi_libpng != pkg; then + if test $abi_libpng = sys; then + _abi_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS -I$ABI_LIBPNG_DIR/include" + fi + if test "${ac_cv_header_png_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for png.h" >&5 +$as_echo_n "checking for png.h... " >&6; } +if test "${ac_cv_header_png_h+set}" = set; then + $as_echo_n "(cached) " >&6 fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +$as_echo "$ac_cv_header_png_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking png.h usability" >&5 +$as_echo_n "checking png.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' + ac_header_compiler=no fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5 +$as_echo_n "checking png.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - AMDEP_TRUE='#' - AMDEP_FALSE= + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } - fi +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## --------------------------------------------- ## +## Report this to http://bugzilla.abisource.com/ ## +## --------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for png.h" >&5 +$as_echo_n "checking for png.h... " >&6; } +if test "${ac_cv_header_png_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_png_h=$ac_header_preproc fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +$as_echo "$ac_cv_header_png_h" >&6; } -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi fi +if test "x$ac_cv_header_png_h" = x""yes; then + abi_png=sys -# Define the identity of the package. - PACKAGE='abiword-plugins' - VERSION='2.6.2' +else + if test $abi_libpng = sys; then + { { $as_echo "$as_me:$LINENO: error: * * * libpng not found in system location * * *" >&5 +$as_echo "$as_me: error: * * * libpng not found in system location * * *" >&2;} + { (exit 1); exit 1; }; } + fi + abi_png=peer +fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF + if test $abi_libpng = sys; then + CPPFLAGS="$_abi_cppflags" + fi +fi -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF +LIBPNG_PEERDIR="`cd ..; pwd`/libpng" -# Some tools Automake needs. +if test $abi_png = peer; then + { $as_echo "$as_me:$LINENO: checking for libpng in peer directory" >&5 +$as_echo_n "checking for libpng in peer directory... " >&6; } + if test -d ../libpng; then + if test -r ../libpng/pngconf.h; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: unable to use peer libpng - libpng/pngconf.h not found" >&5 +$as_echo "$as_me: error: unable to use peer libpng - libpng/pngconf.h not found" >&2;} + { (exit 1); exit 1; }; } + fi + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: unable to use libpng - no peer found" >&5 +$as_echo "$as_me: error: unable to use libpng - no peer found" >&2;} + { (exit 1); exit 1; }; } + fi -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + abi_libpng_message="peer libpng" + LIBPNG_CFLAGS='-I$(top_srcdir)/../libpng' + LIBPNG_LIBS='$(top_srcdir)/../libpng/libpng.a' + PEERDIRS="${PEERDIRS} ${LIBPNG_PEERDIR}" + PEERS="${PEERS} libpng" -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + abi_wv_cppflags="$abi_wv_cppflags -I$LIBPNG_PEERDIR" +else + if test $abi_libpng = sys; then + abi_libpng_message="libpng in -L$ABI_LIBPNG_DIR/lib -lpng" + LIBPNG_CFLAGS="-I$ABI_LIBPNG_DIR/include" + LIBPNG_LIBS="-L$ABI_LIBPNG_DIR/lib -lpng" + elif test $abi_libpng = pkg; then + abi_libpng_message="libpng in $LIBPNG_LIBS" + abi_wv_cppflags="$abi_wv_cppflags $LIBPNG_CFLAGS" + else + abi_libpng_message="libpng in -lpng" + LIBPNG_CFLAGS="" + LIBPNG_LIBS="-lpng" + fi +fi -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -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; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +# Checks for programs. +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -7645,8 +6176,8 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7655,28 +6186,28 @@ fi fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "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; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + 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 @@ -7685,1016 +6216,1162 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="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 -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; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - 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 - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - - - -depcc="$CC" am_compiler_list= - -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -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; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none fi - fi -{ 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 - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - - - -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else - enable_static=no + CC="$ac_cv_prog_CC" fi - - -# Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 else - enable_shared=yes -fi - + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -# Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - enable_fast_install=yes + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + 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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. 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 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -{ 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 + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&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 - # Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break done + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi -SED=$lt_cv_path_SED +fi -{ echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6; } +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } -# 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 +# Provide some information about the compiler. +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then + $as_echo_n "(cached) " >&6 else - with_gnu_ld=no + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no 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; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - 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; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + GCC= fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then + $as_echo_n "(cached) " >&6 else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes else - lt_cv_path_LD="$LD" # Let the user override the test with a path. + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -LD="$lt_cv_path_LD" -if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi 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; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then + $as_echo_n "(cached) " >&6 else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -{ 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 +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC -{ 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; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac -{ 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 - if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + +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_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 +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue fi -{ 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 how to recognize dependent libraries" >&5 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -case $host_os in -aix4* | aix5*) - lt_cv_deplibs_check_method=pass_all - ;; + # Passes both tests. +ac_preproc_ok=: +break +fi -beos*) - lt_cv_deplibs_check_method=pass_all - ;; +rm -f conftest.err conftest.$ac_ext -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; + done + ac_cv_prog_CPP=$CPP -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; + # Broken: fails on valid input. +continue +fi -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; +rm -f conftest.err conftest.$ac_ext -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; + # Passes both tests. +ac_preproc_ok=: +break +fi -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; +rm -f conftest.err conftest.$ac_ext -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi -# This must be Linux ELF. -linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; +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 -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' +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 -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + 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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - ;; +done +done +IFS=$as_save_IFS -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +$as_echo "$CXX" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + 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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; +done +done +IFS=$as_save_IFS -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; + test -n "$ac_ct_CXX" && break +done -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; esac - + CXX=$ac_ct_CXX + fi fi -{ 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 - - + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +int +main () +{ +#ifndef __GNUC__ + choke me +#endif -# Allow CC to be a program name with arguments. -compiler=$CC + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; + ac_compiler_gnu=no fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 8593 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if test "${ac_cv_prog_cxx_g+set}" = set; then + $as_echo_n "(cached) " >&6 +else + 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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - libsuff=64 - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -*-*-sco3.2v5*) - # 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; } -if test "${lt_cv_cc_needs_belf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + CXXFLAGS="" + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : else - 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 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - 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 @@ -8709,469 +7386,571 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - lt_cv_cc_needs_belf=yes + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - lt_cv_cc_needs_belf=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 core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$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=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 + +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - 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 +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + +done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir fi -{ 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" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; - esac - ;; - esac + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh fi - rm -rf conftest* - ;; +fi +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_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 + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +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 \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi -need_locks="$enable_libtool_lock" +am__api_version='1.10' +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then -for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -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 + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&5 +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&2;} + { (exit 1); exit 1; }; } + fi + + test "$2" = conftest.file + ) +then + # Ok. + : +else + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! +Check your system clock" >&5 +$as_echo "$as_me: error: newly created file is older than distributed files! +Check your system clock" >&2;} + { (exit 1); exit 1; }; } fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +test "$program_prefix" != NONE && + 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" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " else - # Is the header compilable? -{ 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 -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + am_missing_run= + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + $as_echo_n "(cached) " >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS - ac_header_compiler=no fi -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; } + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } -# Is the header present? -{ 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 -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null - ac_header_preproc=no +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi fi -rm -f conftest.err conftest.$ac_ext -{ 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 - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -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 -## --------------------------------------------- ## -## Report this to http://bugzilla.abisource.com/ ## -## --------------------------------------------- ## -_ASBOX - ) | 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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' else - eval "$as_ac_Header=\$ac_header_preproc" + AMDEP_TRUE='#' + AMDEP_FALSE= fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } + fi fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi fi -done +# Define the identity of the package. + PACKAGE='abiword-plugins' + VERSION='2.6.8' -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=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; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi +# Some tools Automake needs. -rm -f conftest.err conftest.$ac_ext +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - done - ac_cv_prog_CXXCPP=$CXXCPP -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ 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 - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - # Passes both tests. -ac_preproc_ok=: -break fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } 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' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu fi - - -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -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 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort 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; } -if test "${ac_cv_prog_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -9180,849 +7959,764 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi -fi -F77=$ac_cv_prog_F77 -if test -n "$F77"; then - { echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6; } +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + +depcc="$CXX" am_compiler_list= + +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + am_cv_CXX_dependencies_compiler_type=none fi - - test -n "$F77" && break - done fi -if test -z "$F77"; then - ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort 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; } -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_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 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -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; } + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_F77" && break -done - - 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 + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= fi -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -rm -f a.out -# If we don't use `.F' as extension, the preprocessor is not run on the -# 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; } -if test "${ac_cv_f77_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF - program main -#ifndef __GNUC__ - choke me -#endif - end -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_f77_compiler_gnu=$ac_compiler_gnu - + enable_static=no fi -{ 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; } -if test "${ac_cv_prog_f77_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - FFLAGS=-g -cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_f77_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_prog_f77_g=no -fi -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; } -if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS -elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-g -O2" - else - FFLAGS="-g" - fi -else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-O2" - else - FFLAGS= - fi -fi -G77=`test $ac_compiler_gnu = yes && echo yes` -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 -# 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; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - i=0 - teststring="ABCD" - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; +macro_version='2.2.6' +macro_revision='1.3012' - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -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; } -else - { 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; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' +ltmain="$ac_aux_dir/ltmain.sh" -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" +{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32*) - symcode='[ABCDGISTW]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[ABCDEGRST]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -linux* | k*bsd*-gnu) - if test "$host_cpu" = ia64; then - symcode='[ABCDGIRSTW]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - fi - ;; -irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; -osf*) - symcode='[BCDEGQRST]' - ;; -solaris*) - symcode='[BDRT]' - ;; -sco3.2v5*) - symcode='[DT]' - ;; -sysv4.2uw2*) - symcode='[DT]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[ABDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +$as_echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; + +{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +$as_echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; + +{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if test "${ac_cv_path_SED+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + $as_unset ac_script || ac_script= + if test -z "$SED"; then + ac_path_SED_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 +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "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_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_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 -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do + $ac_path_SED_found && break 3 + done + done +done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 +$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + fi +else + ac_cv_path_SED=$SED +fi - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed - # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" - # Check to see that the pipe works correctly. - pipe_works=no - rm -f conftest* - cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi - rm -f conftest* conftst* - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -fi -if test -z "$lt_cv_sys_global_symbol_pipe"; then - 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; } +{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if test "${ac_cv_path_FGREP+set}" = set; then + $as_echo_n "(cached) " >&6 else - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } -fi + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_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 fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "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_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_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 -{ 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 - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs + $ac_path_FGREP_found && break 3 + done + done +done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } + fi else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs + ac_cv_path_FGREP=$FGREP fi -rmdir .libs 2>/dev/null + + fi fi -{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" +test -z "$GREP" && GREP=grep -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' -sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' -# Same as above, but do not quote variable references. -double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -# Constants: -rm="rm -f" -# Global variables: -default_ofile=libtool -can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -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; } -if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_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; } -else - { 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; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="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 -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; } + + + + +# 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 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + with_gnu_ld=no fi - 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 +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - AR="$ac_cv_prog_AR" + { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } 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; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${lt_cv_path_LD+set}" = set; then + $as_echo_n "(cached) " >&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 - break 2 - fi -done -done -IFS=$as_save_IFS - + lt_cv_path_LD="$LD" # Let the user override the test with a path. fi fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } + +LD="$lt_cv_path_LD" +if test -n "$LD"; then + { $as_echo "$as_me:$LINENO: result: $LD" >&5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if test "${lt_cv_prog_gnu_ld+set}" = set; then + $as_echo_n "(cached) " >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld -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; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + + + + + + +{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test "${lt_cv_path_NM+set}" = set; then + $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" fi -done -done -IFS=$as_save_IFS - -fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} 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; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } fi - - 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 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" else - RANLIB="$ac_cv_prog_RANLIB" -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; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$ac_tool_prefix"; then + for ac_prog in "dumpbin -symbols" "link -dump -symbols" + 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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DUMPBIN+set}" = set; then + $as_echo_n "(cached) " >&6 else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -10031,8 +8725,8 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10041,28 +8735,32 @@ fi fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$DUMPBIN" && break + done 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; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in "dumpbin -symbols" "link -dump -symbols" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then + $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -10071,8 +8769,8 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10081,5827 +8779,5122 @@ 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; } +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - if test "x$ac_ct_STRIP" = x; then - STRIP=":" + + test -n "$ac_ct_DUMPBIN" && break +done + + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" 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;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - STRIP=$ac_ct_STRIP + DUMPBIN=$ac_ct_DUMPBIN fi -else - STRIP="$ac_cv_prog_STRIP" fi -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + + + + +{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if test "${lt_cv_nm_interface+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:8827: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:8830: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:8833: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } + +# find the maximum length of command line arguments +{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if test "${lt_cv_sys_max_cmd_len+set}" = set; then + $as_echo_n "(cached) " >&6 +else + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; -# Only perform the check for file, if the check method requires it -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; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; -EOF - fi ;; - esac - fi - break + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac + 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; } +if test -n $lt_cv_sys_max_cmd_len ; then + { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: none" >&5 +$as_echo "none" >&6; } fi +max_cmd_len=$lt_cv_sys_max_cmd_len -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; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + + + + +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} + +{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } + + +{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +lt_shell_append=no +( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } + + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_unset=false +fi + + + + + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org -EOF - fi ;; - esac - fi - break + + + + + + + +{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if test "${lt_cv_ld_reload_flag+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; + ;; esac + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OBJDUMP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } 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; } + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" else - MAGIC_CMD=: + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" fi - fi - ;; -esac +test -z "$OBJDUMP" && OBJDUMP=objdump -enable_dlopen=no -enable_win32_dll=no -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; -fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" + + + + +{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if test "${lt_cv_deplibs_check_method+set}" = set; then + $as_echo_n "(cached) " >&6 else - pic_mode=default -fi + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. -test -z "$pic_mode" && pic_mode=default +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; -# Use C for the default configuration in the libtool script -tagname= -lt_save_CC="$CC" -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 +beos*) + lt_cv_deplibs_check_method=pass_all + ;; +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; -# Source file extension for C test sources. -ac_ext=c +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; -# Object file extension for compiled C test sources. -objext=o -objext=$objext +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" +cegcc) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; -# Allow CC to be a program name with arguments. -compiler=$CC +# This must be Linux ELF. +linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; +netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; -lt_prog_compiler_no_builtin_flag= +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; -if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; -{ 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 - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:10390: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:10394: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $rm conftest* +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac -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" -else - : fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$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 -fi -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; } - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AR+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:$LINENO: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic='-qnocommon' - lt_prog_compiler_wl='-Wl,' - ;; - esac - ;; - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +else + AR="$ac_cv_prog_AR" +fi - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - esac - ;; - esac - ;; - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - *) - lt_prog_compiler_can_build_shared=no - ;; - esac +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi +done +done +IFS=$as_save_IFS -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -# -# 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; } -if test "${lt_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 else - lt_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:10680: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:10684: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works=yes - fi - fi - $rm conftest* + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -if test x"$lt_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +test -z "$STRIP" && STRIP=: + + + + + + +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -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; } -if test "${lt_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 else - lt_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works=yes - fi - else - lt_prog_compiler_static_works=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS fi -{ 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 - : +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - lt_prog_compiler_static= + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } 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; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else - lt_cv_prog_compiler_c_o=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + RANLIB="$ac_cv_prog_RANLIB" +fi - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -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:10784: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:10788: \$? = $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 - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* +test -z "$RANLIB" && RANLIB=: -fi -{ 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; } - 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; } - 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;} - need_locks=warn - fi -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; } - runpath_var= - allow_undefined_flag= - enable_shared_with_static_runtimes=no - archive_cmds= - archive_expsym_cmds= - old_archive_From_new_cmds= - old_archive_from_expsyms_cmds= - export_dynamic_flag_spec= - whole_archive_flag_spec= - thread_safe_flag_spec= - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= - hardcode_direct=no - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - link_all_deplibs=unknown - hardcode_automatic=no - module_cmds= - module_expsym_cmds= - always_export_symbols=no - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; openbsd*) - with_gnu_ld=no + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi + - ld_shlibs=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. -EOF - fi - ;; - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - ld_shlibs=no - fi - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <&2 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - archive_cmds='' - hardcode_direct=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an empty executable. - 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 conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# Check for command to grab the raw symbol name followed by C symbol from nm. +{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then + $as_echo_n "(cached) " >&6 +else + +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[BCDEGRST]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[BCDT]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[ABCDEGRST]' + fi + ;; +irix* | nonstopux*) + symcode='[BCDEGRST]' + ;; +osf*) + symcode='[BCDEGQRST]' + ;; +solaris*) + symcode='[BDRT]' + ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; +sysv4) + symcode='[DFNSTU]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; 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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" -fi + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + # Check to see that the pipe works correctly. + pipe_works=no - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF -int -main () + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[] = { + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; - ; - return 0; +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; } -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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 +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 + fi + else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done + +fi + +if test -z "$lt_cv_sys_global_symbol_pipe"; then + 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 + { $as_echo "$as_me:$LINENO: result: failed" >&5 +$as_echo "failed" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: ok" >&5 +$as_echo "ok" >&6; } +fi + -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' - link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs=no - ;; - esac - fi - ;; - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line 10027 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + *N32*) + LD="${LD-ld} -melf32bmipn32" ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" ;; - *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + *N32*) + LD="${LD-ld} -n32" ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_direct=no - hardcode_shlibpath_var=no + *64-bit*) + LD="${LD-ld} -64" ;; - *) - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' + esac + fi + fi + rm -rf conftest* + ;; - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld='-rpath $libdir' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if test "${lt_cv_cc_needs_belf+set}" = set; then + $as_echo_n "(cached) " >&6 +else + 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 - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; +int +main () +{ - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + lt_cv_cc_needs_belf=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; + lt_cv_cc_needs_belf=no +fi - solaris*) - no_undefined_flag=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + 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 + +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$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" + fi + ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" fi ;; esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi ;; + esac + fi + rm -rf conftest* + ;; +esac - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' +need_locks="$enable_libtool_lock" - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - *) - ld_shlibs=no - ;; - esac +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi +done +done +IFS=$as_save_IFS -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # 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; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_NMEDIT+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - 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; } - ;; - esac +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - ;; -esac +done +done +IFS=$as_save_IFS -{ 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= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" else - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`echo $lt_search_path_spec` else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + NMEDIT="$ac_cv_prog_NMEDIT" fi -need_lib_prefix=unknown -hardcode_into_libs=no -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +set dummy ${ac_tool_prefix}lipo; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_LIPO+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH +fi +fi +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; -aix4* | aix5*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH +fi +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_LIPO="lipo" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; +done +done +IFS=$as_save_IFS -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; +fi +fi +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; + if test "x$ac_ct_LIPO" = x; then + LIPO=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LIPO=$ac_ct_LIPO + fi +else + LIPO="$ac_cv_prog_LIPO" +fi -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OTOOL+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes +fi +fi +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; +fi +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL="otool" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +fi +fi +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL=$ac_ct_OTOOL + fi +else + OTOOL="$ac_cv_prog_OTOOL" +fi -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OTOOL64+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -freebsd1*) - dynamic_linker=no - ;; +fi +fi +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` + +fi +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL64="otool64" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL64=$ac_ct_OTOOL64 fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; +else + OTOOL64="$ac_cv_prog_OTOOL64" +fi -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; -rdos*) - dynamic_linker=no - ;; -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes + + + + + + + + { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if test "${lt_cv_apple_cc_single_mod+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + 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 conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + lt_cv_ld_exported_symbols_list=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + lt_cv_ld_exported_symbols_list=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; -*) - dynamic_linker=no - ;; -esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +for ac_header in dlfcn.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -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; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var" || \ - test "X$hardcode_automatic" = "Xyes" ; then +done - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink + + +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 -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate + 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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi +done +done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -{ 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 - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -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; } -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; } + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + 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 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + $as_echo_n "(cached) " >&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" - old_striplib="$STRIP -S" - { 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; } + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi - ;; - *) - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - ;; - esac fi - -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - lt_cv_dlopen=no - lt_cv_dlopen_libs= + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; + test -n "$ac_ct_CXX" && break +done - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi - 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; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* 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 -char dlopen (); int main () { -return dlopen (); +#ifndef __GNUC__ + choke me +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dl_dlopen=no + ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +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_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" +{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if test "${ac_cv_prog_cxx_g+set}" = set; then + $as_echo_n "(cached) " >&6 +else + 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 +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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - { 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 - 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. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* 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 -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 -choke me -#endif int main () { -return shl_load (); + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_shl_load=yes + } && test -s conftest.$ac_objext; then + : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_shl_load=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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; } -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; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -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. */ -/* 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 -char shl_load (); int main () { -return shl_load (); + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_shl_load=yes + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dld_shl_load=no + fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ 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" +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$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 - { 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 + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + 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 +{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then + $as_echo_n "(cached) " >&6 else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef dlopen - -/* 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 -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 -choke me -#endif - -int -main () -{ -return dlopen (); - ; - return 0; -} + Syntax error _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_dlopen=yes + }; then + : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_dlopen=no + # Broken: fails on valid input. +continue fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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; } -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; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* 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 -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes + }; then + # Broken: success on invalid input. +continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dl_dlopen=no + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + done + ac_cv_prog_CXXCPP=$CXXCPP + fi -{ 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; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + CXXCPP=$ac_cv_prog_CXXCPP else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* 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" +#ifdef __STDC__ +# include +#else +# include #endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} + Syntax error _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_svld_dlopen=yes + }; then + : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_svld_dlopen=no + # Broken: fails on valid input. +continue fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_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; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* 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 -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_dld_link=yes + }; then + # Broken: success on invalid input. +continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dld_dld_link=no + # Passes both tests. +ac_preproc_ok=: +break fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_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" +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +_lt_caught_CXX_error=yes; } 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 +else + _lt_caught_CXX_error=yes fi -fi -fi +# Set options -fi + enable_dlopen=no + + + enable_win32_dll=no + + + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_shared=yes fi - ;; - esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - 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; } -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross + + + + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then + withval=$with_pic; pic_mode="$withval" else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif -#include +test -z "$pic_mode" && pic_mode=default -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi +else + enable_fast_install=yes fi -rm -fr conftest* -fi -{ 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; } -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif -#include -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } - fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -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 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 -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -{ 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; } -# 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; } - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler \ - CC \ - LD \ - lt_prog_compiler_wl \ - lt_prog_compiler_pic \ - lt_prog_compiler_static \ - lt_prog_compiler_no_builtin_flag \ - export_dynamic_flag_spec \ - thread_safe_flag_spec \ - whole_archive_flag_spec \ - enable_shared_with_static_runtimes \ - old_archive_cmds \ - old_archive_from_new_cmds \ - predep_objects \ - postdep_objects \ - predeps \ - postdeps \ - compiler_lib_search_path \ - archive_cmds \ - archive_expsym_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - old_archive_from_expsyms_cmds \ - allow_undefined_flag \ - no_undefined_flag \ - export_symbols_cmds \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ - hardcode_automatic \ - module_cmds \ - module_expsym_cmds \ - lt_cv_prog_compiler_c_o \ - fix_srcfile_path \ - exclude_expsyms \ - include_expsyms; do - - case $var in - old_archive_cmds | \ - old_archive_from_new_cmds | \ - archive_cmds | \ - archive_expsym_cmds | \ - module_cmds | \ - module_expsym_cmds | \ - old_archive_from_expsyms_cmds | \ - export_symbols_cmds | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac -cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - { echo "$as_me:$LINENO: creating $ofile" >&5 -echo "$as_me: creating $ofile" >&6;} - cat <<__EOF__ >> "$cfgfile" -#! $SHELL -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# A sed program that does not truncate output. -SED=$lt_SED -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# The names of the tagged configurations supported by this script. -available_tags= -# ### BEGIN LIBTOOL CONFIG -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared -# Whether or not to build static libraries. -build_old_libs=$enable_static -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install +test -z "$LN_S" && LN_S="ln -s" -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os -# An echo program that does not interpret backslashes. -echo=$lt_echo -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS -# A C compiler. -LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS -# A language-specific compiler. -CC=$lt_compiler -# Is the compiler the GNU C compiler? -with_gcc=$GCC -# An ERE matcher. -EGREP=$lt_EGREP -# The linker used to build libraries. -LD=$lt_LD -# Whether we need hard or soft links. -LN_S=$lt_LN_S -# A BSD-compatible nm program. -NM=$lt_NM -# A symbol stripping program -STRIP=$lt_STRIP -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + +{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if test "${lt_cv_objdir+set}" = set; then + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" -# Used on cygwin: assembler. -AS="$AS" -# The name of the directory that contains temporary libtool files. -objdir=$objdir -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl -# Object file suffix (normally "o"). -objext="$ac_objext" -# Old archive suffix (normally "a"). -libext="$libext" -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' -# Executable file suffix (normally ""). -exeext="$exeext" -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic -pic_mode=$pic_mode -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o -# Must we lock files when doing compilation? -need_locks=$lt_need_locks -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix -# Do we need a version for libraries? -need_version=$need_version -# Whether dlopen is supported. -dlopen_support=$enable_dlopen -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 -# Library versioning type. -version_type=$version_type +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org -# Format of library name prefix. -libname_spec=$lt_libname_spec +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:$LINENO: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps + else + MAGIC_CMD=: + fi +fi -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps + fi + ;; +esac -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path +# Use C for the default configuration in the libtool script -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method +lt_save_CC="$CC" +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 -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag +# Source file extension for C test sources. +ac_ext=c -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag +# Object file extension for compiled C test sources. +objext=o +objext=$objext -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -# This is the shared library runtime path variable. -runpath_var=$runpath_var -# This is the shared library path variable. -shlibpath_var=$shlibpath_var -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +# Allow CC to be a program name with arguments. +compiler=$CC -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var +if test -n "$compiler"; then -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic +lt_prog_compiler_no_builtin_flag= -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" +if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs + { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:11973: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:11977: \$? = $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. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $RM conftest* -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +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" +else + : +fi -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path +fi -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms -# ### END LIBTOOL CONFIG + lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= -__EOF__ +{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; -CC="$lt_save_CC" + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; -# Check whether --with-tags was given. -if test "${with_tags+set}" = set; then - withval=$with_tags; tagnames="$withval" -fi + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 -echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} - fi + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 -echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} - else - { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 -echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} - fi - fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in - "") ;; - *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 -echo "$as_me: error: invalid tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } + linux* | k*bsd*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' ;; - esac + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + xl*) + # IBM XL C 8.0/Fortran 10.1 on PPC + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + esac + ;; + esac + ;; - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 -echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} - { (exit 1); exit 1; }; } - fi + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - 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=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 + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; -# Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; -# Source file extension for C++ test sources. -ac_ext=cpp + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$objext + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; -# Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }' + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; -# ltmain only uses $CC for tagged configurations so make sure $CC is set. + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac +{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +$as_echo "$lt_prog_compiler_pic" >&6; } -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Allow CC to be a program name with arguments. -compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:12312: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:12316: \$? = $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. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi + fi + $RM conftest* -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - $as_unset lt_cv_prog_gnu_ld fi -if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac else - $as_unset lt_cv_path_LD + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -compiler_CXX=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' -else - lt_prog_compiler_no_builtin_flag_CXX= fi -if test "$GXX" = yes; then - # Set up default GNU C++ configuration -# 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 -else - with_gnu_ld=no -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; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - 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; } -else - { 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 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -echo "${ECHO_T}$LD" >&6; } + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test "${lt_cv_prog_compiler_static_works+set}" = set; then + $as_echo_n "(cached) " >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + 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; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } + +if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - fi - else - with_gnu_ld=no - wlarc= - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi + { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -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:12417: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:12421: \$? = $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 + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -else - GXX=no - with_gnu_ld=no - wlarc= -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; } -ld_shlibs_CXX=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes + { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_CXX=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -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:12472: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:12476: \$? = $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 + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + +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 + { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&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 + { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + need_locks=no +fi -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ + { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + ld_shlibs=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' -fi + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; +_LT_EOF + fi + ;; - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_CXX=no - ;; - esac + ld_shlibs=no fi - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - ld_shlibs_CXX=no - ;; - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - gnu*) - ;; - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no + ld_shlibs=no fi ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - case $host_cpu in - hppa*64*|ia64*) ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - esac - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; + gnu* | linux* | tpf* | k*bsd*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc*) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag= + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC*) - # Portland Group C++ compiler - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + case $cc_basename in + xlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld='-rpath $libdir' + archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi ;; esac - ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + ld_shlibs=no fi - output_verbose_link_cmd='echo' - else - ld_shlibs_CXX=no - fi - ;; - osf3*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: + ;; - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no +_LT_EOF ;; - cxx*) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + esac + ;; - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + aix_use_runtimelinking=no - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; esac - link_all_deplibs_CXX=yes - output_verbose_link_cmd='echo' + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='${wl}-f,' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' fi - ;; - esac - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -esac -{ 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" -LD_CXX="$LD" + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` - - for p in `eval $output_verbose_link_cmd`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" \ - || test $p = "-R"; then - prev=$p - continue - else - prev= - fi + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - ;; +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; +fi - *) ;; # Ignore the rest. +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - esac - done + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -$rm -f confest.$objext -# PORTME: override above test on systems where it is broken -case $host_os in -interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; +fi -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - # - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi ;; - esac - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; - esac - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac + darwin* | rhapsody*) -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; } + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + whole_archive_flag_spec='' + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' + else + ld_shlibs=no + fi - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no ;; - mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + + freebsd1*) + ld_shlibs=no ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic + + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi ;; - esac - else - case $host_os in - aix4* | aix5*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_CXX='-qnocommon' - lt_prog_compiler_wl_CXX='-Wl,' - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - icpc* | ecpc*) - # Intel C++ - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC*) - # Portland Group C++ compiler. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat >conftest.$ac_ext <<_ACEOF +int foo(void) {} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; + + *nto* | *qnx*) + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no + fi + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; + + solaris*) + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi ;; - vxworks*) + esac + link_all_deplibs=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? ;; - *) - lt_prog_compiler_can_build_shared_CXX=no + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + ;; esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' + ;; + esac + fi fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no + +with_gnu_ld=$with_gnu_ld + + + + + + + + + + + + + + # -# Check to make sure the PIC flag actually works. +# Do we need to explicitly link libc? # -if test -n "$lt_prog_compiler_pic_CXX"; then +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # 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. + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc=no + else + archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +$as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac + fi + ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -{ 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 - lt_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:15655: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:15659: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_CXX=yes - fi - fi - $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; } -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -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; } -if test "${lt_prog_compiler_static_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_CXX=yes - fi - else - lt_prog_compiler_static_works_CXX=yes - fi - fi - $rm conftest* - 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; } -if test x"$lt_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -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; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -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:15759: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:15763: \$? = $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 - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $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; } -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; } - 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; } - 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;} - need_locks=warn - fi -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; } - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix4* | aix5*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -{ 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 -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # 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; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - 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; } - ;; - esac - fi - ;; -esac -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + + { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi library_names_spec= libname_spec='lib$name' soname_spec= @@ -15915,7 +13908,6 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" - need_lib_prefix=unknown hardcode_into_libs=no @@ -15933,7 +13925,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -15952,7 +13944,7 @@ aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then : else can_build_shared=no @@ -15978,9 +13970,18 @@ ;; amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac ;; beos*) @@ -16003,25 +14004,28 @@ # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) version_type=windows shrext_cmds=".dll" need_version=no need_lib_prefix=no case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ - $rm \$dlpath' + $RM \$dlpath' shlibpath_overrides_runpath=yes case $host_os in @@ -16030,20 +14034,20 @@ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; - mingw*) + mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH printed by # mingw gcc, but we are running on Cygwin. Gcc prints its search # path with ; separators, and with drive letters. We can handle the # drive letters (cygwin fileutils understands them), so leave them, # especially as we might pass files found there to a mingw objdump, # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi ;; pw32*) @@ -16067,12 +14071,13 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -16165,18 +14170,18 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH @@ -16243,26 +14248,85 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + 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 conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then + shlibpath_overrides_runpath=yes +fi + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi @@ -16279,7 +14343,7 @@ version_type=sunos need_lib_prefix=no need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' @@ -16300,14 +14364,16 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) - version_type=linux +*nto* | *qnx*) + version_type=qnx need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' ;; openbsd*) @@ -16316,13 +14382,13 @@ need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in openbsd2.[89] | openbsd2.[89].*) shlibpath_overrides_runpath=no @@ -16394,7 +14460,6 @@ sni) shlibpath_overrides_runpath=no need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' runpath_var=LD_RUN_PATH ;; siemens) @@ -16425,13 +14490,12 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes hardcode_into_libs=yes if test "$with_gnu_ld" = yes; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes case $host_os in sco3.2v5*) sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" @@ -16441,6 +14505,17 @@ sys_lib_dlsearch_path_spec='/usr/lib' ;; +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -16452,8 +14527,8 @@ dynamic_linker=no ;; esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } +{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -16461,6401 +14536,5687 @@ 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; } -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var_CXX" || \ - test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" fi -{ 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 - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" fi -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_CXX \ - CC_CXX \ - LD_CXX \ - lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ - lt_prog_compiler_static_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ - export_dynamic_flag_spec_CXX \ - thread_safe_flag_spec_CXX \ - whole_archive_flag_spec_CXX \ - enable_shared_with_static_runtimes_CXX \ - old_archive_cmds_CXX \ - old_archive_from_new_cmds_CXX \ - predep_objects_CXX \ - postdep_objects_CXX \ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ - postuninstall_cmds_CXX \ - old_archive_from_expsyms_cmds_CXX \ - allow_undefined_flag_CXX \ - no_undefined_flag_CXX \ - export_symbols_cmds_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ - hardcode_automatic_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX; do - - case $var in - old_archive_cmds_CXX | \ - old_archive_from_new_cmds_CXX | \ - archive_cmds_CXX | \ - archive_expsym_cmds_CXX | \ - module_cmds_CXX | \ - module_expsym_cmds_CXX | \ - old_archive_from_expsyms_cmds_CXX | \ - export_symbols_cmds_CXX | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os -# An echo program that does not interpret backslashes. -echo=$lt_echo -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS -# A C compiler. -LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS -# A language-specific compiler. -CC=$lt_compiler_CXX -# Is the compiler the GNU C compiler? -with_gcc=$GCC_CXX -# An ERE matcher. -EGREP=$lt_EGREP -# The linker used to build libraries. -LD=$lt_LD_CXX -# Whether we need hard or soft links. -LN_S=$lt_LN_S -# A BSD-compatible nm program. -NM=$lt_NM -# A symbol stripping program -STRIP=$lt_STRIP -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" -# Used on cygwin: assembler. -AS="$AS" -# The name of the directory that contains temporary libtool files. -objdir=$objdir -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX -# Object file suffix (normally "o"). -objext="$ac_objext" -# Old archive suffix (normally "a"). -libext="$libext" -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' -# Executable file suffix (normally ""). -exeext="$exeext" -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX -pic_mode=$pic_mode -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -# Must we lock files when doing compilation? -need_locks=$lt_need_locks -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix -# Do we need a version for libraries? -need_version=$need_version -# Whether dlopen is supported. -dlopen_support=$enable_dlopen -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX -# Library versioning type. -version_type=$version_type -# Format of library name prefix. -libname_spec=$lt_libname_spec -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_CXX -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_CXX -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_CXX -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_CXX -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_CXX -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -# This is the shared library runtime path variable. -runpath_var=$runpath_var -# This is the shared library path variable. -shlibpath_var=$shlibpath_var -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_CXX -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_CXX -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX -# ### END LIBTOOL TAG CONFIG: $tagname -__EOF__ + { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } + +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless 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 -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld - else - tagname="" - fi - ;; - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu - - -archive_cmds_need_lc_F77=no -allow_undefined_flag_F77= -always_export_symbols_F77=no -archive_expsym_cmds_F77= -export_dynamic_flag_spec_F77= -hardcode_direct_F77=no -hardcode_libdir_flag_spec_F77= -hardcode_libdir_flag_spec_ld_F77= -hardcode_libdir_separator_F77= -hardcode_minus_L_F77=no -hardcode_automatic_F77=no -module_cmds_F77= -module_expsym_cmds_F77= -link_all_deplibs_F77=unknown -old_archive_cmds_F77=$old_archive_cmds -no_undefined_flag_F77= -whole_archive_flag_spec_F77= -enable_shared_with_static_runtimes_F77=no + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; -# Source file extension for f77 test sources. -ac_ext=f + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; -# Object file extension for compiled f77 test sources. -objext=o -objext_F77=$objext + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code="\ - subroutine t - return - end -" + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -# Code to be used in simple link tests -lt_simple_link_test_code="\ - program t - end -" +/* 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 +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_dl_dlopen=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# ltmain only uses $CC for tagged configurations so make sure $CC is set. + ac_cv_lib_dl_dlopen=no +fi -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes -# Allow CC to be a program name with arguments. -compiler=$CC +fi + ;; -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* + *) + { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 +$as_echo_n "checking for shl_load... " >&6; } +if test "${ac_cv_func_shl_load+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case declares shl_load. + For example, HP-UX 11i declares gettimeofday. */ +#define shl_load innocuous_shl_load -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${F77-"f77"} -compiler=$CC -compiler_F77=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +#undef shl_load +/* 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 +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 +choke me +#endif -{ 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; } +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_shl_load=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -{ 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 + ac_cv_func_shl_load=no +fi -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +$as_echo "$ac_cv_func_shl_load" >&6; } +if test "x$ac_cv_func_shl_load" = x""yes; then + lt_cv_dlopen="shl_load" +else + { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if test "${ac_cv_lib_dld_shl_load+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* 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 +char shl_load (); +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6; } +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_dld_shl_load=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dld_shl_load=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +else + { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 +$as_echo_n "checking for dlopen... " >&6; } +if test "${ac_cv_func_dlopen+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case declares dlopen. + For example, HP-UX 11i declares gettimeofday. */ +#define dlopen innocuous_dlopen -{ 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; } - -GCC_F77="$G77" -LD_F77="$LD" - -lt_prog_compiler_wl_F77= -lt_prog_compiler_pic_F77= -lt_prog_compiler_static_F77= +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -{ 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; } +#ifdef __STDC__ +# include +#else +# include +#endif - if test "$GCC" = yes; then - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_static_F77='-static' +#undef dlopen - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; +/* 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 +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 +choke me +#endif - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_dlopen=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; + ac_cv_func_dlopen=no +fi - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +$as_echo "$ac_cv_func_dlopen" >&6; } +if test "x$ac_cv_func_dlopen" = x""yes; then + lt_cv_dlopen="dlopen" +else + { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_F77='-fno-common' - ;; +/* 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 +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_dl_dlopen=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; + ac_cv_lib_dl_dlopen=no +fi - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared_F77=no - enable_shared=no - ;; +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if test "${ac_cv_lib_svld_dlopen+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_F77=-Kconform_pic - fi - ;; +/* 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 +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_svld_dlopen=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; - esac - ;; + ac_cv_lib_svld_dlopen=no +fi - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl_F77='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - else - lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_F77='-qnocommon' - lt_prog_compiler_wl_F77='-Wl,' - ;; - esac - ;; +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if test "${ac_cv_lib_dld_dld_link+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; +/* 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 +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_dld_dld_link=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl_F77='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_F77='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static_F77='${wl}-a ${wl}archive' - ;; + ac_cv_lib_dld_dld_link=no +fi - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl_F77='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static_F77='-non_shared' - ;; +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +fi - newsos6) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-fpic' - lt_prog_compiler_static_F77='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl_F77='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - lt_prog_compiler_wl_F77='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - lt_prog_compiler_wl_F77='' - ;; - esac - ;; - esac - ;; +fi - osf3* | osf4* | osf5*) - lt_prog_compiler_wl_F77='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; - rdos*) - lt_prog_compiler_static_F77='-non_shared' - ;; +fi - solaris*) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_F77='-Qoption ld ';; - *) - lt_prog_compiler_wl_F77='-Wl,';; - esac - ;; - sunos4*) - lt_prog_compiler_wl_F77='-Qoption ld ' - lt_prog_compiler_pic_F77='-PIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; +fi - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic_F77='-Kconform_pic' - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; +fi - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - unicos*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_can_build_shared_F77=no - ;; +fi - uts4*) - lt_prog_compiler_pic_F77='-pic' - lt_prog_compiler_static_F77='-Bstatic' - ;; + ;; + esac - *) - lt_prog_compiler_can_build_shared_F77=no - ;; - esac + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_F77"; then + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" -{ 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 + { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if test "${lt_cv_dlopen_self+set}" = set; then + $as_echo_n "(cached) " >&6 else - lt_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:17323: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:17327: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_F77=yes - fi - fi - $rm conftest* + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line 15275 "configure" +#include "confdefs.h" -fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } +#if HAVE_DLFCN_H +#include +#endif -if test x"$lt_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in - "" | " "*) ;; - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; - esac -else - lt_prog_compiler_pic_F77= - lt_prog_compiler_can_build_shared_F77=no -fi +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + return status; +} +_LT_EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_F77= - ;; - *) - lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" - ;; -esac +rm -fr conftest* -# -# 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; } -if test "${lt_prog_compiler_static_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_F77=yes - fi - else - lt_prog_compiler_static_works_F77=yes - fi - fi - $rm conftest* - 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; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } -if test x"$lt_prog_compiler_static_works_F77" = xyes; then - : + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if test "${lt_cv_dlopen_self_static+set}" = set; then + $as_echo_n "(cached) " >&6 else - lt_prog_compiler_static_F77= -fi + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line 15371 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif -{ 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 - lt_cv_prog_compiler_c_o_F77=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -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:17427: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:17431: \$? = $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 - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_F77=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + return status; +} +_LT_EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi 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; } +rm -fr conftest* -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; } - 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; } - 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;} - need_locks=warn - fi -else - need_locks=no fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + 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; } + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac - runpath_var= - allow_undefined_flag_F77= - enable_shared_with_static_runtimes_F77=no - archive_cmds_F77= - archive_expsym_cmds_F77= - old_archive_From_new_cmds_F77= - old_archive_from_expsyms_cmds_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= - thread_safe_flag_spec_F77= - hardcode_libdir_flag_spec_F77= - hardcode_libdir_flag_spec_ld_F77= - hardcode_libdir_separator_F77= - hardcode_direct_F77=no - hardcode_minus_L_F77=no - hardcode_shlibpath_var_F77=unsupported - link_all_deplibs_F77=unknown - hardcode_automatic_F77=no - module_cmds_F77= - module_expsym_cmds_F77= - always_export_symbols_F77=no - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms_F77= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; esac +fi - ld_shlibs_F77=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_F77='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_F77= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_F77=no - cat <&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. -EOF - fi - ;; - amigaos*) - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_F77=no - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_F77=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_F77=no - fi - ;; - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_F77='-L$libdir' - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=no - enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_F77=no - fi - ;; - interix[3-9]*) - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - ld_shlibs_F77=no - fi - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_F77=no - cat <&2 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_F77=no - cat <<_LT_EOF 1>&2 +striplib= +old_striplib= +{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&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" + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "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" + old_striplib="$STRIP -S" + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac +fi + + + + -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - ;; - sunos4*) - archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - if test "$ld_shlibs_F77" = no; then - runpath_var= - hardcode_libdir_flag_spec_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=yes - archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct_F77=unsupported - fi - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi + # Report which library types will actually be built + { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no - archive_cmds_F77='' - hardcode_direct_F77=yes - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_F77=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_F77=yes - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_libdir_separator_F77= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_F77=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_F77='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF - program main + { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } - end -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 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 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +CC="$lt_save_CC" - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_F77="-z nodefs" - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF - program main - end -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +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 -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +archive_cmds_need_lc_CXX=no +allow_undefined_flag_CXX= +always_export_symbols_CXX=no +archive_expsym_cmds_CXX= +compiler_needs_object_CXX=no +export_dynamic_flag_spec_CXX= +hardcode_direct_CXX=no +hardcode_direct_absolute_CXX=no +hardcode_libdir_flag_spec_CXX= +hardcode_libdir_flag_spec_ld_CXX= +hardcode_libdir_separator_CXX= +hardcode_minus_L_CXX=no +hardcode_shlibpath_var_CXX=unsupported +hardcode_automatic_CXX=no +inherit_rpath_CXX=no +module_cmds_CXX= +module_expsym_cmds_CXX= +link_all_deplibs_CXX=unknown +old_archive_cmds_CXX=$old_archive_cmds +no_undefined_flag_CXX= +whole_archive_flag_spec_CXX= +enable_shared_with_static_runtimes_CXX=no +# Source file extension for C++ test sources. +ac_ext=cpp -fi +# Object file extension for compiled C++ test sources. +objext=o +objext_CXX=$objext -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_F77=' ${wl}-bernotok' - allow_undefined_flag_F77=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77='$convenience' - archive_cmds_need_lc_F77=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - amigaos*) - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - # see comment about different semantics on the GNU ld section - ld_shlibs_F77=no - ;; + # ltmain only uses $CC for tagged configurations so make sure $CC is set. - bsdi[45]*) - export_dynamic_flag_spec_F77=-rdynamic - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_F77=' ' - allow_undefined_flag_F77=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_F77='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_F77='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_F77=yes - ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc_F77=no - hardcode_direct_F77=no - hardcode_automatic_F77=yes - hardcode_shlibpath_var_F77=unsupported - whole_archive_flag_spec_F77='' - link_all_deplibs_F77=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_F77=no - ;; - esac - fi - ;; - dgux*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; - freebsd1*) - ld_shlibs_F77=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; + ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - hpux9*) - if test "$GCC" = yes; then - archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_direct_F77=yes + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + compiler=$CC + compiler_CXX=$CC + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - ;; - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' + else + lt_prog_compiler_no_builtin_flag_CXX= + fi - hardcode_direct_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' + if test "$GXX" = yes; then + # Set up default GNU C++ configuration - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - fi - ;; - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_F77='+b $libdir' - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - ;; - *) - hardcode_direct_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' +# 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 +else + with_gnu_ld=no +fi - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - ;; - esac - fi +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if test "${lt_cv_path_LD+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if test "${lt_cv_prog_gnu_ld+set}" = set; then + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - newsos6) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_shlibpath_var_F77=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs_F77=no - fi - ;; - os2*) - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - allow_undefined_flag_F77=unsupported - archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - ;; - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_CXX= + fi else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + with_gnu_ld=no + wlarc= - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_F77='-rpath $libdir' + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' fi - hardcode_libdir_separator_F77=: - ;; - solaris*) - no_undefined_flag_F77=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_shlibpath_var_F77=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs_F77=yes - ;; + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; + else + GXX=no + with_gnu_ld=no + wlarc= + fi - sysv4) - case $host_vendor in - sni) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds_F77='$CC -r -o $output$reload_objs' - hardcode_direct_F77=no + # PORTME: fill in a description of your system's C++ link characteristics + { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no ;; - motorola) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_F77=no - ;; + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no - sysv4.3*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - export_dynamic_flag_spec_F77='-Bexport' - ;; + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs_F77=yes - fi - ;; + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_F77='${wl}-z,text' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no - runpath_var='LD_RUN_PATH' + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds_CXX='' + hardcode_direct_CXX=yes + hardcode_direct_absolute_CXX=yes + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + file_list_spec_CXX='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct_CXX=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L_CXX=yes + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_libdir_separator_CXX= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; + export_dynamic_flag_spec_CXX='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + always_export_symbols_CXX=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag_CXX='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_F77='${wl}-z,text' - allow_undefined_flag_F77='${wl}-z,nodefs' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - export_dynamic_flag_spec_F77='${wl}-Bexport' - runpath_var='LD_RUN_PATH' +int +main () +{ - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then - uts4*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - *) - ld_shlibs_F77=no - ;; - esac - fi -{ 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 +fi -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_F77" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_F77=yes +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_F77 in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # 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; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_F77 - pic_flag=$lt_prog_compiler_pic_F77 - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_F77 - allow_undefined_flag_F77= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_F77=no + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else - archive_cmds_need_lc_F77=yes - fi - allow_undefined_flag_F77=$lt_save_allow_undefined_flag - else - 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; } - ;; - esac - fi - ;; -esac - -{ 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= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_CXX="-z nodefs" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -need_lib_prefix=unknown -hardcode_into_libs=no +int +main () +{ -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; -aix4* | aix5*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; +fi -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag_CXX=' ${wl}-bernotok' + allow_undefined_flag_CXX=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' + archive_cmds_need_lc_CXX=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_CXX=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_CXX=no + fi + ;; -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi + ;; + darwin* | rhapsody*) - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='' + link_all_deplibs_CXX=yes + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + else + ld_shlibs_CXX=no + fi - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; + ;; -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; -freebsd1*) - dynamic_linker=no - ;; + freebsd[12]*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + ld_shlibs_CXX=no + ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes + ;; -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; + gnu*) + ;; -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; + hpux9*) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_direct_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + export_dynamic_flag_spec_CXX='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + ;; + *) + hardcode_direct_CXX=yes + hardcode_direct_absolute_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + + interix[3-9]*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + fi + fi + link_all_deplibs_CXX=yes + ;; + esac + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + inherit_rpath_CXX=yes + ;; + + linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + archive_cmds_need_lc_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [1-5]* | *pgcpp\ [1-5]*) + prelink_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + old_archive_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $RANLIB $oldlib' + archive_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 will use weak symbols + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + hardcode_libdir_separator_CXX=: - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + xl*) + # IBM XL 8.0 on PPC, with GNU ld + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + hardcode_libdir_flag_spec_CXX='-R$libdir' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object_CXX=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; + lynxos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; + m88k*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no + *nto* | *qnx*) + ld_shlibs_CXX=yes ;; - *) - shlibpath_overrides_runpath=yes + + openbsd2*) + # C++ shared libraries are fairly broken + ld_shlibs_CXX=no ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + hardcode_direct_absolute_CXX=yes + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=echo + else + ld_shlibs_CXX=no + fi + ;; -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_separator_CXX=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + cxx*) + case $host in + osf3*) + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + ;; + *) + allow_undefined_flag_CXX=' -expect_unresolved \*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + ;; + esac -rdos*) - dynamic_linker=no - ;; + hardcode_libdir_separator_CXX=: -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; + psos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + archive_cmds_need_lc_CXX=yes + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_shlibpath_var_CXX=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' + ;; + esac + link_all_deplibs_CXX=yes + + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + fi + + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_CXX='${wl}-z,text' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_CXX='${wl}-z,text' + allow_undefined_flag_CXX='${wl}-z,nodefs' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + export_dynamic_flag_spec_CXX='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; - esac - ;; -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; + vxworks*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; + { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + GCC_CXX="$GXX" + LD_CXX="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + # Dependencies to place before and after the object being linked: +predep_objects_CXX= +postdep_objects_CXX= +predeps_CXX= +postdeps_CXX= +compiler_lib_search_path_CXX= -*) - dynamic_linker=no - ;; -esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. -{ 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" || \ - test "X$hardcode_automatic_F77" = "Xyes" ; then + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && - test "$hardcode_minus_L_F77" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_F77=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_F77=immediate - fi + for p in `eval "$output_verbose_link_cmd"`; do + case $p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + else + prev= + fi + + if test "$pre_test_object_deps_done" = no; then + case $p in + -L* | -R*) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$compiler_lib_search_path_CXX"; then + compiler_lib_search_path_CXX="${prev}${p}" + else + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$postdeps_CXX"; then + postdeps_CXX="${prev}${p}" + else + postdeps_CXX="${postdeps_CXX} ${prev}${p}" + fi + fi + ;; + + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$predep_objects_CXX"; then + predep_objects_CXX="$p" + else + predep_objects_CXX="$predep_objects_CXX $p" + fi + else + if test -z "$postdep_objects_CXX"; then + postdep_objects_CXX="$p" + else + postdep_objects_CXX="$postdep_objects_CXX $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_F77=unsupported + echo "libtool.m4: error: problem compiling CXX test program" fi -{ 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 - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi +$RM -f confest.$objext + +# PORTME: override above test on systems where it is broken +case $host_os in +interix[3-9]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= + postdep_objects_CXX= + postdeps_CXX= + ;; +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_F77 \ - CC_F77 \ - LD_F77 \ - lt_prog_compiler_wl_F77 \ - lt_prog_compiler_pic_F77 \ - lt_prog_compiler_static_F77 \ - lt_prog_compiler_no_builtin_flag_F77 \ - export_dynamic_flag_spec_F77 \ - thread_safe_flag_spec_F77 \ - whole_archive_flag_spec_F77 \ - enable_shared_with_static_runtimes_F77 \ - old_archive_cmds_F77 \ - old_archive_from_new_cmds_F77 \ - predep_objects_F77 \ - postdep_objects_F77 \ - predeps_F77 \ - postdeps_F77 \ - compiler_lib_search_path_F77 \ - archive_cmds_F77 \ - archive_expsym_cmds_F77 \ - postinstall_cmds_F77 \ - postuninstall_cmds_F77 \ - old_archive_from_expsyms_cmds_F77 \ - allow_undefined_flag_F77 \ - no_undefined_flag_F77 \ - export_symbols_cmds_F77 \ - hardcode_libdir_flag_spec_F77 \ - hardcode_libdir_flag_spec_ld_F77 \ - hardcode_libdir_separator_F77 \ - hardcode_automatic_F77 \ - module_cmds_F77 \ - module_expsym_cmds_F77 \ - lt_cv_prog_compiler_c_o_F77 \ - fix_srcfile_path_F77 \ - exclude_expsyms_F77 \ - include_expsyms_F77; do - - case $var in - old_archive_cmds_F77 | \ - old_archive_from_new_cmds_F77 | \ - archive_cmds_F77 | \ - archive_expsym_cmds_F77 | \ - module_cmds_F77 | \ - module_expsym_cmds_F77 | \ - old_archive_from_expsyms_cmds_F77 | \ - export_symbols_cmds_F77 | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + esac + + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes ;; esac - done - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi ;; esac + ;; +esac -cfgfile="$ofile" - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname +case " $postdeps_CXX " in +*" -lc "*) archive_cmds_need_lc_CXX=no ;; +esac + compiler_lib_search_dirs_CXX= +if test -n "${compiler_lib_search_path_CXX}"; then + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared -# Whether or not to build static libraries. -build_old_libs=$enable_static -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_F77 -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os -# An echo program that does not interpret backslashes. -echo=$lt_echo -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS -# A C compiler. -LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS -# A language-specific compiler. -CC=$lt_compiler_F77 -# Is the compiler the GNU C compiler? -with_gcc=$GCC_F77 -# An ERE matcher. -EGREP=$lt_EGREP -# The linker used to build libraries. -LD=$lt_LD_F77 -# Whether we need hard or soft links. -LN_S=$lt_LN_S -# A BSD-compatible nm program. -NM=$lt_NM -# A symbol stripping program -STRIP=$lt_STRIP -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" -# Used on cygwin: assembler. -AS="$AS" -# The name of the directory that contains temporary libtool files. -objdir=$objdir -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_F77 -# Object file suffix (normally "o"). -objext="$ac_objext" -# Old archive suffix (normally "a"). -libext="$libext" -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' + lt_prog_compiler_wl_CXX= +lt_prog_compiler_pic_CXX= +lt_prog_compiler_static_CXX= -# Executable file suffix (normally ""). -exeext="$exeext" +{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_F77 -pic_mode=$pic_mode + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-static' -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + fi + ;; -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_CXX='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; -# Must we lock files when doing compilation? -need_locks=$lt_need_locks + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_CXX='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_CXX=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic_CXX='-fPIC -shared' + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + else + case $host_os in + aix[4-9]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + else + lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + dgux*) + case $cc_basename in + ec++*) + lt_prog_compiler_pic_CXX='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + lt_prog_compiler_pic_CXX='+Z' + fi + ;; + aCC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_CXX='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler + lt_prog_compiler_wl_CXX='--backend -Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + lt_prog_compiler_static_CXX='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fpic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + xlc* | xlC*) + # IBM XL 8.0 on PPC + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-qpic' + lt_prog_compiler_static_CXX='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + lt_prog_compiler_pic_CXX='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic_CXX='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + lt_prog_compiler_wl_CXX='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + lt_prog_compiler_pic_CXX='-pic' + ;; + cxx*) + # Digital/Compaq C++ + lt_prog_compiler_wl_CXX='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + lt_prog_compiler_pic_CXX='-pic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + lcc*) + # Lucid + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + lt_prog_compiler_pic_CXX='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + lt_prog_compiler_can_build_shared_CXX=no + ;; + esac + fi -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_CXX= + ;; + *) + lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" + ;; +esac +{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -# Do we need a version for libraries? -need_version=$need_version -# Whether dlopen is supported. -dlopen_support=$enable_dlopen -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_CXX"; then + { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:17391: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:17395: \$? = $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. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works_CXX=yes + fi + fi + $RM conftest* -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_F77 +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; + esac +else + lt_prog_compiler_pic_CXX= + lt_prog_compiler_can_build_shared_CXX=no +fi -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 +fi -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 +# +# 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\" +{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works_CXX=yes + fi + else + lt_cv_prog_compiler_static_works_CXX=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" -# Library versioning type. -version_type=$version_type +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } -# Format of library name prefix. -libname_spec=$lt_libname_spec +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then + : +else + lt_prog_compiler_static_CXX= +fi -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_F77 -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 + { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -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:17490: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:17494: \$? = $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 + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_F77 -archive_expsym_cmds=$lt_archive_expsym_cmds_F77 -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_F77 -module_expsym_cmds=$lt_module_expsym_cmds_F77 -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_F77 - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_F77 - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_F77 - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_F77 + { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_F77 + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -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:17542: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:17546: \$? = $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 + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method +fi +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_F77 -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_F77 -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds +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 + { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&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 + { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + export_symbols_cmds_CXX="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -# This is the shared library runtime path variable. -runpath_var=$runpath_var +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } +test "$ld_shlibs_CXX" = no && can_build_shared=no -# This is the shared library path variable. -shlibpath_var=$shlibpath_var +with_gnu_ld_CXX=$with_gnu_ld -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_F77 -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_F77 - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_F77 - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_F77 -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc_CXX" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_CXX=yes -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_F77 + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_CXX in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # 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. + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_CXX=no + else + archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +$as_echo "$archive_cmds_need_lc_CXX" >&6; } + ;; + esac + fi + ;; +esac -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_F77 -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_F77 -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_F77 -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_F77 -# ### END LIBTOOL TAG CONFIG: $tagname -__EOF__ -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -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 -CC="$lt_save_CC" - else - tagname="" - fi - ;; - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -# Source file extension for Java test sources. -ac_ext=java -# Object file extension for compiled Java test sources. -objext=o -objext_GCJ=$objext -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Allow CC to be a program name with arguments. -compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${GCJ-"gcj"} -compiler=$CC -compiler_GCJ=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -# GCJ did not exist at the time GCC didn't implicitly link libc in. -archive_cmds_need_lc_GCJ=no -old_archive_cmds_GCJ=$old_archive_cmds -lt_prog_compiler_no_builtin_flag_GCJ= -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; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:19616: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:19620: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $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; } -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" -else - : -fi -fi -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; } - if test "$GCC" = yes; then - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_static_GCJ='-static' - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_GCJ='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_GCJ='-fno-common' - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared_GCJ=no - enable_shared=no - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_GCJ=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_GCJ='-fPIC' - ;; - esac - ;; - *) - lt_prog_compiler_pic_GCJ='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl_GCJ='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_GCJ='-Bstatic' - else - lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_GCJ='-qnocommon' - lt_prog_compiler_wl_GCJ='-Wl,' - ;; - esac - ;; - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' - ;; - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl_GCJ='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_GCJ='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' - ;; - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl_GCJ='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static_GCJ='-non_shared' - ;; - newsos6) - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-fpic' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl_GCJ='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - lt_prog_compiler_wl_GCJ='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - lt_prog_compiler_wl_GCJ='' - ;; - esac - ;; - esac - ;; - osf3* | osf4* | osf5*) - lt_prog_compiler_wl_GCJ='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' - ;; - rdos*) - lt_prog_compiler_static_GCJ='-non_shared' - ;; - solaris*) - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_GCJ='-Qoption ld ';; - *) - lt_prog_compiler_wl_GCJ='-Wl,';; - esac - ;; - sunos4*) - lt_prog_compiler_wl_GCJ='-Qoption ld ' - lt_prog_compiler_pic_GCJ='-PIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; + { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic_GCJ='-Kconform_pic' - lt_prog_compiler_static_GCJ='-Bstatic' - fi - ;; +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown - unicos*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_can_build_shared_GCJ=no - ;; +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH - uts4*) - lt_prog_compiler_pic_GCJ='-pic' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; - *) - lt_prog_compiler_can_build_shared_GCJ=no +aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi ;; esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH fi + ;; -{ 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; } -if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_GCJ" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:19906: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:19910: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_GCJ=yes - fi - fi - $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; } - -if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in - "" | " "*) ;; - *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; - esac -else - lt_prog_compiler_pic_GCJ= - lt_prog_compiler_can_build_shared_GCJ=no -fi - -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_GCJ= +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ;; - *) - lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; -esac + 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; } -if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_GCJ=yes - fi - else - lt_prog_compiler_static_works_GCJ=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; -fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } +bsdi[45]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; -if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then - : -else - lt_prog_compiler_static_GCJ= -fi +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes -{ 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 - lt_cv_prog_compiler_c_o_GCJ=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -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:20010: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:20014: \$? = $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 - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_GCJ=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; -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; } +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; -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; } - 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; } - 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;} - need_locks=warn - fi -else - need_locks=no -fi +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; -{ 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; } +freebsd1*) + dynamic_linker=no + ;; - runpath_var= - allow_undefined_flag_GCJ= - enable_shared_with_static_runtimes_GCJ=no - archive_cmds_GCJ= - archive_expsym_cmds_GCJ= - old_archive_From_new_cmds_GCJ= - old_archive_from_expsyms_cmds_GCJ= - export_dynamic_flag_spec_GCJ= - whole_archive_flag_spec_GCJ= - thread_safe_flag_spec_GCJ= - hardcode_libdir_flag_spec_GCJ= - hardcode_libdir_flag_spec_ld_GCJ= - hardcode_libdir_separator_GCJ= - hardcode_direct_GCJ=no - hardcode_minus_L_GCJ=no - hardcode_shlibpath_var_GCJ=unsupported - link_all_deplibs_GCJ=unknown - hardcode_automatic_GCJ=no - module_cmds_GCJ= - module_expsym_cmds_GCJ= - always_export_symbols_GCJ=no - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms_GCJ= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - + shlibpath_var=LD_LIBRARY_PATH case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi + freebsd2*) + shlibpath_overrides_runpath=yes ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes ;; - openbsd*) - with_gnu_ld=no + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes ;; esac + ;; - ld_shlibs_GCJ=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' +gnu*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_GCJ= +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_GCJ=no - cat <&2 + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -EOF - fi - ;; +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; - amigaos*) - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_GCJ=no - ;; +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_GCJ=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_GCJ='-L$libdir' - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=no - enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' +int +main () +{ - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_GCJ=no - fi - ;; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then + shlibpath_overrides_runpath=yes +fi - interix[3-9]*) - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - ld_shlibs_GCJ=no - fi - ;; +fi - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_GCJ=no - cat <&2 + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_GCJ=no - cat <<_LT_EOF 1>&2 + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; -_LT_EOF +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi + *) + shlibpath_overrides_runpath=yes ;; esac - ;; - - sunos4*) - archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; + else + shlibpath_overrides_runpath=yes + fi + ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - esac +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; - if test "$ld_shlibs_GCJ" = no; then - runpath_var= - hardcode_libdir_flag_spec_GCJ= - export_dynamic_flag_spec_GCJ= - whole_archive_flag_spec_GCJ= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=yes - archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L_GCJ=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct_GCJ=unsupported - fi - ;; +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no +rdos*) + dynamic_linker=no + ;; - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac +solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; - archive_cmds_GCJ='' - hardcode_direct_GCJ=yes - hardcode_libdir_separator_GCJ=':' - link_all_deplibs_GCJ=yes +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_GCJ=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_GCJ=yes - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_libdir_separator_GCJ= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_GCJ=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_GCJ='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -int -main () -{ +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +*) + dynamic_linker=no + ;; 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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_GCJ="-z nodefs" - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - 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 conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_GCJ=' ${wl}-bernotok' - allow_undefined_flag_GCJ=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_GCJ='$convenience' - archive_cmds_need_lc_GCJ=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - amigaos*) - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - # see comment about different semantics on the GNU ld section - ld_shlibs_GCJ=no - ;; - bsdi[45]*) - export_dynamic_flag_spec_GCJ=-rdynamic - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_GCJ=' ' - allow_undefined_flag_GCJ=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_GCJ='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_GCJ=yes - ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc_GCJ=no - hardcode_direct_GCJ=no - hardcode_automatic_GCJ=yes - hardcode_shlibpath_var_GCJ=unsupported - whole_archive_flag_spec_GCJ='' - link_all_deplibs_GCJ=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_GCJ=no - ;; - esac - fi - ;; - dgux*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_shlibpath_var_GCJ=no - ;; - freebsd1*) - ld_shlibs_GCJ=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - hpux9*) - if test "$GCC" = yes; then - archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_direct_GCJ=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - ;; - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_direct_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - fi - ;; - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - ;; - *) - hardcode_direct_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' - fi - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - link_all_deplibs_GCJ=yes - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - newsos6) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_shlibpath_var_GCJ=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - ;; - *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs_GCJ=no - fi - ;; - os2*) - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - allow_undefined_flag_GCJ=unsupported - archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - ;; - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_GCJ='-rpath $libdir' - fi - hardcode_libdir_separator_GCJ=: - ;; - solaris*) - no_undefined_flag_GCJ=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_shlibpath_var_GCJ=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs_GCJ=yes - ;; - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; + { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || + test -n "$runpath_var_CXX" || + test "X$hardcode_automatic_CXX" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +$as_echo "$hardcode_action_CXX" >&6; } + +if test "$hardcode_action_CXX" = relink || + test "$inherit_rpath_CXX" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi - sysv4) - case $host_vendor in - sni) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds_GCJ='$CC -r -o $output$reload_objs' - hardcode_direct_GCJ=no - ;; - motorola) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_GCJ=no - ;; - sysv4.3*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - export_dynamic_flag_spec_GCJ='-Bexport' - ;; - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs_GCJ=yes - fi - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_GCJ='${wl}-z,text' - archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no - runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_GCJ='${wl}-z,text' - allow_undefined_flag_GCJ='${wl}-z,nodefs' - archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_GCJ=':' - link_all_deplibs_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; + fi # test -n "$compiler" - uts4*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_shlibpath_var_GCJ=no - ;; + CC=$lt_save_CC + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes - *) - ld_shlibs_GCJ=no - ;; - esac - fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } -test "$ld_shlibs_GCJ" = no && can_build_shared=no -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_GCJ" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_GCJ=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_GCJ in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # 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; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_GCJ - pic_flag=$lt_prog_compiler_pic_GCJ - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ - allow_undefined_flag_GCJ= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_GCJ=no - else - archive_cmds_need_lc_GCJ=yes - fi - allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag - else - 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; } - ;; - esac - fi - ;; -esac -{ 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= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; -aix4* | aix5*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; + ac_config_commands="$ac_config_commands libtool" + + + -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no +# Only expand once: - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; +{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +int +main () +{ +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset cs; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_c_const=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -freebsd1*) - dynamic_linker=no - ;; + ac_cv_c_const=no +fi -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then + +cat >>confdefs.h <<\_ACEOF +#define const /**/ +_ACEOF + +fi + +{ $as_echo "$as_me:$LINENO: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if test "${ac_cv_c_inline+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif + +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_c_inline=$ac_kw +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; +fi -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break +done -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } + + +case $ac_cv_c_inline in + inline | yes) ;; *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; +esac -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi +abi_plugin_extra= +abi_plugin_opt=yes +# Check whether --enable-all was given. +if test "${enable_all+set}" = set; then + enableval=$enable_all; + if test "x$enableval" = "xno"; then + abi_plugin_opt=no + fi - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; +fi -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; +abi_tools= +abi_plugin_add=yes +# Check whether --enable-abicollab was given. +if test "${enable_abicollab+set}" = set; then + enableval=$enable_abicollab; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; +else + abi_plugin_add=$abi_plugin_opt -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; +fi -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; +# Check whether --with-abicollab was given. +if test "${with_abicollab+set}" = set; then + withval=$with_abicollab; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi + +fi + + + +abicollab_handler_fake=no +abicollab_handler_xmpp=no +abicollab_handler_tcp=no +abicollab_handler_sugar=no +abicollab_handler_service=no + +abicollab_record_always=no + + +if test $abi_plugin_add = yes; then + abi_plugin_disable=no + + +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" -rdos*) - dynamic_linker=no - ;; +ABICOLLAB_LIBXML2_CPPFLAGS="" +ABICOLLAB_LIBXML2_LIBS="" -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; +ABICOLLAB_FAKE_CPPFLAGS="" +ABICOLLAB_FAKE_LIBS="" -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; +ABICOLLAB_XMPP_CPPFLAGS="" +ABICOLLAB_XMPP_LIBS="" -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; +ABICOLLAB_TCP_CPFLAGS="" +ABICOLLAB_TCP_LIBS="" -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; +ABICOLLAB_SUGAR_CPFLAGS="" +ABICOLLAB_SUGAR_LIBS="" -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; +ABICOLLAB_SERVICE_CPFLAGS="" +ABICOLLAB_SERVICE_LIBS="" -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; -*) - dynamic_linker=no - ;; -esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +# +# General checks +# -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi +if test x$abi_platform != "xcocoa"; then -{ 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" || \ - test "X$hardcode_automatic_GCJ" = "Xyes" ; then +# check for libxml2 - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for _abi_libxml2" >&5 +$as_echo_n "checking for _abi_libxml2... " >&6; } + +if test -n "$_abi_libxml2_CFLAGS"; then + pkg_cv__abi_libxml2_CFLAGS="$_abi_libxml2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.4.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.4.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_libxml2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.4.0" 2>/dev/null` else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$_abi_libxml2_LIBS"; then + pkg_cv__abi_libxml2_LIBS="$_abi_libxml2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.4.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.4.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_libxml2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.4.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -{ 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 - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + _abi_libxml2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.4.0" 2>&1` + else + _abi_libxml2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.4.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$_abi_libxml2_PKG_ERRORS" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_GCJ \ - CC_GCJ \ - LD_GCJ \ - lt_prog_compiler_wl_GCJ \ - lt_prog_compiler_pic_GCJ \ - lt_prog_compiler_static_GCJ \ - lt_prog_compiler_no_builtin_flag_GCJ \ - export_dynamic_flag_spec_GCJ \ - thread_safe_flag_spec_GCJ \ - whole_archive_flag_spec_GCJ \ - enable_shared_with_static_runtimes_GCJ \ - old_archive_cmds_GCJ \ - old_archive_from_new_cmds_GCJ \ - predep_objects_GCJ \ - postdep_objects_GCJ \ - predeps_GCJ \ - postdeps_GCJ \ - compiler_lib_search_path_GCJ \ - archive_cmds_GCJ \ - archive_expsym_cmds_GCJ \ - postinstall_cmds_GCJ \ - postuninstall_cmds_GCJ \ - old_archive_from_expsyms_cmds_GCJ \ - allow_undefined_flag_GCJ \ - no_undefined_flag_GCJ \ - export_symbols_cmds_GCJ \ - hardcode_libdir_flag_spec_GCJ \ - hardcode_libdir_flag_spec_ld_GCJ \ - hardcode_libdir_separator_GCJ \ - hardcode_automatic_GCJ \ - module_cmds_GCJ \ - module_expsym_cmds_GCJ \ - lt_cv_prog_compiler_c_o_GCJ \ - fix_srcfile_path_GCJ \ - exclude_expsyms_GCJ \ - include_expsyms_GCJ; do - - case $var in - old_archive_cmds_GCJ | \ - old_archive_from_new_cmds_GCJ | \ - archive_cmds_GCJ | \ - archive_expsym_cmds_GCJ | \ - module_cmds_GCJ | \ - module_expsym_cmds_GCJ | \ - old_archive_from_expsyms_cmds_GCJ | \ - export_symbols_cmds_GCJ | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done + if test "xabicollab: error, libxml-2.0 >= 2.4.0 required" != "x" ; then + echo "abicollab: error, libxml-2.0 >= 2.4.0 required" >> $abi_plugin_topdir/plugin.status + fi - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac + abi_plugin_disable=yes -cfgfile="$ofile" +elif test $pkg_failed = untried; then - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname + if test "xabicollab: error, libxml-2.0 >= 2.4.0 required" != "x" ; then + echo "abicollab: error, libxml-2.0 >= 2.4.0 required" >> $abi_plugin_topdir/plugin.status + fi -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + abi_plugin_disable=yes -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL +else + _abi_libxml2_CFLAGS=$pkg_cv__abi_libxml2_CFLAGS + _abi_libxml2_LIBS=$pkg_cv__abi_libxml2_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared -# Whether or not to build static libraries. -build_old_libs=$enable_static + if test "xabicollab: okay" != "x" ; then + echo "abicollab: okay" >> $abi_plugin_topdir/plugin.status + fi -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_GCJ -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ +fi +if test "x$abi_plugin_disable" = "xno"; then + ABICOLLAB_LIBXML2_CPPFLAGS="$_abi_libxml2_CFLAGS" + ABICOLLAB_LIBXML2_LIBS="$_abi_libxml2_LIBS" +fi -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os +# check for various boost libs -# An echo program that does not interpret backslashes. -echo=$lt_echo -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS +# Check whether --with-boost was given. +if test "${with_boost+set}" = set; then + withval=$with_boost; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ac_boost_path="" + else + want_boost="yes" + ac_boost_path="$withval" + fi + +else + want_boost="yes" +fi + + +if test "x$want_boost" = "xyes"; then + boost_lib_version_req=1.33.1 + boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'` + boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'` + boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'` + boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + if test "x$boost_lib_version_req_sub_minor" = "x" ; then + boost_lib_version_req_sub_minor="0" + fi + WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` + { $as_echo "$as_me:$LINENO: checking for boostlib >= $boost_lib_version_req" >&5 +$as_echo_n "checking for boostlib >= $boost_lib_version_req... " >&6; } + succeeded=no + + if test "$ac_boost_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_path/lib" + BOOST_CPPFLAGS="-I$ac_boost_path/include" + else + for ac_boost_path_tmp in /usr /usr/local /opt ; do + if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then + BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" + BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" + break; + fi + done + fi + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + 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 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -# A C compiler. -LTCC=$lt_LTCC + #include -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS +int +main () +{ -# A language-specific compiler. -CC=$lt_compiler_GCJ + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif -# Is the compiler the GNU C compiler? -with_gcc=$GCC_GCJ + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then -# An ERE matcher. -EGREP=$lt_EGREP + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + found_system=yes -# The linker used to build libraries. -LD=$lt_LD_GCJ +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Whether we need hard or soft links. -LN_S=$lt_LN_S -# A BSD-compatible nm program. -NM=$lt_NM -# A symbol stripping program -STRIP=$lt_STRIP +fi -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD +rm -f core 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' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" -# Used on cygwin: assembler. -AS="$AS" -# The name of the directory that contains temporary libtool files. -objdir=$objdir + if test "x$succeeded" != "xyes"; then + _version=0 + if test "$ac_boost_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_path/lib" + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + fi + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE" + done + fi + else + for ac_boost_path in /usr /usr/local /opt ; do + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + best_path=$ac_boost_path + fi + done + fi + done -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" + BOOST_LDFLAGS="-L$best_path/lib" -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_GCJ + if test "x$BOOST_ROOT" != "x"; then + if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then + version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` + stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` + stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'` + V_CHECK=`expr $stage_version_shorten \>\= $_version` + if test "$V_CHECK" = "1" ; then + { $as_echo "$as_me:$LINENO: We will use a staged boost library from $BOOST_ROOT" >&5 +$as_echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;} + BOOST_CPPFLAGS="-I$BOOST_ROOT" + BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib" + fi + fi + fi + fi -# Object file suffix (normally "o"). -objext="$ac_objext" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS -# Old archive suffix (normally "a"). -libext="$libext" + 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 -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -# Executable file suffix (normally ""). -exeext="$exeext" + #include -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_GCJ -pic_mode=$pic_mode +int +main () +{ -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then -# Must we lock files when doing compilation? -need_locks=$lt_need_locks + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + found_system=yes -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Do we need a version for libraries? -need_version=$need_version -# Whether dlopen is supported. -dlopen_support=$enable_dlopen -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self +fi -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static +rm -f core 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' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_GCJ + fi -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ + if test "$succeeded" != "yes" ; then + if test "$_version" = "0" ; then + { { $as_echo "$as_me:$LINENO: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&5 +$as_echo "$as_me: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&2;} + { (exit 1); exit 1; }; } + else + { $as_echo "$as_me:$LINENO: Your boost libraries seems to old (version $_version)." >&5 +$as_echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;} + fi + else -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ +cat >>confdefs.h <<\_ACEOF +#define HAVE_BOOST /**/ +_ACEOF -# Library versioning type. -version_type=$version_type + fi -# Format of library name prefix. -libname_spec=$lt_libname_spec + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" +fi -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_GCJ -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds +# check for asio +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 -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ +ABICOLLAB_ASIO_CFLAGS="" +ABICOLLAB_ASIO_DIR="" -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ +# Check whether --with-asio was given. +if test "${with_asio+set}" = set; then + withval=$with_asio; + ABICOLLAB_ASIO_DIR="$withval" + asio_dir=yes -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_GCJ -archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds +else -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_GCJ -module_expsym_cmds=$lt_module_expsym_cmds_GCJ + asio_dir=auto -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib +fi -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_GCJ - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_GCJ +if test "x$asio_dir" = "xyes"; then + ABICOLLAB_ASIO_CPPFLAGS="-I$ABICOLLAB_ASIO_DIR/include" +fi -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method +# +# Checks for Fake support (for debugging purposes only) +# +# Check whether --enable-abicollab-fake-backend was given. +if test "${enable_abicollab_fake_backend+set}" = set; then + enableval=$enable_abicollab_fake_backend; + if test "x$enableval" != "xno" ; then + abicollab_handler_fake=yes -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd + if test "xabicollab Fake support: yes" != "x" ; then + echo "abicollab Fake support: yes" >> $abi_plugin_topdir/plugin.status + fi -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_GCJ + fi -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_GCJ +fi -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds +if test $abicollab_handler_fake = yes ; then + ABICOLLAB_FAKE_CPPFLAGS="-DABICOLLAB_HANDLER_FAKE" +fi -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# +# Checks for XMPP support (using loudmouth) +# -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for _abi_loudmouth" >&5 +$as_echo_n "checking for _abi_loudmouth... " >&6; } -# This is the shared library runtime path variable. -runpath_var=$runpath_var +if test -n "$_abi_loudmouth_CFLAGS"; then + pkg_cv__abi_loudmouth_CFLAGS="$_abi_loudmouth_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"loudmouth-1.0 >= 1.0.1 \"") >&5 + ($PKG_CONFIG --exists --print-errors "loudmouth-1.0 >= 1.0.1 ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_loudmouth_CFLAGS=`$PKG_CONFIG --cflags "loudmouth-1.0 >= 1.0.1 " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$_abi_loudmouth_LIBS"; then + pkg_cv__abi_loudmouth_LIBS="$_abi_loudmouth_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"loudmouth-1.0 >= 1.0.1 \"") >&5 + ($PKG_CONFIG --exists --print-errors "loudmouth-1.0 >= 1.0.1 ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_loudmouth_LIBS=`$PKG_CONFIG --libs "loudmouth-1.0 >= 1.0.1 " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi -# This is the shared library path variable. -shlibpath_var=$shlibpath_var -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_GCJ +if test $pkg_failed = yes; then -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + _abi_loudmouth_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "loudmouth-1.0 >= 1.0.1 " 2>&1` + else + _abi_loudmouth_PKG_ERRORS=`$PKG_CONFIG --print-errors "loudmouth-1.0 >= 1.0.1 " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$_abi_loudmouth_PKG_ERRORS" >&5 -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_GCJ - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_GCJ - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_GCJ + if test "xabicollab XMPP support: no, loudmouth >= 1.0.1 required" != "x" ; then + echo "abicollab XMPP support: no, loudmouth >= 1.0.1 required" >> $abi_plugin_topdir/plugin.status + fi -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_GCJ +elif test $pkg_failed = untried; then -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + if test "xabicollab XMPP support: no, loudmouth >= 1.0.1 required" != "x" ; then + echo "abicollab XMPP support: no, loudmouth >= 1.0.1 required" >> $abi_plugin_topdir/plugin.status + fi -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path +else + _abi_loudmouth_CFLAGS=$pkg_cv__abi_loudmouth_CFLAGS + _abi_loudmouth_LIBS=$pkg_cv__abi_loudmouth_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_GCJ -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_GCJ + if test "xabicollab XMPP support: yes" != "x" ; then + echo "abicollab XMPP support: yes" >> $abi_plugin_topdir/plugin.status + fi -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds + abicollab_handler_xmpp=yes -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_GCJ +fi +if test "x$abicollab_handler_xmpp" = "xyes"; then + ABICOLLAB_XMPP_CPPFLAGS="$_abi_loudmouth_CFLAGS -DABICOLLAB_HANDLER_XMPP" + ABICOLLAB_XMPP_LIBS="$_abi_loudmouth_LIBS" +fi -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_GCJ -# ### END LIBTOOL TAG CONFIG: $tagname -__EOF__ +# +# Checks for TCP support (using asio) +# +CPPFLAGS="$CPPFLAGS $ABICOLLAB_ASIO_CPPFLAGS" +for ac_header in asio.hpp +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -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 +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -CC="$lt_save_CC" + ac_header_preproc=no +fi - else - tagname="" - fi - ;; +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } - RC) +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## --------------------------------------------- ## +## Report this to http://bugzilla.abisource.com/ ## +## --------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -# Source file extension for RC test sources. -ac_ext=rc -# Object file extension for compiled RC test sources. -objext=o -objext_RC=$objext + if test "xabicollab TCP support: yes" != "x" ; then + echo "abicollab TCP support: yes" >> $abi_plugin_topdir/plugin.status + fi -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + abicollab_handler_tcp=yes -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +else -# ltmain only uses $CC for tagged configurations so make sure $CC is set. + if test "xabicollab TCP support: no, asio >= 0.3.8rc1 required" != "x" ; then + echo "abicollab TCP support: no, asio >= 0.3.8rc1 required" >> $abi_plugin_topdir/plugin.status + fi -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +fi -# Allow CC to be a program name with arguments. -compiler=$CC +done +if test "x$abicollab_handler_tcp" = "xyes" ; then + ABICOLLAB_TCP_CPPFLAGS="-DABICOLLAB_HANDLER_TCP $ABICOLLAB_ASIO_CPPFLAGS" + ABICOLLAB_TCP_LIBS="-lpthread" +fi +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +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 -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${RC-"windres"} -compiler=$CC -compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" -lt_cv_prog_compiler_c_o_RC=yes -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_RC \ - CC_RC \ - LD_RC \ - lt_prog_compiler_wl_RC \ - lt_prog_compiler_pic_RC \ - lt_prog_compiler_static_RC \ - lt_prog_compiler_no_builtin_flag_RC \ - export_dynamic_flag_spec_RC \ - thread_safe_flag_spec_RC \ - whole_archive_flag_spec_RC \ - enable_shared_with_static_runtimes_RC \ - old_archive_cmds_RC \ - old_archive_from_new_cmds_RC \ - predep_objects_RC \ - postdep_objects_RC \ - predeps_RC \ - postdeps_RC \ - compiler_lib_search_path_RC \ - archive_cmds_RC \ - archive_expsym_cmds_RC \ - postinstall_cmds_RC \ - postuninstall_cmds_RC \ - old_archive_from_expsyms_cmds_RC \ - allow_undefined_flag_RC \ - no_undefined_flag_RC \ - export_symbols_cmds_RC \ - hardcode_libdir_flag_spec_RC \ - hardcode_libdir_flag_spec_ld_RC \ - hardcode_libdir_separator_RC \ - hardcode_automatic_RC \ - module_cmds_RC \ - module_expsym_cmds_RC \ - lt_cv_prog_compiler_c_o_RC \ - fix_srcfile_path_RC \ - exclude_expsyms_RC \ - include_expsyms_RC; do - - case $var in - old_archive_cmds_RC | \ - old_archive_from_new_cmds_RC | \ - archive_cmds_RC | \ - archive_expsym_cmds_RC | \ - module_cmds_RC | \ - module_expsym_cmds_RC | \ - old_archive_from_expsyms_cmds_RC | \ - export_symbols_cmds_RC | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done +# +# Checks for Sugar +# - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac +# Check whether --with-abicollab-sugar-backend was given. +if test "${with_abicollab_sugar_backend+set}" = set; then + withval=$with_abicollab_sugar_backend; -cfgfile="$ofile" +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for _abi_dbus" >&5 +$as_echo_n "checking for _abi_dbus... " >&6; } - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname +if test -n "$_abi_dbus_CFLAGS"; then + pkg_cv__abi_dbus_CFLAGS="$_abi_dbus_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.1 \"") >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.1 ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_dbus_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0.1 " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$_abi_dbus_LIBS"; then + pkg_cv__abi_dbus_LIBS="$_abi_dbus_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.1 \"") >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.1 ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_dbus_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0.1 " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared +if test $pkg_failed = yes; then -# Whether or not to build static libraries. -build_old_libs=$enable_static +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + _abi_dbus_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.0.1 " 2>&1` + else + _abi_dbus_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.0.1 " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$_abi_dbus_PKG_ERRORS" >&5 -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_RC + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC + if test "xabicollab Sugar support: no, dbus-1 >= 1.0.1 required" != "x" ; then + echo "abicollab Sugar support: no, dbus-1 >= 1.0.1 required" >> $abi_plugin_topdir/plugin.status + fi -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install + abicollab_handler_sugar=no -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os +elif test $pkg_failed = untried; then -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os + if test "xabicollab Sugar support: no, dbus-1 >= 1.0.1 required" != "x" ; then + echo "abicollab Sugar support: no, dbus-1 >= 1.0.1 required" >> $abi_plugin_topdir/plugin.status + fi -# An echo program that does not interpret backslashes. -echo=$lt_echo + abicollab_handler_sugar=no -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS +else + _abi_dbus_CFLAGS=$pkg_cv__abi_dbus_CFLAGS + _abi_dbus_LIBS=$pkg_cv__abi_dbus_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -# A C compiler. -LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS + if test "xabicollab Sugar support: yes" != "x" ; then + echo "abicollab Sugar support: yes" >> $abi_plugin_topdir/plugin.status + fi -# A language-specific compiler. -CC=$lt_compiler_RC + abicollab_handler_sugar=yes -# Is the compiler the GNU C compiler? -with_gcc=$GCC_RC +fi -# An ERE matcher. -EGREP=$lt_EGREP + if test "x$abicollab_handler_sugar" = "xyes" ; then -# The linker used to build libraries. -LD=$lt_LD_RC +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for _abi_dbus_glib" >&5 +$as_echo_n "checking for _abi_dbus_glib... " >&6; } -# Whether we need hard or soft links. -LN_S=$lt_LN_S +if test -n "$_abi_dbus_glib_CFLAGS"; then + pkg_cv__abi_dbus_glib_CFLAGS="$_abi_dbus_glib_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.70 \"") >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.70 ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_dbus_glib_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.70 " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$_abi_dbus_glib_LIBS"; then + pkg_cv__abi_dbus_glib_LIBS="$_abi_dbus_glib_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.70 \"") >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.70 ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_dbus_glib_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.70 " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi -# A BSD-compatible nm program. -NM=$lt_NM -# A symbol stripping program -STRIP=$lt_STRIP -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD +if test $pkg_failed = yes; then -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + _abi_dbus_glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= 0.70 " 2>&1` + else + _abi_dbus_glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= 0.70 " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$_abi_dbus_glib_PKG_ERRORS" >&5 -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -# Used on cygwin: assembler. -AS="$AS" + if test "xabicollab Sugar support: no, dbus-glib-1 >= 0.70 required" != "x" ; then + echo "abicollab Sugar support: no, dbus-glib-1 >= 0.70 required" >> $abi_plugin_topdir/plugin.status + fi -# The name of the directory that contains temporary libtool files. -objdir=$objdir + abicollab_handler_sugar=no -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds +elif test $pkg_failed = untried; then -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_RC + if test "xabicollab Sugar support: no, dbus-glib-1 >= 0.70 required" != "x" ; then + echo "abicollab Sugar support: no, dbus-glib-1 >= 0.70 required" >> $abi_plugin_topdir/plugin.status + fi -# Object file suffix (normally "o"). -objext="$ac_objext" + abicollab_handler_sugar=no -# Old archive suffix (normally "a"). -libext="$libext" +else + _abi_dbus_glib_CFLAGS=$pkg_cv__abi_dbus_glib_CFLAGS + _abi_dbus_glib_LIBS=$pkg_cv__abi_dbus_glib_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' -# Executable file suffix (normally ""). -exeext="$exeext" + if test "xabicollab Sugar support: yes" != "x" ; then + echo "abicollab Sugar support: yes" >> $abi_plugin_topdir/plugin.status + fi -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_RC -pic_mode=$pic_mode + abicollab_handler_sugar=yes -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len +fi + fi -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation? -need_locks=$lt_need_locks +else -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix -# Do we need a version for libraries? -need_version=$need_version + if test "xabicollab Sugar support: no" != "x" ; then + echo "abicollab Sugar support: no" >> $abi_plugin_topdir/plugin.status + fi -# Whether dlopen is supported. -dlopen_support=$enable_dlopen + abicollab_handler_sugar=no -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self +fi -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static +if test "x$abicollab_handler_sugar" = "xyes" ; then + ABICOLLAB_SUGAR_CPPFLAGS="$_abi_dbus_CFLAGS $_abi_dbus_glib_CFLAGS -DABICOLLAB_HANDLER_SUGAR" + ABICOLLAB_SUGAR_LIBS="$_abi_dbus_LIBS $_abi_dbus_glib_LIBS" +fi -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_RC -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC +# +# Checks for the abicollab.net service backend +# -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC +# Check whether --with-abicollab-service-backend was given. +if test "${with_abicollab_service_backend+set}" = set; then + withval=$with_abicollab_service_backend; -# Library versioning type. -version_type=$version_type +for ac_header in asio.hpp +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Format of library name prefix. -libname_spec=$lt_libname_spec + ac_header_compiler=no +fi -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_RC -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds + ac_header_preproc=no +fi -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## --------------------------------------------- ## +## Report this to http://bugzilla.abisource.com/ ## +## --------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_RC -archive_expsym_cmds=$lt_archive_expsym_cmds_RC -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_RC -module_expsym_cmds=$lt_module_expsym_cmds_RC + abicollab_handler_service=yes -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib +else -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_RC - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_RC - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_RC - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_RC + if test "xabicollab abicollab.net support: no, asio >= 0.3.8rc1 required" != "x" ; then + echo "abicollab abicollab.net support: no, asio >= 0.3.8rc1 required" >> $abi_plugin_topdir/plugin.status + fi -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_RC -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method +fi -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd +done -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_RC -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_RC + if test "x$abicollab_handler_service" = "xyes" ; then -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for ABICOLLAB_SOUP" >&5 +$as_echo_n "checking for ABICOLLAB_SOUP... " >&6; } -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval +if test -n "$ABICOLLAB_SOUP_CFLAGS"; then + pkg_cv_ABICOLLAB_SOUP_CFLAGS="$ABICOLLAB_SOUP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2 >= 2.2.100\"") >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.2 >= 2.2.100") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ABICOLLAB_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2 >= 2.2.100" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ABICOLLAB_SOUP_LIBS"; then + pkg_cv_ABICOLLAB_SOUP_LIBS="$ABICOLLAB_SOUP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2 >= 2.2.100\"") >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.2 >= 2.2.100") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ABICOLLAB_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.2 >= 2.2.100" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +if test $pkg_failed = yes; then -# This is the shared library runtime path variable. -runpath_var=$runpath_var +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.2 >= 2.2.100" 2>&1` + else + ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.2 >= 2.2.100" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ABICOLLAB_SOUP_PKG_ERRORS" >&5 -# This is the shared library path variable. -shlibpath_var=$shlibpath_var + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for ABICOLLAB_SOUP" >&5 +$as_echo_n "checking for ABICOLLAB_SOUP... " >&6; } -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_RC +if test -n "$ABICOLLAB_SOUP_CFLAGS"; then + pkg_cv_ABICOLLAB_SOUP_CFLAGS="$ABICOLLAB_SOUP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.4.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.4.1") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ABICOLLAB_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.4.1" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ABICOLLAB_SOUP_LIBS"; then + pkg_cv_ABICOLLAB_SOUP_LIBS="$ABICOLLAB_SOUP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.4.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.4.1") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ABICOLLAB_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.4.1" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_RC - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_RC - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_RC - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_RC +if test $pkg_failed = yes; then -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4 >= 2.4.1" 2>&1` + else + ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4 >= 2.4.1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ABICOLLAB_SOUP_PKG_ERRORS" >&5 -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_RC + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + if test "xabicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" != "x" ; then + echo "abicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" >> $abi_plugin_topdir/plugin.status + fi -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path + abicollab_handler_service=no -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_RC +elif test $pkg_failed = untried; then -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_RC -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds + if test "xabicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" != "x" ; then + echo "abicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" >> $abi_plugin_topdir/plugin.status + fi -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_RC + abicollab_handler_service=no -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_RC +else + ABICOLLAB_SOUP_CFLAGS=$pkg_cv_ABICOLLAB_SOUP_CFLAGS + ABICOLLAB_SOUP_LIBS=$pkg_cv_ABICOLLAB_SOUP_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -# ### END LIBTOOL TAG CONFIG: $tagname + ABICOLLAB_SOUP_CFLAGS+=-DSOUP24 -__EOF__ + if test "xabicollab abicollab.net support: yes" != "x" ; then + echo "abicollab abicollab.net support: yes" >> $abi_plugin_topdir/plugin.status + fi + abicollab_handler_service=yes -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi fi +elif test $pkg_failed = untried; then -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 +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for ABICOLLAB_SOUP" >&5 +$as_echo_n "checking for ABICOLLAB_SOUP... " >&6; } -CC="$lt_save_CC" +if test -n "$ABICOLLAB_SOUP_CFLAGS"; then + pkg_cv_ABICOLLAB_SOUP_CFLAGS="$ABICOLLAB_SOUP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.4.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.4.1") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ABICOLLAB_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.4.1" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ABICOLLAB_SOUP_LIBS"; then + pkg_cv_ABICOLLAB_SOUP_LIBS="$ABICOLLAB_SOUP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.4.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.4.1") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ABICOLLAB_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.4.1" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi - ;; - *) - { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 -echo "$as_me: error: Unsupported tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" +if test $pkg_failed = yes; then - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 -echo "$as_me: error: unable to update list of available tagged configurations." >&2;} - { (exit 1); exit 1; }; } - fi +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4 >= 2.4.1" 2>&1` + else + ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4 >= 2.4.1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ABICOLLAB_SOUP_PKG_ERRORS" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + if test "xabicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" != "x" ; then + echo "abicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" >> $abi_plugin_topdir/plugin.status + fi -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' + abicollab_handler_service=no -# Prevent multiple expansion +elif test $pkg_failed = untried; then + if test "xabicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" != "x" ; then + echo "abicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" >> $abi_plugin_topdir/plugin.status + fi + abicollab_handler_service=no +else + ABICOLLAB_SOUP_CFLAGS=$pkg_cv_ABICOLLAB_SOUP_CFLAGS + ABICOLLAB_SOUP_LIBS=$pkg_cv_ABICOLLAB_SOUP_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + ABICOLLAB_SOUP_CFLAGS+=-DSOUP24 + if test "xabicollab abicollab.net support: yes" != "x" ; then + echo "abicollab abicollab.net support: yes" >> $abi_plugin_topdir/plugin.status + fi + abicollab_handler_service=yes +fi +else + ABICOLLAB_SOUP_CFLAGS=$pkg_cv_ABICOLLAB_SOUP_CFLAGS + ABICOLLAB_SOUP_LIBS=$pkg_cv_ABICOLLAB_SOUP_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + if test "xabicollab abicollab.net support: yes" != "x" ; then + echo "abicollab abicollab.net support: yes" >> $abi_plugin_topdir/plugin.status + fi + abicollab_handler_service=yes +fi + fi +else + if test "xabicollab abicollab.net support: no" != "x" ; then + echo "abicollab abicollab.net support: no" >> $abi_plugin_topdir/plugin.status + fi + abicollab_handler_service=no +fi +if test "x$abicollab_handler_service" = "xyes" ; then + ABICOLLAB_SERVICE_CPPFLAGS="-DABICOLLAB_HANDLER_SERVICE $ABICOLLAB_ASIO_CPPFLAGS $ABICOLLAB_SOUP_CFLAGS" + ABICOLLAB_SERVICE_LIBS="-lpthread $ABICOLLAB_SOUP_LIBS" +fi -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset cs; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - *t++ = 0; - if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - if (!foo) return 0; - } - return !cs[0] && !zero.x; -#endif +# +# Record functionality +# +# Check whether --enable-abicollab-record-always was given. +if test "${enable_abicollab_record_always+set}" = set; then + enableval=$enable_abicollab_record_always; + if test "x$enableval" != "xno" ; then + abicollab_record_always=yes - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_c_const=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test "x ** enabling auto-recording of abicollab sessions ** " != "x" ; then + echo " ** enabling auto-recording of abicollab sessions ** " >> $abi_plugin_topdir/plugin.status + fi - ac_cv_c_const=no -fi + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF +if test $abicollab_record_always = yes ; then + CPPFLAGS="$CPPFLAGS -DABICOLLAB_RECORD_ALWAYS" fi -{ echo "$as_me:$LINENO: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6; } -if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_c_inline=$ac_kw else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + abi_plugin_disable=yes + if test "xabicollab: disabled on Cocoa" != "x" ; then + echo "abicollab: disabled on Cocoa" >> $abi_plugin_topdir/plugin.status + fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools abicollab" + fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6; } -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac + if test "x$abicollab_handler_fake" = "xyes"; then + ABICOLLAB_HANDLER_FAKE_TRUE= + ABICOLLAB_HANDLER_FAKE_FALSE='#' +else + ABICOLLAB_HANDLER_FAKE_TRUE='#' + ABICOLLAB_HANDLER_FAKE_FALSE= +fi + if test "x$abicollab_handler_xmpp" = "xyes"; then + ABICOLLAB_HANDLER_XMPP_TRUE= + ABICOLLAB_HANDLER_XMPP_FALSE='#' +else + ABICOLLAB_HANDLER_XMPP_TRUE='#' + ABICOLLAB_HANDLER_XMPP_FALSE= +fi + if test "x$abicollab_handler_tcp" = "xyes"; then + ABICOLLAB_HANDLER_TCP_TRUE= + ABICOLLAB_HANDLER_TCP_FALSE='#' +else + ABICOLLAB_HANDLER_TCP_TRUE='#' + ABICOLLAB_HANDLER_TCP_FALSE= +fi -abi_plugin_extra= -abi_plugin_opt=yes -# Check whether --enable-all was given. -if test "${enable_all+set}" = set; then - enableval=$enable_all; - if test "x$enableval" = "xno"; then - abi_plugin_opt=no - fi + if test "x$abicollab_handler_sugar" = "xyes"; then + ABICOLLAB_HANDLER_SUGAR_TRUE= + ABICOLLAB_HANDLER_SUGAR_FALSE='#' +else + ABICOLLAB_HANDLER_SUGAR_TRUE='#' + ABICOLLAB_HANDLER_SUGAR_FALSE= +fi + if test "x$abicollab_handler_service" = "xyes"; then + ABICOLLAB_HANDLER_SERVICE_TRUE= + ABICOLLAB_HANDLER_SERVICE_FALSE='#' +else + ABICOLLAB_HANDLER_SERVICE_TRUE='#' + ABICOLLAB_HANDLER_SERVICE_FALSE= fi -abi_tools= + abi_plugin_add=yes -# Check whether --enable-abicollab was given. -if test "${enable_abicollab+set}" = set; then - enableval=$enable_abicollab; +# Check whether --enable-abicommand was given. +if test "${enable_abicommand+set}" = set; then + enableval=$enable_abicommand; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -22866,9 +20227,9 @@ fi -# Check whether --with-abicollab was given. -if test "${with_abicollab+set}" = set; then - withval=$with_abicollab; +# Check whether --with-abicommand was given. +if test "${with_abicommand+set}" = set; then + withval=$with_abicommand; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -22877,17 +20238,6 @@ fi - - -abicollab_handler_fake=no -abicollab_handler_xmpp=no -abicollab_handler_tcp=no -abicollab_handler_sugar=no -abicollab_handler_service=no - -abicollab_record_always=no - - if test $abi_plugin_add = yes; then abi_plugin_disable=no @@ -22895,72 +20245,48 @@ _abi_cppflags_save="$CPPFLAGS" _abi_ldflags_save="$LDFLAGS" -ABICOLLAB_LIBXML2_CPPFLAGS="" -ABICOLLAB_LIBXML2_LIBS="" - -ABICOLLAB_FAKE_CPPFLAGS="" -ABICOLLAB_FAKE_LIBS="" - -ABICOLLAB_XMPP_CPPFLAGS="" -ABICOLLAB_XMPP_LIBS="" - -ABICOLLAB_TCP_CPFLAGS="" -ABICOLLAB_TCP_LIBS="" - -ABICOLLAB_SUGAR_CPFLAGS="" -ABICOLLAB_SUGAR_LIBS="" - -ABICOLLAB_SERVICE_CPFLAGS="" -ABICOLLAB_SERVICE_LIBS="" - - -# -# General checks -# +ABI_COMMAND_CPPFLAGS="" +ABI_COMMAND_LDFLAGS="" -if test x$abi_platform != "xcocoa"; then +# Checks for libraries. +# Checks for header files. -# check for libxml2 pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_libxml2" >&5 -echo $ECHO_N "checking for _abi_libxml2... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for _abi_glib" >&5 +$as_echo_n "checking for _abi_glib... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_libxml2_CFLAGS"; then - pkg_cv__abi_libxml2_CFLAGS="$_abi_libxml2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.4.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.4.0") 2>&5 +if test -n "$_abi_glib_CFLAGS"; then + pkg_cv__abi_glib_CFLAGS="$_abi_glib_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_libxml2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.4.0" 2>/dev/null` + pkg_cv__abi_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_libxml2_LIBS"; then - pkg_cv__abi_libxml2_LIBS="$_abi_libxml2_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.4.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.4.0") 2>&5 +if test -n "$_abi_glib_LIBS"; then + pkg_cv__abi_glib_LIBS="$_abi_glib_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_libxml2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.4.0" 2>/dev/null` + pkg_cv__abi_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -22973,417 +20299,617 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_libxml2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= 2.4.0"` + _abi_glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0" 2>&1` else - _abi_libxml2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= 2.4.0"` + _abi_glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$_abi_libxml2_PKG_ERRORS" >&5 + echo "$_abi_glib_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "xabicollab: error, libxml-2.0 >= 2.4.0 required" != "x" ; then - echo "abicollab: error, libxml-2.0 >= 2.4.0 required" >> $abi_plugin_topdir/plugin.status + if test "xAbiCommand: error - glib-2.0 >= 2.0 and gnome-print >= 2.0 required" != "x" ; then + echo "AbiCommand: error - glib-2.0 >= 2.0 and gnome-print >= 2.0 required" >> $abi_plugin_topdir/plugin.status fi abi_plugin_disable=yes elif test $pkg_failed = untried; then - if test "xabicollab: error, libxml-2.0 >= 2.4.0 required" != "x" ; then - echo "abicollab: error, libxml-2.0 >= 2.4.0 required" >> $abi_plugin_topdir/plugin.status + if test "xAbiCommand: error - glib-2.0 >= 2.0 and gnome-print >= 2.0 required" != "x" ; then + echo "AbiCommand: error - glib-2.0 >= 2.0 and gnome-print >= 2.0 required" >> $abi_plugin_topdir/plugin.status fi abi_plugin_disable=yes else - _abi_libxml2_CFLAGS=$pkg_cv__abi_libxml2_CFLAGS - _abi_libxml2_LIBS=$pkg_cv__abi_libxml2_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + _abi_glib_CFLAGS=$pkg_cv__abi_glib_CFLAGS + _abi_glib_LIBS=$pkg_cv__abi_glib_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi +if test $abi_plugin_disable = no; then + ABI_COMMAND_CPPFLAGS="$_abi_glib_CFLAGS" + ABI_COMMAND_LDFLAGS="$_abi_glib_LIBS" +fi - if test "xabicollab: okay" != "x" ; then - echo "abicollab: okay" >> $abi_plugin_topdir/plugin.status - fi +have_readline=unknown +if test "${ac_cv_header_readline_readline_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for readline/readline.h" >&5 +$as_echo_n "checking for readline/readline.h... " >&6; } +if test "${ac_cv_header_readline_readline_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 +$as_echo "$ac_cv_header_readline_readline_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking readline/readline.h usability" >&5 +$as_echo_n "checking readline/readline.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking readline/readline.h presence" >&5 +$as_echo_n "checking readline/readline.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi -if test "x$abi_plugin_disable" = "xno"; then - ABICOLLAB_LIBXML2_CPPFLAGS="$_abi_libxml2_CFLAGS" - ABICOLLAB_LIBXML2_LIBS="$_abi_libxml2_LIBS" -fi - - -# check for various boost libs +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## --------------------------------------------- ## +## Report this to http://bugzilla.abisource.com/ ## +## --------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for readline/readline.h" >&5 +$as_echo_n "checking for readline/readline.h... " >&6; } +if test "${ac_cv_header_readline_readline_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_readline_readline_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 +$as_echo "$ac_cv_header_readline_readline_h" >&6; } -# Check whether --with-boost was given. -if test "${with_boost+set}" = set; then - withval=$with_boost; - if test "$withval" = "no"; then - want_boost="no" - elif test "$withval" = "yes"; then - want_boost="yes" - ac_boost_path="" - else - want_boost="yes" - ac_boost_path="$withval" - fi +fi +if test "x$ac_cv_header_readline_readline_h" = x""yes; then + if test "${ac_cv_header_readline_history_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for readline/history.h" >&5 +$as_echo_n "checking for readline/history.h... " >&6; } +if test "${ac_cv_header_readline_history_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 +$as_echo "$ac_cv_header_readline_history_h" >&6; } else - want_boost="yes" + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking readline/history.h usability" >&5 +$as_echo_n "checking readline/history.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -if test "x$want_boost" = "xyes"; then - boost_lib_version_req=1.33.1 - boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'` - boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'` - boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'` - boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'` - if test "x$boost_lib_version_req_sub_minor" = "x" ; then - boost_lib_version_req_sub_minor="0" - fi - WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` - { echo "$as_me:$LINENO: checking for boostlib >= $boost_lib_version_req" >&5 -echo $ECHO_N "checking for boostlib >= $boost_lib_version_req... $ECHO_C" >&6; } - succeeded=no +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking readline/history.h presence" >&5 +$as_echo_n "checking readline/history.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test "$ac_boost_path" != ""; then - BOOST_LDFLAGS="-L$ac_boost_path/lib" - BOOST_CPPFLAGS="-I$ac_boost_path/include" - else - for ac_boost_path_tmp in /usr /usr/local /opt ; do - if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then - BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" - BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" - break; - fi - done - fi + ac_header_preproc=no +fi - CPPFLAGS_SAVED="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - export CPPFLAGS +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } - LDFLAGS_SAVED="$LDFLAGS" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: readline/history.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: readline/history.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: readline/history.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: readline/history.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: readline/history.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: readline/history.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: readline/history.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: readline/history.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: readline/history.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## --------------------------------------------- ## +## Report this to http://bugzilla.abisource.com/ ## +## --------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for readline/history.h" >&5 +$as_echo_n "checking for readline/history.h... " >&6; } +if test "${ac_cv_header_readline_history_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_readline_history_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 +$as_echo "$ac_cv_header_readline_history_h" >&6; } - 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 +fi +if test "x$ac_cv_header_readline_history_h" = x""yes; then - cat >conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 +$as_echo_n "checking for readline in -lreadline... " >&6; } +if test "${ac_cv_lib_readline_readline+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lreadline -ltermcap $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - +/* 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 +char readline (); int main () { - - #if BOOST_VERSION >= $WANT_BOOST_VERSION - // Everything is okay - #else - # error Boost version is too old - #endif - +return readline (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +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_compile") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - succeeded=yes - found_system=yes - + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_readline_readline=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - + ac_cv_lib_readline_readline=no fi -rm -f core 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' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - if test "x$succeeded" != "xyes"; then - _version=0 - if test "$ac_boost_path" != ""; then - BOOST_LDFLAGS="-L$ac_boost_path/lib" - if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then - for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do - _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` - V_CHECK=`expr $_version_tmp \> $_version` - if test "$V_CHECK" = "1" ; then - _version=$_version_tmp - fi - VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` - BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE" - done - fi - else - for ac_boost_path in /usr /usr/local /opt ; do - if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then - for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do - _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` - V_CHECK=`expr $_version_tmp \> $_version` - if test "$V_CHECK" = "1" ; then - _version=$_version_tmp - best_path=$ac_boost_path - fi - done - fi - done - - VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` - BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" - BOOST_LDFLAGS="-L$best_path/lib" - - if test "x$BOOST_ROOT" != "x"; then - if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then - version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` - stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` - stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'` - V_CHECK=`expr $stage_version_shorten \>\= $_version` - if test "$V_CHECK" = "1" ; then - { echo "$as_me:$LINENO: We will use a staged boost library from $BOOST_ROOT" >&5 -echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;} - BOOST_CPPFLAGS="-I$BOOST_ROOT" - BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib" - fi - fi - fi - fi - - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - export CPPFLAGS - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 +$as_echo "$ac_cv_lib_readline_readline" >&6; } +if test "x$ac_cv_lib_readline_readline" = x""yes; then - 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 + have_readline=yes + LDFLAGS="-ltermcap $LDFLAGS" + ABI_COMMAND_LDFLAGS="-ltermcap $ABI_COMMAND_LDFLAGS" - cat >conftest.$ac_ext <<_ACEOF +else + { $as_echo "$as_me:$LINENO: checking for rl_initialize in -lreadline" >&5 +$as_echo_n "checking for rl_initialize in -lreadline... " >&6; } +if test "${ac_cv_lib_readline_rl_initialize+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lreadline -lcurses $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - +/* 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 +char rl_initialize (); int main () { - - #if BOOST_VERSION >= $WANT_BOOST_VERSION - // Everything is okay - #else - # error Boost version is too old - #endif - +return rl_initialize (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +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_compile") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_readline_rl_initialize=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - succeeded=yes - found_system=yes + ac_cv_lib_readline_rl_initialize=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_initialize" >&5 +$as_echo "$ac_cv_lib_readline_rl_initialize" >&6; } +if test "x$ac_cv_lib_readline_rl_initialize" = x""yes; then + + have_readline=yes + LDFLAGS="-lcurses $LDFLAGS" + ABI_COMMAND_LDFLAGS="-lcurses $ABI_COMMAND_LDFLAGS" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + have_readline=no +fi + +fi +else + have_readline=no fi -rm -f core 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' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi - if test "$succeeded" != "yes" ; then - if test "$_version" = "0" ; then - { { echo "$as_me:$LINENO: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&5 -echo "$as_me: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: Your boost libraries seems to old (version $_version)." >&5 -echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;} - fi - else +else + have_readline=no +fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_BOOST -_ACEOF +if test $have_readline != yes ; then + if test "xAbiCommand: error - readline library and/or headers not found" != "x" ; then + echo "AbiCommand: error - readline library and/or headers not found" >> $abi_plugin_topdir/plugin.status fi - CPPFLAGS="$CPPFLAGS_SAVED" - LDFLAGS="$LDFLAGS_SAVED" + abi_plugin_disable=yes + +else + + if test "xAbiCommand: okay" != "x" ; then + echo "AbiCommand: okay" >> $abi_plugin_topdir/plugin.status + fi + + ABI_COMMAND_LDFLAGS="-lreadline -lhistory $ABI_COMMAND_LDFLAGS" fi +cat >>confdefs.h <<\_ACEOF +#define ENABLE_PRINT 1 +_ACEOF -# check for asio -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 -ABICOLLAB_ASIO_CFLAGS="" -ABICOLLAB_ASIO_DIR="" -# Check whether --with-asio was given. -if test "${with_asio+set}" = set; then - withval=$with_asio; - ABICOLLAB_ASIO_DIR="$withval" - asio_dir=yes -else - asio_dir=auto +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" + + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools abicommand" + fi +fi +abi_plugin_add=yes +# Check whether --enable-abigimp was given. +if test "${enable_abigimp+set}" = set; then + enableval=$enable_abigimp; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi + +else + abi_plugin_add=$abi_plugin_opt fi -if test "x$asio_dir" = "xyes"; then - ABICOLLAB_ASIO_CPPFLAGS="-I$ABICOLLAB_ASIO_DIR/include" + +# Check whether --with-abigimp was given. +if test "${with_abigimp+set}" = set; then + withval=$with_abigimp; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi + fi +if test $abi_plugin_add = yes; then + abi_plugin_disable=no -# -# Checks for Fake support (for debugging purposes only) -# -# Check whether --enable-abicollab-fake-backend was given. -if test "${enable_abicollab_fake_backend+set}" = set; then - enableval=$enable_abicollab_fake_backend; - if test "x$enableval" != "xno" ; then - abicollab_handler_fake=yes - if test "xabicollab Fake support: yes" != "x" ; then - echo "abicollab Fake support: yes" >> $abi_plugin_topdir/plugin.status + + if test "xabigimp: okay" != "x" ; then + echo "abigimp: okay" >> $abi_plugin_topdir/plugin.status fi - fi + + + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools abigimp" + fi +fi +abi_plugin_add=yes +# Check whether --enable-abigoffice was given. +if test "${enable_abigoffice+set}" = set; then + enableval=$enable_abigoffice; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi + +else + abi_plugin_add=$abi_plugin_opt fi -if test $abicollab_handler_fake = yes ; then - ABICOLLAB_FAKE_CPPFLAGS="-DABICOLLAB_HANDLER_FAKE" + +# Check whether --with-abigoffice was given. +if test "${with_abigoffice+set}" = set; then + withval=$with_abigoffice; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi + fi +if test $abi_plugin_add = yes; then + abi_plugin_disable=no -# -# Checks for XMPP support (using loudmouth) -# +# Checks for GOffice + +LIBGOffice_REQUIRED_VERSION=0.4.0 + pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_loudmouth" >&5 -echo $ECHO_N "checking for _abi_loudmouth... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GOFFICE" >&5 +$as_echo_n "checking for GOFFICE... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_loudmouth_CFLAGS"; then - pkg_cv__abi_loudmouth_CFLAGS="$_abi_loudmouth_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"loudmouth-1.0 >= 1.0.1 \"") >&5 - ($PKG_CONFIG --exists --print-errors "loudmouth-1.0 >= 1.0.1 ") 2>&5 +if test -n "$GOFFICE_CFLAGS"; then + pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.4 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_loudmouth_CFLAGS=`$PKG_CONFIG --cflags "loudmouth-1.0 >= 1.0.1 " 2>/dev/null` + pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_loudmouth_LIBS"; then - pkg_cv__abi_loudmouth_LIBS="$_abi_loudmouth_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"loudmouth-1.0 >= 1.0.1 \"") >&5 - ($PKG_CONFIG --exists --print-errors "loudmouth-1.0 >= 1.0.1 ") 2>&5 +if test -n "$GOFFICE_LIBS"; then + pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.4 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_loudmouth_LIBS=`$PKG_CONFIG --libs "loudmouth-1.0 >= 1.0.1 " 2>/dev/null` + pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -23396,71 +20922,95 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_loudmouth_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "loudmouth-1.0 >= 1.0.1 "` + GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION" 2>&1` else - _abi_loudmouth_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "loudmouth-1.0 >= 1.0.1 "` + GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$_abi_loudmouth_PKG_ERRORS" >&5 + echo "$GOFFICE_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "xabicollab XMPP support: no, loudmouth >= 1.0.1 required" != "x" ; then - echo "abicollab XMPP support: no, loudmouth >= 1.0.1 required" >> $abi_plugin_topdir/plugin.status + if test "xabigoffice: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required" != "x" ; then + echo "abigoffice: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status fi + abi_plugin_disable=yes elif test $pkg_failed = untried; then - if test "xabicollab XMPP support: no, loudmouth >= 1.0.1 required" != "x" ; then - echo "abicollab XMPP support: no, loudmouth >= 1.0.1 required" >> $abi_plugin_topdir/plugin.status + if test "xabigoffice: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required" != "x" ; then + echo "abigoffice: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status fi + abi_plugin_disable=yes else - _abi_loudmouth_CFLAGS=$pkg_cv__abi_loudmouth_CFLAGS - _abi_loudmouth_LIBS=$pkg_cv__abi_loudmouth_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - - - if test "xabicollab XMPP support: yes" != "x" ; then - echo "abicollab XMPP support: yes" >> $abi_plugin_topdir/plugin.status - fi - - abicollab_handler_xmpp=yes + GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS + GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi -if test "x$abicollab_handler_xmpp" = "xyes"; then - ABICOLLAB_XMPP_CPPFLAGS="$_abi_loudmouth_CFLAGS -DABICOLLAB_HANDLER_XMPP" - ABICOLLAB_XMPP_LIBS="$_abi_loudmouth_LIBS" -fi +saved_cflags=$CFLAGS +CFLAGS=$GOFFICE_CFLAGS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#ifndef GOFFICE_WITH_GNOME +#error no gnome support present +#endif +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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then -# -# Checks for TCP support (using asio) -# -CPPFLAGS="$CPPFLAGS $ABICOLLAB_ASIO_CPPFLAGS" +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 -for ac_header in asio.hpp -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -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 +if test "${ac_cv_header_hash_map+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for hash_map" >&5 +$as_echo_n "checking for hash_map... " >&6; } +if test "${ac_cv_header_hash_map+set}" = set; then + $as_echo_n "(cached) " >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 +$as_echo "$ac_cv_header_hash_map" >&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; } +{ $as_echo "$as_me:$LINENO: checking hash_map usability" >&5 +$as_echo_n "checking hash_map usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23468,7 +21018,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -23476,387 +21026,134 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$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; } +{ $as_echo "$as_me:$LINENO: checking hash_map presence" >&5 +$as_echo_n "checking hash_map presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +#include _ACEOF 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: hash_map: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -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;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: hash_map: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: hash_map: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: hash_map: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: hash_map: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: hash_map: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## --------------------------------------------- ## ## Report this to http://bugzilla.abisource.com/ ## ## --------------------------------------------- ## _ASBOX - ) | 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 { 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 -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 - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - - - if test "xabicollab TCP support: yes" != "x" ; then - echo "abicollab TCP support: yes" >> $abi_plugin_topdir/plugin.status - fi - - abicollab_handler_tcp=yes - -else - - if test "xabicollab TCP support: no, asio >= 0.3.8rc1 required" != "x" ; then - echo "abicollab TCP support: no, asio >= 0.3.8rc1 required" >> $abi_plugin_topdir/plugin.status - fi - - -fi - -done - -if test "x$abicollab_handler_tcp" = "xyes" ; then - ABICOLLAB_TCP_CPPFLAGS="-DABICOLLAB_HANDLER_TCP $ABICOLLAB_ASIO_CPPFLAGS" - ABICOLLAB_TCP_LIBS="-lpthread" -fi -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" - - -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 - - -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" - - -# -# Checks for Sugar -# - -# Check whether --with-abicollab-sugar-backend was given. -if test "${with_abicollab_sugar_backend+set}" = set; then - withval=$with_abicollab_sugar_backend; - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_dbus" >&5 -echo $ECHO_N "checking for _abi_dbus... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_dbus_CFLAGS"; then - pkg_cv__abi_dbus_CFLAGS="$_abi_dbus_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.1 \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.1 ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_dbus_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0.1 " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_dbus_LIBS"; then - pkg_cv__abi_dbus_LIBS="$_abi_dbus_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.1 \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.1 ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_dbus_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0.1 " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - _abi_dbus_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= 1.0.1 "` - else - _abi_dbus_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 1.0.1 "` - fi - # Put the nasty error message in config.log where it belongs - echo "$_abi_dbus_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - - if test "xabicollab Sugar support: no, dbus-1 >= 1.0.1 required" != "x" ; then - echo "abicollab Sugar support: no, dbus-1 >= 1.0.1 required" >> $abi_plugin_topdir/plugin.status - fi - - abicollab_handler_sugar=no - -elif test $pkg_failed = untried; then - - if test "xabicollab Sugar support: no, dbus-1 >= 1.0.1 required" != "x" ; then - echo "abicollab Sugar support: no, dbus-1 >= 1.0.1 required" >> $abi_plugin_topdir/plugin.status - fi - - abicollab_handler_sugar=no - -else - _abi_dbus_CFLAGS=$pkg_cv__abi_dbus_CFLAGS - _abi_dbus_LIBS=$pkg_cv__abi_dbus_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - - - if test "xabicollab Sugar support: yes" != "x" ; then - echo "abicollab Sugar support: yes" >> $abi_plugin_topdir/plugin.status - fi - - abicollab_handler_sugar=yes - -fi - - if test "x$abicollab_handler_sugar" = "xyes" ; then - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_dbus_glib" >&5 -echo $ECHO_N "checking for _abi_dbus_glib... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_dbus_glib_CFLAGS"; then - pkg_cv__abi_dbus_glib_CFLAGS="$_abi_dbus_glib_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.70 \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.70 ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_dbus_glib_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.70 " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_dbus_glib_LIBS"; then - pkg_cv__abi_dbus_glib_LIBS="$_abi_dbus_glib_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.70 \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.70 ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_dbus_glib_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.70 " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - _abi_dbus_glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= 0.70 "` - else - _abi_dbus_glib_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= 0.70 "` - fi - # Put the nasty error message in config.log where it belongs - echo "$_abi_dbus_glib_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - - if test "xabicollab Sugar support: no, dbus-glib-1 >= 0.70 required" != "x" ; then - echo "abicollab Sugar support: no, dbus-glib-1 >= 0.70 required" >> $abi_plugin_topdir/plugin.status - fi - - abicollab_handler_sugar=no - -elif test $pkg_failed = untried; then - - if test "xabicollab Sugar support: no, dbus-glib-1 >= 0.70 required" != "x" ; then - echo "abicollab Sugar support: no, dbus-glib-1 >= 0.70 required" >> $abi_plugin_topdir/plugin.status - fi - - abicollab_handler_sugar=no - -else - _abi_dbus_glib_CFLAGS=$pkg_cv__abi_dbus_glib_CFLAGS - _abi_dbus_glib_LIBS=$pkg_cv__abi_dbus_glib_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - - - if test "xabicollab Sugar support: yes" != "x" ; then - echo "abicollab Sugar support: yes" >> $abi_plugin_topdir/plugin.status - fi - - abicollab_handler_sugar=yes - -fi - fi - - -else - - - if test "xabicollab Sugar support: no" != "x" ; then - echo "abicollab Sugar support: no" >> $abi_plugin_topdir/plugin.status - fi - - abicollab_handler_sugar=no - + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for hash_map" >&5 +$as_echo_n "checking for hash_map... " >&6; } +if test "${ac_cv_header_hash_map+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_hash_map=$ac_header_preproc fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 +$as_echo "$ac_cv_header_hash_map" >&6; } -if test "x$abicollab_handler_sugar" = "xyes" ; then - ABICOLLAB_SUGAR_CPPFLAGS="$_abi_dbus_CFLAGS $_abi_dbus_glib_CFLAGS -DABICOLLAB_HANDLER_SUGAR" - ABICOLLAB_SUGAR_LIBS="$_abi_dbus_LIBS $_abi_dbus_glib_LIBS" fi +if test "x$ac_cv_header_hash_map" = x""yes; then +GOFFICE_CFLAGS="-DHAVE_HASH_MAP $GOFFICE_CFLAGS" + if test "xabigoffice: okay" != "x" ; then + echo "abigoffice: okay" >> $abi_plugin_topdir/plugin.status + fi -# -# Checks for the collaborate.abisource.com service backend -# - -# Check whether --with-abicollab-service-backend was given. -if test "${with_abicollab_service_backend+set}" = set; then - withval=$with_abicollab_service_backend; +else -for ac_header in asio.hpp -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -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 +if test "${ac_cv_header_ext_hash_map+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for ext/hash_map" >&5 +$as_echo_n "checking for ext/hash_map... " >&6; } +if test "${ac_cv_header_ext_hash_map+set}" = set; then + $as_echo_n "(cached) " >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 +$as_echo "$ac_cv_header_ext_hash_map" >&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; } +{ $as_echo "$as_me:$LINENO: checking ext/hash_map usability" >&5 +$as_echo_n "checking ext/hash_map usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23864,7 +21161,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -23872,90 +21169,92 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$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; } +{ $as_echo "$as_me:$LINENO: checking ext/hash_map presence" >&5 +$as_echo_n "checking ext/hash_map presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +#include _ACEOF 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -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;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## --------------------------------------------- ## ## Report this to http://bugzilla.abisource.com/ ## @@ -23964,217 +21263,507 @@ ) | 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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for ext/hash_map" >&5 +$as_echo_n "checking for ext/hash_map... " >&6; } +if test "${ac_cv_header_ext_hash_map+set}" = set; then + $as_echo_n "(cached) " >&6 else - eval "$as_ac_Header=\$ac_header_preproc" + ac_cv_header_ext_hash_map=$ac_header_preproc fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 +$as_echo "$ac_cv_header_ext_hash_map" >&6; } fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +if test "x$ac_cv_header_ext_hash_map" = x""yes; then +GOFFICE_CFLAGS="-DHAVE_EXT_HASH_MAP $GOFFICE_CFLAGS" - if test "xabicollab collaborate.abisource.com support: yes" != "x" ; then - echo "abicollab collaborate.abisource.com support: yes" >> $abi_plugin_topdir/plugin.status + if test "xabigoffice: okay" != "x" ; then + echo "abigoffice: okay" >> $abi_plugin_topdir/plugin.status fi - abicollab_handler_service=yes else - if test "xabicollab collaborate.abisource.com support: no, asio >= 0.3.8rc1 required" != "x" ; then - echo "abicollab collaborate.abisource.com support: no, asio >= 0.3.8rc1 required" >> $abi_plugin_topdir/plugin.status + if test "xabigoffice: error hash_map header not found" != "x" ; then + echo "abigoffice: error hash_map header not found" >> $abi_plugin_topdir/plugin.status fi +abi_plugin_disable=yes +fi + + fi -done + +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 else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test "xabicollab collaborate.abisource.com support: no" != "x" ; then - echo "abicollab collaborate.abisource.com support: no" >> $abi_plugin_topdir/plugin.status + if test "xabigoffice: you need a libgoffice version with gnome support" != "x" ; then + echo "abigoffice: you need a libgoffice version with gnome support" >> $abi_plugin_topdir/plugin.status fi - abicollab_handler_service=no +abi_plugin_disable=yes fi -if test "x$abicollab_handler_service" = "xyes" ; then - ABICOLLAB_SERVICE_CPPFLAGS="-DABICOLLAB_HANDLER_SERVICE $ABICOLLAB_ASIO_CPPFLAGS" - ABICOLLAB_SERVICE_LIBS="-lpthread" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS=$saved_cflags + fi -# -# Record functionality -# -# Check whether --enable-abicollab-record-always was given. -if test "${enable_abicollab_record_always+set}" = set; then - enableval=$enable_abicollab_record_always; - if test "x$enableval" != "xno" ; then - abicollab_record_always=yes - if test "x ** enabling auto-recording of abicollab sessions ** " != "x" ; then - echo " ** enabling auto-recording of abicollab sessions ** " >> $abi_plugin_topdir/plugin.status + + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools abigoffice" + fi +fi +abi_plugin_add=yes +# Check whether --enable-abigrammar was given. +if test "${enable_abigrammar+set}" = set; then + enableval=$enable_abigrammar; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi + +else + abi_plugin_add=$abi_plugin_opt + +fi + + +# Check whether --with-abigrammar was given. +if test "${with_abigrammar+set}" = set; then + withval=$with_abigrammar; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes fi +fi + +if test $abi_plugin_add = yes; then + abi_plugin_disable=no + +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" + +ABI_GRAMMAR_CPPFLAGS="" +ABI_GRAMMAR_LDFLAGS="" + +# Checks for libraries. +# Checks for header files. + + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for _abi_grammar" >&5 +$as_echo_n "checking for _abi_grammar... " >&6; } + +if test -n "$_abi_grammar_CFLAGS"; then + pkg_cv__abi_grammar_CFLAGS="$_abi_grammar_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + link-grammar >= 4.2.1 +\"") >&5 + ($PKG_CONFIG --exists --print-errors " + link-grammar >= 4.2.1 +") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_grammar_CFLAGS=`$PKG_CONFIG --cflags " + link-grammar >= 4.2.1 +" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$_abi_grammar_LIBS"; then + pkg_cv__abi_grammar_LIBS="$_abi_grammar_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + link-grammar >= 4.2.1 +\"") >&5 + ($PKG_CONFIG --exists --print-errors " + link-grammar >= 4.2.1 +") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_grammar_LIBS=`$PKG_CONFIG --libs " + link-grammar >= 4.2.1 +" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + _abi_grammar_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + link-grammar >= 4.2.1 +" 2>&1` + else + _abi_grammar_PKG_ERRORS=`$PKG_CONFIG --print-errors " + link-grammar >= 4.2.1 +" 2>&1` fi + # Put the nasty error message in config.log where it belongs + echo "$_abi_grammar_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + if test "xLink Grammar: error - link-grammar >= 4.2.1 required" != "x" ; then + echo "Link Grammar: error - link-grammar >= 4.2.1 required" >> $abi_plugin_topdir/plugin.status + fi + + abi_plugin_disable=yes + +elif test $pkg_failed = untried; then + + if test "xLink Grammar: error - link-grammar >= 4.2.1 required" != "x" ; then + echo "Link Grammar: error - link-grammar >= 4.2.1 required" >> $abi_plugin_topdir/plugin.status + fi + + abi_plugin_disable=yes + +else + _abi_grammar_CFLAGS=$pkg_cv__abi_grammar_CFLAGS + _abi_grammar_LIBS=$pkg_cv__abi_grammar_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + if test "xLink Grammar: okay" != "x" ; then + echo "Link Grammar: okay" >> $abi_plugin_topdir/plugin.status + fi + + +fi +if test $abi_plugin_disable = no; then + ABI_GRAMMAR_CPPFLAGS="$_abi_grammar_CFLAGS" + ABI_GRAMMAR_LDFLAGS="$_abi_grammar_LIBS" +fi + + + + +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" + + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools abigrammar" + fi +fi +abi_plugin_add=yes +# Check whether --enable-abimathview was given. +if test "${enable_abimathview+set}" = set; then + enableval=$enable_abimathview; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi + +else + abi_plugin_add=$abi_plugin_opt fi -if test $abicollab_record_always = yes ; then - CPPFLAGS="$CPPFLAGS -DABICOLLAB_RECORD_ALWAYS" + +# Check whether --with-abimathview was given. +if test "${with_abimathview+set}" = set; then + withval=$with_abimathview; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi + +fi + +if test $abi_plugin_add = yes; then + abi_plugin_disable=no + for ac_prog in flex lex +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_LEX+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$LEX"; then + ac_cv_prog_LEX="$LEX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LEX="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi fi - +LEX=$ac_cv_prog_LEX +if test -n "$LEX"; then + { $as_echo "$as_me:$LINENO: result: $LEX" >&5 +$as_echo "$LEX" >&6; } else - abi_plugin_disable=yes - - if test "xabicollab: disabled on Cocoa" != "x" ; then - echo "abicollab: disabled on Cocoa" >> $abi_plugin_topdir/plugin.status - fi - + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - if test $abi_plugin_disable = no; then - abi_tools="$abi_tools abicollab" - fi -fi - + test -n "$LEX" && break +done +test -n "$LEX" || LEX=":" - if test "x$abicollab_handler_fake" = "xyes"; then - ABICOLLAB_HANDLER_FAKE_TRUE= - ABICOLLAB_HANDLER_FAKE_FALSE='#' +if test "x$LEX" != "x:"; then + cat >conftest.l <<_ACEOF +%% +a { ECHO; } +b { REJECT; } +c { yymore (); } +d { yyless (1); } +e { yyless (input () != 0); } +f { unput (yytext[0]); } +. { BEGIN INITIAL; } +%% +#ifdef YYTEXT_POINTER +extern char *yytext; +#endif +int +main (void) +{ + return ! yylex () + ! yywrap (); +} +_ACEOF +{ (ac_try="$LEX conftest.l" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$LEX conftest.l") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5 +$as_echo_n "checking lex output file root... " >&6; } +if test "${ac_cv_prog_lex_root+set}" = set; then + $as_echo_n "(cached) " >&6 else - ABICOLLAB_HANDLER_FAKE_TRUE='#' - ABICOLLAB_HANDLER_FAKE_FALSE= -fi - if test "x$abicollab_handler_xmpp" = "xyes"; then - ABICOLLAB_HANDLER_XMPP_TRUE= - ABICOLLAB_HANDLER_XMPP_FALSE='#' +if test -f lex.yy.c; then + ac_cv_prog_lex_root=lex.yy +elif test -f lexyy.c; then + ac_cv_prog_lex_root=lexyy else - ABICOLLAB_HANDLER_XMPP_TRUE='#' - ABICOLLAB_HANDLER_XMPP_FALSE= + { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 +$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} + { (exit 1); exit 1; }; } fi - - if test "x$abicollab_handler_tcp" = "xyes"; then - ABICOLLAB_HANDLER_TCP_TRUE= - ABICOLLAB_HANDLER_TCP_FALSE='#' -else - ABICOLLAB_HANDLER_TCP_TRUE='#' - ABICOLLAB_HANDLER_TCP_FALSE= fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 +$as_echo "$ac_cv_prog_lex_root" >&6; } +LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root - if test "x$abicollab_handler_sugar" = "xyes"; then - ABICOLLAB_HANDLER_SUGAR_TRUE= - ABICOLLAB_HANDLER_SUGAR_FALSE='#' +if test -z "${LEXLIB+set}"; then + { $as_echo "$as_me:$LINENO: checking lex library" >&5 +$as_echo_n "checking lex library... " >&6; } +if test "${ac_cv_lib_lex+set}" = set; then + $as_echo_n "(cached) " >&6 else - ABICOLLAB_HANDLER_SUGAR_TRUE='#' - ABICOLLAB_HANDLER_SUGAR_FALSE= -fi - if test "x$abicollab_handler_service" = "xyes"; then - ABICOLLAB_HANDLER_SERVICE_TRUE= - ABICOLLAB_HANDLER_SERVICE_FALSE='#' + ac_save_LIBS=$LIBS + ac_cv_lib_lex='none needed' + for ac_lib in '' -lfl -ll; do + LIBS="$ac_lib $ac_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +`cat $LEX_OUTPUT_ROOT.c` +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_lex=$ac_lib else - ABICOLLAB_HANDLER_SERVICE_TRUE='#' - ABICOLLAB_HANDLER_SERVICE_FALSE= + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + test "$ac_cv_lib_lex" != 'none needed' && break + done + LIBS=$ac_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5 +$as_echo "$ac_cv_lib_lex" >&6; } + test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex +fi -abi_plugin_add=yes -# Check whether --enable-abicommand was given. -if test "${enable_abicommand+set}" = set; then - enableval=$enable_abicommand; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi +{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5 +$as_echo_n "checking whether yytext is a pointer... " >&6; } +if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then + $as_echo_n "(cached) " >&6 else - abi_plugin_add=$abi_plugin_opt + # POSIX says lex can declare yytext either as a pointer or an array; the +# default is implementation-dependent. Figure out which it is, since +# not all implementations provide the %pointer and %array declarations. +ac_cv_prog_lex_yytext_pointer=no +ac_save_LIBS=$LIBS +LIBS="$LEXLIB $ac_save_LIBS" +cat >conftest.$ac_ext <<_ACEOF +#define YYTEXT_POINTER 1 +`cat $LEX_OUTPUT_ROOT.c` +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_prog_lex_yytext_pointer=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -fi +fi -# Check whether --with-abicommand was given. -if test "${with_abicommand+set}" = set; then - withval=$with_abicommand; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes - fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_save_LIBS fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 +$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } +if test $ac_cv_prog_lex_yytext_pointer = yes; then -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +cat >>confdefs.h <<\_ACEOF +#define YYTEXT_POINTER 1 +_ACEOF +fi +rm -f conftest.l $LEX_OUTPUT_ROOT.c -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" +fi -ABI_COMMAND_CPPFLAGS="" -ABI_COMMAND_LDFLAGS="" -# Checks for libraries. -# Checks for header files. +# Checks for GtkMathView. + +MATH_VIEW_REQUIRED_VERSION=0.7.5 pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_glib" >&5 -echo $ECHO_N "checking for _abi_glib... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for MATHVIEW" >&5 +$as_echo_n "checking for MATHVIEW... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_glib_CFLAGS"; then - pkg_cv__abi_glib_CFLAGS="$_abi_glib_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0") 2>&5 +if test -n "$MATHVIEW_CFLAGS"; then + pkg_cv_MATHVIEW_CFLAGS="$MATHVIEW_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mathview-frontend-libxml2 >= \$MATH_VIEW_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0" 2>/dev/null` + pkg_cv_MATHVIEW_CFLAGS=`$PKG_CONFIG --cflags "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_glib_LIBS"; then - pkg_cv__abi_glib_LIBS="$_abi_glib_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0") 2>&5 +if test -n "$MATHVIEW_LIBS"; then + pkg_cv_MATHVIEW_LIBS="$MATHVIEW_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mathview-frontend-libxml2 >= \$MATH_VIEW_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0" 2>/dev/null` + pkg_cv_MATHVIEW_LIBS=`$PKG_CONFIG --libs "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -24187,56 +21776,112 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0"` + MATHVIEW_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION" 2>&1` else - _abi_glib_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.0 libgnomeprint-2.2 >= 2.0"` + MATHVIEW_PKG_ERRORS=`$PKG_CONFIG --print-errors "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$_abi_glib_PKG_ERRORS" >&5 + echo "$MATHVIEW_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "xAbiCommand: error - glib-2.0 >= 2.0 and gnome-print >= 2.0 required" != "x" ; then - echo "AbiCommand: error - glib-2.0 >= 2.0 and gnome-print >= 2.0 required" >> $abi_plugin_topdir/plugin.status + + if test "xabimathview: error gtkmathview >= $MATH_VIEW_REQUIRED_VERSION required" != "x" ; then + echo "abimathview: error gtkmathview >= $MATH_VIEW_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status + fi + + abi_plugin_disable=yes + +elif test $pkg_failed = untried; then + + + if test "xabimathview: error gtkmathview >= $MATH_VIEW_REQUIRED_VERSION required" != "x" ; then + echo "abimathview: error gtkmathview >= $MATH_VIEW_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status + fi + + abi_plugin_disable=yes + +else + MATHVIEW_CFLAGS=$pkg_cv_MATHVIEW_CFLAGS + MATHVIEW_LIBS=$pkg_cv_MATHVIEW_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + + if test "xabimathview: okay" != "x" ; then + echo "abimathview: okay" >> $abi_plugin_topdir/plugin.status fi - abi_plugin_disable=yes -elif test $pkg_failed = untried; then +fi + +if test "$LEX" = :; then + LEX=${am_missing_run}flex +fi +for ac_prog in 'bison -y' byacc +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_YACC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_YACC="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +YACC=$ac_cv_prog_YACC +if test -n "$YACC"; then + { $as_echo "$as_me:$LINENO: result: $YACC" >&5 +$as_echo "$YACC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + - if test "xAbiCommand: error - glib-2.0 >= 2.0 and gnome-print >= 2.0 required" != "x" ; then - echo "AbiCommand: error - glib-2.0 >= 2.0 and gnome-print >= 2.0 required" >> $abi_plugin_topdir/plugin.status - fi + test -n "$YACC" && break +done +test -n "$YACC" || YACC="yacc" - abi_plugin_disable=yes -else - _abi_glib_CFLAGS=$pkg_cv__abi_glib_CFLAGS - _abi_glib_LIBS=$pkg_cv__abi_glib_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -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' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test $abi_plugin_disable = no; then - ABI_COMMAND_CPPFLAGS="$_abi_glib_CFLAGS" - ABI_COMMAND_LDFLAGS="$_abi_glib_LIBS" -fi -have_readline=unknown -if test "${ac_cv_header_readline_readline_h+set}" = set; then - { echo "$as_me:$LINENO: checking for readline/readline.h" >&5 -echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; } -if test "${ac_cv_header_readline_readline_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${ac_cv_header_hash_map+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for hash_map" >&5 +$as_echo_n "checking for hash_map... " >&6; } +if test "${ac_cv_header_hash_map+set}" = set; then + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 +$as_echo "$ac_cv_header_hash_map" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking readline/readline.h usability" >&5 -echo $ECHO_N "checking readline/readline.h usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking hash_map usability" >&5 +$as_echo_n "checking hash_map usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24244,7 +21889,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -24252,90 +21897,92 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking readline/readline.h presence" >&5 -echo $ECHO_N "checking readline/readline.h presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking hash_map presence" >&5 +$as_echo_n "checking hash_map presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: readline/readline.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: hash_map: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: readline/readline.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: readline/readline.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: readline/readline.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: readline/readline.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: hash_map: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: hash_map: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: hash_map: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: hash_map: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hash_map: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: hash_map: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## --------------------------------------------- ## ## Report this to http://bugzilla.abisource.com/ ## @@ -24344,31 +21991,33 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for readline/readline.h" >&5 -echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; } -if test "${ac_cv_header_readline_readline_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for hash_map" >&5 +$as_echo_n "checking for hash_map... " >&6; } +if test "${ac_cv_header_hash_map+set}" = set; then + $as_echo_n "(cached) " >&6 else - ac_cv_header_readline_readline_h=$ac_header_preproc + ac_cv_header_hash_map=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 +$as_echo "$ac_cv_header_hash_map" >&6; } fi -if test $ac_cv_header_readline_readline_h = yes; then +if test "x$ac_cv_header_hash_map" = x""yes; then + MATHVIEW_CFLAGS="-DHAVE_HASH_MAP $MATHVIEW_CFLAGS" +else - if test "${ac_cv_header_readline_history_h+set}" = set; then - { echo "$as_me:$LINENO: checking for readline/history.h" >&5 -echo $ECHO_N "checking for readline/history.h... $ECHO_C" >&6; } -if test "${ac_cv_header_readline_history_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${ac_cv_header_ext_hash_map+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for ext/hash_map" >&5 +$as_echo_n "checking for ext/hash_map... " >&6; } +if test "${ac_cv_header_ext_hash_map+set}" = set; then + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_history_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 +$as_echo "$ac_cv_header_ext_hash_map" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking readline/history.h usability" >&5 -echo $ECHO_N "checking readline/history.h usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking ext/hash_map usability" >&5 +$as_echo_n "checking ext/hash_map usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24376,7 +22025,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -24384,90 +22033,92 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking readline/history.h presence" >&5 -echo $ECHO_N "checking readline/history.h presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking ext/hash_map presence" >&5 +$as_echo_n "checking ext/hash_map presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: readline/history.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: readline/history.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: readline/history.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: readline/history.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: readline/history.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: readline/history.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: readline/history.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: readline/history.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: readline/history.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/history.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: readline/history.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: ext/hash_map: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: ext/hash_map: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## --------------------------------------------- ## ## Report this to http://bugzilla.abisource.com/ ## @@ -24475,302 +22126,54 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; -esac -{ echo "$as_me:$LINENO: checking for readline/history.h" >&5 -echo $ECHO_N "checking for readline/history.h... $ECHO_C" >&6; } -if test "${ac_cv_header_readline_history_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_readline_history_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_history_h" >&6; } - -fi -if test $ac_cv_header_readline_history_h = yes; then - - { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 -echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; } -if test "${ac_cv_lib_readline_readline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lreadline -ltermcap $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 -char readline (); -int -main () -{ -return readline (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_readline_readline=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_readline_readline=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 -echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; } -if test $ac_cv_lib_readline_readline = yes; then - - have_readline=yes - LDFLAGS="-ltermcap $LDFLAGS" - ABI_COMMAND_LDFLAGS="-ltermcap $ABI_COMMAND_LDFLAGS" - -else - { echo "$as_me:$LINENO: checking for rl_initialize in -lreadline" >&5 -echo $ECHO_N "checking for rl_initialize in -lreadline... $ECHO_C" >&6; } -if test "${ac_cv_lib_readline_rl_initialize+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lreadline -lcurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 -char rl_initialize (); -int -main () -{ -return rl_initialize (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_readline_rl_initialize=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_readline_rl_initialize=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_initialize" >&5 -echo "${ECHO_T}$ac_cv_lib_readline_rl_initialize" >&6; } -if test $ac_cv_lib_readline_rl_initialize = yes; then - - have_readline=yes - LDFLAGS="-lcurses $LDFLAGS" - ABI_COMMAND_LDFLAGS="-lcurses $ABI_COMMAND_LDFLAGS" - -else - have_readline=no -fi - - -fi - - -else - have_readline=no -fi - - - -else - have_readline=no -fi - - - -if test $have_readline != yes ; then - - if test "xAbiCommand: error - readline library and/or headers not found" != "x" ; then - echo "AbiCommand: error - readline library and/or headers not found" >> $abi_plugin_topdir/plugin.status - fi - - abi_plugin_disable=yes - -else - - if test "xAbiCommand: okay" != "x" ; then - echo "AbiCommand: okay" >> $abi_plugin_topdir/plugin.status - fi - - ABI_COMMAND_LDFLAGS="-lreadline -lhistory $ABI_COMMAND_LDFLAGS" -fi - - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_PRINT 1 -_ACEOF - - - - - -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" - - if test $abi_plugin_disable = no; then - abi_tools="$abi_tools abicommand" - fi -fi -abi_plugin_add=yes -# Check whether --enable-abidash was given. -if test "${enable_abidash+set}" = set; then - enableval=$enable_abidash; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi - -else - abi_plugin_add=$abi_plugin_opt - -fi - - -# Check whether --with-abidash was given. -if test "${with_abidash+set}" = set; then - withval=$with_abidash; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes - fi - +esac +{ $as_echo "$as_me:$LINENO: checking for ext/hash_map" >&5 +$as_echo_n "checking for ext/hash_map... " >&6; } +if test "${ac_cv_header_ext_hash_map+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_ext_hash_map=$ac_header_preproc fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 +$as_echo "$ac_cv_header_ext_hash_map" >&6; } -if test $abi_plugin_add = yes; then - abi_plugin_disable=no - - - abi_plugin_disable=yes - -if test $abi_plugin_disable = no; then - - if test "xabidash: okay" != "x" ; then - echo "abidash: okay" >> $abi_plugin_topdir/plugin.status - fi - +fi +if test "x$ac_cv_header_ext_hash_map" = x""yes; then + MATHVIEW_CFLAGS="-DHAVE_EXT_HASH_MAP $MATHVIEW_CFLAGS" else - if test "xabidash: disabled" != "x" ; then - echo "abidash: disabled" >> $abi_plugin_topdir/plugin.status + if test "xabimathview: error hash_map header not found" != "x" ; then + echo "abimathview: error hash_map header not found" >> $abi_plugin_topdir/plugin.status fi +abi_plugin_disable=yes fi - if test $abi_plugin_disable = no; then - abi_tools="$abi_tools abidash" - fi -fi -abi_plugin_add=yes -# Check whether --enable-abigimp was given. -if test "${enable_abigimp+set}" = set; then - enableval=$enable_abigimp; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi - -else - abi_plugin_add=$abi_plugin_opt fi -# Check whether --with-abigimp was given. -if test "${with_abigimp+set}" = set; then - withval=$with_abigimp; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes - fi - -fi - -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "xabigimp: okay" != "x" ; then - echo "abigimp: okay" >> $abi_plugin_topdir/plugin.status - fi +echo $MATHVIEW_CFLAGS if test $abi_plugin_disable = no; then - abi_tools="$abi_tools abigimp" + abi_tools="$abi_tools abimathview" fi fi abi_plugin_add=yes -# Check whether --enable-abigoffice was given. -if test "${enable_abigoffice+set}" = set; then - enableval=$enable_abigoffice; +# Check whether --enable-abiscan was given. +if test "${enable_abiscan+set}" = set; then + enableval=$enable_abiscan; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -24781,9 +22184,9 @@ fi -# Check whether --with-abigoffice was given. -if test "${with_abigoffice+set}" = set; then - withval=$with_abigoffice; +# Check whether --with-abiscan was given. +if test "${with_abiscan+set}" = set; then + withval=$with_abiscan; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -24796,50 +22199,46 @@ abi_plugin_disable=no -# Checks for GOffice +# Checks for GnomeScan. -LIBGOffice_REQUIRED_VERSION=0.4.0 +GNOME_SCAN_REQUIRED_VERSION=0.5.1 pkg_failed=no -{ echo "$as_me:$LINENO: checking for GOFFICE" >&5 -echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for GNOMESCAN" >&5 +$as_echo_n "checking for GNOMESCAN... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GOFFICE_CFLAGS"; then - pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.4 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5 - ($PKG_CONFIG --exists --print-errors "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION") 2>&5 +if test -n "$GNOMESCAN_CFLAGS"; then + pkg_cv_GNOMESCAN_CFLAGS="$GNOMESCAN_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-scan >= \$GNOME_SCAN_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_GNOMESCAN_CFLAGS=`$PKG_CONFIG --cflags "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GOFFICE_LIBS"; then - pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.4 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5 - ($PKG_CONFIG --exists --print-errors "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION") 2>&5 +if test -n "$GNOMESCAN_LIBS"; then + pkg_cv_GNOMESCAN_LIBS="$GNOMESCAN_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-scan >= \$GNOME_SCAN_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_GNOMESCAN_LIBS=`$PKG_CONFIG --libs "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -24852,413 +22251,380 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION"` + GNOMESCAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION" 2>&1` else - GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION"` + GNOMESCAN_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GOFFICE_PKG_ERRORS" >&5 + echo "$GNOMESCAN_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "xabigoffice: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required" != "x" ; then - echo "abigoffice: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status + + if test "xabiscan: error gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION required" != "x" ; then + echo "abiscan: error gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status fi abi_plugin_disable=yes elif test $pkg_failed = untried; then - if test "xabigoffice: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required" != "x" ; then - echo "abigoffice: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status + + if test "xabiscan: error gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION required" != "x" ; then + echo "abiscan: error gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status fi abi_plugin_disable=yes else - GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS - GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -saved_cflags=$CFLAGS -CFLAGS=$GOFFICE_CFLAGS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + GNOMESCAN_CFLAGS=$pkg_cv_GNOMESCAN_CFLAGS + GNOMESCAN_LIBS=$pkg_cv_GNOMESCAN_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -#include -#ifndef GOFFICE_WITH_GNOME -#error no gnome support present -#endif -int -main () -{ + if test "xabiscan: okay" != "x" ; then + echo "abiscan: okay" >> $abi_plugin_topdir/plugin.status + fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +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' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test "${ac_cv_header_hash_map+set}" = set; then - { echo "$as_me:$LINENO: checking for hash_map" >&5 -echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools abiscan" + fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_hash_map" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking hash_map usability" >&5 -echo $ECHO_N "checking hash_map usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +abi_plugin_add=yes +# Check whether --enable-aiksaurus was given. +if test "${enable_aiksaurus+set}" = set; then + enableval=$enable_aiksaurus; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + abi_plugin_add=$abi_plugin_opt - ac_header_compiler=no fi -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 hash_map presence" >&5 -echo $ECHO_N "checking hash_map presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Check whether --with-aiksaurus was given. +if test "${with_aiksaurus+set}" = set; then + withval=$with_aiksaurus; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi + +fi + +if test $abi_plugin_add = yes; then + abi_plugin_disable=no + + +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" + +ABI_AIKSAURUS_CPPFLAGS="" +ABI_AIKSAURUS_LDFLAGS="" + +# Checks for libraries. +# Checks for header files. + + +# Check whether --with-Aiksaurus was given. +if test "${with_Aiksaurus+set}" = set; then + withval=$with_Aiksaurus; + if test "x$withval" = "xno" ; then + { { $as_echo "$as_me:$LINENO: error: * * * Aiksaurus library required to build this plugin * * *" >&5 +$as_echo "$as_me: error: * * * Aiksaurus library required to build this plugin * * *" >&2;} + { (exit 1); exit 1; }; } + elif test "x$withval" != "xyes" ; then + ABI_AIKSAURUS_CPPFLAGS="-I$withval/include" + ABI_AIKSAURUS_LDFLAGS="-L$withval/lib" + fi - 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; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: hash_map: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: hash_map: present but cannot be compiled" >&5 -echo "$as_me: WARNING: hash_map: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: hash_map: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: hash_map: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: hash_map: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: hash_map: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------------- ## -## Report this to http://bugzilla.abisource.com/ ## -## --------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for hash_map" >&5 -echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +CPPFLAGS="$CPPFLAGS $ABI_AIKSAURUS_CPPFLAGS" +LDFLAGS="$LDFLAGS $ABI_AIKSAURUS_LDFLAGS" + +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 + + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for PKGAIKSAURUS" >&5 +$as_echo_n "checking for PKGAIKSAURUS... " >&6; } + +if test -n "$PKGAIKSAURUS_CFLAGS"; then + pkg_cv_PKGAIKSAURUS_CFLAGS="$PKGAIKSAURUS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aiksaurus-1.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "aiksaurus-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_PKGAIKSAURUS_CFLAGS=`$PKG_CONFIG --cflags "aiksaurus-1.0" 2>/dev/null` else - ac_cv_header_hash_map=$ac_header_preproc + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PKGAIKSAURUS_LIBS"; then + pkg_cv_PKGAIKSAURUS_LIBS="$PKGAIKSAURUS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aiksaurus-1.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "aiksaurus-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_PKGAIKSAURUS_LIBS=`$PKG_CONFIG --libs "aiksaurus-1.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_hash_map" >&6; } + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi -if test $ac_cv_header_hash_map = yes; then + if test $_pkg_short_errors_supported = yes; then + PKGAIKSAURUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "aiksaurus-1.0" 2>&1` + else + PKGAIKSAURUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "aiksaurus-1.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PKGAIKSAURUS_PKG_ERRORS" >&5 -GOFFICE_CFLAGS="-DHAVE_HASH_MAP $GOFFICE_CFLAGS" + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "xabigoffice: okay" != "x" ; then - echo "abigoffice: okay" >> $abi_plugin_topdir/plugin.status + if test "xaiksaurus: error - Aiksaurus.h not found" != "x" ; then + echo "aiksaurus: error - Aiksaurus.h not found" >> $abi_plugin_topdir/plugin.status fi + abi_plugin_disable=yes -else +elif test $pkg_failed = untried; then + + if test "xaiksaurus: error - Aiksaurus.h not found" != "x" ; then + echo "aiksaurus: error - Aiksaurus.h not found" >> $abi_plugin_topdir/plugin.status + fi + + abi_plugin_disable=yes -if test "${ac_cv_header_ext_hash_map+set}" = set; then - { echo "$as_me:$LINENO: checking for ext/hash_map" >&5 -echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_ext_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ext/hash_map usability" >&5 -echo $ECHO_N "checking ext/hash_map usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + PKGAIKSAURUS_CFLAGS=$pkg_cv_PKGAIKSAURUS_CFLAGS + PKGAIKSAURUS_LIBS=$pkg_cv_PKGAIKSAURUS_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + ABI_AIKSAURUS_CPPFLAGS="`pkg-config --cflags aiksaurus-1.0` $ABI_AIKSAURUS_CPPFLAGS" + ABI_AIKSAURUS_LDFLAGS="`pkg-config --libs aiksaurus-1.0` -lAiksaurus $ABI_AIKSAURUS_LDFLAGS" - ac_header_compiler=no 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 -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 ext/hash_map presence" >&5 -echo $ECHO_N "checking ext/hash_map presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if test $abi_plugin_disable = no; then - ac_header_preproc=no -fi + ABI_AIKSAURUS_CPPFLAGS="$ABI_AIKSAURUS_CPPFLAGS `pkg-config --cflags gtk+-2.0`" + ABI_AIKSAURUS_LDFLAGS="$ABI_AIKSAURUS_LDFLAGS `pkg-config --libs gtk+-2.0`" -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } + 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 -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ext/hash_map: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ext/hash_map: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ext/hash_map: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ext/hash_map: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ext/hash_map: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ext/hash_map: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------------- ## -## Report this to http://bugzilla.abisource.com/ ## -## --------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ext/hash_map" >&5 -echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_ext_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for PKGGAIKSAURUS" >&5 +$as_echo_n "checking for PKGGAIKSAURUS... " >&6; } + +if test -n "$PKGGAIKSAURUS_CFLAGS"; then + pkg_cv_PKGGAIKSAURUS_CFLAGS="$PKGGAIKSAURUS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gaiksaurus-1.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gaiksaurus-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_PKGGAIKSAURUS_CFLAGS=`$PKG_CONFIG --cflags "gaiksaurus-1.0" 2>/dev/null` else - ac_cv_header_ext_hash_map=$ac_header_preproc + pkg_failed=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; } - + else + pkg_failed=untried +fi +if test -n "$PKGGAIKSAURUS_LIBS"; then + pkg_cv_PKGGAIKSAURUS_LIBS="$PKGGAIKSAURUS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gaiksaurus-1.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gaiksaurus-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_PKGGAIKSAURUS_LIBS=`$PKG_CONFIG --libs "gaiksaurus-1.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -if test $ac_cv_header_ext_hash_map = yes; then -GOFFICE_CFLAGS="-DHAVE_EXT_HASH_MAP $GOFFICE_CFLAGS" - if test "xabigoffice: okay" != "x" ; then - echo "abigoffice: okay" >> $abi_plugin_topdir/plugin.status - fi +if test $pkg_failed = yes; then +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + PKGGAIKSAURUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gaiksaurus-1.0" 2>&1` + else + PKGGAIKSAURUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gaiksaurus-1.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PKGGAIKSAURUS_PKG_ERRORS" >&5 - if test "xabigoffice: error hash_map header not found" != "x" ; then - echo "abigoffice: error hash_map header not found" >> $abi_plugin_topdir/plugin.status + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + if test "xaiksaurus: error - AiksaurusGTK.h not found" != "x" ; then + echo "aiksaurus: error - AiksaurusGTK.h not found" >> $abi_plugin_topdir/plugin.status fi -abi_plugin_disable=yes -fi + abi_plugin_disable=yes + +elif test $pkg_failed = untried; then + if test "xaiksaurus: error - AiksaurusGTK.h not found" != "x" ; then + echo "aiksaurus: error - AiksaurusGTK.h not found" >> $abi_plugin_topdir/plugin.status + fi + abi_plugin_disable=yes -fi +else + PKGGAIKSAURUS_CFLAGS=$pkg_cv_PKGGAIKSAURUS_CFLAGS + PKGGAIKSAURUS_LIBS=$pkg_cv_PKGGAIKSAURUS_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + ABI_AIKSAURUS_CPPFLAGS="`pkg-config --cflags gaiksaurus-1.0` $ABI_AIKSAURUS_CPPFLAGS" + ABI_AIKSAURUS_LDFLAGS="`pkg-config --libs gaiksaurus-1.0` -lAiksaurusGTK $ABI_AIKSAURUS_LDFLAGS" -ac_ext=c +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 +fi + +if test $abi_plugin_disable = no; then + + if test "xaiksaurus: okay" != "x" ; then + echo "aiksaurus: okay" >> $abi_plugin_topdir/plugin.status + fi + +fi + + + + +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" + + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools aiksaurus" + fi +fi +abi_plugin_add=yes +# Check whether --enable-babelfish was given. +if test "${enable_babelfish+set}" = set; then + enableval=$enable_babelfish; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + abi_plugin_add=$abi_plugin_opt +fi - if test "xabigoffice: you need a libgoffice version with gnome support" != "x" ; then - echo "abigoffice: you need a libgoffice version with gnome support" >> $abi_plugin_topdir/plugin.status + +# Check whether --with-babelfish was given. +if test "${with_babelfish+set}" = set; then + withval=$with_babelfish; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes fi -abi_plugin_disable=yes - fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -CFLAGS=$saved_cflags +if test $abi_plugin_add = yes; then + abi_plugin_disable=no -fi + if test "xbabelfish: okay" != "x" ; then + echo "babelfish: okay" >> $abi_plugin_topdir/plugin.status + fi if test $abi_plugin_disable = no; then - abi_tools="$abi_tools abigoffice" + abi_tools="$abi_tools babelfish" fi fi abi_plugin_add=yes -# Check whether --enable-abigrammar was given. -if test "${enable_abigrammar+set}" = set; then - enableval=$enable_abigrammar; +# Check whether --enable-develop was given. +if test "${enable_develop+set}" = set; then + enableval=$enable_develop; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -25269,9 +22635,9 @@ fi -# Check whether --with-abigrammar was given. -if test "${with_abigrammar+set}" = set; then - withval=$with_abigrammar; +# Check whether --with-develop was given. +if test "${with_develop+set}" = set; then + withval=$with_develop; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -25280,141 +22646,78 @@ fi + +build_gnu_regex="no" + if test $abi_plugin_add = yes; then abi_plugin_disable=no _abi_cppflags_save="$CPPFLAGS" _abi_ldflags_save="$LDFLAGS" -ABI_GRAMMAR_CPPFLAGS="" -ABI_GRAMMAR_LDFLAGS="" - -# Checks for libraries. -# Checks for header files. - +# Nothing to do at the moment -pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_grammar" >&5 -echo $ECHO_N "checking for _abi_grammar... $ECHO_C" >&6; } +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_grammar_CFLAGS"; then - pkg_cv__abi_grammar_CFLAGS="$_abi_grammar_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - link-grammar >= 4.2.1 -\"") >&5 - ($PKG_CONFIG --exists --print-errors " - link-grammar >= 4.2.1 -") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_grammar_CFLAGS=`$PKG_CONFIG --cflags " - link-grammar >= 4.2.1 -" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_grammar_LIBS"; then - pkg_cv__abi_grammar_LIBS="$_abi_grammar_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - link-grammar >= 4.2.1 -\"") >&5 - ($PKG_CONFIG --exists --print-errors " - link-grammar >= 4.2.1 -") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_grammar_LIBS=`$PKG_CONFIG --libs " - link-grammar >= 4.2.1 -" 2>/dev/null` -else - pkg_failed=yes + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools develop" + fi fi - fi + + if test "x$build_gnu_regex" = "xyes"; then + BUILD_GNU_REGEX_TRUE= + BUILD_GNU_REGEX_FALSE='#' else - pkg_failed=untried + BUILD_GNU_REGEX_TRUE='#' + BUILD_GNU_REGEX_FALSE= fi +abi_plugin_add=yes +# Check whether --enable-freetranslation was given. +if test "${enable_freetranslation+set}" = set; then + enableval=$enable_freetranslation; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes else - _pkg_short_errors_supported=no + abi_plugin_add=$abi_plugin_opt + fi - if test $_pkg_short_errors_supported = yes; then - _abi_grammar_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - link-grammar >= 4.2.1 -"` - else - _abi_grammar_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - link-grammar >= 4.2.1 -"` - fi - # Put the nasty error message in config.log where it belongs - echo "$_abi_grammar_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test "xLink Grammar: error - link-grammar >= 4.2.1 required" != "x" ; then - echo "Link Grammar: error - link-grammar >= 4.2.1 required" >> $abi_plugin_topdir/plugin.status +# Check whether --with-freetranslation was given. +if test "${with_freetranslation+set}" = set; then + withval=$with_freetranslation; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes fi - abi_plugin_disable=yes - -elif test $pkg_failed = untried; then +fi - if test "xLink Grammar: error - link-grammar >= 4.2.1 required" != "x" ; then - echo "Link Grammar: error - link-grammar >= 4.2.1 required" >> $abi_plugin_topdir/plugin.status - fi +if test $abi_plugin_add = yes; then + abi_plugin_disable=no - abi_plugin_disable=yes -else - _abi_grammar_CFLAGS=$pkg_cv__abi_grammar_CFLAGS - _abi_grammar_LIBS=$pkg_cv__abi_grammar_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - if test "xLink Grammar: okay" != "x" ; then - echo "Link Grammar: okay" >> $abi_plugin_topdir/plugin.status + if test "xfreetranslation: okay" != "x" ; then + echo "freetranslation: okay" >> $abi_plugin_topdir/plugin.status fi -fi -if test $abi_plugin_disable = no; then - ABI_GRAMMAR_CPPFLAGS="$_abi_grammar_CFLAGS" - ABI_GRAMMAR_LDFLAGS="$_abi_grammar_LIBS" -fi - - - - -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_tools="$abi_tools abigrammar" + abi_tools="$abi_tools freetranslation" fi fi abi_plugin_add=yes -# Check whether --enable-abimathview was given. -if test "${enable_abimathview+set}" = set; then - enableval=$enable_abimathview; +# Check whether --enable-gda was given. +if test "${enable_gda+set}" = set; then + enableval=$enable_gda; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -25425,9 +22728,9 @@ fi -# Check whether --with-abimathview was given. -if test "${with_abimathview+set}" = set; then - withval=$with_abimathview; +# Check whether --with-gda was given. +if test "${with_gda+set}" = set; then + withval=$with_gda; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -25438,256 +22741,194 @@ if test $abi_plugin_add = yes; then abi_plugin_disable=no - for ac_prog in flex lex -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LEX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$LEX"; then - ac_cv_prog_LEX="$LEX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LEX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" + +ABI_GDA_CPPFLAGS="" +ABI_GDA_LDFLAGS="" + +# Checks for libraries. +# Checks for header files. + + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for _abi_gda" >&5 +$as_echo_n "checking for _abi_gda... " >&6; } + +if test -n "$_abi_gda_CFLAGS"; then + pkg_cv__abi_gda_CFLAGS="$_abi_gda_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda >= 1.2.0 libgnomedb >= 1.2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libgda >= 1.2.0 libgnomedb >= 1.2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_gda_CFLAGS=`$PKG_CONFIG --cflags "libgda >= 1.2.0 libgnomedb >= 1.2.0" 2>/dev/null` +else + pkg_failed=yes fi + else + pkg_failed=untried fi -LEX=$ac_cv_prog_LEX -if test -n "$LEX"; then - { echo "$as_me:$LINENO: result: $LEX" >&5 -echo "${ECHO_T}$LEX" >&6; } +if test -n "$_abi_gda_LIBS"; then + pkg_cv__abi_gda_LIBS="$_abi_gda_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda >= 1.2.0 libgnomedb >= 1.2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libgda >= 1.2.0 libgnomedb >= 1.2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_gda_LIBS=`$PKG_CONFIG --libs "libgda >= 1.2.0 libgnomedb >= 1.2.0" 2>/dev/null` else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + pkg_failed=yes +fi + else + pkg_failed=untried fi - test -n "$LEX" && break -done -test -n "$LEX" || LEX=":" -if test "x$LEX" != "x:"; then - cat >conftest.l <<_ACEOF -%% -a { ECHO; } -b { REJECT; } -c { yymore (); } -d { yyless (1); } -e { yyless (input () != 0); } -f { unput (yytext[0]); } -. { BEGIN INITIAL; } -%% -#ifdef YYTEXT_POINTER -extern char *yytext; -#endif -int -main (void) -{ - return ! yylex () + ! yywrap (); -} -_ACEOF -{ (ac_try="$LEX conftest.l" -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 "$LEX conftest.l") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ echo "$as_me:$LINENO: checking lex output file root" >&5 -echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; } -if test "${ac_cv_prog_lex_root+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +if test $pkg_failed = yes; then -if test -f lex.yy.c; then - ac_cv_prog_lex_root=lex.yy -elif test -f lexyy.c; then - ac_cv_prog_lex_root=lexyy +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 -echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} - { (exit 1); exit 1; }; } -fi + _pkg_short_errors_supported=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 -echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; } -LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root + if test $_pkg_short_errors_supported = yes; then + _abi_gda_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgda >= 1.2.0 libgnomedb >= 1.2.0" 2>&1` + else + _abi_gda_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgda >= 1.2.0 libgnomedb >= 1.2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$_abi_gda_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + if test "xgda: error - libgda and libgnomedb >= 1.2.0 required" != "x" ; then + echo "gda: error - libgda and libgnomedb >= 1.2.0 required" >> $abi_plugin_topdir/plugin.status + fi -if test -z "${LEXLIB+set}"; then - { echo "$as_me:$LINENO: checking lex library" >&5 -echo $ECHO_N "checking lex library... $ECHO_C" >&6; } -if test "${ac_cv_lib_lex+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + abi_plugin_disable=yes + +elif test $pkg_failed = untried; then + + if test "xgda: error - libgda and libgnomedb >= 1.2.0 required" != "x" ; then + echo "gda: error - libgda and libgnomedb >= 1.2.0 required" >> $abi_plugin_topdir/plugin.status + fi + + abi_plugin_disable=yes - ac_save_LIBS=$LIBS - ac_cv_lib_lex='none needed' - for ac_lib in '' -lfl -ll; do - LIBS="$ac_lib $ac_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -`cat $LEX_OUTPUT_ROOT.c` -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_lex=$ac_lib else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + _abi_gda_CFLAGS=$pkg_cv__abi_gda_CFLAGS + _abi_gda_LIBS=$pkg_cv__abi_gda_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi + if test "xgda: okay" != "x" ; then + echo "gda: okay" >> $abi_plugin_topdir/plugin.status + fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - test "$ac_cv_lib_lex" != 'none needed' && break - done - LIBS=$ac_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5 -echo "${ECHO_T}$ac_cv_lib_lex" >&6; } - test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex +if test $abi_plugin_disable = no; then + ABI_GDA_CPPFLAGS="$_abi_gda_CFLAGS" + ABI_GDA_LDFLAGS="$_abi_gda_LIBS" fi -{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5 -echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; } -if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # POSIX says lex can declare yytext either as a pointer or an array; the -# default is implementation-dependent. Figure out which it is, since -# not all implementations provide the %pointer and %array declarations. -ac_cv_prog_lex_yytext_pointer=no -ac_save_LIBS=$LIBS -LIBS="$LEXLIB $ac_save_LIBS" -cat >conftest.$ac_ext <<_ACEOF -#define YYTEXT_POINTER 1 -`cat $LEX_OUTPUT_ROOT.c` -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_prog_lex_yytext_pointer=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" + + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools gda" + fi fi +abi_plugin_add=yes +# Check whether --enable-gdict was given. +if test "${enable_gdict+set}" = set; then + enableval=$enable_gdict; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_save_LIBS +else + abi_plugin_add=$abi_plugin_opt fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 -echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; } -if test $ac_cv_prog_lex_yytext_pointer = yes; then -cat >>confdefs.h <<\_ACEOF -#define YYTEXT_POINTER 1 -_ACEOF -fi -rm -f conftest.l $LEX_OUTPUT_ROOT.c +# Check whether --with-gdict was given. +if test "${with_gdict+set}" = set; then + withval=$with_gdict; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi fi +if test $abi_plugin_add = yes; then + abi_plugin_disable=no -# Checks for GtkMathView. -MATH_VIEW_REQUIRED_VERSION=0.7.5 +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" + +ABI_GDICT_CPPFLAGS="" +ABI_GDICT_LDFLAGS="" + +# Checks for libraries. +# Checks for header files. + +# ABI_GNOME_OPT(1.2.13,yes) +# if [ test $abi_gnome_opt = no ]; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for MATHVIEW" >&5 -echo $ECHO_N "checking for MATHVIEW... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for _abi_gtk" >&5 +$as_echo_n "checking for _abi_gtk... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$MATHVIEW_CFLAGS"; then - pkg_cv_MATHVIEW_CFLAGS="$MATHVIEW_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mathview-frontend-libxml2 >= \$MATH_VIEW_REQUIRED_VERSION\"") >&5 - ($PKG_CONFIG --exists --print-errors "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION") 2>&5 +if test -n "$_abi_gtk_CFLAGS"; then + pkg_cv__abi_gtk_CFLAGS="$_abi_gtk_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_MATHVIEW_CFLAGS=`$PKG_CONFIG --cflags "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION" 2>/dev/null` + pkg_cv__abi_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$MATHVIEW_LIBS"; then - pkg_cv_MATHVIEW_LIBS="$MATHVIEW_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mathview-frontend-libxml2 >= \$MATH_VIEW_REQUIRED_VERSION\"") >&5 - ($PKG_CONFIG --exists --print-errors "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION") 2>&5 +if test -n "$_abi_gtk_LIBS"; then + pkg_cv__abi_gtk_LIBS="$_abi_gtk_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_MATHVIEW_LIBS=`$PKG_CONFIG --libs "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION" 2>/dev/null` + pkg_cv__abi_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -25700,112 +22941,162 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MATHVIEW_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION"` + _abi_gtk_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.0" 2>&1` else - MATHVIEW_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mathview-frontend-libxml2 >= $MATH_VIEW_REQUIRED_VERSION"` + _abi_gtk_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$MATHVIEW_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$_abi_gtk_PKG_ERRORS" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "xabimathview: error gtkmathview >= $MATH_VIEW_REQUIRED_VERSION required" != "x" ; then - echo "abimathview: error gtkmathview >= $MATH_VIEW_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status + if test "xgdict: error - gtk+-2.0 >= 2.0 required" != "x" ; then + echo "gdict: error - gtk+-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status fi - abi_plugin_disable=yes + abi_plugin_disable=yes elif test $pkg_failed = untried; then - - if test "xabimathview: error gtkmathview >= $MATH_VIEW_REQUIRED_VERSION required" != "x" ; then - echo "abimathview: error gtkmathview >= $MATH_VIEW_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status + if test "xgdict: error - gtk+-2.0 >= 2.0 required" != "x" ; then + echo "gdict: error - gtk+-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status fi - abi_plugin_disable=yes + abi_plugin_disable=yes else - MATHVIEW_CFLAGS=$pkg_cv_MATHVIEW_CFLAGS - MATHVIEW_LIBS=$pkg_cv_MATHVIEW_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + _abi_gtk_CFLAGS=$pkg_cv__abi_gtk_CFLAGS + _abi_gtk_LIBS=$pkg_cv__abi_gtk_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - if test "xabimathview: okay" != "x" ; then - echo "abimathview: okay" >> $abi_plugin_topdir/plugin.status + if test "xgdict: okay (no GNOME; using fork-and-exec method)" != "x" ; then + echo "gdict: okay (no GNOME; using fork-and-exec method)" >> $abi_plugin_topdir/plugin.status fi fi - -if test "$LEX" = :; then - LEX=${am_missing_run}flex +if test $abi_plugin_disable = no; then + ABI_GDICT_CPPFLAGS="$_abi_gtk_CFLAGS -DUSE_FORK_AND_EXEC_METHOD=1" + ABI_GDICT_LDFLAGS="$_abi_gtk_LIBS" fi -for ac_prog in 'bison -y' byacc -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_YACC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # Let the user override the test. + +# else +# ABI_GDICT_CPPFLAGS="`$abi_gnome_config --cflags gnomeui gtk glib`" +# ABI_GDICT_LDFLAGS="`$abi_gnome_config --libs gnomeui gtk glib`" +# +# CPPFLAGS="$CPPFLAGS $ABI_GDICT_CPPFLAGS" +# LDFLAGS="$LDFLAGS $ABI_GDICT_LDFLAGS" +# +# have_libgdict=yes +# AC_CHECK_HEADER(libgdict/gdict-defbox.h,[ +# AC_CHECK_LIB(gdict,gdict_defbox_lookup,have_libgdict=yes,[ +# have_libgdict=no +# AC_MSG_WARN([* * * can't link against libgdict * * *]) +# ],$ABI_GDICT_LDFLAGS) +# ],[ AC_MSG_WARN([* * * libgdict doesn't appear to be installed * * *]) +# have_libgdict=no +# ]) +# +# if [ test $have_libgdict = no ]; then +# ABI_GTK12(0) +# ABI_GDICT_CPPFLAGS="`$abi_gtk_config --cflags` -DUSE_FORK_AND_EXEC_METHOD=1" +# ABI_GDICT_LDFLAGS="`$abi_gtk_config --libs`" +# ABI_PLUGIN_REPORT([gdict: okay (falling back to fork-and-exec method)]) +# else +# ABI_GDICT_LDFLAGS="-lgdict $ABI_GDICT_LDFLAGS" +# ABI_PLUGIN_REPORT([gdict: okay (using libgdict)]) +# fi +# fi + +{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } +if test "${ac_cv_header_sys_wait_h+set}" = set; then + $as_echo_n "(cached) " >&6 else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_YACC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#ifndef WEXITSTATUS +# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) +#endif +#ifndef WIFEXITED +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +#endif -fi -fi -YACC=$ac_cv_prog_YACC -if test -n "$YACC"; then - { echo "$as_me:$LINENO: result: $YACC" >&5 -echo "${ECHO_T}$YACC" >&6; } +int +main () +{ + int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_sys_wait_h=yes else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_sys_wait_h=no +fi - test -n "$YACC" && break -done -test -n "$YACC" || YACC="yacc" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +$as_echo "$ac_cv_header_sys_wait_h" >&6; } +if test $ac_cv_header_sys_wait_h = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_SYS_WAIT_H 1 +_ACEOF -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 +fi -if test "${ac_cv_header_hash_map+set}" = set; then - { echo "$as_me:$LINENO: checking for hash_map" >&5 -echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +for ac_header in unistd.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_hash_map" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking hash_map usability" >&5 -echo $ECHO_N "checking hash_map usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25813,7 +23104,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -25821,90 +23112,92 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking hash_map presence" >&5 -echo $ECHO_N "checking hash_map presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <$ac_header> _ACEOF 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: hash_map: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: hash_map: present but cannot be compiled" >&5 -echo "$as_me: WARNING: hash_map: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: hash_map: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: hash_map: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: hash_map: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: hash_map: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## --------------------------------------------- ## ## Report this to http://bugzilla.abisource.com/ ## @@ -25913,33 +23206,38 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for hash_map" >&5 -echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else - ac_cv_header_hash_map=$ac_header_preproc + eval "$as_ac_Header=\$ac_header_preproc" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_hash_map" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi -if test $ac_cv_header_hash_map = yes; then - MATHVIEW_CFLAGS="-DHAVE_HASH_MAP $MATHVIEW_CFLAGS" -else +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -if test "${ac_cv_header_ext_hash_map+set}" = set; then - { echo "$as_me:$LINENO: checking for ext/hash_map" >&5 -echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_ext_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; } + +done + + +# Checks for typedefs, structures, and compiler characteristics. +{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5 +$as_echo_n "checking for pid_t... " >&6; } +if test "${ac_cv_type_pid_t+set}" = set; then + $as_echo_n "(cached) " >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ext/hash_map usability" >&5 -echo $ECHO_N "checking ext/hash_map usability... $ECHO_C" >&6; } + ac_cv_type_pid_t=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25947,7 +23245,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +int +main () +{ +if (sizeof (pid_t)) + return 0; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -25955,289 +23260,99 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -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 ext/hash_map presence" >&5 -echo $ECHO_N "checking ext/hash_map presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +$ac_includes_default +int +main () +{ +if (sizeof ((pid_t))) + return 0; + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -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; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ext/hash_map: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ext/hash_map: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ext/hash_map: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ext/hash_map: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ext/hash_map: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ext/hash_map: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------------- ## -## Report this to http://bugzilla.abisource.com/ ## -## --------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ext/hash_map" >&5 -echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_ext_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_ext_hash_map=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; } - -fi -if test $ac_cv_header_ext_hash_map = yes; then - MATHVIEW_CFLAGS="-DHAVE_EXT_HASH_MAP $MATHVIEW_CFLAGS" -else - - if test "xabimathview: error hash_map header not found" != "x" ; then - echo "abimathview: error hash_map header not found" >> $abi_plugin_topdir/plugin.status - fi - -abi_plugin_disable=yes -fi - - - -fi - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -echo $MATHVIEW_CFLAGS - - - - if test $abi_plugin_disable = no; then - abi_tools="$abi_tools abimathview" - fi -fi -abi_plugin_add=yes -# Check whether --enable-abiscan was given. -if test "${enable_abiscan+set}" = set; then - enableval=$enable_abiscan; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi - -else - abi_plugin_add=$abi_plugin_opt - -fi - - -# Check whether --with-abiscan was given. -if test "${with_abiscan+set}" = set; then - withval=$with_abiscan; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes - fi - -fi - -if test $abi_plugin_add = yes; then - abi_plugin_disable=no - - -# Checks for GnomeScan. - -GNOME_SCAN_REQUIRED_VERSION=0.5.1 - - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for GNOMESCAN" >&5 -echo $ECHO_N "checking for GNOMESCAN... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$GNOMESCAN_CFLAGS"; then - pkg_cv_GNOMESCAN_CFLAGS="$GNOMESCAN_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-scan >= \$GNOME_SCAN_REQUIRED_VERSION\"") >&5 - ($PKG_CONFIG --exists --print-errors "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GNOMESCAN_CFLAGS=`$PKG_CONFIG --cflags "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$GNOMESCAN_LIBS"; then - pkg_cv_GNOMESCAN_LIBS="$GNOMESCAN_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-scan >= \$GNOME_SCAN_REQUIRED_VERSION\"") >&5 - ($PKG_CONFIG --exists --print-errors "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GNOMESCAN_LIBS=`$PKG_CONFIG --libs "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + } && test -s conftest.$ac_objext; then + : else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GNOMESCAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION"` - else - GNOMESCAN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GNOMESCAN_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - - - if test "xabiscan: error gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION required" != "x" ; then - echo "abiscan: error gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status - fi - - abi_plugin_disable=yes - -elif test $pkg_failed = untried; then - - - if test "xabiscan: error gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION required" != "x" ; then - echo "abiscan: error gnome-scan >= $GNOME_SCAN_REQUIRED_VERSION required" >> $abi_plugin_topdir/plugin.status - fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - abi_plugin_disable=yes + ac_cv_type_pid_t=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - GNOMESCAN_CFLAGS=$pkg_cv_GNOMESCAN_CFLAGS - GNOMESCAN_LIBS=$pkg_cv_GNOMESCAN_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test "xabiscan: okay" != "x" ; then - echo "abiscan: okay" >> $abi_plugin_topdir/plugin.status - fi +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 +$as_echo "$ac_cv_type_pid_t" >&6; } +if test "x$ac_cv_type_pid_t" = x""yes; then + : +else +cat >>confdefs.h <<_ACEOF +#define pid_t int +_ACEOF 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' -ac_compiler_gnu=$ac_cv_cxx_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 + +# Checks for library functions. +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_tools="$abi_tools abiscan" + abi_tools="$abi_tools gdict" fi fi abi_plugin_add=yes -# Check whether --enable-aiksaurus was given. -if test "${enable_aiksaurus+set}" = set; then - enableval=$enable_aiksaurus; +# Check whether --enable-google was given. +if test "${enable_google+set}" = set; then + enableval=$enable_google; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -26248,9 +23363,9 @@ fi -# Check whether --with-aiksaurus was given. -if test "${with_aiksaurus+set}" = set; then - withval=$with_aiksaurus; +# Check whether --with-google was given. +if test "${with_google+set}" = set; then + withval=$with_google; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -26263,184 +23378,91 @@ abi_plugin_disable=no -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" -ABI_AIKSAURUS_CPPFLAGS="" -ABI_AIKSAURUS_LDFLAGS="" + if test "xgoogle: okay" != "x" ; then + echo "google: okay" >> $abi_plugin_topdir/plugin.status + fi -# Checks for libraries. -# Checks for header files. -# Check whether --with-Aiksaurus was given. -if test "${with_Aiksaurus+set}" = set; then - withval=$with_Aiksaurus; - if test "x$withval" = "xno" ; then - { { echo "$as_me:$LINENO: error: * * * Aiksaurus library required to build this plugin * * *" >&5 -echo "$as_me: error: * * * Aiksaurus library required to build this plugin * * *" >&2;} - { (exit 1); exit 1; }; } - elif test "x$withval" != "xyes" ; then - ABI_AIKSAURUS_CPPFLAGS="-I$withval/include" - ABI_AIKSAURUS_LDFLAGS="-L$withval/lib" + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools google" fi - fi +abi_plugin_add=yes +# Check whether --enable-loadbindings was given. +if test "${enable_loadbindings+set}" = set; then + enableval=$enable_loadbindings; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi - -CPPFLAGS="$CPPFLAGS $ABI_AIKSAURUS_CPPFLAGS" -LDFLAGS="$LDFLAGS $ABI_AIKSAURUS_LDFLAGS" - -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 - - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for PKGAIKSAURUS" >&5 -echo $ECHO_N "checking for PKGAIKSAURUS... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$PKGAIKSAURUS_CFLAGS"; then - pkg_cv_PKGAIKSAURUS_CFLAGS="$PKGAIKSAURUS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aiksaurus-1.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "aiksaurus-1.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_PKGAIKSAURUS_CFLAGS=`$PKG_CONFIG --cflags "aiksaurus-1.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$PKGAIKSAURUS_LIBS"; then - pkg_cv_PKGAIKSAURUS_LIBS="$PKGAIKSAURUS_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aiksaurus-1.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "aiksaurus-1.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_PKGAIKSAURUS_LIBS=`$PKG_CONFIG --libs "aiksaurus-1.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then + abi_plugin_add=$abi_plugin_opt -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no fi - if test $_pkg_short_errors_supported = yes; then - PKGAIKSAURUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "aiksaurus-1.0"` - else - PKGAIKSAURUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "aiksaurus-1.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$PKGAIKSAURUS_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - - if test "xaiksaurus: error - Aiksaurus.h not found" != "x" ; then - echo "aiksaurus: error - Aiksaurus.h not found" >> $abi_plugin_topdir/plugin.status - fi - - abi_plugin_disable=yes -elif test $pkg_failed = untried; then - if test "xaiksaurus: error - Aiksaurus.h not found" != "x" ; then - echo "aiksaurus: error - Aiksaurus.h not found" >> $abi_plugin_topdir/plugin.status +# Check whether --with-loadbindings was given. +if test "${with_loadbindings+set}" = set; then + withval=$with_loadbindings; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes fi - abi_plugin_disable=yes - -else - PKGAIKSAURUS_CFLAGS=$pkg_cv_PKGAIKSAURUS_CFLAGS - PKGAIKSAURUS_LIBS=$pkg_cv_PKGAIKSAURUS_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - - ABI_AIKSAURUS_CPPFLAGS="`pkg-config --cflags aiksaurus-1.0` $ABI_AIKSAURUS_CPPFLAGS" - ABI_AIKSAURUS_LDFLAGS="`pkg-config --libs aiksaurus-1.0` -lAiksaurus $ABI_AIKSAURUS_LDFLAGS" - fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test $abi_plugin_add = yes; then + abi_plugin_disable=no -if test $abi_plugin_disable = no; then - ABI_AIKSAURUS_CPPFLAGS="$ABI_AIKSAURUS_CPPFLAGS `pkg-config --cflags gtk+-2.0`" - ABI_AIKSAURUS_LDFLAGS="$ABI_AIKSAURUS_LDFLAGS `pkg-config --libs gtk+-2.0`" +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" - 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 +LOADBINDINGS_CPPFLAGS="" +LOADBINDINGS_LDFLAGS="" + +# Checks for libraries. +# Checks for header files. pkg_failed=no -{ echo "$as_me:$LINENO: checking for PKGGAIKSAURUS" >&5 -echo $ECHO_N "checking for PKGGAIKSAURUS... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for _abi_glib" >&5 +$as_echo_n "checking for _abi_glib... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$PKGGAIKSAURUS_CFLAGS"; then - pkg_cv_PKGGAIKSAURUS_CFLAGS="$PKGGAIKSAURUS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gaiksaurus-1.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gaiksaurus-1.0") 2>&5 +if test -n "$_abi_glib_CFLAGS"; then + pkg_cv__abi_glib_CFLAGS="$_abi_glib_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 \"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_PKGGAIKSAURUS_CFLAGS=`$PKG_CONFIG --cflags "gaiksaurus-1.0" 2>/dev/null` + pkg_cv__abi_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.0 " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$PKGGAIKSAURUS_LIBS"; then - pkg_cv_PKGGAIKSAURUS_LIBS="$PKGGAIKSAURUS_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gaiksaurus-1.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gaiksaurus-1.0") 2>&5 +if test -n "$_abi_glib_LIBS"; then + pkg_cv__abi_glib_LIBS="$_abi_glib_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 \"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_PKGGAIKSAURUS_LIBS=`$PKG_CONFIG --libs "gaiksaurus-1.0" 2>/dev/null` + pkg_cv__abi_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0 " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -26453,110 +23475,62 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PKGGAIKSAURUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gaiksaurus-1.0"` + _abi_glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.0 " 2>&1` else - PKGGAIKSAURUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gaiksaurus-1.0"` + _abi_glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.0 " 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$PKGGAIKSAURUS_PKG_ERRORS" >&5 + echo "$_abi_glib_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "xaiksaurus: error - AiksaurusGTK.h not found" != "x" ; then - echo "aiksaurus: error - AiksaurusGTK.h not found" >> $abi_plugin_topdir/plugin.status + if test "xLoadBindings: error - glib-2.0 >= 2.0 required" != "x" ; then + echo "LoadBindings: error - glib-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status fi - abi_plugin_disable=yes + abi_plugin_disable=yes elif test $pkg_failed = untried; then - if test "xaiksaurus: error - AiksaurusGTK.h not found" != "x" ; then - echo "aiksaurus: error - AiksaurusGTK.h not found" >> $abi_plugin_topdir/plugin.status + if test "xLoadBindings: error - glib-2.0 >= 2.0 required" != "x" ; then + echo "LoadBindings: error - glib-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status fi - abi_plugin_disable=yes + abi_plugin_disable=yes else - PKGGAIKSAURUS_CFLAGS=$pkg_cv_PKGGAIKSAURUS_CFLAGS - PKGGAIKSAURUS_LIBS=$pkg_cv_PKGGAIKSAURUS_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - - ABI_AIKSAURUS_CPPFLAGS="`pkg-config --cflags gaiksaurus-1.0` $ABI_AIKSAURUS_CPPFLAGS" - ABI_AIKSAURUS_LDFLAGS="`pkg-config --libs gaiksaurus-1.0` -lAiksaurusGTK $ABI_AIKSAURUS_LDFLAGS" - -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 - + _abi_glib_CFLAGS=$pkg_cv__abi_glib_CFLAGS + _abi_glib_LIBS=$pkg_cv__abi_glib_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + : fi if test $abi_plugin_disable = no; then - - if test "xaiksaurus: okay" != "x" ; then - echo "aiksaurus: okay" >> $abi_plugin_topdir/plugin.status - fi - -fi - - - - -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" - - if test $abi_plugin_disable = no; then - abi_tools="$abi_tools aiksaurus" - fi -fi -abi_plugin_add=yes -# Check whether --enable-babelfish was given. -if test "${enable_babelfish+set}" = set; then - enableval=$enable_babelfish; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi - -else - abi_plugin_add=$abi_plugin_opt - -fi - - -# Check whether --with-babelfish was given. -if test "${with_babelfish+set}" = set; then - withval=$with_babelfish; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes + LOADBINDINGS_CPPFLAGS="$_abi_glib_CFLAGS" + LOADBINDINGS_LDFLAGS="$_abi_glib_LIBS" + + if test "xloadbindings: okay" != "x" ; then + echo "loadbindings: okay" >> $abi_plugin_topdir/plugin.status fi fi -if test $abi_plugin_add = yes; then - abi_plugin_disable=no - - if test "xbabelfish: okay" != "x" ; then - echo "babelfish: okay" >> $abi_plugin_topdir/plugin.status - fi - +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_tools="$abi_tools babelfish" + abi_tools="$abi_tools loadbindings" fi fi abi_plugin_add=yes -# Check whether --enable-develop was given. -if test "${enable_develop+set}" = set; then - enableval=$enable_develop; +# Check whether --enable-ots was given. +if test "${enable_ots+set}" = set; then + enableval=$enable_ots; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -26567,9 +23541,9 @@ fi -# Check whether --with-develop was given. -if test "${with_develop+set}" = set; then - withval=$with_develop; +# Check whether --with-ots was given. +if test "${with_ots+set}" = set; then + withval=$with_ots; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -26578,78 +23552,153 @@ fi - -build_gnu_regex="no" - if test $abi_plugin_add = yes; then abi_plugin_disable=no _abi_cppflags_save="$CPPFLAGS" _abi_ldflags_save="$LDFLAGS" -# Nothing to do at the moment +ABI_OTS_CPPFLAGS="" +ABI_OTS_LDFLAGS="" -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" +# Checks for libraries. +# Checks for header files. - if test $abi_plugin_disable = no; then - abi_tools="$abi_tools develop" - fi -fi - if test "x$build_gnu_regex" = "xyes"; then - BUILD_GNU_REGEX_TRUE= - BUILD_GNU_REGEX_FALSE='#' +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for _abi_ots" >&5 +$as_echo_n "checking for _abi_ots... " >&6; } + +if test -n "$_abi_ots_CFLAGS"; then + pkg_cv__abi_ots_CFLAGS="$_abi_ots_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gtk+-2.0 + libglade-2.0 + libots-1 >= 0.5.0 +\"") >&5 + ($PKG_CONFIG --exists --print-errors " + gtk+-2.0 + libglade-2.0 + libots-1 >= 0.5.0 +") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_ots_CFLAGS=`$PKG_CONFIG --cflags " + gtk+-2.0 + libglade-2.0 + libots-1 >= 0.5.0 +" 2>/dev/null` else - BUILD_GNU_REGEX_TRUE='#' - BUILD_GNU_REGEX_FALSE= + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$_abi_ots_LIBS"; then + pkg_cv__abi_ots_LIBS="$_abi_ots_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gtk+-2.0 + libglade-2.0 + libots-1 >= 0.5.0 +\"") >&5 + ($PKG_CONFIG --exists --print-errors " + gtk+-2.0 + libglade-2.0 + libots-1 >= 0.5.0 +") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_ots_LIBS=`$PKG_CONFIG --libs " + gtk+-2.0 + libglade-2.0 + libots-1 >= 0.5.0 +" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -abi_plugin_add=yes -# Check whether --enable-freetranslation was given. -if test "${enable_freetranslation+set}" = set; then - enableval=$enable_freetranslation; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi -else - abi_plugin_add=$abi_plugin_opt +if test $pkg_failed = yes; then +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + _abi_ots_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + gtk+-2.0 + libglade-2.0 + libots-1 >= 0.5.0 +" 2>&1` + else + _abi_ots_PKG_ERRORS=`$PKG_CONFIG --print-errors " + gtk+-2.0 + libglade-2.0 + libots-1 >= 0.5.0 +" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$_abi_ots_PKG_ERRORS" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -# Check whether --with-freetranslation was given. -if test "${with_freetranslation+set}" = set; then - withval=$with_freetranslation; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes + if test "xOts: error - libots-1 >= 0.5.0 required" != "x" ; then + echo "Ots: error - libots-1 >= 0.5.0 required" >> $abi_plugin_topdir/plugin.status fi -fi + abi_plugin_disable=yes -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +elif test $pkg_failed = untried; then + + if test "xOts: error - libots-1 >= 0.5.0 required" != "x" ; then + echo "Ots: error - libots-1 >= 0.5.0 required" >> $abi_plugin_topdir/plugin.status + fi + abi_plugin_disable=yes +else + _abi_ots_CFLAGS=$pkg_cv__abi_ots_CFLAGS + _abi_ots_LIBS=$pkg_cv__abi_ots_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - if test "xfreetranslation: okay" != "x" ; then - echo "freetranslation: okay" >> $abi_plugin_topdir/plugin.status + if test "xOts: okay" != "x" ; then + echo "Ots: okay" >> $abi_plugin_topdir/plugin.status fi +fi +if test $abi_plugin_disable = no; then + ABI_OTS_CPPFLAGS="$_abi_ots_CFLAGS" + ABI_OTS_LDFLAGS="$_abi_ots_LIBS" +fi + + + + +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_tools="$abi_tools freetranslation" + abi_tools="$abi_tools ots" fi fi abi_plugin_add=yes -# Check whether --enable-gda was given. -if test "${enable_gda+set}" = set; then - enableval=$enable_gda; +# Check whether --enable-presentation was given. +if test "${enable_presentation+set}" = set; then + enableval=$enable_presentation; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -26660,9 +23709,9 @@ fi -# Check whether --with-gda was given. -if test "${with_gda+set}" = set; then - withval=$with_gda; +# Check whether --with-presentation was given. +if test "${with_presentation+set}" = set; then + withval=$with_presentation; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -26678,52 +23727,48 @@ _abi_cppflags_save="$CPPFLAGS" _abi_ldflags_save="$LDFLAGS" -ABI_GDA_CPPFLAGS="" -ABI_GDA_LDFLAGS="" +PRESENTATION_CPPFLAGS="" +PRESENTATION_LDFLAGS="" # Checks for libraries. # Checks for header files. pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_gda" >&5 -echo $ECHO_N "checking for _abi_gda... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for _abi_glib" >&5 +$as_echo_n "checking for _abi_glib... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_gda_CFLAGS"; then - pkg_cv__abi_gda_CFLAGS="$_abi_gda_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda >= 1.2.0 libgnomedb >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "libgda >= 1.2.0 libgnomedb >= 1.2.0") 2>&5 +if test -n "$_abi_glib_CFLAGS"; then + pkg_cv__abi_glib_CFLAGS="$_abi_glib_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 \"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_gda_CFLAGS=`$PKG_CONFIG --cflags "libgda >= 1.2.0 libgnomedb >= 1.2.0" 2>/dev/null` + pkg_cv__abi_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.0 " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_gda_LIBS"; then - pkg_cv__abi_gda_LIBS="$_abi_gda_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda >= 1.2.0 libgnomedb >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "libgda >= 1.2.0 libgnomedb >= 1.2.0") 2>&5 +if test -n "$_abi_glib_LIBS"; then + pkg_cv__abi_glib_LIBS="$_abi_glib_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 \"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_gda_LIBS=`$PKG_CONFIG --libs "libgda >= 1.2.0 libgnomedb >= 1.2.0" 2>/dev/null` + pkg_cv__abi_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0 " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -26736,46 +23781,46 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_gda_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda >= 1.2.0 libgnomedb >= 1.2.0"` + _abi_glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.0 " 2>&1` else - _abi_gda_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda >= 1.2.0 libgnomedb >= 1.2.0"` + _abi_glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.0 " 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$_abi_gda_PKG_ERRORS" >&5 + echo "$_abi_glib_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "xgda: error - libgda and libgnomedb >= 1.2.0 required" != "x" ; then - echo "gda: error - libgda and libgnomedb >= 1.2.0 required" >> $abi_plugin_topdir/plugin.status + if test "xPrsentation: error - glib-2.0 >= 2.0 required" != "x" ; then + echo "Prsentation: error - glib-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status fi abi_plugin_disable=yes elif test $pkg_failed = untried; then - if test "xgda: error - libgda and libgnomedb >= 1.2.0 required" != "x" ; then - echo "gda: error - libgda and libgnomedb >= 1.2.0 required" >> $abi_plugin_topdir/plugin.status + if test "xPrsentation: error - glib-2.0 >= 2.0 required" != "x" ; then + echo "Prsentation: error - glib-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status fi abi_plugin_disable=yes else - _abi_gda_CFLAGS=$pkg_cv__abi_gda_CFLAGS - _abi_gda_LIBS=$pkg_cv__abi_gda_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + _abi_glib_CFLAGS=$pkg_cv__abi_glib_CFLAGS + _abi_glib_LIBS=$pkg_cv__abi_glib_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi +if test $abi_plugin_disable = no; then + PRESENTATION_CPPFLAGS="$_abi_glib_CFLAGS" + PRESENTATION_LDFLAGS="$_abi_glib_LIBS" - if test "xgda: okay" != "x" ; then - echo "gda: okay" >> $abi_plugin_topdir/plugin.status + if test "xpresentation: okay" != "x" ; then + echo "presentation: okay" >> $abi_plugin_topdir/plugin.status fi - -fi -if test $abi_plugin_disable = no; then - ABI_GDA_CPPFLAGS="$_abi_gda_CFLAGS" - ABI_GDA_LDFLAGS="$_abi_gda_LIBS" fi @@ -26785,13 +23830,53 @@ LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_tools="$abi_tools gda" + abi_tools="$abi_tools presentation" fi fi abi_plugin_add=yes -# Check whether --enable-gdict was given. -if test "${enable_gdict+set}" = set; then - enableval=$enable_gdict; +# Check whether --enable-urldict was given. +if test "${enable_urldict+set}" = set; then + enableval=$enable_urldict; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi + +else + abi_plugin_add=$abi_plugin_opt + +fi + + +# Check whether --with-urldict was given. +if test "${with_urldict+set}" = set; then + withval=$with_urldict; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi + +fi + +if test $abi_plugin_add = yes; then + abi_plugin_disable=no + + + + if test "xurldict: okay" != "x" ; then + echo "urldict: okay" >> $abi_plugin_topdir/plugin.status + fi + + + + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools urldict" + fi +fi +abi_plugin_add=yes +# Check whether --enable-wikipedia was given. +if test "${enable_wikipedia+set}" = set; then + enableval=$enable_wikipedia; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -26802,9 +23887,9 @@ fi -# Check whether --with-gdict was given. -if test "${with_gdict+set}" = set; then - withval=$with_gdict; +# Check whether --with-wikipedia was given. +if test "${with_wikipedia+set}" = set; then + withval=$with_wikipedia; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -26817,224 +23902,115 @@ abi_plugin_disable=no -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" - -ABI_GDICT_CPPFLAGS="" -ABI_GDICT_LDFLAGS="" - -# Checks for libraries. -# Checks for header files. -# ABI_GNOME_OPT(1.2.13,yes) -# if [ test $abi_gnome_opt = no ]; then + if test "xwikipedia: okay" != "x" ; then + echo "wikipedia: okay" >> $abi_plugin_topdir/plugin.status + fi -pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_gtk" >&5 -echo $ECHO_N "checking for _abi_gtk... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_gtk_CFLAGS"; then - pkg_cv__abi_gtk_CFLAGS="$_abi_gtk_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_gtk_LIBS"; then - pkg_cv__abi_gtk_LIBS="$_abi_gtk_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried + if test $abi_plugin_disable = no; then + abi_tools="$abi_tools wikipedia" + fi fi +abi_wp_impexp_graphics= +abi_plugin_add=yes +# Check whether --enable-bmp was given. +if test "${enable_bmp+set}" = set; then + enableval=$enable_bmp; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes else - _pkg_short_errors_supported=no + abi_plugin_add=$abi_plugin_opt + fi - if test $_pkg_short_errors_supported = yes; then - _abi_gtk_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.0"` - else - _abi_gtk_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$_abi_gtk_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test "xgdict: error - gtk+-2.0 >= 2.0 required" != "x" ; then - echo "gdict: error - gtk+-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status +# Check whether --with-bmp was given. +if test "${with_bmp+set}" = set; then + withval=$with_bmp; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes fi - abi_plugin_disable=yes +fi -elif test $pkg_failed = untried; then +if test $abi_plugin_add = yes; then + abi_plugin_disable=no - if test "xgdict: error - gtk+-2.0 >= 2.0 required" != "x" ; then - echo "gdict: error - gtk+-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status - fi - abi_plugin_disable=yes +ABI_BMP_CPPFLAGS="$LIBPNG_CFLAGS" +ABI_BMP_LDFLAGS="$LIBPNG_LIBS" -else - _abi_gtk_CFLAGS=$pkg_cv__abi_gtk_CFLAGS - _abi_gtk_LIBS=$pkg_cv__abi_gtk_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - if test "xgdict: okay (no GNOME; using fork-and-exec method)" != "x" ; then - echo "gdict: okay (no GNOME; using fork-and-exec method)" >> $abi_plugin_topdir/plugin.status - fi -fi -if test $abi_plugin_disable = no; then - ABI_GDICT_CPPFLAGS="$_abi_gtk_CFLAGS -DUSE_FORK_AND_EXEC_METHOD=1" - ABI_GDICT_LDFLAGS="$_abi_gtk_LIBS" -fi + if test "xbmp: okay" != "x" ; then + echo "bmp: okay" >> $abi_plugin_topdir/plugin.status + fi -# else -# ABI_GDICT_CPPFLAGS="`$abi_gnome_config --cflags gnomeui gtk glib`" -# ABI_GDICT_LDFLAGS="`$abi_gnome_config --libs gnomeui gtk glib`" -# -# CPPFLAGS="$CPPFLAGS $ABI_GDICT_CPPFLAGS" -# LDFLAGS="$LDFLAGS $ABI_GDICT_LDFLAGS" -# -# have_libgdict=yes -# AC_CHECK_HEADER(libgdict/gdict-defbox.h,[ -# AC_CHECK_LIB(gdict,gdict_defbox_lookup,have_libgdict=yes,[ -# have_libgdict=no -# AC_MSG_WARN([* * * can't link against libgdict * * *]) -# ],$ABI_GDICT_LDFLAGS) -# ],[ AC_MSG_WARN([* * * libgdict doesn't appear to be installed * * *]) -# have_libgdict=no -# ]) -# -# if [ test $have_libgdict = no ]; then -# ABI_GTK12(0) -# ABI_GDICT_CPPFLAGS="`$abi_gtk_config --cflags` -DUSE_FORK_AND_EXEC_METHOD=1" -# ABI_GDICT_LDFLAGS="`$abi_gtk_config --libs`" -# ABI_PLUGIN_REPORT([gdict: okay (falling back to fork-and-exec method)]) -# else -# ABI_GDICT_LDFLAGS="-lgdict $ABI_GDICT_LDFLAGS" -# ABI_PLUGIN_REPORT([gdict: okay (using libgdict)]) -# fi -# fi -{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_wait_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif + if test $abi_plugin_disable = no; then + abi_wp_impexp_graphics="$abi_wp_impexp_graphics bmp" + fi +fi +abi_plugin_add=yes +# Check whether --enable-jpeg was given. +if test "${enable_jpeg+set}" = set; then + enableval=$enable_jpeg; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi -int -main () -{ - int s; - wait (&s); - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_sys_wait_h=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + abi_plugin_add=$abi_plugin_opt - ac_cv_header_sys_wait_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } -if test $ac_cv_header_sys_wait_h = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_WAIT_H 1 -_ACEOF +# Check whether --with-jpeg was given. +if test "${with_jpeg+set}" = set; then + withval=$with_jpeg; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi fi +if test $abi_plugin_add = yes; then + abi_plugin_disable=no -for ac_header in unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -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 + +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" + +ABI_JPEG_CPPFLAGS="" +ABI_JPEG_LDFLAGS="" + +# Checks for libraries. +# Checks for header files. + +if test "${ac_cv_header_jpeglib_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +$as_echo_n "checking for jpeglib.h... " >&6; } +if test "${ac_cv_header_jpeglib_h+set}" = set; then + $as_echo_n "(cached) " >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +$as_echo "$ac_cv_header_jpeglib_h" >&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; } +{ $as_echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 +$as_echo_n "checking jpeglib.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27042,7 +24018,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -27050,90 +24026,92 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$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; } +{ $as_echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 +$as_echo_n "checking jpeglib.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +#include _ACEOF 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -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;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## --------------------------------------------- ## ## Report this to http://bugzilla.abisource.com/ ## @@ -27142,94 +24120,119 @@ ) | 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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +$as_echo_n "checking for jpeglib.h... " >&6; } +if test "${ac_cv_header_jpeglib_h+set}" = set; then + $as_echo_n "(cached) " >&6 else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - + ac_cv_header_jpeglib_h=$ac_header_preproc fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +$as_echo "$ac_cv_header_jpeglib_h" >&6; } fi +if test "x$ac_cv_header_jpeglib_h" = x""yes; then -done - - -# Checks for typedefs, structures, and compiler characteristics. -{ echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } -if test "${ac_cv_type_pid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5 +$as_echo_n "checking for jpeg_read_header in -ljpeg... " >&6; } +if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-ljpeg $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -typedef pid_t ac__type_new_; + +/* 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 +char jpeg_read_header (); int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; +return jpeg_read_header (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +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_compile") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_pid_t=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_jpeg_jpeg_read_header=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_pid_t=no + ac_cv_lib_jpeg_jpeg_read_header=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } -if test $ac_cv_type_pid_t = yes; then - : +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 +$as_echo "$ac_cv_lib_jpeg_jpeg_read_header" >&6; } +if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; then + + + if test "xjpeg: okay" != "x" ; then + echo "jpeg: okay" >> $abi_plugin_topdir/plugin.status + fi + + else -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF + if test "xjpeg: error - libjpeg not found" != "x" ; then + echo "jpeg: error - libjpeg not found" >> $abi_plugin_topdir/plugin.status + fi + + abi_plugin_disable=yes fi -# Checks for library functions. +else + + if test "xjpeg: error - jpeg header not found" != "x" ; then + echo "jpeg: error - jpeg header not found" >> $abi_plugin_topdir/plugin.status + fi + + abi_plugin_disable=yes + +fi + + + +if test $abi_plugin_disable = no; then + ABI_JPEG_CPPFLAGS="$LIBPNG_CFLAGS" + ABI_JPEG_LDFLAGS="-ljpeg $LIBPNG_LIBS" +fi @@ -27238,13 +24241,13 @@ LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_tools="$abi_tools gdict" + abi_wp_impexp_graphics="$abi_wp_impexp_graphics jpeg" fi fi abi_plugin_add=yes -# Check whether --enable-google was given. -if test "${enable_google+set}" = set; then - enableval=$enable_google; +# Check whether --enable-librsvg was given. +if test "${enable_librsvg+set}" = set; then + enableval=$enable_librsvg; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -27255,9 +24258,9 @@ fi -# Check whether --with-google was given. -if test "${with_google+set}" = set; then - withval=$with_google; +# Check whether --with-librsvg was given. +if test "${with_librsvg+set}" = set; then + withval=$with_librsvg; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -27270,21 +24273,119 @@ abi_plugin_disable=no +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" - if test "xgoogle: okay" != "x" ; then - echo "google: okay" >> $abi_plugin_topdir/plugin.status +LIBRSVG_CPPFLAGS="" +LIBRSVG_LDFLAGS="" + +# Checks for libraries. +# Checks for header files. + + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for _abi_librsvg" >&5 +$as_echo_n "checking for _abi_librsvg... " >&6; } + +if test -n "$_abi_librsvg_CFLAGS"; then + pkg_cv__abi_librsvg_CFLAGS="$_abi_librsvg_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_librsvg_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$_abi_librsvg_LIBS"; then + pkg_cv__abi_librsvg_LIBS="$_abi_librsvg_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_librsvg_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + _abi_librsvg_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "librsvg-2.0 >= 2.0" 2>&1` + else + _abi_librsvg_PKG_ERRORS=`$PKG_CONFIG --print-errors "librsvg-2.0 >= 2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$_abi_librsvg_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + if test "xLibRSVG: error - librsvg-2.0 >= 2.0 required" != "x" ; then + echo "LibRSVG: error - librsvg-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status + fi + + abi_plugin_disable=yes + +elif test $pkg_failed = untried; then + + if test "xLibRSVG: error - librsvg-2.0 >= 2.0 required" != "x" ; then + echo "LibRSVG: error - librsvg-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status + fi + + abi_plugin_disable=yes + +else + _abi_librsvg_CFLAGS=$pkg_cv__abi_librsvg_CFLAGS + _abi_librsvg_LIBS=$pkg_cv__abi_librsvg_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + + if test "xLibRSVG: okay" != "x" ; then + echo "LibRSVG: okay" >> $abi_plugin_topdir/plugin.status fi +fi +if test $abi_plugin_disable = no; then + LIBRSVG_CPPFLAGS="$_abi_librsvg_CFLAGS" + LIBRSVG_LDFLAGS="$_abi_librsvg_LIBS" +fi + + + + +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_tools="$abi_tools google" + abi_wp_impexp_graphics="$abi_wp_impexp_graphics librsvg" fi fi abi_plugin_add=yes -# Check whether --enable-loadbindings was given. -if test "${enable_loadbindings+set}" = set; then - enableval=$enable_loadbindings; +# Check whether --enable-win32native was given. +if test "${enable_win32native+set}" = set; then + enableval=$enable_win32native; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -27295,9 +24396,9 @@ fi -# Check whether --with-loadbindings was given. -if test "${with_loadbindings+set}" = set; then - withval=$with_loadbindings; +# Check whether --with-win32native was given. +if test "${with_win32native+set}" = set; then + withval=$with_win32native; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -27313,52 +24414,48 @@ _abi_cppflags_save="$CPPFLAGS" _abi_ldflags_save="$LDFLAGS" -LOADBINDINGS_CPPFLAGS="" -LOADBINDINGS_LDFLAGS="" +LIBRSVG_CPPFLAGS="" +LIBRSVG_LDFLAGS="" # Checks for libraries. # Checks for header files. pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_glib" >&5 -echo $ECHO_N "checking for _abi_glib... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for _abi_librsvg" >&5 +$as_echo_n "checking for _abi_librsvg... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_glib_CFLAGS"; then - pkg_cv__abi_glib_CFLAGS="$_abi_glib_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 \"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 ") 2>&5 +if test -n "$_abi_librsvg_CFLAGS"; then + pkg_cv__abi_librsvg_CFLAGS="$_abi_librsvg_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.0 " 2>/dev/null` + pkg_cv__abi_librsvg_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_glib_LIBS"; then - pkg_cv__abi_glib_LIBS="$_abi_glib_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 \"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 ") 2>&5 +if test -n "$_abi_librsvg_LIBS"; then + pkg_cv__abi_librsvg_LIBS="$_abi_librsvg_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0 " 2>/dev/null` + pkg_cv__abi_librsvg_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -27371,46 +24468,46 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.0 "` + _abi_librsvg_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "librsvg-2.0 >= 2.0" 2>&1` else - _abi_glib_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.0 "` + _abi_librsvg_PKG_ERRORS=`$PKG_CONFIG --print-errors "librsvg-2.0 >= 2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$_abi_glib_PKG_ERRORS" >&5 + echo "$_abi_librsvg_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "xLoadBindings: error - glib-2.0 >= 2.0 required" != "x" ; then - echo "LoadBindings: error - glib-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status + if test "xLibRSVG: error - librsvg-2.0 >= 2.0 required" != "x" ; then + echo "LibRSVG: error - librsvg-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status fi abi_plugin_disable=yes elif test $pkg_failed = untried; then - if test "xLoadBindings: error - glib-2.0 >= 2.0 required" != "x" ; then - echo "LoadBindings: error - glib-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status + if test "xLibRSVG: error - librsvg-2.0 >= 2.0 required" != "x" ; then + echo "LibRSVG: error - librsvg-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status fi abi_plugin_disable=yes else - _abi_glib_CFLAGS=$pkg_cv__abi_glib_CFLAGS - _abi_glib_LIBS=$pkg_cv__abi_glib_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi + _abi_librsvg_CFLAGS=$pkg_cv__abi_librsvg_CFLAGS + _abi_librsvg_LIBS=$pkg_cv__abi_librsvg_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -if test $abi_plugin_disable = no; then - LOADBINDINGS_CPPFLAGS="$_abi_glib_CFLAGS" - LOADBINDINGS_LDFLAGS="$_abi_glib_LIBS" - if test "xloadbindings: okay" != "x" ; then - echo "loadbindings: okay" >> $abi_plugin_topdir/plugin.status + if test "xLibRSVG: okay" != "x" ; then + echo "LibRSVG: okay" >> $abi_plugin_topdir/plugin.status fi + +fi +if test $abi_plugin_disable = no; then + LIBRSVG_CPPFLAGS="$_abi_librsvg_CFLAGS" + LIBRSVG_LDFLAGS="$_abi_librsvg_LIBS" fi @@ -27420,13 +24517,13 @@ LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_tools="$abi_tools loadbindings" + abi_wp_impexp_graphics="$abi_wp_impexp_graphics win32native" fi fi abi_plugin_add=yes -# Check whether --enable-ots was given. -if test "${enable_ots+set}" = set; then - enableval=$enable_ots; +# Check whether --enable-wmf was given. +if test "${enable_wmf+set}" = set; then + enableval=$enable_wmf; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -27437,9 +24534,9 @@ fi -# Check whether --with-ots was given. -if test "${with_ots+set}" = set; then - withval=$with_ots; +# Check whether --with-wmf was given. +if test "${with_wmf+set}" = set; then + withval=$with_wmf; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -27451,138 +24548,219 @@ if test $abi_plugin_add = yes; then abi_plugin_disable=no + _abi_cppflags_save="$CPPFLAGS" _abi_ldflags_save="$LDFLAGS" -ABI_OTS_CPPFLAGS="" -ABI_OTS_LDFLAGS="" +ABI_WMF_CPPFLAGS="" +ABI_WMF_LDFLAGS="" # Checks for libraries. # Checks for header files. -pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_ots" >&5 -echo $ECHO_N "checking for _abi_ots... $ECHO_C" >&6; } + abi_libwmf_config="" + abi_libwmf_version="" + if test "xyes" = "xyes" ; then + abi_libwmf_opt=check + else + abi_libwmf_opt=required + fi + +# Check whether --with-libwmf was given. +if test "${with_libwmf+set}" = set; then + withval=$with_libwmf; + if test "x$withval" = "xno" ; then + if test $abi_libwmf_opt = required ; then + { { $as_echo "$as_me:$LINENO: error: * * * libwmf is not optional! * * *" >&5 +$as_echo "$as_me: error: * * * libwmf is not optional! * * *" >&2;} + { (exit 1); exit 1; }; } + fi + abi_libwmf_opt=no + elif test "x$withval" = "xyes" ; then + abi_libwmf_opt=required + abi_libwmf_dir="" + else + abi_libwmf_opt=required + abi_libwmf_dir="$withval" + fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_ots_CFLAGS"; then - pkg_cv__abi_ots_CFLAGS="$_abi_ots_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - gtk+-2.0 - libglade-2.0 - libots-1 >= 0.5.0 -\"") >&5 - ($PKG_CONFIG --exists --print-errors " - gtk+-2.0 - libglade-2.0 - libots-1 >= 0.5.0 -") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_ots_CFLAGS=`$PKG_CONFIG --cflags " - gtk+-2.0 - libglade-2.0 - libots-1 >= 0.5.0 -" 2>/dev/null` -else - pkg_failed=yes -fi - fi else - pkg_failed=untried + abi_libwmf_dir="" + fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_ots_LIBS"; then - pkg_cv__abi_ots_LIBS="$_abi_ots_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - gtk+-2.0 - libglade-2.0 - libots-1 >= 0.5.0 -\"") >&5 - ($PKG_CONFIG --exists --print-errors " - gtk+-2.0 - libglade-2.0 - libots-1 >= 0.5.0 -") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_ots_LIBS=`$PKG_CONFIG --libs " - gtk+-2.0 - libglade-2.0 - libots-1 >= 0.5.0 -" 2>/dev/null` + + if test $abi_libwmf_opt != no ; then + if test "x$abi_libwmf_dir" = "x" ; then + # Extract the first word of "libwmf-config", so it can be a program name with args. +set dummy libwmf-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_abi_libwmf_config+set}" = set; then + $as_echo_n "(cached) " >&6 else - pkg_failed=yes + case $abi_libwmf_config in + [\\/]* | ?:[\\/]*) + ac_cv_path_abi_libwmf_config="$abi_libwmf_config" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_abi_libwmf_config="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac fi - fi +abi_libwmf_config=$ac_cv_path_abi_libwmf_config +if test -n "$abi_libwmf_config"; then + { $as_echo "$as_me:$LINENO: result: $abi_libwmf_config" >&5 +$as_echo "$abi_libwmf_config" >&6; } else - pkg_failed=untried + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + else + # Extract the first word of "libwmf-config", so it can be a program name with args. +set dummy libwmf-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_abi_libwmf_config+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $abi_libwmf_config in + [\\/]* | ?:[\\/]*) + ac_cv_path_abi_libwmf_config="$abi_libwmf_config" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$abi_libwmf_dir/bin:$PATH" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_abi_libwmf_config="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + ;; +esac +fi +abi_libwmf_config=$ac_cv_path_abi_libwmf_config +if test -n "$abi_libwmf_config"; then + { $as_echo "$as_me:$LINENO: result: $abi_libwmf_config" >&5 +$as_echo "$abi_libwmf_config" >&6; } else - _pkg_short_errors_supported=no + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - if test $_pkg_short_errors_supported = yes; then - _abi_ots_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - gtk+-2.0 - libglade-2.0 - libots-1 >= 0.5.0 -"` - else - _abi_ots_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - gtk+-2.0 - libglade-2.0 - libots-1 >= 0.5.0 -"` - fi - # Put the nasty error message in config.log where it belongs - echo "$_abi_ots_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test "xOts: error - libots-1 >= 0.5.0 required" != "x" ; then - echo "Ots: error - libots-1 >= 0.5.0 required" >> $abi_plugin_topdir/plugin.status + fi + if test "x$abi_libwmf_config" = "x" ; then + if test $abi_libwmf_opt = required ; then + { { $as_echo "$as_me:$LINENO: error: * * * unable to find libwmf-config in path! * * *" >&5 +$as_echo "$as_me: error: * * * unable to find libwmf-config in path! * * *" >&2;} + { (exit 1); exit 1; }; } + fi + abi_libwmf_opt=no + fi fi + if test $abi_libwmf_opt != no ; then + if $abi_libwmf_config --version > /dev/null 2>&1 ; then + _abi_libwmf_version="0.2.8" + _abi_libwmf_major=`echo $_abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + _abi_libwmf_minor=`echo $_abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + _abi_libwmf_micro=`echo $_abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - abi_plugin_disable=yes + { $as_echo "$as_me:$LINENO: checking for libwmf >= $_abi_libwmf_major.$_abi_libwmf_minor.$_abi_libwmf_micro" >&5 +$as_echo_n "checking for libwmf >= $_abi_libwmf_major.$_abi_libwmf_minor.$_abi_libwmf_micro... " >&6; } -elif test $pkg_failed = untried; then + abi_libwmf_version=`$abi_libwmf_config --version` + abi_libwmf_major=`echo $abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + abi_libwmf_minor=`echo $abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + abi_libwmf_micro=`echo $abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "xOts: error - libots-1 >= 0.5.0 required" != "x" ; then - echo "Ots: error - libots-1 >= 0.5.0 required" >> $abi_plugin_topdir/plugin.status + abi_libwmf_version="" + if test $abi_libwmf_major -gt $_abi_libwmf_major ; then + abi_libwmf_version="$abi_libwmf_major.$abi_libwmf_minor.$abi_libwmf_micro" + elif test $abi_libwmf_major -eq $_abi_libwmf_major ; then + if test $abi_libwmf_minor -gt $_abi_libwmf_minor ; then + abi_libwmf_version="$abi_libwmf_major.$abi_libwmf_minor.$abi_libwmf_micro" + elif test $abi_libwmf_minor -eq $_abi_libwmf_minor ; then + if test $abi_libwmf_micro -ge $_abi_libwmf_micro ; then + abi_libwmf_version="$abi_libwmf_major.$abi_libwmf_minor.$abi_libwmf_micro" + fi + fi + fi + if test "x$abi_libwmf_version" = "x" ; then + if test $abi_libwmf_opt = required ; then + { { $as_echo "$as_me:$LINENO: error: * * * libwmf version is incompatible! require at least \"1.2.0.2.8\" * * *" >&5 +$as_echo "$as_me: error: * * * libwmf version is incompatible! require at least \"1.2.0.2.8\" * * *" >&2;} + { (exit 1); exit 1; }; } + fi + abi_libwmf_opt=no + { $as_echo "$as_me:$LINENO: result: no - $abi_libwmf_major.$abi_libwmf_minor.$abi_libwmf_micro" >&5 +$as_echo "no - $abi_libwmf_major.$abi_libwmf_minor.$abi_libwmf_micro" >&6; } + else + { $as_echo "$as_me:$LINENO: result: yes - $abi_libwmf_version" >&5 +$as_echo "yes - $abi_libwmf_version" >&6; } + fi + else + { $as_echo "$as_me:$LINENO: WARNING: * * * problem obtaining libwmf version... * * *" >&5 +$as_echo "$as_me: WARNING: * * * problem obtaining libwmf version... * * *" >&2;} + if test $abi_libwmf_opt = required ; then + { { $as_echo "$as_me:$LINENO: error: * * * unable to determine libwmf version! * * *" >&5 +$as_echo "$as_me: error: * * * unable to determine libwmf version! * * *" >&2;} + { (exit 1); exit 1; }; } + fi + abi_libwmf_opt=no + fi + fi + if test $abi_libwmf_opt != no ; then + if test "x$abi_libwmf_dir" = "x" ; then + abi_libwmf_opt=yes + else + abi_libwmf_opt="$abi_libwmf_dir" + fi fi - abi_plugin_disable=yes +if test "$abi_libwmf_opt" = "no" ; then + + if test "xwmf: error - libwmf >= 0.2.8 not found" != "x" ; then + echo "wmf: error - libwmf >= 0.2.8 not found" >> $abi_plugin_topdir/plugin.status + fi + abi_plugin_disable=yes else - _abi_ots_CFLAGS=$pkg_cv__abi_ots_CFLAGS - _abi_ots_LIBS=$pkg_cv__abi_ots_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - if test "xOts: okay" != "x" ; then - echo "Ots: okay" >> $abi_plugin_topdir/plugin.status + if test "xwmf: okay" != "x" ; then + echo "wmf: okay" >> $abi_plugin_topdir/plugin.status fi - fi + if test $abi_plugin_disable = no; then - ABI_OTS_CPPFLAGS="$_abi_ots_CFLAGS" - ABI_OTS_LDFLAGS="$_abi_ots_LIBS" + ABI_WMF_CPPFLAGS="`$abi_libwmf_config --cflags`" + ABI_WMF_LDFLAGS="`$abi_libwmf_config --libs`" fi @@ -27592,13 +24770,13 @@ LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_tools="$abi_tools ots" + abi_wp_impexp_graphics="$abi_wp_impexp_graphics wmf" fi fi abi_plugin_add=yes -# Check whether --enable-presentation was given. -if test "${enable_presentation+set}" = set; then - enableval=$enable_presentation; +# Check whether --enable-wpg was given. +if test "${enable_wpg+set}" = set; then + enableval=$enable_wpg; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -27609,9 +24787,9 @@ fi -# Check whether --with-presentation was given. -if test "${with_presentation+set}" = set; then - withval=$with_presentation; +# Check whether --with-wpg was given. +if test "${with_wpg+set}" = set; then + withval=$with_wpg; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -27627,52 +24805,48 @@ _abi_cppflags_save="$CPPFLAGS" _abi_ldflags_save="$LDFLAGS" -PRESENTATION_CPPFLAGS="" -PRESENTATION_LDFLAGS="" +LIBWPG_CPPFLAGS="" +LIBWPG_LDFLAGS="" # Checks for libraries. # Checks for header files. pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_glib" >&5 -echo $ECHO_N "checking for _abi_glib... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for _abi_libwpg" >&5 +$as_echo_n "checking for _abi_libwpg... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_glib_CFLAGS"; then - pkg_cv__abi_glib_CFLAGS="$_abi_glib_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 \"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 ") 2>&5 +if test -n "$_abi_libwpg_CFLAGS"; then + pkg_cv__abi_libwpg_CFLAGS="$_abi_libwpg_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.0 " 2>/dev/null` + pkg_cv__abi_libwpg_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_glib_LIBS"; then - pkg_cv__abi_glib_LIBS="$_abi_glib_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.0 \"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.0 ") 2>&5 +if test -n "$_abi_libwpg_LIBS"; then + pkg_cv__abi_libwpg_LIBS="$_abi_libwpg_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0 " 2>/dev/null` + pkg_cv__abi_libwpg_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -27685,102 +24859,65 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.0 "` + _abi_libwpg_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" 2>&1` else - _abi_glib_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.0 "` + _abi_libwpg_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$_abi_glib_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - - if test "xPrsentation: error - glib-2.0 >= 2.0 required" != "x" ; then - echo "Prsentation: error - glib-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status - fi - - abi_plugin_disable=yes + echo "$_abi_libwpg_PKG_ERRORS" >&5 -elif test $pkg_failed = untried; then + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "xPrsentation: error - glib-2.0 >= 2.0 required" != "x" ; then - echo "Prsentation: error - glib-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status + if test "xlibwpg: error - libwpg-0.1 >= 0.1.0 and libwpd-0.8 >= 0.8.0 required" != "x" ; then + echo "libwpg: error - libwpg-0.1 >= 0.1.0 and libwpd-0.8 >= 0.8.0 required" >> $abi_plugin_topdir/plugin.status fi abi_plugin_disable=yes -else - _abi_glib_CFLAGS=$pkg_cv__abi_glib_CFLAGS - _abi_glib_LIBS=$pkg_cv__abi_glib_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi - -if test $abi_plugin_disable = no; then - PRESENTATION_CPPFLAGS="$_abi_glib_CFLAGS" - PRESENTATION_LDFLAGS="$_abi_glib_LIBS" - - if test "xpresentation: okay" != "x" ; then - echo "presentation: okay" >> $abi_plugin_topdir/plugin.status - fi - -fi - - - - -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" - - if test $abi_plugin_disable = no; then - abi_tools="$abi_tools presentation" - fi -fi -abi_plugin_add=yes -# Check whether --enable-urldict was given. -if test "${enable_urldict+set}" = set; then - enableval=$enable_urldict; - if test "x$enableval" = "xno"; then - abi_plugin_add=no +elif test $pkg_failed = untried; then + + if test "xlibwpg: error - libwpg-0.1 >= 0.1.0 and libwpd-0.8 >= 0.8.0 required" != "x" ; then + echo "libwpg: error - libwpg-0.1 >= 0.1.0 and libwpd-0.8 >= 0.8.0 required" >> $abi_plugin_topdir/plugin.status fi -else - abi_plugin_add=$abi_plugin_opt + abi_plugin_disable=yes -fi +else + _abi_libwpg_CFLAGS=$pkg_cv__abi_libwpg_CFLAGS + _abi_libwpg_LIBS=$pkg_cv__abi_libwpg_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -# Check whether --with-urldict was given. -if test "${with_urldict+set}" = set; then - withval=$with_urldict; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes + if test "xlibwpg: okay" != "x" ; then + echo "libwpg: okay" >> $abi_plugin_topdir/plugin.status fi -fi - -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +fi +if test $abi_plugin_disable = no; then + LIBWPG_CPPFLAGS="$_abi_libwpg_CFLAGS" + LIBWPG_LDFLAGS="$_abi_libwpg_LIBS" +fi - if test "xurldict: okay" != "x" ; then - echo "urldict: okay" >> $abi_plugin_topdir/plugin.status - fi +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_tools="$abi_tools urldict" + abi_wp_impexp_graphics="$abi_wp_impexp_graphics wpg" fi fi + + +abi_wp_impexp= abi_plugin_add=yes -# Check whether --enable-wikipedia was given. -if test "${enable_wikipedia+set}" = set; then - enableval=$enable_wikipedia; +# Check whether --enable-applix was given. +if test "${enable_applix+set}" = set; then + enableval=$enable_applix; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -27791,9 +24928,9 @@ fi -# Check whether --with-wikipedia was given. -if test "${with_wikipedia+set}" = set; then - withval=$with_wikipedia; +# Check whether --with-applix was given. +if test "${with_applix+set}" = set; then + withval=$with_applix; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -27807,23 +24944,20 @@ - if test "xwikipedia: okay" != "x" ; then - echo "wikipedia: okay" >> $abi_plugin_topdir/plugin.status + if test "xapplix: okay" != "x" ; then + echo "applix: okay" >> $abi_plugin_topdir/plugin.status fi if test $abi_plugin_disable = no; then - abi_tools="$abi_tools wikipedia" + abi_wp_impexp="$abi_wp_impexp applix" fi fi - - -abi_wp_impexp_graphics= abi_plugin_add=yes -# Check whether --enable-bmp was given. -if test "${enable_bmp+set}" = set; then - enableval=$enable_bmp; +# Check whether --enable-clarisworks was given. +if test "${enable_clarisworks+set}" = set; then + enableval=$enable_clarisworks; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -27834,9 +24968,9 @@ fi -# Check whether --with-bmp was given. -if test "${with_bmp+set}" = set; then - withval=$with_bmp; +# Check whether --with-clarisworks was given. +if test "${with_clarisworks+set}" = set; then + withval=$with_clarisworks; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -27849,26 +24983,21 @@ abi_plugin_disable=no -ABI_BMP_CPPFLAGS="$LIBPNG_CFLAGS" -ABI_BMP_LDFLAGS="$LIBPNG_LIBS" - - - - - if test "xbmp: okay" != "x" ; then - echo "bmp: okay" >> $abi_plugin_topdir/plugin.status + if test "xclarisworks: okay" != "x" ; then + echo "clarisworks: okay" >> $abi_plugin_topdir/plugin.status fi + if test $abi_plugin_disable = no; then - abi_wp_impexp_graphics="$abi_wp_impexp_graphics bmp" + abi_wp_impexp="$abi_wp_impexp clarisworks" fi fi abi_plugin_add=yes -# Check whether --enable-jpeg was given. -if test "${enable_jpeg+set}" = set; then - enableval=$enable_jpeg; +# Check whether --enable-docbook was given. +if test "${enable_docbook+set}" = set; then + enableval=$enable_docbook; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -27879,9 +25008,9 @@ fi -# Check whether --with-jpeg was given. -if test "${with_jpeg+set}" = set; then - withval=$with_jpeg; +# Check whether --with-docbook was given. +if test "${with_docbook+set}" = set; then + withval=$with_docbook; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -27894,35 +25023,29 @@ abi_plugin_disable=no -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" - -ABI_JPEG_CPPFLAGS="" -ABI_JPEG_LDFLAGS="" - -# Checks for libraries. -# Checks for header files. - -if test "${ac_cv_header_jpeglib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if test "${ac_cv_header_time+set}" = set; then + $as_echo_n "(cached) " >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 -echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include +#include +#include +#include + +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -27930,207 +25053,139 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + ac_cv_header_time=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_time=no fi 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; } +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +$as_echo "$ac_cv_header_time" >&6; } +if test $ac_cv_header_time = yes; then -# Is the header present? -{ echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 -echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +cat >>confdefs.h <<\_ACEOF +#define TIME_WITH_SYS_TIME 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -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; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------------- ## -## Report this to http://bugzilla.abisource.com/ ## -## --------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_jpeglib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } +ABI_DOCBOOK_CPPFLAGS="" +ABI_DOCBOOK_LDFLAGS="" -fi -if test $ac_cv_header_jpeglib_h = yes; then - { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6; } -if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljpeg $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* 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 -char jpeg_read_header (); -int -main () -{ -return jpeg_read_header (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_jpeg_jpeg_read_header=yes + + + if test "xdocbook: okay" != "x" ; then + echo "docbook: okay" >> $abi_plugin_topdir/plugin.status + fi + + + + if test $abi_plugin_disable = no; then + abi_wp_impexp="$abi_wp_impexp docbook" + fi +fi +abi_plugin_add=yes +# Check whether --enable-eml was given. +if test "${enable_eml+set}" = set; then + enableval=$enable_eml; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + abi_plugin_add=$abi_plugin_opt - ac_cv_lib_jpeg_jpeg_read_header=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +# Check whether --with-eml was given. +if test "${with_eml+set}" = set; then + withval=$with_eml; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi + fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6; } -if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then + +if test $abi_plugin_add = yes; then + abi_plugin_disable=no - if test "xjpeg: okay" != "x" ; then - echo "jpeg: okay" >> $abi_plugin_topdir/plugin.status + + if test "xeml: okay" != "x" ; then + echo "eml: okay" >> $abi_plugin_topdir/plugin.status fi -else - if test "xjpeg: error - libjpeg not found" != "x" ; then - echo "jpeg: error - libjpeg not found" >> $abi_plugin_topdir/plugin.status + if test $abi_plugin_disable = no; then + abi_wp_impexp="$abi_wp_impexp eml" + fi +fi +abi_plugin_add=yes +# Check whether --enable-hancom was given. +if test "${enable_hancom+set}" = set; then + enableval=$enable_hancom; + if test "x$enableval" = "xno"; then + abi_plugin_add=no fi - abi_plugin_disable=yes +else + abi_plugin_add=$abi_plugin_opt fi -else - - if test "xjpeg: error - jpeg header not found" != "x" ; then - echo "jpeg: error - jpeg header not found" >> $abi_plugin_topdir/plugin.status +# Check whether --with-hancom was given. +if test "${with_hancom+set}" = set; then + withval=$with_hancom; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes fi - abi_plugin_disable=yes - fi +if test $abi_plugin_add = yes; then + abi_plugin_disable=no -if test $abi_plugin_disable = no; then - ABI_JPEG_CPPFLAGS="$LIBPNG_CFLAGS" - ABI_JPEG_LDFLAGS="-ljpeg $LIBPNG_LIBS" -fi +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" + +ABI_HANCOM_CPPFLAGS="" +ABI_HANCOM_LDFLAGS="" + +# Checks for libraries. +# Checks for header files. + + + if test "xHancom: okay" != "x" ; then + echo "Hancom: okay" >> $abi_plugin_topdir/plugin.status + fi + @@ -28139,13 +25194,13 @@ LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_wp_impexp_graphics="$abi_wp_impexp_graphics jpeg" + abi_wp_impexp="$abi_wp_impexp hancom" fi fi abi_plugin_add=yes -# Check whether --enable-librsvg was given. -if test "${enable_librsvg+set}" = set; then - enableval=$enable_librsvg; +# Check whether --enable-hrtext was given. +if test "${enable_hrtext+set}" = set; then + enableval=$enable_hrtext; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -28156,9 +25211,9 @@ fi -# Check whether --with-librsvg was given. -if test "${with_librsvg+set}" = set; then - withval=$with_librsvg; +# Check whether --with-hrtext was given. +if test "${with_hrtext+set}" = set; then + withval=$with_hrtext; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -28171,123 +25226,101 @@ abi_plugin_disable=no -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" - -LIBRSVG_CPPFLAGS="" -LIBRSVG_LDFLAGS="" -# Checks for libraries. -# Checks for header files. + if test "xhrtext: okay" != "x" ; then + echo "hrtext: okay" >> $abi_plugin_topdir/plugin.status + fi -pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_librsvg" >&5 -echo $ECHO_N "checking for _abi_librsvg... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_librsvg_CFLAGS"; then - pkg_cv__abi_librsvg_CFLAGS="$_abi_librsvg_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_librsvg_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_librsvg_LIBS"; then - pkg_cv__abi_librsvg_LIBS="$_abi_librsvg_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_librsvg_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.0" 2>/dev/null` -else - pkg_failed=yes + if test $abi_plugin_disable = no; then + abi_wp_impexp="$abi_wp_impexp hrtext" + fi fi - fi +abi_plugin_add=yes +# Check whether --enable-iscii-text was given. +if test "${enable_iscii_text+set}" = set; then + enableval=$enable_iscii_text; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi + else - pkg_failed=untried -fi + abi_plugin_add=$abi_plugin_opt +fi -if test $pkg_failed = yes; then +# Check whether --with-iscii-text was given. +if test "${with_iscii_text+set}" = set; then + withval=$with_iscii_text; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no fi - if test $_pkg_short_errors_supported = yes; then - _abi_librsvg_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "librsvg-2.0 >= 2.0"` - else - _abi_librsvg_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "librsvg-2.0 >= 2.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$_abi_librsvg_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +if test $abi_plugin_add = yes; then + abi_plugin_disable=no + - if test "xLibRSVG: error - librsvg-2.0 >= 2.0 required" != "x" ; then - echo "LibRSVG: error - librsvg-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status + + if test "xiscii-text: okay" != "x" ; then + echo "iscii-text: okay" >> $abi_plugin_topdir/plugin.status fi - abi_plugin_disable=yes -elif test $pkg_failed = untried; then - if test "xLibRSVG: error - librsvg-2.0 >= 2.0 required" != "x" ; then - echo "LibRSVG: error - librsvg-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status + if test $abi_plugin_disable = no; then + abi_wp_impexp="$abi_wp_impexp iscii-text" + fi +fi +abi_plugin_add=yes +# Check whether --enable-kword was given. +if test "${enable_kword+set}" = set; then + enableval=$enable_kword; + if test "x$enableval" = "xno"; then + abi_plugin_add=no fi - - abi_plugin_disable=yes else - _abi_librsvg_CFLAGS=$pkg_cv__abi_librsvg_CFLAGS - _abi_librsvg_LIBS=$pkg_cv__abi_librsvg_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + abi_plugin_add=$abi_plugin_opt +fi - if test "xLibRSVG: okay" != "x" ; then - echo "LibRSVG: okay" >> $abi_plugin_topdir/plugin.status - fi +# Check whether --with-kword was given. +if test "${with_kword+set}" = set; then + withval=$with_kword; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi fi -if test $abi_plugin_disable = no; then - LIBRSVG_CPPFLAGS="$_abi_librsvg_CFLAGS" - LIBRSVG_LDFLAGS="$_abi_librsvg_LIBS" -fi +if test $abi_plugin_add = yes; then + abi_plugin_disable=no -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" + if test "xkword: okay" != "x" ; then + echo "kword: okay" >> $abi_plugin_topdir/plugin.status + fi + + if test $abi_plugin_disable = no; then - abi_wp_impexp_graphics="$abi_wp_impexp_graphics librsvg" + abi_wp_impexp="$abi_wp_impexp kword" fi fi abi_plugin_add=yes -# Check whether --enable-win32native was given. -if test "${enable_win32native+set}" = set; then - enableval=$enable_win32native; +# Check whether --enable-latex was given. +if test "${enable_latex+set}" = set; then + enableval=$enable_latex; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -28298,9 +25331,9 @@ fi -# Check whether --with-win32native was given. -if test "${with_win32native+set}" = set; then - withval=$with_win32native; +# Check whether --with-latex was given. +if test "${with_latex+set}" = set; then + withval=$with_latex; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -28313,55 +25346,67 @@ abi_plugin_disable=no -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" -LIBRSVG_CPPFLAGS="" -LIBRSVG_LDFLAGS="" + if test "xlatex: okay" != "x" ; then + echo "latex: okay" >> $abi_plugin_topdir/plugin.status + fi -# Checks for libraries. -# Checks for header files. +libxslt_req='libxslt' + +# use libxslt if detected +if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$libxslt_req \"") >&5 + ($PKG_CONFIG --exists --print-errors " $libxslt_req ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + + abi_cv_libxslt="yes" + +else + + abi_cv_libxslt="no" + +fi + +if test "$abi_cv_libxslt" == "yes"; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_librsvg" >&5 -echo $ECHO_N "checking for _abi_librsvg... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for LIBXSLT" >&5 +$as_echo_n "checking for LIBXSLT... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_librsvg_CFLAGS"; then - pkg_cv__abi_librsvg_CFLAGS="$_abi_librsvg_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.0") 2>&5 +if test -n "$LIBXSLT_CFLAGS"; then + pkg_cv_LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$libxslt_req\"") >&5 + ($PKG_CONFIG --exists --print-errors "$libxslt_req") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_librsvg_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.0" 2>/dev/null` + pkg_cv_LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "$libxslt_req" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_librsvg_LIBS"; then - pkg_cv__abi_librsvg_LIBS="$_abi_librsvg_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.0") 2>&5 +if test -n "$LIBXSLT_LIBS"; then + pkg_cv_LIBXSLT_LIBS="$LIBXSLT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$libxslt_req\"") >&5 + ($PKG_CONFIG --exists --print-errors "$libxslt_req") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_librsvg_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.0" 2>/dev/null` + pkg_cv_LIBXSLT_LIBS=`$PKG_CONFIG --libs "$libxslt_req" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -28374,62 +25419,113 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_librsvg_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "librsvg-2.0 >= 2.0"` + LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$libxslt_req" 2>&1` else - _abi_librsvg_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "librsvg-2.0 >= 2.0"` + LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$libxslt_req" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$_abi_librsvg_PKG_ERRORS" >&5 + echo "$LIBXSLT_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { { $as_echo "$as_me:$LINENO: error: Package requirements ($libxslt_req) were not met: - if test "xLibRSVG: error - librsvg-2.0 >= 2.0 required" != "x" ; then - echo "LibRSVG: error - librsvg-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status - fi +$LIBXSLT_PKG_ERRORS - abi_plugin_disable=yes +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables LIBXSLT_CFLAGS +and LIBXSLT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +$as_echo "$as_me: error: Package requirements ($libxslt_req) were not met: + +$LIBXSLT_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables LIBXSLT_CFLAGS +and LIBXSLT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -elif test $pkg_failed = untried; then +Alternatively, you may set the environment variables LIBXSLT_CFLAGS +and LIBXSLT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - if test "xLibRSVG: error - librsvg-2.0 >= 2.0 required" != "x" ; then - echo "LibRSVG: error - librsvg-2.0 >= 2.0 required" >> $abi_plugin_topdir/plugin.status - fi +To get pkg-config, see . +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. - abi_plugin_disable=yes +Alternatively, you may set the environment variables LIBXSLT_CFLAGS +and LIBXSLT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } else - _abi_librsvg_CFLAGS=$pkg_cv__abi_librsvg_CFLAGS - _abi_librsvg_LIBS=$pkg_cv__abi_librsvg_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - + LIBXSLT_CFLAGS=$pkg_cv_LIBXSLT_CFLAGS + LIBXSLT_LIBS=$pkg_cv_LIBXSLT_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + LATEX_CFLAGS="$LATEX_CFLAGS "'${LIBXSLT_CFLAGS}'" -DHAVE_LIBXSLT" + LATEX_LIBS="$LATEX_LIBS "'${LIBXSLT_LIBS}' - if test "xLibRSVG: okay" != "x" ; then - echo "LibRSVG: okay" >> $abi_plugin_topdir/plugin.status + if test "xlatex: equation export enabled" != "x" ; then + echo "latex: equation export enabled" >> $abi_plugin_topdir/plugin.status fi +else + + if test "xlatex: equation export disabled" != "x" ; then + echo "latex: equation export disabled" >> $abi_plugin_topdir/plugin.status + fi fi -if test $abi_plugin_disable = no; then - LIBRSVG_CPPFLAGS="$_abi_librsvg_CFLAGS" - LIBRSVG_LDFLAGS="$_abi_librsvg_LIBS" + +LATEX_CFLAGS="$LATEX_CFLAGS "'${PLUGIN_CFLAGS}' +LATEX_LIBS="$LATEX_LIBS "'${PLUGIN_LIBS}' + +if test "$enable_latex_builtin" == "yes"; then + LATEX_CFLAGS="$LATEX_CFLAGS -DABI_PLUGIN_BUILTIN" fi -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_wp_impexp_graphics="$abi_wp_impexp_graphics win32native" + abi_wp_impexp="$abi_wp_impexp latex" fi fi + + + if test "x$abi_cv_libxslt" = "xyes"; then + HAVE_LIBXSLT_TRUE= + HAVE_LIBXSLT_FALSE='#' +else + HAVE_LIBXSLT_TRUE='#' + HAVE_LIBXSLT_FALSE= +fi + + + abi_plugin_add=yes -# Check whether --enable-wmf was given. -if test "${enable_wmf+set}" = set; then - enableval=$enable_wmf; +# Check whether --enable-mif was given. +if test "${enable_mif+set}" = set; then + enableval=$enable_mif; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -28440,9 +25536,9 @@ fi -# Check whether --with-wmf was given. -if test "${with_wmf+set}" = set; then - withval=$with_wmf; +# Check whether --with-mif was given. +if test "${with_mif+set}" = set; then + withval=$with_mif; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -28455,234 +25551,101 @@ abi_plugin_disable=no -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" - -ABI_WMF_CPPFLAGS="" -ABI_WMF_LDFLAGS="" - -# Checks for libraries. -# Checks for header files. - - abi_libwmf_config="" - abi_libwmf_version="" - if test "xyes" = "xyes" ; then - abi_libwmf_opt=check - else - abi_libwmf_opt=required + if test "xmif: okay" != "x" ; then + echo "mif: okay" >> $abi_plugin_topdir/plugin.status fi -# Check whether --with-libwmf was given. -if test "${with_libwmf+set}" = set; then - withval=$with_libwmf; - if test "x$withval" = "xno" ; then - if test $abi_libwmf_opt = required ; then - { { echo "$as_me:$LINENO: error: * * * libwmf is not optional! * * *" >&5 -echo "$as_me: error: * * * libwmf is not optional! * * *" >&2;} - { (exit 1); exit 1; }; } - fi - abi_libwmf_opt=no - elif test "x$withval" = "xyes" ; then - abi_libwmf_opt=required - abi_libwmf_dir="" - else - abi_libwmf_opt=required - abi_libwmf_dir="$withval" - fi -else - abi_libwmf_dir="" + if test $abi_plugin_disable = no; then + abi_wp_impexp="$abi_wp_impexp mif" + fi fi +abi_plugin_add=yes +# Check whether --enable-mswrite was given. +if test "${enable_mswrite+set}" = set; then + enableval=$enable_mswrite; + if test "x$enableval" = "xno"; then + abi_plugin_add=no + fi - if test $abi_libwmf_opt != no ; then - if test "x$abi_libwmf_dir" = "x" ; then - # Extract the first word of "libwmf-config", so it can be a program name with args. -set dummy libwmf-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_abi_libwmf_config+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $abi_libwmf_config in - [\\/]* | ?:[\\/]*) - ac_cv_path_abi_libwmf_config="$abi_libwmf_config" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_abi_libwmf_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 + abi_plugin_add=$abi_plugin_opt - ;; -esac -fi -abi_libwmf_config=$ac_cv_path_abi_libwmf_config -if test -n "$abi_libwmf_config"; then - { echo "$as_me:$LINENO: result: $abi_libwmf_config" >&5 -echo "${ECHO_T}$abi_libwmf_config" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } fi - else - # Extract the first word of "libwmf-config", so it can be a program name with args. -set dummy libwmf-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_abi_libwmf_config+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $abi_libwmf_config in - [\\/]* | ?:[\\/]*) - ac_cv_path_abi_libwmf_config="$abi_libwmf_config" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$abi_libwmf_dir/bin:$PATH" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_abi_libwmf_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 +# Check whether --with-mswrite was given. +if test "${with_mswrite+set}" = set; then + withval=$with_mswrite; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi - ;; -esac -fi -abi_libwmf_config=$ac_cv_path_abi_libwmf_config -if test -n "$abi_libwmf_config"; then - { echo "$as_me:$LINENO: result: $abi_libwmf_config" >&5 -echo "${ECHO_T}$abi_libwmf_config" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } fi +if test $abi_plugin_add = yes; then + abi_plugin_disable=no - fi - if test "x$abi_libwmf_config" = "x" ; then - if test $abi_libwmf_opt = required ; then - { { echo "$as_me:$LINENO: error: * * * unable to find libwmf-config in path! * * *" >&5 -echo "$as_me: error: * * * unable to find libwmf-config in path! * * *" >&2;} - { (exit 1); exit 1; }; } - fi - abi_libwmf_opt=no - fi + + + if test "xmswrite: okay" != "x" ; then + echo "mswrite: okay" >> $abi_plugin_topdir/plugin.status fi - if test $abi_libwmf_opt != no ; then - if $abi_libwmf_config --version > /dev/null 2>&1 ; then - _abi_libwmf_version="0.2.8" - _abi_libwmf_major=`echo $_abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - _abi_libwmf_minor=`echo $_abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - _abi_libwmf_micro=`echo $_abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - { echo "$as_me:$LINENO: checking for libwmf >= $_abi_libwmf_major.$_abi_libwmf_minor.$_abi_libwmf_micro" >&5 -echo $ECHO_N "checking for libwmf >= $_abi_libwmf_major.$_abi_libwmf_minor.$_abi_libwmf_micro... $ECHO_C" >&6; } - abi_libwmf_version=`$abi_libwmf_config --version` - abi_libwmf_major=`echo $abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - abi_libwmf_minor=`echo $abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - abi_libwmf_micro=`echo $abi_libwmf_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - abi_libwmf_version="" - if test $abi_libwmf_major -gt $_abi_libwmf_major ; then - abi_libwmf_version="$abi_libwmf_major.$abi_libwmf_minor.$abi_libwmf_micro" - elif test $abi_libwmf_major -eq $_abi_libwmf_major ; then - if test $abi_libwmf_minor -gt $_abi_libwmf_minor ; then - abi_libwmf_version="$abi_libwmf_major.$abi_libwmf_minor.$abi_libwmf_micro" - elif test $abi_libwmf_minor -eq $_abi_libwmf_minor ; then - if test $abi_libwmf_micro -ge $_abi_libwmf_micro ; then - abi_libwmf_version="$abi_libwmf_major.$abi_libwmf_minor.$abi_libwmf_micro" - fi - fi - fi - if test "x$abi_libwmf_version" = "x" ; then - if test $abi_libwmf_opt = required ; then - { { echo "$as_me:$LINENO: error: * * * libwmf version is incompatible! require at least \"1.2.0.2.8\" * * *" >&5 -echo "$as_me: error: * * * libwmf version is incompatible! require at least \"1.2.0.2.8\" * * *" >&2;} - { (exit 1); exit 1; }; } - fi - abi_libwmf_opt=no - { echo "$as_me:$LINENO: result: no - $abi_libwmf_major.$abi_libwmf_minor.$abi_libwmf_micro" >&5 -echo "${ECHO_T}no - $abi_libwmf_major.$abi_libwmf_minor.$abi_libwmf_micro" >&6; } - else - { echo "$as_me:$LINENO: result: yes - $abi_libwmf_version" >&5 -echo "${ECHO_T}yes - $abi_libwmf_version" >&6; } - fi - else - { echo "$as_me:$LINENO: WARNING: * * * problem obtaining libwmf version... * * *" >&5 -echo "$as_me: WARNING: * * * problem obtaining libwmf version... * * *" >&2;} - if test $abi_libwmf_opt = required ; then - { { echo "$as_me:$LINENO: error: * * * unable to determine libwmf version! * * *" >&5 -echo "$as_me: error: * * * unable to determine libwmf version! * * *" >&2;} - { (exit 1); exit 1; }; } - fi - abi_libwmf_opt=no - fi + if test $abi_plugin_disable = no; then + abi_wp_impexp="$abi_wp_impexp mswrite" fi - if test $abi_libwmf_opt != no ; then - if test "x$abi_libwmf_dir" = "x" ; then - abi_libwmf_opt=yes - else - abi_libwmf_opt="$abi_libwmf_dir" - fi +fi +abi_plugin_add=yes +# Check whether --enable-nroff was given. +if test "${enable_nroff+set}" = set; then + enableval=$enable_nroff; + if test "x$enableval" = "xno"; then + abi_plugin_add=no fi -if test "$abi_libwmf_opt" = "no" ; then +else + abi_plugin_add=$abi_plugin_opt - if test "xwmf: error - libwmf >= 0.2.8 not found" != "x" ; then - echo "wmf: error - libwmf >= 0.2.8 not found" >> $abi_plugin_topdir/plugin.status - fi +fi - abi_plugin_disable=yes -else - if test "xwmf: okay" != "x" ; then - echo "wmf: okay" >> $abi_plugin_topdir/plugin.status +# Check whether --with-nroff was given. +if test "${with_nroff+set}" = set; then + withval=$with_nroff; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes fi fi -if test $abi_plugin_disable = no; then - ABI_WMF_CPPFLAGS="`$abi_libwmf_config --cflags`" - ABI_WMF_LDFLAGS="`$abi_libwmf_config --libs`" -fi +if test $abi_plugin_add = yes; then + abi_plugin_disable=no + if test "xnroff: okay" != "x" ; then + echo "nroff: okay" >> $abi_plugin_topdir/plugin.status + fi + -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_wp_impexp_graphics="$abi_wp_impexp_graphics wmf" + abi_wp_impexp="$abi_wp_impexp nroff" fi fi abi_plugin_add=yes -# Check whether --enable-wpg was given. -if test "${enable_wpg+set}" = set; then - enableval=$enable_wpg; +# Check whether --enable-OpenDocument was given. +if test "${enable_OpenDocument+set}" = set; then + enableval=$enable_OpenDocument; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -28693,9 +25656,9 @@ fi -# Check whether --with-wpg was given. -if test "${with_wpg+set}" = set; then - withval=$with_wpg; +# Check whether --with-OpenDocument was given. +if test "${with_OpenDocument+set}" = set; then + withval=$with_OpenDocument; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -28711,106 +25674,18 @@ _abi_cppflags_save="$CPPFLAGS" _abi_ldflags_save="$LDFLAGS" -LIBWPG_CPPFLAGS="" -LIBWPG_LDFLAGS="" +ABI_OPENDOCUMENT_CPPFLAGS="" +ABI_OPENDOCUMENT_LDFLAGS="" # Checks for libraries. # Checks for header files. -pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_libwpg" >&5 -echo $ECHO_N "checking for _abi_libwpg... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_libwpg_CFLAGS"; then - pkg_cv__abi_libwpg_CFLAGS="$_abi_libwpg_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_libwpg_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_libwpg_LIBS"; then - pkg_cv__abi_libwpg_LIBS="$_abi_libwpg_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_libwpg_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - _abi_libwpg_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"` - else - _abi_libwpg_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$_abi_libwpg_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - - if test "xlibwpg: error - libwpg-0.1 >= 0.1.0 and libwpd-0.8 >= 0.8.0 required" != "x" ; then - echo "libwpg: error - libwpg-0.1 >= 0.1.0 and libwpd-0.8 >= 0.8.0 required" >> $abi_plugin_topdir/plugin.status - fi - - abi_plugin_disable=yes - -elif test $pkg_failed = untried; then - - if test "xlibwpg: error - libwpg-0.1 >= 0.1.0 and libwpd-0.8 >= 0.8.0 required" != "x" ; then - echo "libwpg: error - libwpg-0.1 >= 0.1.0 and libwpd-0.8 >= 0.8.0 required" >> $abi_plugin_topdir/plugin.status - fi - - abi_plugin_disable=yes - -else - _abi_libwpg_CFLAGS=$pkg_cv__abi_libwpg_CFLAGS - _abi_libwpg_LIBS=$pkg_cv__abi_libwpg_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - - - if test "xlibwpg: okay" != "x" ; then - echo "libwpg: okay" >> $abi_plugin_topdir/plugin.status + if test "xOpenDocument: okay" != "x" ; then + echo "OpenDocument: okay" >> $abi_plugin_topdir/plugin.status fi -fi -if test $abi_plugin_disable = no; then - LIBWPG_CPPFLAGS="$_abi_libwpg_CFLAGS" - LIBWPG_LDFLAGS="$_abi_libwpg_LIBS" -fi - @@ -28818,16 +25693,13 @@ LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_wp_impexp_graphics="$abi_wp_impexp_graphics wpg" + abi_wp_impexp="$abi_wp_impexp OpenDocument" fi fi - - -abi_wp_impexp= abi_plugin_add=yes -# Check whether --enable-applix was given. -if test "${enable_applix+set}" = set; then - enableval=$enable_applix; +# Check whether --enable-OpenWriter was given. +if test "${enable_OpenWriter+set}" = set; then + enableval=$enable_OpenWriter; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -28838,9 +25710,9 @@ fi -# Check whether --with-applix was given. -if test "${with_applix+set}" = set; then - withval=$with_applix; +# Check whether --with-OpenWriter was given. +if test "${with_OpenWriter+set}" = set; then + withval=$with_OpenWriter; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -28853,21 +25725,35 @@ abi_plugin_disable=no +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" - if test "xapplix: okay" != "x" ; then - echo "applix: okay" >> $abi_plugin_topdir/plugin.status +ABI_OPENWRITER_CPPFLAGS="" +ABI_OPENWRITER_LDFLAGS="" + +# Checks for libraries. +# Checks for header files. + + + if test "xOpenWriter: okay" != "x" ; then + echo "OpenWriter: okay" >> $abi_plugin_topdir/plugin.status fi + + +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" + if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp applix" + abi_wp_impexp="$abi_wp_impexp OpenWriter" fi fi abi_plugin_add=yes -# Check whether --enable-clarisworks was given. -if test "${enable_clarisworks+set}" = set; then - enableval=$enable_clarisworks; +# Check whether --enable-OpenXML was given. +if test "${enable_OpenXML+set}" = set; then + enableval=$enable_OpenXML; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -28878,9 +25764,9 @@ fi -# Check whether --with-clarisworks was given. -if test "${with_clarisworks+set}" = set; then - withval=$with_clarisworks; +# Check whether --with-OpenXML was given. +if test "${with_OpenXML+set}" = set; then + withval=$with_OpenXML; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -28893,66 +25779,196 @@ abi_plugin_disable=no +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" - if test "xclarisworks: okay" != "x" ; then - echo "clarisworks: okay" >> $abi_plugin_topdir/plugin.status +ABI_OPENXML_CPPFLAGS="" +ABI_OPENXML_LDFLAGS="" + +# Checks for libraries. +# Checks for header files. + + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for _abi_openxml" >&5 +$as_echo_n "checking for _abi_openxml... " >&6; } + +if test -n "$_abi_openxml_CFLAGS"; then + pkg_cv__abi_openxml_CFLAGS="$_abi_openxml_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + libgsf-1 >= 1.14.4 +\"") >&5 + ($PKG_CONFIG --exists --print-errors " + libgsf-1 >= 1.14.4 +") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_openxml_CFLAGS=`$PKG_CONFIG --cflags " + libgsf-1 >= 1.14.4 +" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$_abi_openxml_LIBS"; then + pkg_cv__abi_openxml_LIBS="$_abi_openxml_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + libgsf-1 >= 1.14.4 +\"") >&5 + ($PKG_CONFIG --exists --print-errors " + libgsf-1 >= 1.14.4 +") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_openxml_LIBS=`$PKG_CONFIG --libs " + libgsf-1 >= 1.14.4 +" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + _abi_openxml_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + libgsf-1 >= 1.14.4 +" 2>&1` + else + _abi_openxml_PKG_ERRORS=`$PKG_CONFIG --print-errors " + libgsf-1 >= 1.14.4 +" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$_abi_openxml_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + if test "xlibgsf: error - libgsf >= 1.14.4 required" != "x" ; then + echo "libgsf: error - libgsf >= 1.14.4 required" >> $abi_plugin_topdir/plugin.status fi + abi_plugin_disable=yes +elif test $pkg_failed = untried; then - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp clarisworks" + if test "xlibgsf: error - libgsf >= 1.14.4 required" != "x" ; then + echo "libgsf: error - libgsf >= 1.14.4 required" >> $abi_plugin_topdir/plugin.status fi + + abi_plugin_disable=yes + +else + _abi_openxml_CFLAGS=$pkg_cv__abi_openxml_CFLAGS + _abi_openxml_LIBS=$pkg_cv__abi_openxml_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + if test "xOpenXML: okay" != "x" ; then + echo "OpenXML: okay" >> $abi_plugin_topdir/plugin.status + fi + + fi -abi_plugin_add=yes -# Check whether --enable-docbook was given. -if test "${enable_docbook+set}" = set; then - enableval=$enable_docbook; - if test "x$enableval" = "xno"; then - abi_plugin_add=no + + + +# Check whether --with-boost was given. +if test "${with_boost+set}" = set; then + withval=$with_boost; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ac_boost_path="" + else + want_boost="yes" + ac_boost_path="$withval" fi else - abi_plugin_add=$abi_plugin_opt - + want_boost="yes" fi -# Check whether --with-docbook was given. -if test "${with_docbook+set}" = set; then - withval=$with_docbook; - if test "x$withval" = "xno"; then - abi_plugin_add=no +if test "x$want_boost" = "xyes"; then + boost_lib_version_req=1.33.1 + boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'` + boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'` + boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'` + boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + if test "x$boost_lib_version_req_sub_minor" = "x" ; then + boost_lib_version_req_sub_minor="0" + fi + WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` + { $as_echo "$as_me:$LINENO: checking for boostlib >= $boost_lib_version_req" >&5 +$as_echo_n "checking for boostlib >= $boost_lib_version_req... " >&6; } + succeeded=no + + if test "$ac_boost_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_path/lib" + BOOST_CPPFLAGS="-I$ac_boost_path/include" else - abi_plugin_add=yes + for ac_boost_path_tmp in /usr /usr/local /opt ; do + if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then + BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" + BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" + break; + fi + done fi -fi + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS -if test $abi_plugin_add = yes; then - abi_plugin_disable=no + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + 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 whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } -if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include -#include + + #include int main () { -if ((struct tm *) 0) -return 0; + + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + ; return 0; } @@ -28963,99 +25979,205 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_time=yes + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + found_system=yes + else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_time=no + + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then + 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 -cat >>confdefs.h <<\_ACEOF -#define TIME_WITH_SYS_TIME 1 -_ACEOF -fi -ABI_DOCBOOK_CPPFLAGS="" -ABI_DOCBOOK_LDFLAGS="" + if test "x$succeeded" != "xyes"; then + _version=0 + if test "$ac_boost_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_path/lib" + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + fi + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE" + done + fi + else + for ac_boost_path in /usr /usr/local /opt ; do + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + best_path=$ac_boost_path + fi + done + fi + done + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" + BOOST_LDFLAGS="-L$best_path/lib" + if test "x$BOOST_ROOT" != "x"; then + if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then + version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` + stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` + stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'` + V_CHECK=`expr $stage_version_shorten \>\= $_version` + if test "$V_CHECK" = "1" ; then + { $as_echo "$as_me:$LINENO: We will use a staged boost library from $BOOST_ROOT" >&5 +$as_echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;} + BOOST_CPPFLAGS="-I$BOOST_ROOT" + BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib" + fi + fi + fi + fi + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + 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 "xdocbook: okay" != "x" ; then - echo "docbook: okay" >> $abi_plugin_topdir/plugin.status - fi + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + #include +int +main () +{ - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp docbook" - fi -fi -abi_plugin_add=yes -# Check whether --enable-eml was given. -if test "${enable_eml+set}" = set; then - enableval=$enable_eml; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + found_system=yes else - abi_plugin_add=$abi_plugin_opt + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + 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 + + fi -# Check whether --with-eml was given. -if test "${with_eml+set}" = set; then - withval=$with_eml; - if test "x$withval" = "xno"; then - abi_plugin_add=no + if test "$succeeded" != "yes" ; then + if test "$_version" = "0" ; then + { { $as_echo "$as_me:$LINENO: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&5 +$as_echo "$as_me: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&2;} + { (exit 1); exit 1; }; } + else + { $as_echo "$as_me:$LINENO: Your boost libraries seems to old (version $_version)." >&5 +$as_echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;} + fi else - abi_plugin_add=yes + + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BOOST /**/ +_ACEOF + fi + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" fi -if test $abi_plugin_add = yes; then - abi_plugin_disable=no - if test "xeml: okay" != "x" ; then - echo "eml: okay" >> $abi_plugin_topdir/plugin.status - fi +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp eml" + abi_wp_impexp="$abi_wp_impexp OpenXML" fi fi abi_plugin_add=yes -# Check whether --enable-hancom was given. -if test "${enable_hancom+set}" = set; then - enableval=$enable_hancom; +# Check whether --enable-opml was given. +if test "${enable_opml+set}" = set; then + enableval=$enable_opml; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -29066,9 +26188,9 @@ fi -# Check whether --with-hancom was given. -if test "${with_hancom+set}" = set; then - withval=$with_hancom; +# Check whether --with-opml was given. +if test "${with_opml+set}" = set; then + withval=$with_opml; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -29081,35 +26203,21 @@ abi_plugin_disable=no -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" - -ABI_HANCOM_CPPFLAGS="" -ABI_HANCOM_LDFLAGS="" - -# Checks for libraries. -# Checks for header files. - - if test "xHancom: okay" != "x" ; then - echo "Hancom: okay" >> $abi_plugin_topdir/plugin.status + if test "xopml: okay" != "x" ; then + echo "opml: okay" >> $abi_plugin_topdir/plugin.status fi - - -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp hancom" + abi_wp_impexp="$abi_wp_impexp opml" fi fi abi_plugin_add=yes -# Check whether --enable-hrtext was given. -if test "${enable_hrtext+set}" = set; then - enableval=$enable_hrtext; +# Check whether --enable-passepartout was given. +if test "${enable_passepartout+set}" = set; then + enableval=$enable_passepartout; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -29120,9 +26228,9 @@ fi -# Check whether --with-hrtext was given. -if test "${with_hrtext+set}" = set; then - withval=$with_hrtext; +# Check whether --with-passepartout was given. +if test "${with_passepartout+set}" = set; then + withval=$with_passepartout; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -29136,20 +26244,20 @@ - if test "xhrtext: okay" != "x" ; then - echo "hrtext: okay" >> $abi_plugin_topdir/plugin.status + if test "xpassepartout: okay" != "x" ; then + echo "passepartout: okay" >> $abi_plugin_topdir/plugin.status fi if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp hrtext" + abi_wp_impexp="$abi_wp_impexp passepartout" fi fi abi_plugin_add=yes -# Check whether --enable-iscii-text was given. -if test "${enable_iscii_text+set}" = set; then - enableval=$enable_iscii_text; +# Check whether --enable-pdb was given. +if test "${enable_pdb+set}" = set; then + enableval=$enable_pdb; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -29160,9 +26268,9 @@ fi -# Check whether --with-iscii-text was given. -if test "${with_iscii_text+set}" = set; then - withval=$with_iscii_text; +# Check whether --with-pdb was given. +if test "${with_pdb+set}" = set; then + withval=$with_pdb; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -29173,23 +26281,14 @@ if test $abi_plugin_add = yes; then abi_plugin_disable=no - - - - if test "xiscii-text: okay" != "x" ; then - echo "iscii-text: okay" >> $abi_plugin_topdir/plugin.status - fi - - - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp iscii-text" + abi_wp_impexp="$abi_wp_impexp pdb" fi fi abi_plugin_add=yes -# Check whether --enable-kword was given. -if test "${enable_kword+set}" = set; then - enableval=$enable_kword; +# Check whether --enable-pdf was given. +if test "${enable_pdf+set}" = set; then + enableval=$enable_pdf; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -29200,9 +26299,9 @@ fi -# Check whether --with-kword was given. -if test "${with_kword+set}" = set; then - withval=$with_kword; +# Check whether --with-pdf was given. +if test "${with_pdf+set}" = set; then + withval=$with_pdf; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -29216,20 +26315,19 @@ - if test "xkword: okay" != "x" ; then - echo "kword: okay" >> $abi_plugin_topdir/plugin.status + if test "xpdf: okay" != "x" ; then + echo "pdf: okay" >> $abi_plugin_topdir/plugin.status fi - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp kword" + abi_wp_impexp="$abi_wp_impexp pdf" fi fi abi_plugin_add=yes -# Check whether --enable-latex was given. -if test "${enable_latex+set}" = set; then - enableval=$enable_latex; +# Check whether --enable-psion was given. +if test "${enable_psion+set}" = set; then + enableval=$enable_psion; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -29240,9 +26338,9 @@ fi -# Check whether --with-latex was given. -if test "${with_latex+set}" = set; then - withval=$with_latex; +# Check whether --with-psion was given. +if test "${with_psion+set}" = set; then + withval=$with_psion; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -29255,61 +26353,184 @@ abi_plugin_disable=no +# The required psiconv version, as reported by psiconv-config +psiconv_major_req=0 +psiconv_minor_req=9 +psiconv_patch_req=4 + +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" - if test "xlatex: okay" != "x" ; then - echo "latex: okay" >> $abi_plugin_topdir/plugin.status - fi +ABI_PSION_CPPFLAGS="" +ABI_PSION_LDFLAGS="" +psiconvconfigdir="" +# Check whether --with-psiconv-config was given. +if test "${with_psiconv_config+set}" = set; then + withval=$with_psiconv_config; + psiconvconfigdir="$withval" - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp latex" - fi fi -abi_plugin_add=yes -# Check whether --enable-mif was given. -if test "${enable_mif+set}" = set; then - enableval=$enable_mif; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi + + +if test "x$abi_plugin_disable" != "xyes"; then + if test "x$psiconvconfigdir" = "x"; then + # Extract the first word of "psiconv-config", so it can be a program name with args. +set dummy psiconv-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_psiconvconfig+set}" = set; then + $as_echo_n "(cached) " >&6 else - abi_plugin_add=$abi_plugin_opt + case $psiconvconfig in + [\\/]* | ?:[\\/]*) + ac_cv_path_psiconvconfig="$psiconvconfig" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_psiconvconfig="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; +esac +fi +psiconvconfig=$ac_cv_path_psiconvconfig +if test -n "$psiconvconfig"; then + { $as_echo "$as_me:$LINENO: result: $psiconvconfig" >&5 +$as_echo "$psiconvconfig" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -# Check whether --with-mif was given. -if test "${with_mif+set}" = set; then - withval=$with_mif; - if test "x$withval" = "xno"; then - abi_plugin_add=no else - abi_plugin_add=yes + # Extract the first word of "psiconv-config", so it can be a program name with args. +set dummy psiconv-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_psiconvconfig+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $psiconvconfig in + [\\/]* | ?:[\\/]*) + ac_cv_path_psiconvconfig="$psiconvconfig" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in "$psiconvconfigdir" +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_psiconvconfig="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +psiconvconfig=$ac_cv_path_psiconvconfig +if test -n "$psiconvconfig"; then + { $as_echo "$as_me:$LINENO: result: $psiconvconfig" >&5 +$as_echo "$psiconvconfig" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + fi + if test "x$psiconvconfig" = "x"; then + abi_plugin_disable=yes + fi fi -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +if test "x$abi_plugin_disable" != "xyes"; then + { $as_echo "$as_me:$LINENO: checking for psiconv >= ${psiconv_major_req}.${psiconv_minor_req}.${psiconv_patch_req}" >&5 +$as_echo_n "checking for psiconv >= ${psiconv_major_req}.${psiconv_minor_req}.${psiconv_patch_req}... " >&6; } + IFS_old="$IFS" + IFS='.' + set -- `psiconv-config --version` + psiconv_major_found="${1}" + psiconv_minor_found="${2}" + psiconv_patch_found="${3}" + IFS="$IFS_old" + if test "$psiconv_major_found" -lt "$psiconv_major_req"; then + abi_plugin_disable=yes + elif test "$psiconv_major_found" -eq "$psiconv_major_req"; then + if test "$psiconv_minor_found" -lt "$psiconv_minor_req"; then + abi_plugin_disable=yes + elif test "$psiconv_minor_found" -eq "$psiconv_minor_req"; then + if test "$psiconv_patch_found" -lt "$psiconv_patch_req"; then + abi_plugin_disable=yes + fi + fi + fi + if test "x$abi_plugin_disable" = "xyes"; then + { $as_echo "$as_me:$LINENO: result: version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_patch_found} (Too old!)" >&5 +$as_echo "version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_patch_found} (Too old!)" >&6; } + else + { $as_echo "$as_me:$LINENO: result: version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_patch_found} (OK)" >&5 +$as_echo "version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_patch_found} (OK)" >&6; } + fi +fi + +if test "x$abi_plugin_disable" != "xyes"; then + ABI_PSION_CPPFLAGS=`psiconv-config --cflags` + ABI_PSION_LDFLAGS=`psiconv-config --libs` +fi +ABI_PSION_CPPFLAGS="$ABI_PSION_CPPFLAGS $LIBPNG_CFLAGS" +ABI_PSION_LDFLAGS="$ABI_PSION_LDFLAGS $LIBPNG_LDFLAGS" - if test "xmif: okay" != "x" ; then - echo "mif: okay" >> $abi_plugin_topdir/plugin.status + + +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" + +if test "x$abi_plugin_disable" != "xyes"; then + + if test "xpsion: OK" != "x" ; then + echo "psion: OK" >> $abi_plugin_topdir/plugin.status fi +else + + if test "xpsion: psiconv (>= 0.9.1) not found" != "x" ; then + echo "psion: psiconv (>= 0.9.1) not found" >> $abi_plugin_topdir/plugin.status + fi +fi if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp mif" + abi_wp_impexp="$abi_wp_impexp psion" fi fi abi_plugin_add=yes -# Check whether --enable-mswrite was given. -if test "${enable_mswrite+set}" = set; then - enableval=$enable_mswrite; +# Check whether --enable-sdw was given. +if test "${enable_sdw+set}" = set; then + enableval=$enable_sdw; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -29320,9 +26541,9 @@ fi -# Check whether --with-mswrite was given. -if test "${with_mswrite+set}" = set; then - withval=$with_mswrite; +# Check whether --with-sdw was given. +if test "${with_sdw+set}" = set; then + withval=$with_sdw; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -29335,21 +26556,35 @@ abi_plugin_disable=no +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" - if test "xmswrite: okay" != "x" ; then - echo "mswrite: okay" >> $abi_plugin_topdir/plugin.status +ABI_SDW_CPPFLAGS="" +ABI_SDW_LDFLAGS="" + +# Checks for libraries. +# Checks for header files. + + + if test "xsdw: okay" != "x" ; then + echo "sdw: okay" >> $abi_plugin_topdir/plugin.status fi + + +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" + if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp mswrite" + abi_wp_impexp="$abi_wp_impexp sdw" fi fi abi_plugin_add=yes -# Check whether --enable-nroff was given. -if test "${enable_nroff+set}" = set; then - enableval=$enable_nroff; +# Check whether --enable-t602 was given. +if test "${enable_t602+set}" = set; then + enableval=$enable_t602; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -29360,9 +26595,9 @@ fi -# Check whether --with-nroff was given. -if test "${with_nroff+set}" = set; then - withval=$with_nroff; +# Check whether --with-t602 was given. +if test "${with_t602+set}" = set; then + withval=$with_t602; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -29376,20 +26611,20 @@ - if test "xnroff: okay" != "x" ; then - echo "nroff: okay" >> $abi_plugin_topdir/plugin.status + if test "xt602: okay" != "x" ; then + echo "t602: okay" >> $abi_plugin_topdir/plugin.status fi if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp nroff" + abi_wp_impexp="$abi_wp_impexp t602" fi fi abi_plugin_add=yes -# Check whether --enable-OpenDocument was given. -if test "${enable_OpenDocument+set}" = set; then - enableval=$enable_OpenDocument; +# Check whether --enable-wml was given. +if test "${enable_wml+set}" = set; then + enableval=$enable_wml; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -29400,9 +26635,9 @@ fi -# Check whether --with-OpenDocument was given. -if test "${with_OpenDocument+set}" = set; then - withval=$with_OpenDocument; +# Check whether --with-wml was given. +if test "${with_wml+set}" = set; then + withval=$with_wml; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -29415,35 +26650,21 @@ abi_plugin_disable=no -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" - -ABI_OPENDOCUMENT_CPPFLAGS="" -ABI_OPENDOCUMENT_LDFLAGS="" - -# Checks for libraries. -# Checks for header files. - - if test "xOpenDocument: okay" != "x" ; then - echo "OpenDocument: okay" >> $abi_plugin_topdir/plugin.status + if test "xwml: okay" != "x" ; then + echo "wml: okay" >> $abi_plugin_topdir/plugin.status fi - - -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp OpenDocument" + abi_wp_impexp="$abi_wp_impexp wml" fi fi abi_plugin_add=yes -# Check whether --enable-OpenWriter was given. -if test "${enable_OpenWriter+set}" = set; then - enableval=$enable_OpenWriter; +# Check whether --enable-wordperfect was given. +if test "${enable_wordperfect+set}" = set; then + enableval=$enable_wordperfect; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -29454,9 +26675,9 @@ fi -# Check whether --with-OpenWriter was given. -if test "${with_OpenWriter+set}" = set; then - withval=$with_OpenWriter; +# Check whether --with-wordperfect was given. +if test "${with_wordperfect+set}" = set; then + withval=$with_wordperfect; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -29468,122 +26689,143 @@ if test $abi_plugin_add = yes; then abi_plugin_disable=no - _abi_cppflags_save="$CPPFLAGS" _abi_ldflags_save="$LDFLAGS" -ABI_OPENWRITER_CPPFLAGS="" -ABI_OPENWRITER_LDFLAGS="" +WORDPERFECT_CPPFLAGS="" +WORDPERFECT_LDFLAGS="" # Checks for libraries. -# Checks for header files. - +# Checks for header fils. - if test "xOpenWriter: okay" != "x" ; then - echo "OpenWriter: okay" >> $abi_plugin_topdir/plugin.status - fi +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for _abi_wordperfect" >&5 +$as_echo_n "checking for _abi_wordperfect... " >&6; } +if test -n "$_abi_wordperfect_CFLAGS"; then + pkg_cv__abi_wordperfect_CFLAGS="$_abi_wordperfect_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpd-0.8 >= 0.8.0 \"") >&5 + ($PKG_CONFIG --exists --print-errors "libwpd-0.8 >= 0.8.0 ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 >= 0.8.0 " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$_abi_wordperfect_LIBS"; then + pkg_cv__abi_wordperfect_LIBS="$_abi_wordperfect_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpd-0.8 >= 0.8.0 \"") >&5 + ($PKG_CONFIG --exists --print-errors "libwpd-0.8 >= 0.8.0 ") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv__abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 >= 0.8.0 " 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" +if test $pkg_failed = yes; then - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp OpenWriter" - fi +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi -abi_plugin_add=yes -# Check whether --enable-OpenXML was given. -if test "${enable_OpenXML+set}" = set; then - enableval=$enable_OpenXML; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi + if test $_pkg_short_errors_supported = yes; then + _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwpd-0.8 >= 0.8.0 " 2>&1` + else + _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwpd-0.8 >= 0.8.0 " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$_abi_wordperfect_PKG_ERRORS" >&5 -else - abi_plugin_add=$abi_plugin_opt + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -fi + if test "xWordPerfect: error - libwpd-0.8 >= 0.8.0 required" != "x" ; then + echo "WordPerfect: error - libwpd-0.8 >= 0.8.0 required" >> $abi_plugin_topdir/plugin.status + fi + abi_plugin_disable=yes -# Check whether --with-OpenXML was given. -if test "${with_OpenXML+set}" = set; then - withval=$with_OpenXML; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes +elif test $pkg_failed = untried; then + + if test "xWordPerfect: error - libwpd-0.8 >= 0.8.0 required" != "x" ; then + echo "WordPerfect: error - libwpd-0.8 >= 0.8.0 required" >> $abi_plugin_topdir/plugin.status fi -fi + abi_plugin_disable=yes -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +else + _abi_wordperfect_CFLAGS=$pkg_cv__abi_wordperfect_CFLAGS + _abi_wordperfect_LIBS=$pkg_cv__abi_wordperfect_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" + if test "xWordPerfect: okay" != "x" ; then + echo "WordPerfect: okay" >> $abi_plugin_topdir/plugin.status + fi -ABI_OPENXML_CPPFLAGS="" -ABI_OPENXML_LDFLAGS="" -# Checks for libraries. -# Checks for header files. +fi + +if test $abi_plugin_disable = no; then + WORDPERFECT_CPPFLAGS="$_abi_wordperfect_CFLAGS" + WORDPERFECT_LDFLAGS="$_abi_wordperfect_LIBS" +fi +msworks_disable=no pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_openxml" >&5 -echo $ECHO_N "checking for _abi_openxml... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for _abi_msworks" >&5 +$as_echo_n "checking for _abi_msworks... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_openxml_CFLAGS"; then - pkg_cv__abi_openxml_CFLAGS="$_abi_openxml_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - libgsf-1 >= 1.14.4 -\"") >&5 - ($PKG_CONFIG --exists --print-errors " - libgsf-1 >= 1.14.4 -") 2>&5 +if test -n "$_abi_msworks_CFLAGS"; then + pkg_cv__abi_msworks_CFLAGS="$_abi_msworks_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwps-0.1 >= 0.1.0 \"") >&5 + ($PKG_CONFIG --exists --print-errors "libwps-0.1 >= 0.1.0 ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_openxml_CFLAGS=`$PKG_CONFIG --cflags " - libgsf-1 >= 1.14.4 -" 2>/dev/null` + pkg_cv__abi_msworks_CFLAGS=`$PKG_CONFIG --cflags "libwps-0.1 >= 0.1.0 " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_openxml_LIBS"; then - pkg_cv__abi_openxml_LIBS="$_abi_openxml_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - libgsf-1 >= 1.14.4 -\"") >&5 - ($PKG_CONFIG --exists --print-errors " - libgsf-1 >= 1.14.4 -") 2>&5 +if test -n "$_abi_msworks_LIBS"; then + pkg_cv__abi_msworks_LIBS="$_abi_msworks_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwps-0.1 >= 0.1.0 \"") >&5 + ($PKG_CONFIG --exists --print-errors "libwps-0.1 >= 0.1.0 ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv__abi_openxml_LIBS=`$PKG_CONFIG --libs " - libgsf-1 >= 1.14.4 -" 2>/dev/null` + pkg_cv__abi_msworks_LIBS=`$PKG_CONFIG --libs "libwps-0.1 >= 0.1.0 " 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -29596,130 +26838,153 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - _abi_openxml_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - libgsf-1 >= 1.14.4 -"` + _abi_msworks_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwps-0.1 >= 0.1.0 " 2>&1` else - _abi_openxml_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - libgsf-1 >= 1.14.4 -"` + _abi_msworks_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwps-0.1 >= 0.1.0 " 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$_abi_openxml_PKG_ERRORS" >&5 + echo "$_abi_msworks_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "xlibgsf: error - libgsf >= 1.14.4 required" != "x" ; then - echo "libgsf: error - libgsf >= 1.14.4 required" >> $abi_plugin_topdir/plugin.status + if test "xMS Works: error - libwps-0.1 >= 0.1.0 required" != "x" ; then + echo "MS Works: error - libwps-0.1 >= 0.1.0 required" >> $abi_plugin_topdir/plugin.status fi - abi_plugin_disable=yes + msworks_disable=yes elif test $pkg_failed = untried; then - if test "xlibgsf: error - libgsf >= 1.14.4 required" != "x" ; then - echo "libgsf: error - libgsf >= 1.14.4 required" >> $abi_plugin_topdir/plugin.status + if test "xMS Works: error - libwps-0.1 >= 0.1.0 required" != "x" ; then + echo "MS Works: error - libwps-0.1 >= 0.1.0 required" >> $abi_plugin_topdir/plugin.status fi - abi_plugin_disable=yes + msworks_disable=yes else - _abi_openxml_CFLAGS=$pkg_cv__abi_openxml_CFLAGS - _abi_openxml_LIBS=$pkg_cv__abi_openxml_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + _abi_msworks_CFLAGS=$pkg_cv__abi_msworks_CFLAGS + _abi_msworks_LIBS=$pkg_cv__abi_msworks_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - if test "xOpenXML: okay" != "x" ; then - echo "OpenXML: okay" >> $abi_plugin_topdir/plugin.status + + if test "xMS Works: okay" != "x" ; then + echo "MS Works: okay" >> $abi_plugin_topdir/plugin.status + fi + + +fi + +if test $msworks_disable = no; then + WORDPERFECT_CPPFLAGS="$WORDPERFECT_CPPFLAGS $_abi_msworks_CFLAGS -DHAVE_LIBWPS=1" + WORDPERFECT_LDFLAGS="$WORDPERFECT_LDFLATS $_abi_msworks_LIBS" +fi + + + + +CPPFLAGS="$_abi_cppflags_save" +LDFLAGS="$_abi_ldflags_save" + + if test $abi_plugin_disable = no; then + abi_wp_impexp="$abi_wp_impexp wordperfect" + fi +fi +abi_plugin_add=yes +# Check whether --enable-xhtml was given. +if test "${enable_xhtml+set}" = set; then + enableval=$enable_xhtml; + if test "x$enableval" = "xno"; then + abi_plugin_add=no fi +else + abi_plugin_add=$abi_plugin_opt + +fi + + +# Check whether --with-xhtml was given. +if test "${with_xhtml+set}" = set; then + withval=$with_xhtml; + if test "x$withval" = "xno"; then + abi_plugin_add=no + else + abi_plugin_add=yes + fi fi -# Check whether --with-boost was given. -if test "${with_boost+set}" = set; then - withval=$with_boost; - if test "$withval" = "no"; then - want_boost="no" - elif test "$withval" = "yes"; then - want_boost="yes" - ac_boost_path="" - else - want_boost="yes" - ac_boost_path="$withval" +inter7eps_disable=no +htmltidy_disable=yes +htmlxml2_disable=no + + +if test $abi_plugin_add = yes; then + abi_plugin_disable=no + + +_abi_cppflags_save="$CPPFLAGS" +_abi_ldflags_save="$LDFLAGS" + +# Checks for libraries. +# Checks for header files. + +ABI_XHTML_I7EPS_CPPFLAGS="" +ABI_XHTML_I7EPS_LDFLAGS="" + + +# Check whether --with-inter7eps was given. +if test "${with_inter7eps+set}" = set; then + withval=$with_inter7eps; + if test "x$withval" = "xno"; then + + if test "xxhtml(mht): inter7 EPS support disabled" != "x" ; then + echo "xhtml(mht): inter7 EPS support disabled" >> $abi_plugin_topdir/plugin.status fi -else - want_boost="yes" -fi - - -if test "x$want_boost" = "xyes"; then - boost_lib_version_req=1.33.1 - boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'` - boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'` - boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'` - boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'` - if test "x$boost_lib_version_req_sub_minor" = "x" ; then - boost_lib_version_req_sub_minor="0" - fi - WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` - { echo "$as_me:$LINENO: checking for boostlib >= $boost_lib_version_req" >&5 -echo $ECHO_N "checking for boostlib >= $boost_lib_version_req... $ECHO_C" >&6; } - succeeded=no - - if test "$ac_boost_path" != ""; then - BOOST_LDFLAGS="-L$ac_boost_path/lib" - BOOST_CPPFLAGS="-I$ac_boost_path/include" + inter7eps_disable=yes + elif test "x$withval" != "xyes"; then + ABI_XHTML_I7EPS_CPPFLAGS="-I$withval/include" + ABI_XHTML_I7EPS_LDFLAGS="-L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" + LDFLAGS="$LDFLAGS -L$withval/lib" else - for ac_boost_path_tmp in /usr /usr/local /opt ; do - if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then - BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" - BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" - break; - fi - done + ABI_XHTML_I7EPS_CPPFLAGS="-I/usr/include" + CPPFLAGS="$CPPFLAGS -I/usr/include" fi - CPPFLAGS_SAVED="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - export CPPFLAGS +else + ABI_XHTML_I7EPS_CPPFLAGS="-I/usr/include" + CPPFLAGS="$CPPFLAGS -I/usr/include" - LDFLAGS_SAVED="$LDFLAGS" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS +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' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF +if test $inter7eps_disable != yes; then + if test "${ac_cv_header_eps_eps_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for eps/eps.h" >&5 +$as_echo_n "checking for eps/eps.h... " >&6; } +if test "${ac_cv_header_eps_eps_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_eps_eps_h" >&5 +$as_echo "$ac_cv_header_eps_eps_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking eps/eps.h usability" >&5 +$as_echo_n "checking eps/eps.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - - #include - -int -main () -{ - - #if BOOST_VERSION >= $WANT_BOOST_VERSION - // Everything is okay - #else - # error Boost version is too old - #endif - - ; - return 0; -} +$ac_includes_default +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -29727,527 +26992,442 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - succeeded=yes - found_system=yes - + ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - + ac_header_compiler=no fi rm -f core 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' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - if test "x$succeeded" != "xyes"; then - _version=0 - if test "$ac_boost_path" != ""; then - BOOST_LDFLAGS="-L$ac_boost_path/lib" - if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then - for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do - _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` - V_CHECK=`expr $_version_tmp \> $_version` - if test "$V_CHECK" = "1" ; then - _version=$_version_tmp - fi - VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` - BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE" - done - fi - else - for ac_boost_path in /usr /usr/local /opt ; do - if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then - for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do - _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` - V_CHECK=`expr $_version_tmp \> $_version` - if test "$V_CHECK" = "1" ; then - _version=$_version_tmp - best_path=$ac_boost_path - fi - done - fi - done - - VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` - BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" - BOOST_LDFLAGS="-L$best_path/lib" - - if test "x$BOOST_ROOT" != "x"; then - if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then - version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` - stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` - stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'` - V_CHECK=`expr $stage_version_shorten \>\= $_version` - if test "$V_CHECK" = "1" ; then - { echo "$as_me:$LINENO: We will use a staged boost library from $BOOST_ROOT" >&5 -echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;} - BOOST_CPPFLAGS="-I$BOOST_ROOT" - BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib" - fi - fi - fi - fi - - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - export CPPFLAGS - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS - - 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 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } - cat >conftest.$ac_ext <<_ACEOF +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking eps/eps.h presence" >&5 +$as_echo_n "checking eps/eps.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - - #include - -int -main () -{ - - #if BOOST_VERSION >= $WANT_BOOST_VERSION - // Everything is okay - #else - # error Boost version is too old - #endif - - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - succeeded=yes - found_system=yes - + }; then + ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - 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 - - fi - - if test "$succeeded" != "yes" ; then - if test "$_version" = "0" ; then - { { echo "$as_me:$LINENO: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&5 -echo "$as_me: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: Your boost libraries seems to old (version $_version)." >&5 -echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;} - fi - else - - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_BOOST -_ACEOF - - fi - - CPPFLAGS="$CPPFLAGS_SAVED" - LDFLAGS="$LDFLAGS_SAVED" + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } - - - - -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" - - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp OpenXML" - fi -fi -abi_plugin_add=yes -# Check whether --enable-opml was given. -if test "${enable_opml+set}" = set; then - enableval=$enable_opml; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi - +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: eps/eps.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: eps/eps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: eps/eps.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: eps/eps.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: eps/eps.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: eps/eps.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: eps/eps.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: eps/eps.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: eps/eps.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: eps/eps.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: eps/eps.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: eps/eps.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: eps/eps.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: eps/eps.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: eps/eps.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: eps/eps.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## --------------------------------------------- ## +## Report this to http://bugzilla.abisource.com/ ## +## --------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for eps/eps.h" >&5 +$as_echo_n "checking for eps/eps.h... " >&6; } +if test "${ac_cv_header_eps_eps_h+set}" = set; then + $as_echo_n "(cached) " >&6 else - abi_plugin_add=$abi_plugin_opt + ac_cv_header_eps_eps_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_eps_eps_h" >&5 +$as_echo "$ac_cv_header_eps_eps_h" >&6; } fi +if test "x$ac_cv_header_eps_eps_h" = x""yes; then -# Check whether --with-opml was given. -if test "${with_opml+set}" = set; then - withval=$with_opml; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes + if test "xxhtml(mht): okay" != "x" ; then + echo "xhtml(mht): okay" >> $abi_plugin_topdir/plugin.status fi -fi - -if test $abi_plugin_add = yes; then - abi_plugin_disable=no - + ABI_XHTML_I7EPS_CPPFLAGS="$ABI_XHTML_I7EPS_CPPFLAGS -DXHTML_MULTIPART_SUPPORTED" + ABI_XHTML_I7EPS_LDFLAGS="$ABI_XHTML_I7EPS_LDFLAGS -leps" +else - if test "xopml: okay" != "x" ; then - echo "opml: okay" >> $abi_plugin_topdir/plugin.status + if test "xxhtml(mht): error - inter7 EPS headers not found" != "x" ; then + echo "xhtml(mht): error - inter7 EPS headers not found" >> $abi_plugin_topdir/plugin.status fi - - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp opml" - fi -fi -abi_plugin_add=yes -# Check whether --enable-passepartout was given. -if test "${enable_passepartout+set}" = set; then - enableval=$enable_passepartout; - if test "x$enableval" = "xno"; then - abi_plugin_add=no + if test "xxhtml(mht): http://www.inter7.com/eps/" != "x" ; then + echo "xhtml(mht): http://www.inter7.com/eps/" >> $abi_plugin_topdir/plugin.status fi -else - abi_plugin_add=$abi_plugin_opt + inter7eps_disable=yes fi -# Check whether --with-passepartout was given. -if test "${with_passepartout+set}" = set; then - withval=$with_passepartout; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes - fi - +fi +if test $inter7eps_disable = yes; then + ABI_XHTML_I7EPS_CPPFLAGS="" + ABI_XHTML_I7EPS_LDFLAGS="" fi -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +ABI_XHTML_TIDY_CPPFLAGS="" +ABI_XHTML_TIDY_LDFLAGS="" +# Check whether --with-libtidy was given. +if test "${with_libtidy+set}" = set; then + withval=$with_libtidy; + if test "x$withval" = "xno"; then - if test "xpassepartout: okay" != "x" ; then - echo "passepartout: okay" >> $abi_plugin_topdir/plugin.status + if test "xxhtml(html): libtidy support disabled" != "x" ; then + echo "xhtml(html): libtidy support disabled" >> $abi_plugin_topdir/plugin.status fi + htmltidy_disable=yes + elif test "x$withval" != "xyes"; then + ABI_XHTML_TIDY_CPPFLAGS="-I$withval/include" + ABI_XHTML_TIDY_LDFLAGS="-L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" + LDFLAGS="$LDFLAGS -L$withval/lib" - - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp passepartout" - fi -fi -abi_plugin_add=yes -# Check whether --enable-pdb was given. -if test "${enable_pdb+set}" = set; then - enableval=$enable_pdb; - if test "x$enableval" = "xno"; then - abi_plugin_add=no + if test "xxhtml(html): libtidy support enabled" != "x" ; then + echo "xhtml(html): libtidy support enabled" >> $abi_plugin_topdir/plugin.status fi -else - abi_plugin_add=$abi_plugin_opt - -fi + htmltidy_disable=no + else + if test "xxhtml(html): libtidy support enabled" != "x" ; then + echo "xhtml(html): libtidy support enabled" >> $abi_plugin_topdir/plugin.status + fi -# Check whether --with-pdb was given. -if test "${with_pdb+set}" = set; then - withval=$with_pdb; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes + htmltidy_disable=no fi fi -if test $abi_plugin_add = yes; then - abi_plugin_disable=no - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp pdb" - fi -fi -abi_plugin_add=yes -# Check whether --enable-pdf was given. -if test "${enable_pdf+set}" = set; then - enableval=$enable_pdf; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi +if test $htmltidy_disable != yes; then + if test "${ac_cv_header_tidy_tidy_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for tidy/tidy.h" >&5 +$as_echo_n "checking for tidy/tidy.h... " >&6; } +if test "${ac_cv_header_tidy_tidy_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tidy_tidy_h" >&5 +$as_echo "$ac_cv_header_tidy_tidy_h" >&6; } else - abi_plugin_add=$abi_plugin_opt + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking tidy/tidy.h usability" >&5 +$as_echo_n "checking tidy/tidy.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -# Check whether --with-pdf was given. -if test "${with_pdf+set}" = set; then - withval=$with_pdf; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes - fi +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking tidy/tidy.h presence" >&5 +$as_echo_n "checking tidy/tidy.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi -if test $abi_plugin_add = yes; then - abi_plugin_disable=no - - - - if test "xpdf: okay" != "x" ; then - echo "pdf: okay" >> $abi_plugin_topdir/plugin.status - fi - - - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp pdf" - fi -fi -abi_plugin_add=yes -# Check whether --enable-psion was given. -if test "${enable_psion+set}" = set; then - enableval=$enable_psion; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: tidy/tidy.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: tidy/tidy.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tidy/tidy.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: tidy/tidy.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: tidy/tidy.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: tidy/tidy.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tidy/tidy.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: tidy/tidy.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tidy/tidy.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: tidy/tidy.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tidy/tidy.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: tidy/tidy.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tidy/tidy.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: tidy/tidy.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tidy/tidy.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: tidy/tidy.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## --------------------------------------------- ## +## Report this to http://bugzilla.abisource.com/ ## +## --------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for tidy/tidy.h" >&5 +$as_echo_n "checking for tidy/tidy.h... " >&6; } +if test "${ac_cv_header_tidy_tidy_h+set}" = set; then + $as_echo_n "(cached) " >&6 else - abi_plugin_add=$abi_plugin_opt + ac_cv_header_tidy_tidy_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tidy_tidy_h" >&5 +$as_echo "$ac_cv_header_tidy_tidy_h" >&6; } fi +if test "x$ac_cv_header_tidy_tidy_h" = x""yes; then -# Check whether --with-psion was given. -if test "${with_psion+set}" = set; then - withval=$with_psion; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes + if test "xxhtml(html): okay" != "x" ; then + echo "xhtml(html): okay" >> $abi_plugin_topdir/plugin.status fi -fi + ABI_XHTML_TIDY_CPPFLAGS="$ABI_XHTML_TIDY_CPPFLAGS -DXHTML_HTML_TIDY_SUPPORTED" + ABI_XHTML_TIDY_LDFLAGS="$ABI_XHTML_TIDY_LDFLAGS -ltidy" -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +else + if test "xxhtml(html): error - libtidy headers not found" != "x" ; then + echo "xhtml(html): error - libtidy headers not found" >> $abi_plugin_topdir/plugin.status + fi -# The required psiconv version, as reported by psiconv-config -psiconv_major_req=0 -psiconv_minor_req=9 -psiconv_patch_req=4 -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" + if test "xxhtml(html): http://tidy.sourceforge.net/" != "x" ; then + echo "xhtml(html): http://tidy.sourceforge.net/" >> $abi_plugin_topdir/plugin.status + fi -ABI_PSION_CPPFLAGS="" -ABI_PSION_LDFLAGS="" -psiconvconfigdir="" + htmltidy_disable=yes +fi -# Check whether --with-psiconv-config was given. -if test "${with_psiconv_config+set}" = set; then - withval=$with_psiconv_config; - psiconvconfigdir="$withval" fi +if test $htmltidy_disable = yes; then + ABI_XHTML_TIDY_CPPFLAGS="" + ABI_XHTML_TIDY_LDFLAGS="" +fi +ABI_XHTML_XML2_CPPFLAGS="" +ABI_XHTML_XML2_LDFLAGS="" +if test $htmlxml2_disable != yes; then -if test "x$abi_plugin_disable" != "xyes"; then - if test "x$psiconvconfigdir" = "x"; then - # Extract the first word of "psiconv-config", so it can be a program name with args. -set dummy psiconv-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_psiconvconfig+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $psiconvconfig in - [\\/]* | ?:[\\/]*) - ac_cv_path_psiconvconfig="$psiconvconfig" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_psiconvconfig="$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 +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for LIBXML2" >&5 +$as_echo_n "checking for LIBXML2... " >&6; } - ;; -esac +if test -n "$LIBXML2_CFLAGS"; then + pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.4.20\"") >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.4.20") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.4.20" 2>/dev/null` +else + pkg_failed=yes fi -psiconvconfig=$ac_cv_path_psiconvconfig -if test -n "$psiconvconfig"; then - { echo "$as_me:$LINENO: result: $psiconvconfig" >&5 -echo "${ECHO_T}$psiconvconfig" >&6; } + else + pkg_failed=untried +fi +if test -n "$LIBXML2_LIBS"; then + pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.4.20\"") >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.4.20") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.4.20" 2>/dev/null` else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + pkg_failed=yes +fi + else + pkg_failed=untried fi - else - # Extract the first word of "psiconv-config", so it can be a program name with args. -set dummy psiconv-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_psiconvconfig+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $psiconvconfig in - [\\/]* | ?:[\\/]*) - ac_cv_path_psiconvconfig="$psiconvconfig" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in "$psiconvconfigdir" -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_psiconvconfig="$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 -psiconvconfig=$ac_cv_path_psiconvconfig -if test -n "$psiconvconfig"; then - { echo "$as_me:$LINENO: result: $psiconvconfig" >&5 -echo "${ECHO_T}$psiconvconfig" >&6; } +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.4.20" 2>&1` + else + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.4.20" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBXML2_PKG_ERRORS" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + if test "xxhtml(html): libxml2 support disabled" != "x" ; then + echo "xhtml(html): libxml2 support disabled" >> $abi_plugin_topdir/plugin.status fi - if test "x$psiconvconfig" = "x"; then - abi_plugin_disable=yes - fi -fi + htmlxml2_disable=yes -if test "x$abi_plugin_disable" != "xyes"; then - { echo "$as_me:$LINENO: checking for psiconv >= ${psiconv_major_req}.${psiconv_minor_req}.${psiconv_patch_req}" >&5 -echo $ECHO_N "checking for psiconv >= ${psiconv_major_req}.${psiconv_minor_req}.${psiconv_patch_req}... $ECHO_C" >&6; } - IFS_old="$IFS" - IFS='.' - set -- `psiconv-config --version` - psiconv_major_found="${1}" - psiconv_minor_found="${2}" - psiconv_patch_found="${3}" - IFS="$IFS_old" - if test "$psiconv_major_found" -lt "$psiconv_major_req"; then - abi_plugin_disable=yes - elif test "$psiconv_major_found" -eq "$psiconv_major_req"; then - if test "$psiconv_minor_found" -lt "$psiconv_minor_req"; then - abi_plugin_disable=yes - elif test "$psiconv_minor_found" -eq "$psiconv_minor_req"; then - if test "$psiconv_patch_found" -lt "$psiconv_patch_req"; then - abi_plugin_disable=yes - fi - fi +elif test $pkg_failed = untried; then + + if test "xxhtml(html): libxml2 support disabled" != "x" ; then + echo "xhtml(html): libxml2 support disabled" >> $abi_plugin_topdir/plugin.status fi - if test "x$abi_plugin_disable" = "xyes"; then - { echo "$as_me:$LINENO: result: version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_patch_found} (Too old!)" >&5 -echo "${ECHO_T}version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_patch_found} (Too old!)" >&6; } - else - { echo "$as_me:$LINENO: result: version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_patch_found} (OK)" >&5 -echo "${ECHO_T}version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_patch_found} (OK)" >&6; } + + htmlxml2_disable=yes + +else + LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS + LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + + if test "xxhtml(html): libxml2 support enabled" != "x" ; then + echo "xhtml(html): libxml2 support enabled" >> $abi_plugin_topdir/plugin.status fi -fi -if test "x$abi_plugin_disable" != "xyes"; then - ABI_PSION_CPPFLAGS=`psiconv-config --cflags` - ABI_PSION_LDFLAGS=`psiconv-config --libs` + +fi +fi +if test $htmlxml2_disable != yes; then + ABI_XHTML_XML2_CPPFLAGS="$LIBXML2_CFLAGS -DXHTML_HTML_XML2_SUPPORTED" + ABI_XHTML_XML2_LDFLAGS="$LIBXML2_LIBS" fi -ABI_PSION_CPPFLAGS="$ABI_PSION_CPPFLAGS $LIBPNG_CFLAGS" -ABI_PSION_LDFLAGS="$ABI_PSION_LDFLAGS $LIBPNG_LDFLAGS" +ABI_XHTML_CPPFLAGS="$ABI_XHTML_I7EPS_CPPFLAGS $ABI_XHTML_TIDY_CPPFLAGS $ABI_XHTML_XML2_CPPFLAGS" +ABI_XHTML_LDFLAGS="$ABI_XHTML_I7EPS_LDFLAGS $ABI_XHTML_TIDY_LDFLAGS $ABI_XHTML_XML2_LDFLAGS" @@ -30255,82 +27435,74 @@ CPPFLAGS="$_abi_cppflags_save" LDFLAGS="$_abi_ldflags_save" -if test "x$abi_plugin_disable" != "xyes"; then +if test "$inter7eps_disable" = yes; then + if test "$htmltidy_disable" = yes -a "$htmlxml2_disable" = yes; then + abi_plugin_disable=yes - if test "xpsion: OK" != "x" ; then - echo "psion: OK" >> $abi_plugin_topdir/plugin.status + if test "xxhtml: no options enabled/satisfied - disabling" != "x" ; then + echo "xhtml: no options enabled/satisfied - disabling" >> $abi_plugin_topdir/plugin.status fi -else + else - if test "xpsion: psiconv (>= 0.9.1) not found" != "x" ; then - echo "psion: psiconv (>= 0.9.1) not found" >> $abi_plugin_topdir/plugin.status + if test "xxhtml: building without Multipart support" != "x" ; then + echo "xhtml: building without Multipart support" >> $abi_plugin_topdir/plugin.status fi -fi - - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp psion" - fi -fi -abi_plugin_add=yes -# Check whether --enable-sdw was given. -if test "${enable_sdw+set}" = set; then - enableval=$enable_sdw; - if test "x$enableval" = "xno"; then - abi_plugin_add=no fi - else - abi_plugin_add=$abi_plugin_opt - -fi + if test "$htmltidy_disable" = yes -a "$htmlxml2_disable" = yes; then + if test "xxhtml: building without HTML support" != "x" ; then + echo "xhtml: building without HTML support" >> $abi_plugin_topdir/plugin.status + fi -# Check whether --with-sdw was given. -if test "${with_sdw+set}" = set; then - withval=$with_sdw; - if test "x$withval" = "xno"; then - abi_plugin_add=no else - abi_plugin_add=yes + + if test "xxhtml: okay" != "x" ; then + echo "xhtml: okay" >> $abi_plugin_topdir/plugin.status fi + fi fi -if test $abi_plugin_add = yes; then - abi_plugin_disable=no - - -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" - -ABI_SDW_CPPFLAGS="" -ABI_SDW_LDFLAGS="" - -# Checks for libraries. -# Checks for header files. - - if test "xsdw: okay" != "x" ; then - echo "sdw: okay" >> $abi_plugin_topdir/plugin.status + if test $abi_plugin_disable = no; then + abi_wp_impexp="$abi_wp_impexp xhtml" fi +fi + if test $inter7eps_disable != yes; then + ABI_XHTML_MHT_TRUE= + ABI_XHTML_MHT_FALSE='#' +else + ABI_XHTML_MHT_TRUE='#' + ABI_XHTML_MHT_FALSE= +fi + + if test $htmltidy_disable != yes; then + ABI_XHTML_TIDY_TRUE= + ABI_XHTML_TIDY_FALSE='#' +else + ABI_XHTML_TIDY_TRUE='#' + ABI_XHTML_TIDY_FALSE= +fi + if test $htmlxml2_disable != yes; then + ABI_XHTML_XML2_TRUE= + ABI_XHTML_XML2_FALSE='#' +else + ABI_XHTML_XML2_TRUE='#' + ABI_XHTML_XML2_FALSE= +fi -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp sdw" - fi -fi abi_plugin_add=yes -# Check whether --enable-t602 was given. -if test "${enable_t602+set}" = set; then - enableval=$enable_t602; +# Check whether --enable-xsl-fo was given. +if test "${enable_xsl_fo+set}" = set; then + enableval=$enable_xsl_fo; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -30341,9 +27513,9 @@ fi -# Check whether --with-t602 was given. -if test "${with_t602+set}" = set; then - withval=$with_t602; +# Check whether --with-xsl-fo was given. +if test "${with_xsl_fo+set}" = set; then + withval=$with_xsl_fo; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -30357,20 +27529,23 @@ - if test "xt602: okay" != "x" ; then - echo "t602: okay" >> $abi_plugin_topdir/plugin.status + if test "xxsl-fo: okay" != "x" ; then + echo "xsl-fo: okay" >> $abi_plugin_topdir/plugin.status fi if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp t602" + abi_wp_impexp="$abi_wp_impexp xsl-fo" fi fi + + +abi_wp_scripts= abi_plugin_add=yes -# Check whether --enable-wml was given. -if test "${enable_wml+set}" = set; then - enableval=$enable_wml; +# Check whether --enable-shell was given. +if test "${enable_shell+set}" = set; then + enableval=$enable_shell; if test "x$enableval" = "xno"; then abi_plugin_add=no fi @@ -30381,9 +27556,9 @@ fi -# Check whether --with-wml was given. -if test "${with_wml+set}" = set; then - withval=$with_wml; +# Check whether --with-shell was given. +if test "${with_shell+set}" = set; then + withval=$with_shell; if test "x$withval" = "xno"; then abi_plugin_add=no else @@ -30397,2632 +27572,2680 @@ - if test "xwml: okay" != "x" ; then - echo "wml: okay" >> $abi_plugin_topdir/plugin.status + if test "xshell: okay" != "x" ; then + echo "shell: okay" >> $abi_plugin_topdir/plugin.status fi if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp wml" + abi_wp_scripts="$abi_wp_scripts shell" fi fi -abi_plugin_add=yes -# Check whether --enable-wordperfect was given. -if test "${enable_wordperfect+set}" = set; then - enableval=$enable_wordperfect; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi -else - abi_plugin_add=$abi_plugin_opt -fi +ac_config_files="$ac_config_files GNUmakefile tools/GNUmakefile wp/GNUmakefile wp/impexp/GNUmakefile wp/impexp/graphics/GNUmakefile wp/scripts/GNUmakefile" +ac_config_files="$ac_config_files tools/abicollab/GNUmakefile tools/abicollab/core/GNUmakefile tools/abicollab/core/dialogs/GNUmakefile tools/abicollab/core/dialogs/xp/GNUmakefile tools/abicollab/core/dialogs/unix/GNUmakefile tools/abicollab/core/dialogs/win/GNUmakefile tools/abicollab/core/packet/GNUmakefile tools/abicollab/core/packet/xp/GNUmakefile tools/abicollab/core/session/GNUmakefile tools/abicollab/core/session/xp/GNUmakefile tools/abicollab/backends/GNUmakefile tools/abicollab/backends/xmpp/GNUmakefile tools/abicollab/backends/xmpp/xp/GNUmakefile tools/abicollab/backends/xmpp/unix/GNUmakefile tools/abicollab/backends/tcp/GNUmakefile tools/abicollab/backends/tcp/xp/GNUmakefile tools/abicollab/backends/tcp/unix/GNUmakefile tools/abicollab/backends/tcp/win/GNUmakefile tools/abicollab/backends/sugar/GNUmakefile tools/abicollab/backends/sugar/unix/GNUmakefile tools/abicollab/backends/fake/GNUmakefile tools/abicollab/backends/fake/xp/GNUmakefile tools/abicollab/backends/service/GNUmakefile tools/abicollab/backends/service/xp/GNUmakefile tools/abicollab/backends/service/unix/GNUmakefile tools/abicollab/backends/xp/GNUmakefile tools/abicommand/GNUmakefile tools/abicommand/xp/GNUmakefile tools/abigimp/GNUmakefile tools/abigimp/xp/GNUmakefile tools/abigoffice/GNUmakefile tools/abigoffice/unix/GNUmakefile tools/abigrammar/GNUmakefile tools/abigrammar/linkgrammarwrap/GNUmakefile tools/abigrammar/xp/GNUmakefile tools/abimathview/GNUmakefile tools/abimathview/itex2MML/GNUmakefile tools/abimathview/xp/GNUmakefile tools/abiscan/GNUmakefile tools/abiscan/unix/GNUmakefile tools/aiksaurus/GNUmakefile tools/aiksaurus/xp/GNUmakefile tools/babelfish/GNUmakefile tools/babelfish/xp/GNUmakefile tools/develop/GNUmakefile tools/develop/xp/GNUmakefile tools/develop/gnu-regex/GNUmakefile tools/freetranslation/GNUmakefile tools/freetranslation/xp/GNUmakefile tools/gda/GNUmakefile tools/gda/unix/GNUmakefile tools/gdict/GNUmakefile tools/gdict/unix/GNUmakefile tools/google/GNUmakefile tools/google/xp/GNUmakefile tools/loadbindings/GNUmakefile tools/loadbindings/xp/GNUmakefile tools/ots/GNUmakefile tools/ots/xp/GNUmakefile tools/presentation/GNUmakefile tools/presentation/xp/GNUmakefile tools/urldict/GNUmakefile tools/urldict/xp/GNUmakefile tools/wikipedia/GNUmakefile tools/wikipedia/xp/GNUmakefile" -# Check whether --with-wordperfect was given. -if test "${with_wordperfect+set}" = set; then - withval=$with_wordperfect; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes - fi +ac_config_files="$ac_config_files wp/impexp/applix/GNUmakefile wp/impexp/applix/xp/GNUmakefile wp/impexp/clarisworks/GNUmakefile wp/impexp/clarisworks/xp/GNUmakefile wp/impexp/docbook/GNUmakefile wp/impexp/docbook/xp/GNUmakefile wp/impexp/eml/GNUmakefile wp/impexp/eml/xp/GNUmakefile wp/impexp/hancom/GNUmakefile wp/impexp/hancom/xp/GNUmakefile wp/impexp/hrtext/GNUmakefile wp/impexp/hrtext/xp/GNUmakefile wp/impexp/iscii-text/GNUmakefile wp/impexp/iscii-text/xp/GNUmakefile wp/impexp/kword/GNUmakefile wp/impexp/kword/xp/GNUmakefile wp/impexp/latex/GNUmakefile wp/impexp/latex/xp/GNUmakefile wp/impexp/latex/xsltml/GNUmakefile wp/impexp/mif/GNUmakefile wp/impexp/mif/xp/GNUmakefile wp/impexp/mswrite/GNUmakefile wp/impexp/mswrite/xp/GNUmakefile wp/impexp/nroff/GNUmakefile wp/impexp/nroff/xp/GNUmakefile wp/impexp/OpenDocument/GNUmakefile wp/impexp/OpenDocument/common/GNUmakefile wp/impexp/OpenDocument/common/xp/GNUmakefile wp/impexp/OpenDocument/exp/GNUmakefile wp/impexp/OpenDocument/exp/xp/GNUmakefile wp/impexp/OpenDocument/imp/GNUmakefile wp/impexp/OpenDocument/imp/xp/GNUmakefile wp/impexp/OpenWriter/GNUmakefile wp/impexp/OpenWriter/xp/GNUmakefile wp/impexp/OpenXML/GNUmakefile wp/impexp/OpenXML/common/GNUmakefile wp/impexp/OpenXML/common/xp/GNUmakefile wp/impexp/OpenXML/exp/GNUmakefile wp/impexp/OpenXML/exp/xp/GNUmakefile wp/impexp/OpenXML/imp/GNUmakefile wp/impexp/OpenXML/imp/xp/GNUmakefile wp/impexp/opml/GNUmakefile wp/impexp/opml/xp/GNUmakefile wp/impexp/passepartout/GNUmakefile wp/impexp/passepartout/xp/GNUmakefile wp/impexp/pdb/GNUmakefile wp/impexp/pdb/xp/GNUmakefile wp/impexp/pdf/GNUmakefile wp/impexp/pdf/xp/GNUmakefile wp/impexp/psion/GNUmakefile wp/impexp/psion/xp/GNUmakefile wp/impexp/sdw/GNUmakefile wp/impexp/sdw/xp/GNUmakefile wp/impexp/t602/GNUmakefile wp/impexp/t602/xp/GNUmakefile wp/impexp/wml/GNUmakefile wp/impexp/wml/xp/GNUmakefile wp/impexp/wordperfect/GNUmakefile wp/impexp/wordperfect/xp/GNUmakefile wp/impexp/xhtml/GNUmakefile wp/impexp/xhtml/xp/GNUmakefile wp/impexp/xsl-fo/GNUmakefile wp/impexp/xsl-fo/xp/GNUmakefile" + +ac_config_files="$ac_config_files wp/impexp/graphics/bmp/GNUmakefile wp/impexp/graphics/bmp/xp/GNUmakefile wp/impexp/graphics/jpeg/GNUmakefile wp/impexp/graphics/jpeg/xp/GNUmakefile wp/impexp/graphics/librsvg/GNUmakefile wp/impexp/graphics/librsvg/unix/GNUmakefile wp/impexp/graphics/win32native/GNUmakefile wp/impexp/graphics/win32native/unix/GNUmakefile wp/impexp/graphics/wmf/GNUmakefile wp/impexp/graphics/wmf/xp/GNUmakefile wp/impexp/graphics/wpg/GNUmakefile wp/impexp/graphics/wpg/xp/GNUmakefile" + +ac_config_files="$ac_config_files wp/scripts/shell/GNUmakefile wp/scripts/shell/xp/GNUmakefile" + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi fi +rm -f confcache -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} +t clear +:clear +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g +t quote +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g +t quote +b any +:quote +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g +s/\$/$$/g +H +:any +${ + g + s/^\n// + s/\n/ /g + p +} +' +DEFS=`sed -n "$ac_script" confdefs.h` -WORDPERFECT_CPPFLAGS="" -WORDPERFECT_LDFLAGS="" -# Checks for libraries. -# Checks for header fils. +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs +LTLIBOBJS=$ac_ltlibobjs -pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_wordperfect" >&5 -echo $ECHO_N "checking for _abi_wordperfect... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_wordperfect_CFLAGS"; then - pkg_cv__abi_wordperfect_CFLAGS="$_abi_wordperfect_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpd-0.8 >= 0.8.0 \"") >&5 - ($PKG_CONFIG --exists --print-errors "libwpd-0.8 >= 0.8.0 ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 >= 0.8.0 " 2>/dev/null` -else - pkg_failed=yes +if test -z "${BUILD_PLATFORM_COCOA_TRUE}" && test -z "${BUILD_PLATFORM_COCOA_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PLATFORM_COCOA\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"BUILD_PLATFORM_COCOA\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi - fi -else - pkg_failed=untried +if test -z "${BUILD_PLATFORM_GNOME_TRUE}" && test -z "${BUILD_PLATFORM_GNOME_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PLATFORM_GNOME\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"BUILD_PLATFORM_GNOME\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${BUILD_PLATFORM_QNX_TRUE}" && test -z "${BUILD_PLATFORM_QNX_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PLATFORM_QNX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"BUILD_PLATFORM_QNX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${ABI_PLUGIN_DEBUG_TRUE}" && test -z "${ABI_PLUGIN_DEBUG_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ABI_PLUGIN_DEBUG\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ABI_PLUGIN_DEBUG\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${ABICOLLAB_HANDLER_FAKE_TRUE}" && test -z "${ABICOLLAB_HANDLER_FAKE_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ABICOLLAB_HANDLER_FAKE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ABICOLLAB_HANDLER_FAKE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${ABICOLLAB_HANDLER_XMPP_TRUE}" && test -z "${ABICOLLAB_HANDLER_XMPP_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ABICOLLAB_HANDLER_XMPP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ABICOLLAB_HANDLER_XMPP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${ABICOLLAB_HANDLER_TCP_TRUE}" && test -z "${ABICOLLAB_HANDLER_TCP_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ABICOLLAB_HANDLER_TCP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ABICOLLAB_HANDLER_TCP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${ABICOLLAB_HANDLER_SUGAR_TRUE}" && test -z "${ABICOLLAB_HANDLER_SUGAR_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ABICOLLAB_HANDLER_SUGAR\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ABICOLLAB_HANDLER_SUGAR\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${ABICOLLAB_HANDLER_SERVICE_TRUE}" && test -z "${ABICOLLAB_HANDLER_SERVICE_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ABICOLLAB_HANDLER_SERVICE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ABICOLLAB_HANDLER_SERVICE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${BUILD_GNU_REGEX_TRUE}" && test -z "${BUILD_GNU_REGEX_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GNU_REGEX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"BUILD_GNU_REGEX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HAVE_LIBXSLT_TRUE}" && test -z "${HAVE_LIBXSLT_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBXSLT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"HAVE_LIBXSLT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${ABI_XHTML_MHT_TRUE}" && test -z "${ABI_XHTML_MHT_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ABI_XHTML_MHT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ABI_XHTML_MHT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_wordperfect_LIBS"; then - pkg_cv__abi_wordperfect_LIBS="$_abi_wordperfect_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwpd-0.8 >= 0.8.0 \"") >&5 - ($PKG_CONFIG --exists --print-errors "libwpd-0.8 >= 0.8.0 ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 >= 0.8.0 " 2>/dev/null` -else - pkg_failed=yes +if test -z "${ABI_XHTML_TIDY_TRUE}" && test -z "${ABI_XHTML_TIDY_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ABI_XHTML_TIDY\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ABI_XHTML_TIDY\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi - fi -else - pkg_failed=untried +if test -z "${ABI_XHTML_XML2_TRUE}" && test -z "${ABI_XHTML_XML2_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ABI_XHTML_XML2\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ABI_XHTML_XML2\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi +: ${CONFIG_STATUS=./config.status} +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. +debug=false +ac_cs_recheck=false +ac_cs_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_ACEOF -if test $pkg_failed = yes; then +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST else - _pkg_short_errors_supported=no + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi - if test $_pkg_short_errors_supported = yes; then - _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libwpd-0.8 >= 0.8.0 "` - else - _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-0.8 >= 0.8.0 "` - fi - # Put the nasty error message in config.log where it belongs - echo "$_abi_wordperfect_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test "xWordPerfect: error - libwpd-0.8 >= 0.8.0 required" != "x" ; then - echo "WordPerfect: error - libwpd-0.8 >= 0.8.0 required" >> $abi_plugin_topdir/plugin.status - fi - abi_plugin_disable=yes -elif test $pkg_failed = untried; then +# 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 - if test "xWordPerfect: error - libwpd-0.8 >= 0.8.0 required" != "x" ; then - echo "WordPerfect: error - libwpd-0.8 >= 0.8.0 required" >> $abi_plugin_topdir/plugin.status - fi +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi - abi_plugin_disable=yes +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset else - _abi_wordperfect_CFLAGS=$pkg_cv__abi_wordperfect_CFLAGS - _abi_wordperfect_LIBS=$pkg_cv__abi_wordperfect_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - - - if test "xWordPerfect: okay" != "x" ; then - echo "WordPerfect: okay" >> $abi_plugin_topdir/plugin.status - fi - - + as_unset=false fi -if test $abi_plugin_disable = no; then - WORDPERFECT_CPPFLAGS="$_abi_wordperfect_CFLAGS" - WORDPERFECT_LDFLAGS="$_abi_wordperfect_LIBS" -fi -msworks_disable=no +# 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.) +IFS=" "" $as_nl" -pkg_failed=no -{ echo "$as_me:$LINENO: checking for _abi_msworks" >&5 -echo $ECHO_N "checking for _abi_msworks... $ECHO_C" >&6; } +# 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 -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_msworks_CFLAGS"; then - pkg_cv__abi_msworks_CFLAGS="$_abi_msworks_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwps-0.1 >= 0.1.0 \"") >&5 - ($PKG_CONFIG --exists --print-errors "libwps-0.1 >= 0.1.0 ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_msworks_CFLAGS=`$PKG_CONFIG --cflags "libwps-0.1 >= 0.1.0 " 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$_abi_msworks_LIBS"; then - pkg_cv__abi_msworks_LIBS="$_abi_msworks_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwps-0.1 >= 0.1.0 \"") >&5 - ($PKG_CONFIG --exists --print-errors "libwps-0.1 >= 0.1.0 ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv__abi_msworks_LIBS=`$PKG_CONFIG --libs "libwps-0.1 >= 0.1.0 " 2>/dev/null` -else - pkg_failed=yes + ;; +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 - fi -else - pkg_failed=untried +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } fi +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - _pkg_short_errors_supported=no + as_expr=false fi - if test $_pkg_short_errors_supported = yes; then - _abi_msworks_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libwps-0.1 >= 0.1.0 "` - else - _abi_msworks_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwps-0.1 >= 0.1.0 "` - fi - # Put the nasty error message in config.log where it belongs - echo "$_abi_msworks_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - - if test "xMS Works: error - libwps-0.1 >= 0.1.0 required" != "x" ; then - echo "MS Works: error - libwps-0.1 >= 0.1.0 required" >> $abi_plugin_topdir/plugin.status - fi - - msworks_disable=yes - -elif test $pkg_failed = untried; then - - if test "xMS Works: error - libwps-0.1 >= 0.1.0 required" != "x" ; then - echo "MS Works: error - libwps-0.1 >= 0.1.0 required" >> $abi_plugin_topdir/plugin.status - fi - - msworks_disable=yes +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - _abi_msworks_CFLAGS=$pkg_cv__abi_msworks_CFLAGS - _abi_msworks_LIBS=$pkg_cv__abi_msworks_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + as_basename=false +fi - if test "xMS Works: okay" != "x" ; then - echo "MS Works: okay" >> $abi_plugin_topdir/plugin.status - fi +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -fi -if test $msworks_disable = no; then - WORDPERFECT_CPPFLAGS="$WORDPERFECT_CPPFLAGS $_abi_msworks_CFLAGS -DHAVE_LIBWPS=1" - WORDPERFECT_LDFLAGS="$WORDPERFECT_LDFLATS $_abi_msworks_LIBS" -fi + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp wordperfect" - fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false fi -abi_plugin_add=yes -# Check whether --enable-xhtml was given. -if test "${enable_xhtml+set}" = set; then - enableval=$enable_xhtml; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - abi_plugin_add=$abi_plugin_opt - + 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 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -# Check whether --with-xhtml was given. -if test "${with_xhtml+set}" = set; then - withval=$with_xhtml; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes - fi +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi +as_executable_p=$as_test_x +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -inter7eps_disable=no -htmltidy_disable=yes -htmlxml2_disable=no +exec 6>&1 -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +# Save the log message, to keep $[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by abiword-plugins $as_me 2.6.8, which was +generated by GNU Autoconf 2.63. Invocation command line was + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ -_abi_cppflags_save="$CPPFLAGS" -_abi_ldflags_save="$LDFLAGS" +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" -# Checks for libraries. -# Checks for header files. +_ACEOF -ABI_XHTML_I7EPS_CPPFLAGS="" -ABI_XHTML_I7EPS_LDFLAGS="" +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac -# Check whether --with-inter7eps was given. -if test "${with_inter7eps+set}" = set; then - withval=$with_inter7eps; - if test "x$withval" = "xno"; then - if test "xxhtml(mht): inter7 EPS support disabled" != "x" ; then - echo "xhtml(mht): inter7 EPS support disabled" >> $abi_plugin_topdir/plugin.status - fi +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_commands="$ac_config_commands" - inter7eps_disable=yes - elif test "x$withval" != "xyes"; then - ABI_XHTML_I7EPS_CPPFLAGS="-I$withval/include" - ABI_XHTML_I7EPS_LDFLAGS="-L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - else - ABI_XHTML_I7EPS_CPPFLAGS="-I/usr/include" - CPPFLAGS="$CPPFLAGS -I/usr/include" - fi +_ACEOF -else - ABI_XHTML_I7EPS_CPPFLAGS="-I/usr/include" - CPPFLAGS="$CPPFLAGS -I/usr/include" +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. -fi +Usage: $0 [OPTION]... [FILE]... + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE -if test $inter7eps_disable != yes; then - if test "${ac_cv_header_eps_eps_h+set}" = set; then - { echo "$as_me:$LINENO: checking for eps/eps.h" >&5 -echo $ECHO_N "checking for eps/eps.h... $ECHO_C" >&6; } -if test "${ac_cv_header_eps_eps_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_eps_eps_h" >&5 -echo "${ECHO_T}$ac_cv_header_eps_eps_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking eps/eps.h usability" >&5 -echo $ECHO_N "checking eps/eps.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +Configuration files: +$config_files - ac_header_compiler=no -fi +Configuration commands: +$config_commands -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; } +Report bugs to ." -# Is the header present? -{ echo "$as_me:$LINENO: checking eps/eps.h presence" >&5 -echo $ECHO_N "checking eps/eps.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_version="\\ +abiword-plugins config.status 2.6.8 +configured by $0, generated by GNU Autoconf 2.63, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - ac_header_preproc=no -fi +Copyright (C) 2008 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: eps/eps.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: eps/eps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: eps/eps.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: eps/eps.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: eps/eps.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: eps/eps.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: eps/eps.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: eps/eps.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: eps/eps.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: eps/eps.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: eps/eps.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: eps/eps.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: eps/eps.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: eps/eps.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: eps/eps.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: eps/eps.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------------- ## -## Report this to http://bugzilla.abisource.com/ ## -## --------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; -esac -{ echo "$as_me:$LINENO: checking for eps/eps.h" >&5 -echo $ECHO_N "checking for eps/eps.h... $ECHO_C" >&6; } -if test "${ac_cv_header_eps_eps_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_eps_eps_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_eps_eps_h" >&5 -echo "${ECHO_T}$ac_cv_header_eps_eps_h" >&6; } + esac -fi -if test $ac_cv_header_eps_eps_h = yes; then + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + ac_need_defaults=false;; + --he | --h | --help | --hel | -h ) + $as_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. + -*) { $as_echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; - if test "xxhtml(mht): okay" != "x" ; then - echo "xhtml(mht): okay" >> $abi_plugin_topdir/plugin.status - fi + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; - ABI_XHTML_I7EPS_CPPFLAGS="$ABI_XHTML_I7EPS_CPPFLAGS -DXHTML_MULTIPART_SUPPORTED" - ABI_XHTML_I7EPS_LDFLAGS="$ABI_XHTML_I7EPS_LDFLAGS -leps" + esac + shift +done -else +ac_configure_extra_args= - if test "xxhtml(mht): error - inter7 EPS headers not found" != "x" ; then - echo "xhtml(mht): error - inter7 EPS headers not found" >> $abi_plugin_topdir/plugin.status - fi +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi - if test "xxhtml(mht): http://www.inter7.com/eps/" != "x" ; then - echo "xhtml(mht): http://www.inter7.com/eps/" >> $abi_plugin_topdir/plugin.status - fi +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 - inter7eps_disable=yes +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -fi +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -fi -if test $inter7eps_disable = yes; then - ABI_XHTML_I7EPS_CPPFLAGS="" - ABI_XHTML_I7EPS_LDFLAGS="" -fi +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' +macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' +macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' +pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' +host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' +host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' +host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' +build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' +build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' +build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' +SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' +Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' +GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' +EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' +FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' +LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' +NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' +LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' +ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' +exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' +lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' +reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' +AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' +STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' +RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' +compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' +GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' +SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' +ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' +need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' +LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' +OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' +libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' +fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' +version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' +runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' +libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' +soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' +finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' +old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' +striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' +predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' +predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' +postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' +fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' + +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# Quote evaled strings. +for var in SED \ +GREP \ +EGREP \ +FGREP \ +LD \ +NM \ +LN_S \ +lt_SP2NL \ +lt_NL2SP \ +reload_flag \ +OBJDUMP \ +deplibs_check_method \ +file_magic_cmd \ +AR \ +AR_FLAGS \ +STRIP \ +RANLIB \ +CC \ +CFLAGS \ +compiler \ +lt_cv_sys_global_symbol_pipe \ +lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_c_name_address \ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +SHELL \ +ECHO \ +lt_prog_compiler_no_builtin_flag \ +lt_prog_compiler_wl \ +lt_prog_compiler_pic \ +lt_prog_compiler_static \ +lt_cv_prog_compiler_c_o \ +need_locks \ +DSYMUTIL \ +NMEDIT \ +LIPO \ +OTOOL \ +OTOOL64 \ +shrext_cmds \ +export_dynamic_flag_spec \ +whole_archive_flag_spec \ +compiler_needs_object \ +with_gnu_ld \ +allow_undefined_flag \ +no_undefined_flag \ +hardcode_libdir_flag_spec \ +hardcode_libdir_flag_spec_ld \ +hardcode_libdir_separator \ +fix_srcfile_path \ +exclude_expsyms \ +include_expsyms \ +file_list_spec \ +variables_saved_for_relink \ +libname_spec \ +library_names_spec \ +soname_spec \ +finish_eval \ +old_striplib \ +striplib \ +compiler_lib_search_dirs \ +predep_objects \ +postdep_objects \ +predeps \ +postdeps \ +compiler_lib_search_path \ +LD_CXX \ +compiler_CXX \ +lt_prog_compiler_no_builtin_flag_CXX \ +lt_prog_compiler_wl_CXX \ +lt_prog_compiler_pic_CXX \ +lt_prog_compiler_static_CXX \ +lt_cv_prog_compiler_c_o_CXX \ +export_dynamic_flag_spec_CXX \ +whole_archive_flag_spec_CXX \ +compiler_needs_object_CXX \ +with_gnu_ld_CXX \ +allow_undefined_flag_CXX \ +no_undefined_flag_CXX \ +hardcode_libdir_flag_spec_CXX \ +hardcode_libdir_flag_spec_ld_CXX \ +hardcode_libdir_separator_CXX \ +fix_srcfile_path_CXX \ +exclude_expsyms_CXX \ +include_expsyms_CXX \ +file_list_spec_CXX \ +compiler_lib_search_dirs_CXX \ +predep_objects_CXX \ +postdep_objects_CXX \ +predeps_CXX \ +postdeps_CXX \ +compiler_lib_search_path_CXX; do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done -ABI_XHTML_TIDY_CPPFLAGS="" -ABI_XHTML_TIDY_LDFLAGS="" +# Double-quote double-evaled strings. +for var in reload_cmds \ +old_postinstall_cmds \ +old_postuninstall_cmds \ +old_archive_cmds \ +extract_expsyms_cmds \ +old_archive_from_new_cmds \ +old_archive_from_expsyms_cmds \ +archive_cmds \ +archive_expsym_cmds \ +module_cmds \ +module_expsym_cmds \ +export_symbols_cmds \ +prelink_cmds \ +postinstall_cmds \ +postuninstall_cmds \ +finish_cmds \ +sys_lib_search_path_spec \ +sys_lib_dlsearch_path_spec \ +old_archive_cmds_CXX \ +old_archive_from_new_cmds_CXX \ +old_archive_from_expsyms_cmds_CXX \ +archive_cmds_CXX \ +archive_expsym_cmds_CXX \ +module_cmds_CXX \ +module_expsym_cmds_CXX \ +export_symbols_cmds_CXX \ +prelink_cmds_CXX; do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done +# Fix-up fallback echo if it was mangled by the above quoting rules. +case \$lt_ECHO in +*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` + ;; +esac -# Check whether --with-libtidy was given. -if test "${with_libtidy+set}" = set; then - withval=$with_libtidy; - if test "x$withval" = "xno"; then +ac_aux_dir='$ac_aux_dir' +xsi_shell='$xsi_shell' +lt_shell_append='$lt_shell_append' - if test "xxhtml(html): libtidy support disabled" != "x" ; then - echo "xhtml(html): libtidy support disabled" >> $abi_plugin_topdir/plugin.status - fi +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi - htmltidy_disable=yes - elif test "x$withval" != "xyes"; then - ABI_XHTML_TIDY_CPPFLAGS="-I$withval/include" - ABI_XHTML_TIDY_LDFLAGS="-L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - if test "xxhtml(html): libtidy support enabled" != "x" ; then - echo "xhtml(html): libtidy support enabled" >> $abi_plugin_topdir/plugin.status - fi + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile' - htmltidy_disable=no - else - if test "xxhtml(html): libtidy support enabled" != "x" ; then - echo "xhtml(html): libtidy support enabled" >> $abi_plugin_topdir/plugin.status - fi - htmltidy_disable=no - fi -fi -if test $htmltidy_disable != yes; then - if test "${ac_cv_header_tidy_tidy_h+set}" = set; then - { echo "$as_me:$LINENO: checking for tidy/tidy.h" >&5 -echo $ECHO_N "checking for tidy/tidy.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tidy_tidy_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tidy_tidy_h" >&5 -echo "${ECHO_T}$ac_cv_header_tidy_tidy_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking tidy/tidy.h usability" >&5 -echo $ECHO_N "checking tidy/tidy.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi -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; } +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Is the header present? -{ echo "$as_me:$LINENO: checking tidy/tidy.h presence" >&5 -echo $ECHO_N "checking tidy/tidy.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;; + "tools/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/GNUmakefile" ;; + "wp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/GNUmakefile" ;; + "wp/impexp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/GNUmakefile" ;; + "wp/impexp/graphics/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/GNUmakefile" ;; + "wp/scripts/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/scripts/GNUmakefile" ;; + "tools/abicollab/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/GNUmakefile" ;; + "tools/abicollab/core/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/GNUmakefile" ;; + "tools/abicollab/core/dialogs/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/dialogs/GNUmakefile" ;; + "tools/abicollab/core/dialogs/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/dialogs/xp/GNUmakefile" ;; + "tools/abicollab/core/dialogs/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/dialogs/unix/GNUmakefile" ;; + "tools/abicollab/core/dialogs/win/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/dialogs/win/GNUmakefile" ;; + "tools/abicollab/core/packet/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/packet/GNUmakefile" ;; + "tools/abicollab/core/packet/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/packet/xp/GNUmakefile" ;; + "tools/abicollab/core/session/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/session/GNUmakefile" ;; + "tools/abicollab/core/session/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/session/xp/GNUmakefile" ;; + "tools/abicollab/backends/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/GNUmakefile" ;; + "tools/abicollab/backends/xmpp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/xmpp/GNUmakefile" ;; + "tools/abicollab/backends/xmpp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/xmpp/xp/GNUmakefile" ;; + "tools/abicollab/backends/xmpp/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/xmpp/unix/GNUmakefile" ;; + "tools/abicollab/backends/tcp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/tcp/GNUmakefile" ;; + "tools/abicollab/backends/tcp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/tcp/xp/GNUmakefile" ;; + "tools/abicollab/backends/tcp/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/tcp/unix/GNUmakefile" ;; + "tools/abicollab/backends/tcp/win/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/tcp/win/GNUmakefile" ;; + "tools/abicollab/backends/sugar/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/sugar/GNUmakefile" ;; + "tools/abicollab/backends/sugar/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/sugar/unix/GNUmakefile" ;; + "tools/abicollab/backends/fake/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/fake/GNUmakefile" ;; + "tools/abicollab/backends/fake/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/fake/xp/GNUmakefile" ;; + "tools/abicollab/backends/service/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/service/GNUmakefile" ;; + "tools/abicollab/backends/service/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/service/xp/GNUmakefile" ;; + "tools/abicollab/backends/service/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/service/unix/GNUmakefile" ;; + "tools/abicollab/backends/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/xp/GNUmakefile" ;; + "tools/abicommand/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicommand/GNUmakefile" ;; + "tools/abicommand/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicommand/xp/GNUmakefile" ;; + "tools/abigimp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigimp/GNUmakefile" ;; + "tools/abigimp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigimp/xp/GNUmakefile" ;; + "tools/abigoffice/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigoffice/GNUmakefile" ;; + "tools/abigoffice/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigoffice/unix/GNUmakefile" ;; + "tools/abigrammar/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigrammar/GNUmakefile" ;; + "tools/abigrammar/linkgrammarwrap/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigrammar/linkgrammarwrap/GNUmakefile" ;; + "tools/abigrammar/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigrammar/xp/GNUmakefile" ;; + "tools/abimathview/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abimathview/GNUmakefile" ;; + "tools/abimathview/itex2MML/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abimathview/itex2MML/GNUmakefile" ;; + "tools/abimathview/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abimathview/xp/GNUmakefile" ;; + "tools/abiscan/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abiscan/GNUmakefile" ;; + "tools/abiscan/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abiscan/unix/GNUmakefile" ;; + "tools/aiksaurus/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/aiksaurus/GNUmakefile" ;; + "tools/aiksaurus/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/aiksaurus/xp/GNUmakefile" ;; + "tools/babelfish/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/babelfish/GNUmakefile" ;; + "tools/babelfish/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/babelfish/xp/GNUmakefile" ;; + "tools/develop/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/develop/GNUmakefile" ;; + "tools/develop/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/develop/xp/GNUmakefile" ;; + "tools/develop/gnu-regex/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/develop/gnu-regex/GNUmakefile" ;; + "tools/freetranslation/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/freetranslation/GNUmakefile" ;; + "tools/freetranslation/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/freetranslation/xp/GNUmakefile" ;; + "tools/gda/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/gda/GNUmakefile" ;; + "tools/gda/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/gda/unix/GNUmakefile" ;; + "tools/gdict/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/gdict/GNUmakefile" ;; + "tools/gdict/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/gdict/unix/GNUmakefile" ;; + "tools/google/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/google/GNUmakefile" ;; + "tools/google/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/google/xp/GNUmakefile" ;; + "tools/loadbindings/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/loadbindings/GNUmakefile" ;; + "tools/loadbindings/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/loadbindings/xp/GNUmakefile" ;; + "tools/ots/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/ots/GNUmakefile" ;; + "tools/ots/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/ots/xp/GNUmakefile" ;; + "tools/presentation/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/presentation/GNUmakefile" ;; + "tools/presentation/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/presentation/xp/GNUmakefile" ;; + "tools/urldict/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/urldict/GNUmakefile" ;; + "tools/urldict/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/urldict/xp/GNUmakefile" ;; + "tools/wikipedia/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/wikipedia/GNUmakefile" ;; + "tools/wikipedia/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/wikipedia/xp/GNUmakefile" ;; + "wp/impexp/applix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/applix/GNUmakefile" ;; + "wp/impexp/applix/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/applix/xp/GNUmakefile" ;; + "wp/impexp/clarisworks/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/clarisworks/GNUmakefile" ;; + "wp/impexp/clarisworks/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/clarisworks/xp/GNUmakefile" ;; + "wp/impexp/docbook/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/docbook/GNUmakefile" ;; + "wp/impexp/docbook/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/docbook/xp/GNUmakefile" ;; + "wp/impexp/eml/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/eml/GNUmakefile" ;; + "wp/impexp/eml/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/eml/xp/GNUmakefile" ;; + "wp/impexp/hancom/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/hancom/GNUmakefile" ;; + "wp/impexp/hancom/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/hancom/xp/GNUmakefile" ;; + "wp/impexp/hrtext/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/hrtext/GNUmakefile" ;; + "wp/impexp/hrtext/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/hrtext/xp/GNUmakefile" ;; + "wp/impexp/iscii-text/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/iscii-text/GNUmakefile" ;; + "wp/impexp/iscii-text/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/iscii-text/xp/GNUmakefile" ;; + "wp/impexp/kword/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/kword/GNUmakefile" ;; + "wp/impexp/kword/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/kword/xp/GNUmakefile" ;; + "wp/impexp/latex/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/latex/GNUmakefile" ;; + "wp/impexp/latex/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/latex/xp/GNUmakefile" ;; + "wp/impexp/latex/xsltml/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/latex/xsltml/GNUmakefile" ;; + "wp/impexp/mif/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/mif/GNUmakefile" ;; + "wp/impexp/mif/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/mif/xp/GNUmakefile" ;; + "wp/impexp/mswrite/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/mswrite/GNUmakefile" ;; + "wp/impexp/mswrite/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/mswrite/xp/GNUmakefile" ;; + "wp/impexp/nroff/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/nroff/GNUmakefile" ;; + "wp/impexp/nroff/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/nroff/xp/GNUmakefile" ;; + "wp/impexp/OpenDocument/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/GNUmakefile" ;; + "wp/impexp/OpenDocument/common/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/common/GNUmakefile" ;; + "wp/impexp/OpenDocument/common/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/common/xp/GNUmakefile" ;; + "wp/impexp/OpenDocument/exp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/exp/GNUmakefile" ;; + "wp/impexp/OpenDocument/exp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/exp/xp/GNUmakefile" ;; + "wp/impexp/OpenDocument/imp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/imp/GNUmakefile" ;; + "wp/impexp/OpenDocument/imp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/imp/xp/GNUmakefile" ;; + "wp/impexp/OpenWriter/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenWriter/GNUmakefile" ;; + "wp/impexp/OpenWriter/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenWriter/xp/GNUmakefile" ;; + "wp/impexp/OpenXML/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/GNUmakefile" ;; + "wp/impexp/OpenXML/common/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/common/GNUmakefile" ;; + "wp/impexp/OpenXML/common/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/common/xp/GNUmakefile" ;; + "wp/impexp/OpenXML/exp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/exp/GNUmakefile" ;; + "wp/impexp/OpenXML/exp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/exp/xp/GNUmakefile" ;; + "wp/impexp/OpenXML/imp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/imp/GNUmakefile" ;; + "wp/impexp/OpenXML/imp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/imp/xp/GNUmakefile" ;; + "wp/impexp/opml/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/opml/GNUmakefile" ;; + "wp/impexp/opml/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/opml/xp/GNUmakefile" ;; + "wp/impexp/passepartout/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/passepartout/GNUmakefile" ;; + "wp/impexp/passepartout/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/passepartout/xp/GNUmakefile" ;; + "wp/impexp/pdb/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/pdb/GNUmakefile" ;; + "wp/impexp/pdb/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/pdb/xp/GNUmakefile" ;; + "wp/impexp/pdf/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/pdf/GNUmakefile" ;; + "wp/impexp/pdf/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/pdf/xp/GNUmakefile" ;; + "wp/impexp/psion/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/psion/GNUmakefile" ;; + "wp/impexp/psion/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/psion/xp/GNUmakefile" ;; + "wp/impexp/sdw/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/sdw/GNUmakefile" ;; + "wp/impexp/sdw/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/sdw/xp/GNUmakefile" ;; + "wp/impexp/t602/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/t602/GNUmakefile" ;; + "wp/impexp/t602/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/t602/xp/GNUmakefile" ;; + "wp/impexp/wml/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/wml/GNUmakefile" ;; + "wp/impexp/wml/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/wml/xp/GNUmakefile" ;; + "wp/impexp/wordperfect/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/wordperfect/GNUmakefile" ;; + "wp/impexp/wordperfect/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/wordperfect/xp/GNUmakefile" ;; + "wp/impexp/xhtml/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/xhtml/GNUmakefile" ;; + "wp/impexp/xhtml/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/xhtml/xp/GNUmakefile" ;; + "wp/impexp/xsl-fo/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/xsl-fo/GNUmakefile" ;; + "wp/impexp/xsl-fo/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/xsl-fo/xp/GNUmakefile" ;; + "wp/impexp/graphics/bmp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/bmp/GNUmakefile" ;; + "wp/impexp/graphics/bmp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/bmp/xp/GNUmakefile" ;; + "wp/impexp/graphics/jpeg/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/jpeg/GNUmakefile" ;; + "wp/impexp/graphics/jpeg/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/jpeg/xp/GNUmakefile" ;; + "wp/impexp/graphics/librsvg/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/librsvg/GNUmakefile" ;; + "wp/impexp/graphics/librsvg/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/librsvg/unix/GNUmakefile" ;; + "wp/impexp/graphics/win32native/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/win32native/GNUmakefile" ;; + "wp/impexp/graphics/win32native/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/win32native/unix/GNUmakefile" ;; + "wp/impexp/graphics/wmf/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/wmf/GNUmakefile" ;; + "wp/impexp/graphics/wmf/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/wmf/xp/GNUmakefile" ;; + "wp/impexp/graphics/wpg/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/wpg/GNUmakefile" ;; + "wp/impexp/graphics/wpg/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/wpg/xp/GNUmakefile" ;; + "wp/scripts/shell/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/scripts/shell/GNUmakefile" ;; + "wp/scripts/shell/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/scripts/shell/xp/GNUmakefile" ;; - ac_header_preproc=no -fi + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +done -rm -f conftest.err conftest.$ac_ext -{ 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 - yes:no: ) - { echo "$as_me:$LINENO: WARNING: tidy/tidy.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tidy/tidy.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tidy/tidy.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: tidy/tidy.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: tidy/tidy.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tidy/tidy.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tidy/tidy.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tidy/tidy.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tidy/tidy.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: tidy/tidy.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: tidy/tidy.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: tidy/tidy.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: tidy/tidy.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tidy/tidy.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: tidy/tidy.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: tidy/tidy.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------------- ## -## Report this to http://bugzilla.abisource.com/ ## -## --------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for tidy/tidy.h" >&5 -echo $ECHO_N "checking for tidy/tidy.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tidy_tidy_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_tidy_tidy_h=$ac_header_preproc +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tidy_tidy_h" >&5 -echo "${ECHO_T}$ac_cv_header_tidy_tidy_h" >&6; } -fi -if test $ac_cv_header_tidy_tidy_h = yes; then +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || +{ + $as_echo "$as_me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } +} - if test "xxhtml(html): okay" != "x" ; then - echo "xhtml(html): okay" >> $abi_plugin_topdir/plugin.status - fi +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then - ABI_XHTML_TIDY_CPPFLAGS="$ABI_XHTML_TIDY_CPPFLAGS -DXHTML_HTML_TIDY_SUPPORTED" - ABI_XHTML_TIDY_LDFLAGS="$ABI_XHTML_TIDY_LDFLAGS -ltidy" +ac_cr=' ' +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' else + ac_cs_awk_cr=$ac_cr +fi - if test "xxhtml(html): error - libtidy headers not found" != "x" ; then - echo "xhtml(html): error - libtidy headers not found" >> $abi_plugin_topdir/plugin.status - fi - - - if test "xxhtml(html): http://tidy.sourceforge.net/" != "x" ; then - echo "xhtml(html): http://tidy.sourceforge.net/" >> $abi_plugin_topdir/plugin.status - fi +echo 'BEGIN {' >"$tmp/subs1.awk" && +_ACEOF - htmltidy_disable=yes -fi +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_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 +rm -f conf$$subs.sh -fi -if test $htmltidy_disable = yes; then - ABI_XHTML_TIDY_CPPFLAGS="" - ABI_XHTML_TIDY_LDFLAGS="" -fi +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\).*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\).*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" -ABI_XHTML_XML2_CPPFLAGS="" -ABI_XHTML_XML2_LDFLAGS="" +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } -if test $htmlxml2_disable != yes; then + print line +} -pkg_failed=no -{ echo "$as_me:$LINENO: checking for LIBXML2" >&5 -echo $ECHO_N "checking for LIBXML2... $ECHO_C" >&6; } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +$as_echo "$as_me: error: could not setup config files machinery" >&2;} + { (exit 1); exit 1; }; } +_ACEOF -if test -n "$PKG_CONFIG"; then - if test -n "$LIBXML2_CFLAGS"; then - pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.4.20\"") >&5 - ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.4.20") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.4.20" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$LIBXML2_LIBS"; then - pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.4.20\"") >&5 - ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.4.20") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.4.20" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried +# 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 || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= 2.4.20"` - else - LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= 2.4.20"` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBXML2_PKG_ERRORS" >&5 +eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +$as_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 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + 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 || + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + ac_file_inputs="$ac_file_inputs '$ac_f'" + done - if test "xxhtml(html): libxml2 support disabled" != "x" ; then - echo "xhtml(html): libxml2 support disabled" >> $abi_plugin_topdir/plugin.status - 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. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac - htmlxml2_disable=yes + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; + esac + ;; + esac -elif test $pkg_failed = untried; then + 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 || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_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 || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. - if test "xxhtml(html): libxml2 support disabled" != "x" ; then - echo "xhtml(html): libxml2 support disabled" >> $abi_plugin_topdir/plugin.status - fi +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_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 - htmlxml2_disable=yes +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -else - LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS - LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + case $ac_mode in + :F) + # + # CONFIG_FILE + # - if test "xxhtml(html): libxml2 support enabled" != "x" ; then - echo "xhtml(html): libxml2 support enabled" >> $abi_plugin_topdir/plugin.status - fi + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# 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= -fi -fi -if test $htmlxml2_disable != yes; then - ABI_XHTML_XML2_CPPFLAGS="$LIBXML2_CFLAGS -DXHTML_HTML_XML2_SUPPORTED" - ABI_XHTML_XML2_LDFLAGS="$LIBXML2_LIBS" -fi +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + 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 -ABI_XHTML_CPPFLAGS="$ABI_XHTML_I7EPS_CPPFLAGS $ABI_XHTML_TIDY_CPPFLAGS $ABI_XHTML_XML2_CPPFLAGS" -ABI_XHTML_LDFLAGS="$ABI_XHTML_I7EPS_LDFLAGS $ABI_XHTML_TIDY_LDFLAGS $ABI_XHTML_XML2_LDFLAGS" +# 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 || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;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 +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } +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"; } && + { $as_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 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } + ;; -CPPFLAGS="$_abi_cppflags_save" -LDFLAGS="$_abi_ldflags_save" + :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac -if test "$inter7eps_disable" = yes; then - if test "$htmltidy_disable" = yes -a "$htmlxml2_disable" = yes; then - abi_plugin_disable=yes - if test "xxhtml: no options enabled/satisfied - disabling" != "x" ; then - echo "xhtml: no options enabled/satisfied - disabling" >> $abi_plugin_topdir/plugin.status - fi + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +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. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + 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 :; do + case $as_dir in #( + *\'*) as_qdir=`$as_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 || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done + ;; + "libtool":C) - else + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi - if test "xxhtml: building without Multipart support" != "x" ; then - echo "xhtml: building without Multipart support" >> $abi_plugin_topdir/plugin.status - fi + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" - fi -else - if test "$htmltidy_disable" = yes -a "$htmlxml2_disable" = yes; then + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL - if test "xxhtml: building without HTML support" != "x" ; then - echo "xhtml: building without HTML support" >> $abi_plugin_topdir/plugin.status - fi +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - else - if test "xxhtml: okay" != "x" ; then - echo "xhtml: okay" >> $abi_plugin_topdir/plugin.status - fi +# The names of the tagged configurations supported by this script. +available_tags="CXX " - fi -fi +# ### BEGIN LIBTOOL CONFIG +# Whether or not to build static libraries. +build_old_libs=$enable_static - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp xhtml" - fi -fi +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared - if test $inter7eps_disable != yes; then - ABI_XHTML_MHT_TRUE= - ABI_XHTML_MHT_FALSE='#' -else - ABI_XHTML_MHT_TRUE='#' - ABI_XHTML_MHT_FALSE= -fi +# What type of objects to build. +pic_mode=$pic_mode - if test $htmltidy_disable != yes; then - ABI_XHTML_TIDY_TRUE= - ABI_XHTML_TIDY_FALSE='#' -else - ABI_XHTML_TIDY_TRUE='#' - ABI_XHTML_TIDY_FALSE= -fi +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install - if test $htmlxml2_disable != yes; then - ABI_XHTML_XML2_TRUE= - ABI_XHTML_XML2_FALSE='#' -else - ABI_XHTML_XML2_TRUE='#' - ABI_XHTML_XML2_FALSE= -fi +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os +# A sed program that does not truncate output. +SED=$lt_SED -abi_plugin_add=yes -# Check whether --enable-xsl-fo was given. -if test "${enable_xsl_fo+set}" = set; then - enableval=$enable_xsl_fo; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="\$SED -e 1s/^X//" -else - abi_plugin_add=$abi_plugin_opt +# A grep program that handles long lines. +GREP=$lt_GREP -fi +# An ERE matcher. +EGREP=$lt_EGREP +# A literal string matcher. +FGREP=$lt_FGREP -# Check whether --with-xsl-fo was given. -if test "${with_xsl_fo+set}" = set; then - withval=$with_xsl_fo; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes - fi +# A BSD- or MS-compatible name lister. +NM=$lt_NM -fi +# Whether we need soft or hard links. +LN_S=$lt_LN_S -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +# What is the maximum length of a command? +max_cmd_len=$max_cmd_len +# Object file suffix (normally "o"). +objext=$ac_objext +# Executable file suffix (normally ""). +exeext=$exeext - if test "xxsl-fo: okay" != "x" ; then - echo "xsl-fo: okay" >> $abi_plugin_topdir/plugin.status - fi +# whether the shell understands "unset". +lt_unset=$lt_unset +# turn spaces into newlines. +SP2NL=$lt_lt_SP2NL +# turn newlines into spaces. +NL2SP=$lt_lt_NL2SP - if test $abi_plugin_disable = no; then - abi_wp_impexp="$abi_wp_impexp xsl-fo" - fi -fi +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP -abi_wp_scripts= -abi_plugin_add=yes -# Check whether --enable-shell was given. -if test "${enable_shell+set}" = set; then - enableval=$enable_shell; - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method -else - abi_plugin_add=$abi_plugin_opt +# Command to use when deplibs_check_method == "file_magic". +file_magic_cmd=$lt_file_magic_cmd -fi +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS +# A symbol stripping program. +STRIP=$lt_STRIP -# Check whether --with-shell was given. -if test "${with_shell+set}" = set; then - withval=$with_shell; - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes - fi +# Commands used to install an old-style archive. +RANLIB=$lt_RANLIB +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds -fi +# A C compiler. +LTCC=$lt_CC -if test $abi_plugin_add = yes; then - abi_plugin_disable=no +# LTCC compiler flags. +LTCFLAGS=$lt_CFLAGS +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +# Transform the output of nm in a proper C declaration. +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - if test "xshell: okay" != "x" ; then - echo "shell: okay" >> $abi_plugin_topdir/plugin.status - fi +# Transform the output of nm in a C name address pair. +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +# Transform the output of nm in a C name address pair when lib prefix is needed. +global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name of the directory that contains temporary libtool files. +objdir=$objdir - if test $abi_plugin_disable = no; then - abi_wp_scripts="$abi_wp_scripts shell" - fi -fi +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL +# An echo program that does not interpret backslashes. +ECHO=$lt_ECHO -ac_config_files="$ac_config_files GNUmakefile tools/GNUmakefile wp/GNUmakefile wp/impexp/GNUmakefile wp/impexp/graphics/GNUmakefile wp/scripts/GNUmakefile" +# Used to examine libraries when file_magic_cmd begins with "file". +MAGIC_CMD=$MAGIC_CMD -ac_config_files="$ac_config_files tools/abicollab/GNUmakefile tools/abicollab/core/GNUmakefile tools/abicollab/core/dialogs/GNUmakefile tools/abicollab/core/dialogs/xp/GNUmakefile tools/abicollab/core/dialogs/unix/GNUmakefile tools/abicollab/core/dialogs/win/GNUmakefile tools/abicollab/core/packet/GNUmakefile tools/abicollab/core/packet/xp/GNUmakefile tools/abicollab/core/session/GNUmakefile tools/abicollab/core/session/xp/GNUmakefile tools/abicollab/backends/GNUmakefile tools/abicollab/backends/xmpp/GNUmakefile tools/abicollab/backends/xmpp/xp/GNUmakefile tools/abicollab/backends/xmpp/unix/GNUmakefile tools/abicollab/backends/tcp/GNUmakefile tools/abicollab/backends/tcp/xp/GNUmakefile tools/abicollab/backends/tcp/unix/GNUmakefile tools/abicollab/backends/tcp/win/GNUmakefile tools/abicollab/backends/sugar/GNUmakefile tools/abicollab/backends/sugar/unix/GNUmakefile tools/abicollab/backends/fake/GNUmakefile tools/abicollab/backends/fake/xp/GNUmakefile tools/abicollab/backends/service/GNUmakefile tools/abicollab/backends/service/xp/GNUmakefile tools/abicollab/backends/service/unix/GNUmakefile tools/abicollab/backends/xp/GNUmakefile tools/abicommand/GNUmakefile tools/abicommand/xp/GNUmakefile tools/abidash/GNUmakefile tools/abidash/xp/GNUmakefile tools/abigimp/GNUmakefile tools/abigimp/xp/GNUmakefile tools/abigoffice/GNUmakefile tools/abigoffice/unix/GNUmakefile tools/abigrammar/GNUmakefile tools/abigrammar/linkgrammarwrap/GNUmakefile tools/abigrammar/xp/GNUmakefile tools/abimathview/GNUmakefile tools/abimathview/itex2MML/GNUmakefile tools/abimathview/xp/GNUmakefile tools/abiscan/GNUmakefile tools/abiscan/unix/GNUmakefile tools/aiksaurus/GNUmakefile tools/aiksaurus/xp/GNUmakefile tools/babelfish/GNUmakefile tools/babelfish/xp/GNUmakefile tools/develop/GNUmakefile tools/develop/xp/GNUmakefile tools/develop/gnu-regex/GNUmakefile tools/freetranslation/GNUmakefile tools/freetranslation/xp/GNUmakefile tools/gda/GNUmakefile tools/gda/unix/GNUmakefile tools/gdict/GNUmakefile tools/gdict/unix/GNUmakefile tools/google/GNUmakefile tools/google/xp/GNUmakefile tools/loadbindings/GNUmakefile tools/loadbindings/xp/GNUmakefile tools/ots/GNUmakefile tools/ots/xp/GNUmakefile tools/presentation/GNUmakefile tools/presentation/xp/GNUmakefile tools/urldict/GNUmakefile tools/urldict/xp/GNUmakefile tools/wikipedia/GNUmakefile tools/wikipedia/xp/GNUmakefile" +# Must we lock files when doing compilation? +need_locks=$lt_need_locks -ac_config_files="$ac_config_files wp/impexp/applix/GNUmakefile wp/impexp/applix/xp/GNUmakefile wp/impexp/clarisworks/GNUmakefile wp/impexp/clarisworks/xp/GNUmakefile wp/impexp/docbook/GNUmakefile wp/impexp/docbook/xp/GNUmakefile wp/impexp/eml/GNUmakefile wp/impexp/eml/xp/GNUmakefile wp/impexp/hancom/GNUmakefile wp/impexp/hancom/xp/GNUmakefile wp/impexp/hrtext/GNUmakefile wp/impexp/hrtext/xp/GNUmakefile wp/impexp/iscii-text/GNUmakefile wp/impexp/iscii-text/xp/GNUmakefile wp/impexp/kword/GNUmakefile wp/impexp/kword/xp/GNUmakefile wp/impexp/latex/GNUmakefile wp/impexp/latex/xp/GNUmakefile wp/impexp/mif/GNUmakefile wp/impexp/mif/xp/GNUmakefile wp/impexp/mswrite/GNUmakefile wp/impexp/mswrite/xp/GNUmakefile wp/impexp/nroff/GNUmakefile wp/impexp/nroff/xp/GNUmakefile wp/impexp/OpenDocument/GNUmakefile wp/impexp/OpenDocument/common/GNUmakefile wp/impexp/OpenDocument/common/xp/GNUmakefile wp/impexp/OpenDocument/exp/GNUmakefile wp/impexp/OpenDocument/exp/xp/GNUmakefile wp/impexp/OpenDocument/imp/GNUmakefile wp/impexp/OpenDocument/imp/xp/GNUmakefile wp/impexp/OpenWriter/GNUmakefile wp/impexp/OpenWriter/xp/GNUmakefile wp/impexp/OpenXML/GNUmakefile wp/impexp/OpenXML/common/GNUmakefile wp/impexp/OpenXML/common/xp/GNUmakefile wp/impexp/OpenXML/imp/GNUmakefile wp/impexp/OpenXML/imp/xp/GNUmakefile wp/impexp/opml/GNUmakefile wp/impexp/opml/xp/GNUmakefile wp/impexp/passepartout/GNUmakefile wp/impexp/passepartout/xp/GNUmakefile wp/impexp/pdb/GNUmakefile wp/impexp/pdb/xp/GNUmakefile wp/impexp/pdf/GNUmakefile wp/impexp/pdf/xp/GNUmakefile wp/impexp/psion/GNUmakefile wp/impexp/psion/xp/GNUmakefile wp/impexp/sdw/GNUmakefile wp/impexp/sdw/xp/GNUmakefile wp/impexp/t602/GNUmakefile wp/impexp/t602/xp/GNUmakefile wp/impexp/wml/GNUmakefile wp/impexp/wml/xp/GNUmakefile wp/impexp/wordperfect/GNUmakefile wp/impexp/wordperfect/xp/GNUmakefile wp/impexp/xhtml/GNUmakefile wp/impexp/xhtml/xp/GNUmakefile wp/impexp/xsl-fo/GNUmakefile wp/impexp/xsl-fo/xp/GNUmakefile" +# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +DSYMUTIL=$lt_DSYMUTIL -ac_config_files="$ac_config_files wp/impexp/graphics/bmp/GNUmakefile wp/impexp/graphics/bmp/xp/GNUmakefile wp/impexp/graphics/jpeg/GNUmakefile wp/impexp/graphics/jpeg/xp/GNUmakefile wp/impexp/graphics/librsvg/GNUmakefile wp/impexp/graphics/librsvg/unix/GNUmakefile wp/impexp/graphics/win32native/GNUmakefile wp/impexp/graphics/win32native/unix/GNUmakefile wp/impexp/graphics/wmf/GNUmakefile wp/impexp/graphics/wmf/xp/GNUmakefile wp/impexp/graphics/wpg/GNUmakefile wp/impexp/graphics/wpg/xp/GNUmakefile" +# Tool to change global to local symbols on Mac OS X. +NMEDIT=$lt_NMEDIT -ac_config_files="$ac_config_files wp/scripts/shell/GNUmakefile wp/scripts/shell/xp/GNUmakefile" +# Tool to manipulate fat objects and archives on Mac OS X. +LIPO=$lt_LIPO -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. +# ldd/readelf like tool for Mach-O binaries on Mac OS X. +OTOOL=$lt_OTOOL -_ACEOF +# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +OTOOL64=$lt_OTOOL64 -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done +# Old archive suffix (normally "a"). +libext=$libext - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache +# Shared library suffix (normally ".so"). +shrext_cmds=$lt_shrext_cmds -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` +# Variables whose values should be saved in libtool wrapper scripts and +# restored at link time. +variables_saved_for_relink=$lt_variables_saved_for_relink +# Do we need the "lib" prefix for modules? +need_lib_prefix=$need_lib_prefix -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs +# Do we need a version for libraries? +need_version=$need_version -LTLIBOBJS=$ac_ltlibobjs +# Library versioning type. +version_type=$version_type +# Shared library runtime path variable. +runpath_var=$runpath_var -if test -z "${BUILD_PLATFORM_COCOA_TRUE}" && test -z "${BUILD_PLATFORM_COCOA_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_PLATFORM_COCOA\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_PLATFORM_COCOA\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${BUILD_PLATFORM_GNOME_TRUE}" && test -z "${BUILD_PLATFORM_GNOME_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_PLATFORM_GNOME\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_PLATFORM_GNOME\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${BUILD_PLATFORM_QNX_TRUE}" && test -z "${BUILD_PLATFORM_QNX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_PLATFORM_QNX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_PLATFORM_QNX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ABI_PLUGIN_DEBUG_TRUE}" && test -z "${ABI_PLUGIN_DEBUG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABI_PLUGIN_DEBUG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABI_PLUGIN_DEBUG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ABICOLLAB_HANDLER_FAKE_TRUE}" && test -z "${ABICOLLAB_HANDLER_FAKE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABICOLLAB_HANDLER_FAKE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABICOLLAB_HANDLER_FAKE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ABICOLLAB_HANDLER_XMPP_TRUE}" && test -z "${ABICOLLAB_HANDLER_XMPP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABICOLLAB_HANDLER_XMPP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABICOLLAB_HANDLER_XMPP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ABICOLLAB_HANDLER_TCP_TRUE}" && test -z "${ABICOLLAB_HANDLER_TCP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABICOLLAB_HANDLER_TCP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABICOLLAB_HANDLER_TCP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ABICOLLAB_HANDLER_SUGAR_TRUE}" && test -z "${ABICOLLAB_HANDLER_SUGAR_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABICOLLAB_HANDLER_SUGAR\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABICOLLAB_HANDLER_SUGAR\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ABICOLLAB_HANDLER_SERVICE_TRUE}" && test -z "${ABICOLLAB_HANDLER_SERVICE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABICOLLAB_HANDLER_SERVICE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABICOLLAB_HANDLER_SERVICE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${BUILD_GNU_REGEX_TRUE}" && test -z "${BUILD_GNU_REGEX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_GNU_REGEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_GNU_REGEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ABI_XHTML_MHT_TRUE}" && test -z "${ABI_XHTML_MHT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABI_XHTML_MHT\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABI_XHTML_MHT\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ABI_XHTML_TIDY_TRUE}" && test -z "${ABI_XHTML_TIDY_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABI_XHTML_TIDY\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABI_XHTML_TIDY\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ABI_XHTML_XML2_TRUE}" && test -z "${ABI_XHTML_XML2_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ABI_XHTML_XML2\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ABI_XHTML_XML2\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi +# Shared library path variable. +shlibpath_var=$shlibpath_var -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF +# Format of library name prefix. +libname_spec=$lt_libname_spec -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME +library_names_spec=$lt_library_names_spec -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec -fi +# Command to use after installation of a shared archive. +postinstall_cmds=$lt_postinstall_cmds +# Command to use after uninstallation of a shared archive. +postuninstall_cmds=$lt_postuninstall_cmds +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds +# As "finish_cmds", except a single script fragment to be evaled but +# not shown. +finish_eval=$lt_finish_eval -# 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 +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs -# 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 +# Compile-time system search path for libraries. +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi +# Run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Whether dlopen is supported. +dlopen_support=$enable_dlopen -# 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" +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + + +# The linker used to build libraries. +LD=$lt_LD + +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds -# 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 +# A language specific compiler. +CC=$lt_compiler - ;; -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 +# Is the compiler the GNU compiler? +with_gcc=$GCC -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc -# CDPATH. -$as_unset CDPATH +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec - 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" || { +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld -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 +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator -# 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'" +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L -exec 6>&1 +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var -# Save the log message, to keep $[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by abiword-plugins $as_me 2.6.2, which was -generated by GNU Autoconf 2.61. Invocation command line was +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs -_ACEOF +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path -cat >>$CONFIG_STATUS <<_ACEOF -# Files that config.status was made for. -config_files="$ac_config_files" -config_commands="$ac_config_commands" +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols -_ACEOF +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds -cat >>$CONFIG_STATUS <<\_ACEOF -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms -Usage: $0 [OPTIONS] [FILE]... +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds -Configuration files: -$config_files +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec -Configuration commands: -$config_commands +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action -Report bugs to ." +# The directories searched by this compiler when creating a shared library. +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -abiword-plugins config.status 2.6.2 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +# Dependencies to place before and after the objects being linked to +# create a shared library. +predep_objects=$lt_predep_objects +postdep_objects=$lt_postdep_objects +predeps=$lt_predeps +postdeps=$lt_postdeps + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path -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." +# ### END LIBTOOL CONFIG -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' -_ACEOF +_LT_EOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF ;; esac - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; +ltmain="$ac_aux_dir/ltmain.sh" - *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + case $xsi_shell in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; esac - shift -done +} -ac_configure_extra_args= +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" +} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL - export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +func_stripname () +{ + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} +} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -exec 5>>config.log +# func_opt_split +func_opt_split () { - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - echo "$ac_log" -} >&5 + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -# -# INIT-COMMANDS -# -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} -_ACEOF +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} -cat >>$CONFIG_STATUS <<\_ACEOF +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $* )) +} -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;; - "tools/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/GNUmakefile" ;; - "wp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/GNUmakefile" ;; - "wp/impexp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/GNUmakefile" ;; - "wp/impexp/graphics/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/GNUmakefile" ;; - "wp/scripts/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/scripts/GNUmakefile" ;; - "tools/abicollab/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/GNUmakefile" ;; - "tools/abicollab/core/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/GNUmakefile" ;; - "tools/abicollab/core/dialogs/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/dialogs/GNUmakefile" ;; - "tools/abicollab/core/dialogs/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/dialogs/xp/GNUmakefile" ;; - "tools/abicollab/core/dialogs/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/dialogs/unix/GNUmakefile" ;; - "tools/abicollab/core/dialogs/win/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/dialogs/win/GNUmakefile" ;; - "tools/abicollab/core/packet/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/packet/GNUmakefile" ;; - "tools/abicollab/core/packet/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/packet/xp/GNUmakefile" ;; - "tools/abicollab/core/session/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/session/GNUmakefile" ;; - "tools/abicollab/core/session/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/core/session/xp/GNUmakefile" ;; - "tools/abicollab/backends/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/GNUmakefile" ;; - "tools/abicollab/backends/xmpp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/xmpp/GNUmakefile" ;; - "tools/abicollab/backends/xmpp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/xmpp/xp/GNUmakefile" ;; - "tools/abicollab/backends/xmpp/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/xmpp/unix/GNUmakefile" ;; - "tools/abicollab/backends/tcp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/tcp/GNUmakefile" ;; - "tools/abicollab/backends/tcp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/tcp/xp/GNUmakefile" ;; - "tools/abicollab/backends/tcp/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/tcp/unix/GNUmakefile" ;; - "tools/abicollab/backends/tcp/win/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/tcp/win/GNUmakefile" ;; - "tools/abicollab/backends/sugar/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/sugar/GNUmakefile" ;; - "tools/abicollab/backends/sugar/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/sugar/unix/GNUmakefile" ;; - "tools/abicollab/backends/fake/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/fake/GNUmakefile" ;; - "tools/abicollab/backends/fake/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/fake/xp/GNUmakefile" ;; - "tools/abicollab/backends/service/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/service/GNUmakefile" ;; - "tools/abicollab/backends/service/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/service/xp/GNUmakefile" ;; - "tools/abicollab/backends/service/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/service/unix/GNUmakefile" ;; - "tools/abicollab/backends/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicollab/backends/xp/GNUmakefile" ;; - "tools/abicommand/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicommand/GNUmakefile" ;; - "tools/abicommand/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abicommand/xp/GNUmakefile" ;; - "tools/abidash/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abidash/GNUmakefile" ;; - "tools/abidash/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abidash/xp/GNUmakefile" ;; - "tools/abigimp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigimp/GNUmakefile" ;; - "tools/abigimp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigimp/xp/GNUmakefile" ;; - "tools/abigoffice/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigoffice/GNUmakefile" ;; - "tools/abigoffice/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigoffice/unix/GNUmakefile" ;; - "tools/abigrammar/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigrammar/GNUmakefile" ;; - "tools/abigrammar/linkgrammarwrap/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigrammar/linkgrammarwrap/GNUmakefile" ;; - "tools/abigrammar/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abigrammar/xp/GNUmakefile" ;; - "tools/abimathview/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abimathview/GNUmakefile" ;; - "tools/abimathview/itex2MML/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abimathview/itex2MML/GNUmakefile" ;; - "tools/abimathview/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abimathview/xp/GNUmakefile" ;; - "tools/abiscan/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abiscan/GNUmakefile" ;; - "tools/abiscan/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/abiscan/unix/GNUmakefile" ;; - "tools/aiksaurus/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/aiksaurus/GNUmakefile" ;; - "tools/aiksaurus/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/aiksaurus/xp/GNUmakefile" ;; - "tools/babelfish/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/babelfish/GNUmakefile" ;; - "tools/babelfish/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/babelfish/xp/GNUmakefile" ;; - "tools/develop/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/develop/GNUmakefile" ;; - "tools/develop/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/develop/xp/GNUmakefile" ;; - "tools/develop/gnu-regex/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/develop/gnu-regex/GNUmakefile" ;; - "tools/freetranslation/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/freetranslation/GNUmakefile" ;; - "tools/freetranslation/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/freetranslation/xp/GNUmakefile" ;; - "tools/gda/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/gda/GNUmakefile" ;; - "tools/gda/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/gda/unix/GNUmakefile" ;; - "tools/gdict/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/gdict/GNUmakefile" ;; - "tools/gdict/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/gdict/unix/GNUmakefile" ;; - "tools/google/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/google/GNUmakefile" ;; - "tools/google/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/google/xp/GNUmakefile" ;; - "tools/loadbindings/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/loadbindings/GNUmakefile" ;; - "tools/loadbindings/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/loadbindings/xp/GNUmakefile" ;; - "tools/ots/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/ots/GNUmakefile" ;; - "tools/ots/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/ots/xp/GNUmakefile" ;; - "tools/presentation/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/presentation/GNUmakefile" ;; - "tools/presentation/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/presentation/xp/GNUmakefile" ;; - "tools/urldict/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/urldict/GNUmakefile" ;; - "tools/urldict/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/urldict/xp/GNUmakefile" ;; - "tools/wikipedia/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/wikipedia/GNUmakefile" ;; - "tools/wikipedia/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES tools/wikipedia/xp/GNUmakefile" ;; - "wp/impexp/applix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/applix/GNUmakefile" ;; - "wp/impexp/applix/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/applix/xp/GNUmakefile" ;; - "wp/impexp/clarisworks/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/clarisworks/GNUmakefile" ;; - "wp/impexp/clarisworks/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/clarisworks/xp/GNUmakefile" ;; - "wp/impexp/docbook/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/docbook/GNUmakefile" ;; - "wp/impexp/docbook/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/docbook/xp/GNUmakefile" ;; - "wp/impexp/eml/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/eml/GNUmakefile" ;; - "wp/impexp/eml/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/eml/xp/GNUmakefile" ;; - "wp/impexp/hancom/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/hancom/GNUmakefile" ;; - "wp/impexp/hancom/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/hancom/xp/GNUmakefile" ;; - "wp/impexp/hrtext/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/hrtext/GNUmakefile" ;; - "wp/impexp/hrtext/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/hrtext/xp/GNUmakefile" ;; - "wp/impexp/iscii-text/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/iscii-text/GNUmakefile" ;; - "wp/impexp/iscii-text/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/iscii-text/xp/GNUmakefile" ;; - "wp/impexp/kword/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/kword/GNUmakefile" ;; - "wp/impexp/kword/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/kword/xp/GNUmakefile" ;; - "wp/impexp/latex/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/latex/GNUmakefile" ;; - "wp/impexp/latex/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/latex/xp/GNUmakefile" ;; - "wp/impexp/mif/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/mif/GNUmakefile" ;; - "wp/impexp/mif/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/mif/xp/GNUmakefile" ;; - "wp/impexp/mswrite/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/mswrite/GNUmakefile" ;; - "wp/impexp/mswrite/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/mswrite/xp/GNUmakefile" ;; - "wp/impexp/nroff/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/nroff/GNUmakefile" ;; - "wp/impexp/nroff/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/nroff/xp/GNUmakefile" ;; - "wp/impexp/OpenDocument/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/GNUmakefile" ;; - "wp/impexp/OpenDocument/common/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/common/GNUmakefile" ;; - "wp/impexp/OpenDocument/common/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/common/xp/GNUmakefile" ;; - "wp/impexp/OpenDocument/exp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/exp/GNUmakefile" ;; - "wp/impexp/OpenDocument/exp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/exp/xp/GNUmakefile" ;; - "wp/impexp/OpenDocument/imp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/imp/GNUmakefile" ;; - "wp/impexp/OpenDocument/imp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenDocument/imp/xp/GNUmakefile" ;; - "wp/impexp/OpenWriter/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenWriter/GNUmakefile" ;; - "wp/impexp/OpenWriter/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenWriter/xp/GNUmakefile" ;; - "wp/impexp/OpenXML/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/GNUmakefile" ;; - "wp/impexp/OpenXML/common/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/common/GNUmakefile" ;; - "wp/impexp/OpenXML/common/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/common/xp/GNUmakefile" ;; - "wp/impexp/OpenXML/imp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/imp/GNUmakefile" ;; - "wp/impexp/OpenXML/imp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/OpenXML/imp/xp/GNUmakefile" ;; - "wp/impexp/opml/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/opml/GNUmakefile" ;; - "wp/impexp/opml/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/opml/xp/GNUmakefile" ;; - "wp/impexp/passepartout/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/passepartout/GNUmakefile" ;; - "wp/impexp/passepartout/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/passepartout/xp/GNUmakefile" ;; - "wp/impexp/pdb/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/pdb/GNUmakefile" ;; - "wp/impexp/pdb/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/pdb/xp/GNUmakefile" ;; - "wp/impexp/pdf/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/pdf/GNUmakefile" ;; - "wp/impexp/pdf/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/pdf/xp/GNUmakefile" ;; - "wp/impexp/psion/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/psion/GNUmakefile" ;; - "wp/impexp/psion/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/psion/xp/GNUmakefile" ;; - "wp/impexp/sdw/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/sdw/GNUmakefile" ;; - "wp/impexp/sdw/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/sdw/xp/GNUmakefile" ;; - "wp/impexp/t602/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/t602/GNUmakefile" ;; - "wp/impexp/t602/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/t602/xp/GNUmakefile" ;; - "wp/impexp/wml/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/wml/GNUmakefile" ;; - "wp/impexp/wml/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/wml/xp/GNUmakefile" ;; - "wp/impexp/wordperfect/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/wordperfect/GNUmakefile" ;; - "wp/impexp/wordperfect/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/wordperfect/xp/GNUmakefile" ;; - "wp/impexp/xhtml/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/xhtml/GNUmakefile" ;; - "wp/impexp/xhtml/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/xhtml/xp/GNUmakefile" ;; - "wp/impexp/xsl-fo/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/xsl-fo/GNUmakefile" ;; - "wp/impexp/xsl-fo/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/xsl-fo/xp/GNUmakefile" ;; - "wp/impexp/graphics/bmp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/bmp/GNUmakefile" ;; - "wp/impexp/graphics/bmp/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/bmp/xp/GNUmakefile" ;; - "wp/impexp/graphics/jpeg/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/jpeg/GNUmakefile" ;; - "wp/impexp/graphics/jpeg/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/jpeg/xp/GNUmakefile" ;; - "wp/impexp/graphics/librsvg/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/librsvg/GNUmakefile" ;; - "wp/impexp/graphics/librsvg/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/librsvg/unix/GNUmakefile" ;; - "wp/impexp/graphics/win32native/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/win32native/GNUmakefile" ;; - "wp/impexp/graphics/win32native/unix/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/win32native/unix/GNUmakefile" ;; - "wp/impexp/graphics/wmf/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/wmf/GNUmakefile" ;; - "wp/impexp/graphics/wmf/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/wmf/xp/GNUmakefile" ;; - "wp/impexp/graphics/wpg/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/wpg/GNUmakefile" ;; - "wp/impexp/graphics/wpg/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/impexp/graphics/wpg/xp/GNUmakefile" ;; - "wp/scripts/shell/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/scripts/shell/GNUmakefile" ;; - "wp/scripts/shell/xp/GNUmakefile") CONFIG_FILES="$CONFIG_FILES wp/scripts/shell/xp/GNUmakefile" ;; +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} + +_LT_EOF + ;; + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} - *) { { 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; }; };; +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; esac -done +} +# sed scripts: +my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' +my_sed_long_arg='1s/^-[^=]*=//' -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +} -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || +# func_lo2o object +func_lo2o () { - 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 + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` } -# Create a (secure) tmp directory for tmp files. +# func_xform libobj-or-source +func_xform () { - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` +} + +# func_arith arithmetic-term... +func_arith () { - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || + func_arith_result=`expr "$@"` +} + +# func_len string +# STRING may not start with a hyphen. +func_len () { - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` } -# -# Set up the sed scripts for CONFIG_FILES section. -# +_LT_EOF +esac -# 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 +case $lt_shell_append in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$1+=\$2" +} +_LT_EOF + ;; + *) + cat << \_LT_EOF >> "$cfgfile" -_ACEOF +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$1=\$$1\$2" +} +_LT_EOF + ;; + esac -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 -PKG_CONFIG!$PKG_CONFIG$ac_delim -GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim -GLIB_LIBS!$GLIB_LIBS$ac_delim -GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim -GNOME_LIBS!$GNOME_LIBS$ac_delim -NAUTILUS_CFLAGS!$NAUTILUS_CFLAGS$ac_delim -NAUTILUS_LIBS!$NAUTILUS_LIBS$ac_delim -GTK_CFLAGS!$GTK_CFLAGS$ac_delim -GTK_LIBS!$GTK_LIBS$ac_delim -PLATFORM_CPPFLAGS!$PLATFORM_CPPFLAGS$ac_delim -PLATFORM_LDFLAGS!$PLATFORM_LDFLAGS$ac_delim -BUILD_PLATFORM_COCOA_TRUE!$BUILD_PLATFORM_COCOA_TRUE$ac_delim -BUILD_PLATFORM_COCOA_FALSE!$BUILD_PLATFORM_COCOA_FALSE$ac_delim -BUILD_PLATFORM_GNOME_TRUE!$BUILD_PLATFORM_GNOME_TRUE$ac_delim -BUILD_PLATFORM_GNOME_FALSE!$BUILD_PLATFORM_GNOME_FALSE$ac_delim -BUILD_PLATFORM_QNX_TRUE!$BUILD_PLATFORM_QNX_TRUE$ac_delim -BUILD_PLATFORM_QNX_FALSE!$BUILD_PLATFORM_QNX_FALSE$ac_delim -ABI_PLUGIN_DEBUG_TRUE!$ABI_PLUGIN_DEBUG_TRUE$ac_delim -ABI_PLUGIN_DEBUG_FALSE!$ABI_PLUGIN_DEBUG_FALSE$ac_delim -ABI_CPPFLAGS!$ABI_CPPFLAGS$ac_delim -ABI_CFLAGS!$ABI_CFLAGS$ac_delim -ABI_LIBS!$ABI_LIBS$ac_delim -ABI_PLUGIN_DIR!$ABI_PLUGIN_DIR$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 -CPP!$CPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim -LIBPNG_LIBS!$LIBPNG_LIBS$ac_delim -LIBPNG_PEERDIR!$LIBPNG_PEERDIR$ac_delim -CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -AWK!$AWK$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -LN_S!$LN_S$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -am__isrc!$am__isrc$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 -am__leading_dot!$am__leading_dot$ac_delim -AMTAR!$AMTAR$ac_delim -_ACEOF + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - 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 -done + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" -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 >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF + cat <<_LT_EOF >> "$ofile" +# ### BEGIN LIBTOOL TAG CONFIG: CXX -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -am__tar!$am__tar$ac_delim -am__untar!$am__untar$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 -CXXDEPMODE!$CXXDEPMODE$ac_delim -am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -am__fastdepCXX_FALSE!$am__fastdepCXX_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 -SED!$SED$ac_delim -ECHO!$ECHO$ac_delim -AR!$AR$ac_delim -RANLIB!$RANLIB$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 -_abi_libxml2_CFLAGS!$_abi_libxml2_CFLAGS$ac_delim -_abi_libxml2_LIBS!$_abi_libxml2_LIBS$ac_delim -ABICOLLAB_LIBXML2_CPPFLAGS!$ABICOLLAB_LIBXML2_CPPFLAGS$ac_delim -ABICOLLAB_LIBXML2_LIBS!$ABICOLLAB_LIBXML2_LIBS$ac_delim -BOOST_CPPFLAGS!$BOOST_CPPFLAGS$ac_delim -BOOST_LDFLAGS!$BOOST_LDFLAGS$ac_delim -ABICOLLAB_FAKE_CPPFLAGS!$ABICOLLAB_FAKE_CPPFLAGS$ac_delim -ABICOLLAB_FAKE_LIBS!$ABICOLLAB_FAKE_LIBS$ac_delim -_abi_loudmouth_CFLAGS!$_abi_loudmouth_CFLAGS$ac_delim -_abi_loudmouth_LIBS!$_abi_loudmouth_LIBS$ac_delim -ABICOLLAB_XMPP_CPPFLAGS!$ABICOLLAB_XMPP_CPPFLAGS$ac_delim -ABICOLLAB_XMPP_LIBS!$ABICOLLAB_XMPP_LIBS$ac_delim -ABICOLLAB_TCP_CPPFLAGS!$ABICOLLAB_TCP_CPPFLAGS$ac_delim -ABICOLLAB_TCP_LIBS!$ABICOLLAB_TCP_LIBS$ac_delim -_abi_dbus_CFLAGS!$_abi_dbus_CFLAGS$ac_delim -_abi_dbus_LIBS!$_abi_dbus_LIBS$ac_delim -_abi_dbus_glib_CFLAGS!$_abi_dbus_glib_CFLAGS$ac_delim -_abi_dbus_glib_LIBS!$_abi_dbus_glib_LIBS$ac_delim -ABICOLLAB_SUGAR_CPPFLAGS!$ABICOLLAB_SUGAR_CPPFLAGS$ac_delim -ABICOLLAB_SUGAR_LIBS!$ABICOLLAB_SUGAR_LIBS$ac_delim -ABICOLLAB_SERVICE_CPPFLAGS!$ABICOLLAB_SERVICE_CPPFLAGS$ac_delim -ABICOLLAB_SERVICE_LIBS!$ABICOLLAB_SERVICE_LIBS$ac_delim -ABICOLLAB_HANDLER_FAKE_TRUE!$ABICOLLAB_HANDLER_FAKE_TRUE$ac_delim -ABICOLLAB_HANDLER_FAKE_FALSE!$ABICOLLAB_HANDLER_FAKE_FALSE$ac_delim -ABICOLLAB_HANDLER_XMPP_TRUE!$ABICOLLAB_HANDLER_XMPP_TRUE$ac_delim -ABICOLLAB_HANDLER_XMPP_FALSE!$ABICOLLAB_HANDLER_XMPP_FALSE$ac_delim -ABICOLLAB_HANDLER_TCP_TRUE!$ABICOLLAB_HANDLER_TCP_TRUE$ac_delim -ABICOLLAB_HANDLER_TCP_FALSE!$ABICOLLAB_HANDLER_TCP_FALSE$ac_delim -ABICOLLAB_HANDLER_SUGAR_TRUE!$ABICOLLAB_HANDLER_SUGAR_TRUE$ac_delim -ABICOLLAB_HANDLER_SUGAR_FALSE!$ABICOLLAB_HANDLER_SUGAR_FALSE$ac_delim -ABICOLLAB_HANDLER_SERVICE_TRUE!$ABICOLLAB_HANDLER_SERVICE_TRUE$ac_delim -ABICOLLAB_HANDLER_SERVICE_FALSE!$ABICOLLAB_HANDLER_SERVICE_FALSE$ac_delim -_abi_glib_CFLAGS!$_abi_glib_CFLAGS$ac_delim -_abi_glib_LIBS!$_abi_glib_LIBS$ac_delim -ABI_COMMAND_CPPFLAGS!$ABI_COMMAND_CPPFLAGS$ac_delim -ABI_COMMAND_LDFLAGS!$ABI_COMMAND_LDFLAGS$ac_delim -GOFFICE_CFLAGS!$GOFFICE_CFLAGS$ac_delim -GOFFICE_LIBS!$GOFFICE_LIBS$ac_delim -_abi_grammar_CFLAGS!$_abi_grammar_CFLAGS$ac_delim -_abi_grammar_LIBS!$_abi_grammar_LIBS$ac_delim -ABI_GRAMMAR_CPPFLAGS!$ABI_GRAMMAR_CPPFLAGS$ac_delim -ABI_GRAMMAR_LDFLAGS!$ABI_GRAMMAR_LDFLAGS$ac_delim -MATHVIEW_CFLAGS!$MATHVIEW_CFLAGS$ac_delim -MATHVIEW_LIBS!$MATHVIEW_LIBS$ac_delim -LEX!$LEX$ac_delim -LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim -LEXLIB!$LEXLIB$ac_delim -YACC!$YACC$ac_delim -YFLAGS!$YFLAGS$ac_delim -GNOMESCAN_CFLAGS!$GNOMESCAN_CFLAGS$ac_delim -GNOMESCAN_LIBS!$GNOMESCAN_LIBS$ac_delim -PKGAIKSAURUS_CFLAGS!$PKGAIKSAURUS_CFLAGS$ac_delim -PKGAIKSAURUS_LIBS!$PKGAIKSAURUS_LIBS$ac_delim -PKGGAIKSAURUS_CFLAGS!$PKGGAIKSAURUS_CFLAGS$ac_delim -PKGGAIKSAURUS_LIBS!$PKGGAIKSAURUS_LIBS$ac_delim -ABI_AIKSAURUS_CPPFLAGS!$ABI_AIKSAURUS_CPPFLAGS$ac_delim -ABI_AIKSAURUS_LDFLAGS!$ABI_AIKSAURUS_LDFLAGS$ac_delim -BUILD_GNU_REGEX_TRUE!$BUILD_GNU_REGEX_TRUE$ac_delim -BUILD_GNU_REGEX_FALSE!$BUILD_GNU_REGEX_FALSE$ac_delim -_abi_gda_CFLAGS!$_abi_gda_CFLAGS$ac_delim -_abi_gda_LIBS!$_abi_gda_LIBS$ac_delim -ABI_GDA_CPPFLAGS!$ABI_GDA_CPPFLAGS$ac_delim -ABI_GDA_LDFLAGS!$ABI_GDA_LDFLAGS$ac_delim -_abi_gtk_CFLAGS!$_abi_gtk_CFLAGS$ac_delim -_abi_gtk_LIBS!$_abi_gtk_LIBS$ac_delim -ABI_GDICT_CPPFLAGS!$ABI_GDICT_CPPFLAGS$ac_delim -_ACEOF +# The linker used to build libraries. +LD=$lt_LD_CXX - 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 -done +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds_CXX -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 +# A language specific compiler. +CC=$lt_compiler_CXX -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.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 >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF +# Is the compiler the GNU compiler? +with_gcc=$GCC_CXX +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -ABI_GDICT_LDFLAGS!$ABI_GDICT_LDFLAGS$ac_delim -LOADBINDINGS_CPPFLAGS!$LOADBINDINGS_CPPFLAGS$ac_delim -LOADBINDINGS_LDFLAGS!$LOADBINDINGS_LDFLAGS$ac_delim -_abi_ots_CFLAGS!$_abi_ots_CFLAGS$ac_delim -_abi_ots_LIBS!$_abi_ots_LIBS$ac_delim -ABI_OTS_CPPFLAGS!$ABI_OTS_CPPFLAGS$ac_delim -ABI_OTS_LDFLAGS!$ABI_OTS_LDFLAGS$ac_delim -PRESENTATION_CPPFLAGS!$PRESENTATION_CPPFLAGS$ac_delim -PRESENTATION_LDFLAGS!$PRESENTATION_LDFLAGS$ac_delim -abi_tools!$abi_tools$ac_delim -ABI_BMP_CPPFLAGS!$ABI_BMP_CPPFLAGS$ac_delim -ABI_BMP_LDFLAGS!$ABI_BMP_LDFLAGS$ac_delim -ABI_JPEG_CPPFLAGS!$ABI_JPEG_CPPFLAGS$ac_delim -ABI_JPEG_LDFLAGS!$ABI_JPEG_LDFLAGS$ac_delim -_abi_librsvg_CFLAGS!$_abi_librsvg_CFLAGS$ac_delim -_abi_librsvg_LIBS!$_abi_librsvg_LIBS$ac_delim -LIBRSVG_CPPFLAGS!$LIBRSVG_CPPFLAGS$ac_delim -LIBRSVG_LDFLAGS!$LIBRSVG_LDFLAGS$ac_delim -abi_libwmf_config!$abi_libwmf_config$ac_delim -ABI_WMF_CPPFLAGS!$ABI_WMF_CPPFLAGS$ac_delim -ABI_WMF_LDFLAGS!$ABI_WMF_LDFLAGS$ac_delim -_abi_libwpg_CFLAGS!$_abi_libwpg_CFLAGS$ac_delim -_abi_libwpg_LIBS!$_abi_libwpg_LIBS$ac_delim -LIBWPG_CPPFLAGS!$LIBWPG_CPPFLAGS$ac_delim -LIBWPG_LDFLAGS!$LIBWPG_LDFLAGS$ac_delim -abi_wp_impexp_graphics!$abi_wp_impexp_graphics$ac_delim -ABI_DOCBOOK_CPPFLAGS!$ABI_DOCBOOK_CPPFLAGS$ac_delim -ABI_DOCBOOK_LDFLAGS!$ABI_DOCBOOK_LDFLAGS$ac_delim -ABI_HANCOM_CPPFLAGS!$ABI_HANCOM_CPPFLAGS$ac_delim -ABI_HANCOM_LDFLAGS!$ABI_HANCOM_LDFLAGS$ac_delim -ABI_OPENDOCUMENT_CPPFLAGS!$ABI_OPENDOCUMENT_CPPFLAGS$ac_delim -ABI_OPENDOCUMENT_LDFLAGS!$ABI_OPENDOCUMENT_LDFLAGS$ac_delim -ABI_OPENWRITER_CPPFLAGS!$ABI_OPENWRITER_CPPFLAGS$ac_delim -ABI_OPENWRITER_LDFLAGS!$ABI_OPENWRITER_LDFLAGS$ac_delim -_abi_openxml_CFLAGS!$_abi_openxml_CFLAGS$ac_delim -_abi_openxml_LIBS!$_abi_openxml_LIBS$ac_delim -ABI_OPENXML_CPPFLAGS!$ABI_OPENXML_CPPFLAGS$ac_delim -ABI_OPENXML_LDFLAGS!$ABI_OPENXML_LDFLAGS$ac_delim -psiconvconfig!$psiconvconfig$ac_delim -ABI_PSION_CPPFLAGS!$ABI_PSION_CPPFLAGS$ac_delim -ABI_PSION_LDFLAGS!$ABI_PSION_LDFLAGS$ac_delim -ABI_SDW_CPPFLAGS!$ABI_SDW_CPPFLAGS$ac_delim -ABI_SDW_LDFLAGS!$ABI_SDW_LDFLAGS$ac_delim -_abi_wordperfect_CFLAGS!$_abi_wordperfect_CFLAGS$ac_delim -_abi_wordperfect_LIBS!$_abi_wordperfect_LIBS$ac_delim -_abi_msworks_CFLAGS!$_abi_msworks_CFLAGS$ac_delim -_abi_msworks_LIBS!$_abi_msworks_LIBS$ac_delim -WORDPERFECT_CPPFLAGS!$WORDPERFECT_CPPFLAGS$ac_delim -WORDPERFECT_LDFLAGS!$WORDPERFECT_LDFLAGS$ac_delim -LIBXML2_CFLAGS!$LIBXML2_CFLAGS$ac_delim -LIBXML2_LIBS!$LIBXML2_LIBS$ac_delim -ABI_XHTML_CPPFLAGS!$ABI_XHTML_CPPFLAGS$ac_delim -ABI_XHTML_LDFLAGS!$ABI_XHTML_LDFLAGS$ac_delim -ABI_XHTML_MHT_TRUE!$ABI_XHTML_MHT_TRUE$ac_delim -ABI_XHTML_MHT_FALSE!$ABI_XHTML_MHT_FALSE$ac_delim -ABI_XHTML_TIDY_TRUE!$ABI_XHTML_TIDY_TRUE$ac_delim -ABI_XHTML_TIDY_FALSE!$ABI_XHTML_TIDY_FALSE$ac_delim -ABI_XHTML_XML2_TRUE!$ABI_XHTML_XML2_TRUE$ac_delim -ABI_XHTML_XML2_FALSE!$ABI_XHTML_XML2_FALSE$ac_delim -abi_wp_impexp!$abi_wp_impexp$ac_delim -abi_wp_scripts!$abi_wp_scripts$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; 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 +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX -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-3.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 >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof -_ACEOF +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -# 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 +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX -cat >>$CONFIG_STATUS <<\_ACEOF -fi # test -n "$CONFIG_FILES" +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -for ac_tag in :F $CONFIG_FILES :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 +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - 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 +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object_CXX - # 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 +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; - esac - ;; - esac +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds_CXX +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX + +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds_CXX +module_expsym_cmds=$lt_module_expsym_cmds_CXX + +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld_CXX -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_CXX -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_CXX +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - case $ac_mode in - :F) - # - # CONFIG_FILE - # +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -_ACEOF +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -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= +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct_CXX -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 +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute_CXX -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t -$ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L_CXX -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;} +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac - ;; +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic_CXX +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath_CXX - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_CXX +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path_CXX + +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols_CXX + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_CXX + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_CXX + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_CXX + +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds_CXX + +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec_CXX + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_CXX + +# The directories searched by this compiler when creating a shared library. +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX + +# Dependencies to place before and after the objects being linked to +# create a shared library. +predep_objects=$lt_predep_objects_CXX +postdep_objects=$lt_postdep_objects_CXX +predeps=$lt_predeps_CXX +postdeps=$lt_postdeps_CXX + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX + +# ### END LIBTOOL TAG CONFIG: CXX +_LT_EOF - 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. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - 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'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - 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'` - { 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 :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done ;; esac @@ -33034,6 +30257,11 @@ chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -33055,6 +30283,10 @@ # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi if test -f plugin.status; then diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/configure.ac /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/configure.ac --- abiword-2.6.2/abiword-plugins/configure.ac 2008-04-06 22:37:25.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/configure.ac 2009-07-15 16:56:23.000000000 +0100 @@ -1,9 +1,9 @@ -AC_INIT([abiword-plugins], 2.6.2, [http://bugzilla.abisource.com/]) +AC_INIT([abiword-plugins], 2.6.8, [http://bugzilla.abisource.com/]) AC_CONFIG_SRCDIR([ac-helpers/abi-plugin-init.m4]) dnl First of all AbiWord plugin macros: dnl -ABI_PLUGIN_INIT(2.6.2) +ABI_PLUGIN_INIT(2.6.8) ABI_PLUGIN_CONFIG # Checks for programs. @@ -81,27 +81,6 @@ fi fi abi_plugin_add=yes -AC_ARG_ENABLE(abidash,[ --disable-abidash],[ - if test "x$enableval" = "xno"; then - abi_plugin_add=no - fi -],[ abi_plugin_add=$abi_plugin_opt -]) -AC_ARG_WITH(abidash,[ --without-abidash],[ - if test "x$withval" = "xno"; then - abi_plugin_add=no - else - abi_plugin_add=yes - fi -]) -if test $abi_plugin_add = yes; then - abi_plugin_disable=no - ABIPGN_ABIDASH - if test $abi_plugin_disable = no; then - abi_tools="$abi_tools abidash" - fi -fi -abi_plugin_add=yes AC_ARG_ENABLE(abigimp,[ --disable-abigimp],[ if test "x$enableval" = "xno"; then abi_plugin_add=no @@ -781,6 +760,7 @@ abi_wp_impexp="$abi_wp_impexp latex" fi fi +ABIPGN_LATEX_END abi_plugin_add=yes AC_ARG_ENABLE(mif,[ --disable-mif],[ if test "x$enableval" = "xno"; then @@ -1197,8 +1177,6 @@ tools/abicollab/backends/xp/GNUmakefile tools/abicommand/GNUmakefile tools/abicommand/xp/GNUmakefile -tools/abidash/GNUmakefile -tools/abidash/xp/GNUmakefile tools/abigimp/GNUmakefile tools/abigimp/xp/GNUmakefile tools/abigoffice/GNUmakefile @@ -1256,6 +1234,7 @@ wp/impexp/kword/xp/GNUmakefile wp/impexp/latex/GNUmakefile wp/impexp/latex/xp/GNUmakefile +wp/impexp/latex/xsltml/GNUmakefile wp/impexp/mif/GNUmakefile wp/impexp/mif/xp/GNUmakefile wp/impexp/mswrite/GNUmakefile @@ -1274,6 +1253,8 @@ wp/impexp/OpenXML/GNUmakefile wp/impexp/OpenXML/common/GNUmakefile wp/impexp/OpenXML/common/xp/GNUmakefile +wp/impexp/OpenXML/exp/GNUmakefile +wp/impexp/OpenXML/exp/xp/GNUmakefile wp/impexp/OpenXML/imp/GNUmakefile wp/impexp/OpenXML/imp/xp/GNUmakefile wp/impexp/opml/GNUmakefile diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/depcomp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/depcomp --- abiword-2.6.2/abiword-plugins/depcomp 2008-04-06 22:37:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/depcomp 2009-07-15 16:56:23.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2006-10-15.18 +scriptversion=2007-03-29.01 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -215,34 +215,39 @@ # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u "$@" -Wc,-M else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u "$@" -M fi stat=$? - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - if test $stat -eq 0; then : else - rm -f "$tmpdepfile" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then - outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/GNUmakefile.in 2008-04-06 22:38:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -81,6 +81,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -146,14 +148,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -170,6 +172,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -186,6 +191,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -196,7 +204,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -262,7 +275,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -293,6 +306,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -306,6 +320,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -358,7 +373,7 @@ -rm -rf .libs _libs distclean-libtool: - -rm -f libtool + -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -461,8 +476,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -472,13 +487,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -549,6 +563,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -575,6 +593,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -727,8 +747,8 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-libtool distclean-tags \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-libtool distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/install-sh /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/install-sh --- abiword-2.6.2/abiword-plugins/install-sh 2008-04-06 22:37:35.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/install-sh 2009-07-15 16:56:23.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-10-14.15 +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} if test -z "$doit"; then doit_exec=exec else @@ -58,34 +58,49 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' -posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 +chgrpcmd= chmodcmd=$chmodprog chowncmd= -chgrpcmd= -stripcmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" +stripcmd= + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -95,65 +110,55 @@ In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) shift - continue;; + -c) ;; + + -C) copy_on_change=true;; - -d) dir_arg=true - shift - continue;; + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - shift - shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - continue;; + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; @@ -165,21 +170,22 @@ *) break;; esac + shift done -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dstarg"; then + if test -n "$dst_arg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" + set fnord "$@" "$dst_arg" shift # fnord fi shift # arg - dstarg=$arg + dst_arg=$arg done fi @@ -224,7 +230,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src ;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -242,22 +248,22 @@ exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dstarg + dst=$dst_arg # Protect names starting with `-'. case $dst in - -*) dst=./$dst ;; + -*) dst=./$dst;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -378,26 +384,19 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; esac - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac + eval "$initialize_posix_glob" oIFS=$IFS IFS=/ - $posix_glob && set -f + $posix_glob set -f set fnord $dstdir shift - $posix_glob && set +f + $posix_glob set +f IFS=$oIFS prefixes= @@ -459,41 +458,54 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ - || { - echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - } || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 trap '' 0 fi diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/ltmain.sh /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/ltmain.sh --- abiword-2.6.2/abiword-plugins/ltmain.sh 2007-08-29 12:52:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/ltmain.sh 2009-07-15 16:56:23.000000000 +0100 @@ -1,52 +1,83 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun configure. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007 Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify +# Generated from ltmain.m4sh. + +# ltmain.sh (GNU libtool) 2.2.6 +# Written by Gordon Matzigkeit , 1996 + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, but +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -basename="s,^.*/,,g" - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - -# The name of this program: -progname=`echo "$progpath" | $SED $basename` -modename="$progname" +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, +# or obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 +# Usage: $progname [OPTION]... [MODE-ARG]... +# +# Provide generalized library-building support services. +# +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print informational messages (default) +# --version print version information +# -h, --help print short or long help message +# +# MODE must be one of the following: +# +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory +# +# MODE-ARGS vary depending on the MODE. +# Try `$progname --help --mode=MODE' for a more detailed description of MODE. +# +# When reporting a bug, please describe a test case to reproduce it and +# include the following information: +# +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.2.6 +# automake: $automake_version +# autoconf: $autoconf_version +# +# Report bugs to . PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.24 -TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" +VERSION=2.2.6 +TIMESTAMP="" +package_revision=1.3012 -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -60,98 +91,261 @@ BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# Check that we have a working $echo. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : -else - # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE -fi +dirname="s,/[^/]*$,," +basename="s,^.*/,," -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= -duplicate_deps=no -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} + +# Generated shell functions inserted here. + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + +# The name of this program: +# In the unlikely event $progname began with a '-', it would play havoc with +# func_echo (imagine progname=-n), so we prepend ./ in that case: +func_dirname_and_basename "$progpath" +progname=$func_basename_result +case $progname in + -*) progname=./$progname ;; +esac + +# Make sure we have an absolute path for reexecution: +case $progpath in + [\\/]*|[A-Za-z]:\\*) ;; + *[\\/]*) + progdir=$func_dirname_result + progdir=`cd "$progdir" && pwd` + progpath="$progdir/$progname" + ;; + *) + save_IFS="$IFS" + IFS=: + for progdir in $PATH; do + IFS="$save_IFS" + test -x "$progdir/$progname" && break + done + IFS="$save_IFS" + test -n "$progdir" || progdir=`pwd` + progpath="$progdir/$progname" + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed="${SED}"' -e 1s/^X//' +sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Re-`\' parameter expansions in output of double_quote_subst that were +# `\'-ed in input to the same. If an odd number of `\' preceded a '$' +# in input to double_quote_subst, that '$' was protected from expansion. +# Since each input `\' is now two `\'s, look for any number of runs of +# four `\'s followed by two `\'s and then a '$'. `\' that '$'. +bs='\\' +bs2='\\\\' +bs4='\\\\\\\\' +dollar='\$' +sed_double_backslash="\ + s/$bs4/&\\ +/g + s/^$bs2$dollar/$bs&/ + s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g + s/\n//g" + +# Standard options: +opt_dry_run=false +opt_help=false +opt_quiet=false +opt_verbose=false +opt_warning=: + +# func_echo arg... +# Echo program name prefixed message, along with the current mode +# name if it has been set yet. +func_echo () +{ + $ECHO "$progname${mode+: }$mode: $*" +} + +# func_verbose arg... +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $opt_verbose && func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + +# func_error arg... +# Echo program name prefixed message to standard error. +func_error () +{ + $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 +} + +# func_warning arg... +# Echo program name prefixed warning message to standard error. +func_warning () +{ + $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 + + # bash bug again: + : +} + +# func_fatal_error arg... +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + func_error ${1+"$@"} + exit $EXIT_FAILURE +} + +# func_fatal_help arg... +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () +{ + func_error ${1+"$@"} + func_fatal_error "$help" +} +help="Try \`$progname --help' for more information." ## default + + +# func_grep expression filename +# Check whether EXPRESSION matches any line of FILENAME, without output. +func_grep () +{ + $GREP "$1" "$2" >/dev/null 2>&1 +} + + +# func_mkdir_p directory-path +# Make sure the entire path to DIRECTORY-PATH is available. +func_mkdir_p () +{ + my_directory_path="$1" + my_dir_list= + + if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + + # Protect directory names starting with `-' + case $my_directory_path in + -*) my_directory_path="./$my_directory_path" ;; + esac + + # While some portion of DIR does not yet exist... + while test ! -d "$my_directory_path"; do + # ...make a list in topmost first order. Use a colon delimited + # list incase some portion of path contains whitespace. + my_dir_list="$my_directory_path:$my_dir_list" + + # If the last portion added has no slash in it, the list is done + case $my_directory_path in */*) ;; *) break ;; esac + + # ...otherwise throw away the child directory and loop + my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` + done + my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` + + save_mkdir_p_IFS="$IFS"; IFS=':' + for my_dir in $my_dir_list; do + IFS="$save_mkdir_p_IFS" + # mkdir can fail with a `File exist' error if two processes + # try to create one of the directories concurrently. Don't + # stop in that case! + $MKDIR "$my_dir" 2>/dev/null || : + done + IFS="$save_mkdir_p_IFS" + + # Bail out if we (or some other process) failed to create a directory. + test -d "$my_directory_path" || \ + func_fatal_error "Failed to create \`$1'" + fi +} -##################################### -# Shell function definitions: -# This seems to be the best place for them # func_mktempdir [string] # Make a temporary directory that won't clash with other running @@ -161,7 +355,7 @@ { my_template="${TMPDIR-/tmp}/${1-$progname}" - if test "$run" = ":"; then + if test "$opt_dry_run" = ":"; then # Return a directory name, but don't create it in dry-run mode my_tmpdir="${my_template}-$$" else @@ -170,526 +364,787 @@ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" - save_mktempdir_umask=`umask` - umask 0077 - $mkdir "$my_tmpdir" - umask $save_mktempdir_umask + save_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$my_tmpdir" + umask $save_mktempdir_umask fi # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || { - $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 - exit $EXIT_FAILURE - } + test -d "$my_tmpdir" || \ + func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $echo "X$my_tmpdir" | $Xsed + $ECHO "X$my_tmpdir" | $Xsed } -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -func_win32_libid () +# func_quote_for_eval arg +# Aesthetically quote ARG to be evaled later. +# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT +# is double-quoted, suitable for a subsequent eval, whereas +# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters +# which are still active within double quotes backslashified. +func_quote_for_eval () { - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ - $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; + case $1 in + *[\\\`\"\$]*) + func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; + *) + func_quote_for_eval_unquoted_result="$1" ;; + esac + + case $func_quote_for_eval_unquoted_result in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and and variable + # expansion for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" + ;; + *) + func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" esac - ;; - esac - $echo $win32_libid_type } -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () +# func_quote_for_expand arg +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () { - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. + case $1 in + *[\\\`\"]*) + my_arg=`$ECHO "X$1" | $Xsed \ + -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case "$@ " in - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit $EXIT_FAILURE -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac - fi + my_arg="$1" ;; + esac + + case $my_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + my_arg="\"$my_arg\"" + ;; + esac + + func_quote_for_expand_result="$my_arg" } -# func_extract_an_archive dir oldlib -func_extract_an_archive () +# func_show_eval cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () { - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" + my_cmd="$1" + my_fail_exp="${2-:}" - $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" - $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$my_cmd" + my_status=$? + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi fi } -# func_extract_archives gentop oldlib ... -func_extract_archives () + +# func_show_eval_locale cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () { - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - my_status="" + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } - $show "${rm}r $my_gentop" - $run ${rm}r "$my_gentop" - $show "$mkdir $my_gentop" - $run $mkdir "$my_gentop" - my_status=$? - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then - exit $my_status + if ${opt_dry_run-false}; then :; else + eval "$lt_user_locale + $my_cmd" + my_status=$? + eval "$lt_safe_locale" + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi fi +} - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - extracted_serial=`expr $extracted_serial + 1` - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" - $show "$mkdir $my_xdir" - $run $mkdir "$my_xdir" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then - exit $exit_status - fi - case $host in - *-darwin*) - $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - ${rm}r unfat-$$ - cd "$darwin_orig_dir" - else - cd "$darwin_orig_dir" - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - fi # $run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - func_extract_archives_result="$my_oldobjs" + + + +# func_version +# Echo version message to standard output and exit. +func_version () +{ + $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { + s/^# // + s/^# *$// + s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ + p + }' < "$progpath" + exit $? +} + +# func_usage +# Echo short help message to standard output and exit. +func_usage () +{ + $SED -n '/^# Usage:/,/# -h/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ + p + }' < "$progpath" + $ECHO + $ECHO "run \`$progname --help | more' for full usage" + exit $? +} + +# func_help +# Echo long help message to standard output and exit. +func_help () +{ + $SED -n '/^# Usage:/,/# Report bugs to/ { + s/^# // + s/^# *$// + s*\$progname*'$progname'* + s*\$host*'"$host"'* + s*\$SHELL*'"$SHELL"'* + s*\$LTCC*'"$LTCC"'* + s*\$LTCFLAGS*'"$LTCFLAGS"'* + s*\$LD*'"$LD"'* + s/\$with_gnu_ld/'"$with_gnu_ld"'/ + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + p + }' < "$progpath" + exit $? +} + +# func_missing_arg argname +# Echo program name prefixed message to standard error and set global +# exit_cmd. +func_missing_arg () +{ + func_error "missing argument for $1" + exit_cmd=exit } -# End of Shell function definitions -##################################### -# Darwin sucks -eval std_shrext=\"$shrext_cmds\" +exit_cmd=: -disable_libs=no -# Parse our command line options once, thoroughly. -while test "$#" -gt 0 -do - arg="$1" + + + +# Check that we have a working $ECHO. +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then + # Yippee, $ECHO works! + : +else + # Restart under the correct shell, and then maybe $ECHO will work. + exec $SHELL "$progpath" --no-reexec ${1+"$@"} +fi - case $arg in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat <&2 - exit $EXIT_FAILURE - ;; - esac +magic="%%%MAGIC variable%%%" +magic_exe="%%%MAGIC EXE variable%%%" - case $tagname in - CC) - # Don't test for the "default" C tag, as we know, it's there, but - # not specially marked. - ;; - *) - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then - taglist="$taglist $tagname" - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi - ;; - esac - ;; - *) - eval "$prev=\$arg" - ;; - esac +# Global variables. +# $mode is unset +nonopt= +execute_dlfiles= +preserve_args= +lo2o="s/\\.lo\$/.${objext}/" +o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 - prev= - prevopt= - continue - fi +opt_dry_run=false +opt_duplicate_deps=false +opt_silent=false +opt_debug=: - # Have we seen a non-optional argument yet? - case $arg in - --help) - show_help=yes - ;; +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= - --version) - echo "\ -$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP - -Copyright (C) 2007 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit $? - ;; +# func_fatal_configuration arg... +# Echo program name prefixed message to standard error, followed by +# a configuration failure hint, and exit. +func_fatal_configuration () +{ + func_error ${1+"$@"} + func_error "See the $PACKAGE documentation for more information." + func_fatal_error "Fatal configuration error." +} + + +# func_config +# Display the configuration for all the tags in this script. +func_config () +{ + re_begincf='^# ### BEGIN LIBTOOL' + re_endcf='^# ### END LIBTOOL' + + # Default configuration. + $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath # Now print the configurations for the tags. for tagname in $taglist; do - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" + $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" done - exit $? - ;; - - --debug) - $echo "$progname: enabling shell trace mode" - set -x - preserve_args="$preserve_args $arg" - ;; - --dry-run | -n) - run=: - ;; + exit $? +} - --features) - $echo "host: $host" +# func_features +# Display the features supported by this script. +func_features () +{ + $ECHO "host: $host" if test "$build_libtool_libs" = yes; then - $echo "enable shared libraries" + $ECHO "enable shared libraries" else - $echo "disable shared libraries" + $ECHO "disable shared libraries" fi if test "$build_old_libs" = yes; then - $echo "enable static libraries" + $ECHO "enable static libraries" else - $echo "disable static libraries" + $ECHO "disable static libraries" fi + exit $? - ;; +} - --finish) mode="finish" ;; +# func_enable_tag tagname +# Verify that TAGNAME is valid, and either flag an error and exit, or +# enable the TAGNAME tag. We also add TAGNAME to the global $taglist +# variable here. +func_enable_tag () +{ + # Global variable: + tagname="$1" + + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf="/$re_begincf/,/$re_endcf/p" + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; + *) + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - --preserve-dup-deps) duplicate_deps="yes" ;; + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac +} - --quiet | --silent) - show=: - preserve_args="$preserve_args $arg" - ;; +# Parse options once, thoroughly. This comes as soon as possible in +# the script to make things like `libtool --version' happen quickly. +{ - --tag) - prevopt="--tag" - prev=tag - preserve_args="$preserve_args --tag" + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift ;; - --tag=*) - set tag "$optarg" ${1+"$@"} - shift - prev=tag - preserve_args="$preserve_args --tag" + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift ;; - - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift ;; - - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift ;; - - *) - nonopt="$arg" - break + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift ;; esac -done -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE -fi + # Parse non-mode specific arguments: + while test "$#" -gt 0; do + opt="$1" + shift -case $disable_libs in -no) - ;; -shared) - build_libtool_libs=no - build_old_libs=yes - ;; -static) - build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` - ;; -esac + case $opt in + --config) func_config ;; -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= + --debug) preserve_args="$preserve_args $opt" + func_echo "enabling shell trace mode" + opt_debug='set -x' + $opt_debug + ;; -if test -z "$show_help"; then + -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break + execute_dlfiles="$execute_dlfiles $1" + shift + ;; - # Infer the operation mode. - if test -z "$mode"; then - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 - case $nonopt in - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link - for arg - do - case $arg in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx | *strace | *truss) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall + --dry-run | -n) opt_dry_run=: ;; + --features) func_features ;; + --finish) mode="finish" ;; + + --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break + case $1 in + # Valid mode arguments: + clean) ;; + compile) ;; + execute) ;; + finish) ;; + install) ;; + link) ;; + relink) ;; + uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; + esac + + mode="$1" + shift + ;; + + --preserve-dup-deps) + opt_duplicate_deps=: ;; + + --quiet|--silent) preserve_args="$preserve_args $opt" + opt_silent=: + ;; + + --verbose| -v) preserve_args="$preserve_args $opt" + opt_silent=false + ;; + + --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break + preserve_args="$preserve_args $opt $1" + func_enable_tag "$1" # tagname is set here + shift + ;; + + # Separate optargs to long options: + -dlopen=*|--mode=*|--tag=*) + func_opt_split "$opt" + set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} + shift + ;; + + -\?|-h) func_usage ;; + --help) opt_help=: ;; + --version) func_version ;; + + -*) func_fatal_help "unrecognized option \`$opt'" ;; + + *) nonopt="$opt" + break + ;; + esac + done + + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: ;; *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute + opt_duplicate_compiler_generated_deps=$opt_duplicate_deps + ;; + esac - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi + # Having warned about all mis-specified options, bail out if + # anything was wrong. + $exit_cmd $EXIT_FAILURE +} + +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF fi - ;; - esac + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +## ----------- ## +## Main. ## +## ----------- ## + +$opt_help || { + # Sanity checks first: + func_check_version_match + + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi + test -z "$mode" && func_fatal_error "error: you must specify a MODE." + + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 exit $EXIT_FAILURE fi # Change the help message to a mode-specific one. generic_help="$help" - help="Try \`$modename --help --mode=$mode' for more information." + help="Try \`$progname --help --mode=$mode' for more information." +} - # These modes are in order of execution frequency so that they run quickly. - case $mode in - # libtool compile mode - compile) - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; +# func_lalib_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_lalib_p () +{ + test -f "$1" && + $SED -e 4q "$1" 2>/dev/null \ + | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} - target ) - libobj="$arg" - arg_mode=normal - continue - ;; +# func_lalib_unsafe_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function implements the same check as func_lalib_p without +# resorting to external programs. To this end, it redirects stdin and +# closes it afterwards, without saving the original file descriptor. +# As a safety measure, use it only where a negative result would be +# fatal anyway. Works if `file' does not exist. +func_lalib_unsafe_p () +{ + lalib_p=no + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then + for lalib_p_l in 1 2 3 4 + do + read lalib_p_line + case "$lalib_p_line" in + \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; + esac + done + exec 0<&5 5<&- + fi + test "$lalib_p" = yes +} - normal ) - # Accept any command-line options. - case $arg in - -o) - if test -n "$libobj" ; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit $EXIT_FAILURE - fi - arg_mode=target - continue - ;; +# func_ltwrapper_script_p file +# True iff FILE is a libtool wrapper script +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_script_p () +{ + func_lalib_p "$1" +} - -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" - continue - ;; +# func_ltwrapper_executable_p file +# True iff FILE is a libtool wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_executable_p () +{ + func_ltwrapper_exec_suffix= + case $1 in + *.exe) ;; + *) func_ltwrapper_exec_suffix=.exe ;; + esac + $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 +} + +# func_ltwrapper_scriptname file +# Assumes file is an ltwrapper_executable +# uses $file to determine the appropriate filename for a +# temporary ltwrapper_script. +func_ltwrapper_scriptname () +{ + func_ltwrapper_scriptname_result="" + if func_ltwrapper_executable_p "$1"; then + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + fi +} + +# func_ltwrapper_p file +# True iff FILE is a libtool wrapper script or wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_p () +{ + func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" +} + + +# func_execute_cmds commands fail_cmd +# Execute tilde-delimited COMMANDS. +# If FAIL_CMD is given, eval that upon failure. +# FAIL_CMD may read-access the current command in variable CMD! +func_execute_cmds () +{ + $opt_debug + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs + eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +} + + +# func_source file +# Source FILE, adding directory component if necessary. +# Note that it is not necessary on cygwin/mingw to append a dot to +# FILE even if both FILE and FILE.exe exist: automatic-append-.exe +# behavior happens only for exec(3), not for open(2)! Also, sourcing +# `FILE.' does not work on cygwin managed mounts. +func_source () +{ + $opt_debug + case $1 in + */* | *\\*) . "$1" ;; + *) . "./$1" ;; + esac +} + + +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () +{ + $opt_debug + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" + done + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" + done + case "$@ " in + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + func_echo "unable to infer tagged configuration" + func_fatal_error "specify a tag with \`--tag'" +# else +# func_verbose "using $tagname tagged configuration" + fi + ;; + esac + fi +} + + + +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# but don't create it if we're doing a dry run. +func_write_libtool_object () +{ + write_libobj=${1} + if test "$build_libtool_libs" = yes; then + write_lobj=\'${2}\' + else + write_lobj=none + fi + + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T <\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" + func_quote_for_eval "$arg" + lastarg="$lastarg $func_quote_for_eval_result" done IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result # Add the arguments to base_compile. base_compile="$base_compile $lastarg" continue ;; - * ) + *) # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # @@ -738,65 +1187,42 @@ esac # case $arg_mode # Aesthetically quote the previous argument. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - - case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, and some SunOS ksh mistreat backslash-escaping - # in scan sets (worked around with variable expansion), - # and furthermore cannot handle '|' '&' '(' ')' in scan sets - # at all, so we specify them separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - - base_compile="$base_compile $lastarg" + func_quote_for_eval "$lastarg" + base_compile="$base_compile $func_quote_for_eval_result" done # for arg case $arg_mode in arg) - $echo "$modename: you must specify an argument for -Xcompile" - exit $EXIT_FAILURE + func_fatal_error "you must specify an argument for -Xcompile" ;; target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit $EXIT_FAILURE + func_fatal_error "you must specify a target with \`-o'" ;; *) # Get the name of the library object. - [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` + test -z "$libobj" && { + func_basename "$srcfile" + libobj="$func_basename_result" + } ;; esac # Recognize several different file suffixes. # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSifmso]' case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.ii) xform=ii ;; - *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.[fF][09]?) xform=[fF][09]. ;; - *.for) xform=for ;; - *.java) xform=java ;; - *.obj) xform=obj ;; + *.[cCFSifmso] | \ + *.ada | *.adb | *.ads | *.asm | \ + *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ + *.[fF][09]? | *.for | *.java | *.obj | *.sx) + func_xform "$libobj" + libobj=$func_xform_result + ;; esac - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - case $libobj in - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; + *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit $EXIT_FAILURE + func_fatal_error "cannot determine name of library object from \`$libobj'" ;; esac @@ -804,7 +1230,15 @@ for arg in $later; do case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + continue + ;; + -static) + build_libtool_libs=no build_old_libs=yes continue ;; @@ -821,28 +1255,17 @@ esac done - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qlibobj="\"$qlibobj\"" ;; - esac - test "X$libobj" != "X$qlibobj" \ - && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir= - else - xdir=$xdir/ - fi + func_quote_for_eval "$libobj" + test "X$libobj" != "X$func_quote_for_eval_result" \ + && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && func_warning "libobj name \`$libobj' may not contain shell special characters." + func_dirname_and_basename "$obj" "/" "" + objname="$func_basename_result" + xdir="$func_dirname_result" lobj=${xdir}$objdir/$objname - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + test -z "$base_compile" && \ + func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. if test "$build_old_libs" = yes; then @@ -851,12 +1274,9 @@ removelist="$lobj $libobj ${libobj}T" fi - $run $rm $removelist - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in - cygwin* | mingw* | pw32* | os2*) + cygwin* | mingw* | pw32* | os2* | cegcc*) pic_mode=default ;; esac @@ -868,10 +1288,8 @@ # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 else output_obj= need_locks=no @@ -881,13 +1299,13 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file if test "$need_locks" = yes; then - until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" sleep 2 done elif test "$need_locks" = warn; then if test -f "$lockfile"; then - $echo "\ + $ECHO "\ *** ERROR, $lockfile exists and contains: `cat $lockfile 2>/dev/null` @@ -898,34 +1316,22 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." - $run $rm $removelist + $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - $echo "$srcfile" > "$lockfile" + removelist="$removelist $output_obj" + $ECHO "$srcfile" > "$lockfile" fi + $opt_dry_run || $RM $removelist + removelist="$removelist $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + if test -n "$fix_srcfile_path"; then eval srcfile=\"$fix_srcfile_path\" fi - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qsrcfile="\"$qsrcfile\"" ;; - esac - - $run $rm "$libobj" "${libobj}T" - - # Create a libtool object file (analogous to a ".la" file), - # but don't create it if we're doing a dry run. - test -z "$run" && cat > ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ + $ECHO "\ *** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` @@ -978,45 +1371,27 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." - $run $rm $removelist + $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi # Just move the object if needed, then go on to compile the next one if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - $show "$mv $output_obj $lobj" - if $run $mv $output_obj $lobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi + func_show_eval '$MV "$output_obj" "$lobj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' fi - # Append the name of the PIC object to the libtool object file. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ + $ECHO "\ *** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` @@ -1050,5458 +1420,6777 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." - $run $rm $removelist + $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi # Just move the object if needed if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi + func_show_eval '$MV "$output_obj" "$obj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' fi - - # Append the name of the non-PIC object the libtool object file. - # Only append if the libtool object file exists. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T <&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done +If FILE is a libtool library, object or program, all the files associated +with it are deleted. Otherwise, only FILE itself is deleted using RM." + ;; - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes + compile) + $ECHO \ +"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test - ;; - *) qarg=$arg ;; - esac - libtool_args="$libtool_args $qarg" +Compile a source file into a libtool library object. - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac +This mode accepts the following additional options: - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - else - dlprefiles="$dlprefiles $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" - exit $EXIT_FAILURE - fi - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat $save_arg` - do -# moreargs="$moreargs $fil" - arg=$fil - # A libtool-controlled object. + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes + -prefer-pic try to building PIC objects only + -prefer-non-pic try to building non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= +COMPILE-COMMAND is a command to be used in creating a \`standard' object file +from the given SOURCEFILE. - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac +The output file name is determined by removing the directory component from +SOURCEFILE, then substituting the C source code suffix \`.c' with the +library object suffix, \`.lo'." + ;; - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi + execute) + $ECHO \ +"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi +Automatically set library path, then run a program. - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" +This mode accepts the following additional options: - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi + -dlopen FILE add the directory containing FILE to the library path - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi +This mode sets the library path environment variable according to \`-dlopen' +flags. - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi +If any of the ARGS are libtool executable wrappers, then they are translated +into their corresponding uninstalled binary, and any of their required library +directories are added to the library path. - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" +Then, COMMAND is executed, with ARGS as arguments." + ;; - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. + finish) + $ECHO \ +"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi +Complete the installation of libtool libraries. - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - done - else - $echo "$modename: link input file \`$save_arg' does not exist" - exit $EXIT_FAILURE - fi - arg=$save_arg - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= - compile_command="$compile_command $wl$qarg" - finalize_command="$finalize_command $wl$qarg" - continue - ;; - xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - darwin_framework|darwin_framework_skip) - test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - prev= - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" +Each LIBDIR is a directory that contains libtool libraries. - case $arg in - -all-static) - if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; +The commands that this mode executes may require superuser privileges. Use +the \`--dry-run' option if you just want to see what would be executed." + ;; - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; + install) + $ECHO \ +"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -avoid-version) - avoid_version=yes - continue - ;; +Install executables or libraries. - -dlopen) - prev=dlfiles - continue - ;; +INSTALL-COMMAND is the installation command. The first component should be +either the \`install' or \`cp' program. - -dlpreopen) - prev=dlprefiles - continue - ;; +The following components of INSTALL-COMMAND are treated specially: - -export-dynamic) - export_dynamic=yes - continue - ;; + -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: more than one -exported-symbols argument is not allowed" - exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; +The rest of the components are interpreted as arguments to that command (only +BSD-compatible install options are recognized)." + ;; - -framework|-arch|-isysroot) - case " $CC " in - *" ${arg} ${1} "* | *" ${arg} ${1} "*) - prev=darwin_framework_skip ;; - *) compiler_flags="$compiler_flags $arg" - prev=darwin_framework ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; + link) + $ECHO \ +"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -inst-prefix-dir) - prev=inst_prefix - continue - ;; +Link object files or libraries together to form another library, or to +create an executable program. - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; - esac - continue - ;; +LINK-COMMAND is a command using the C compiler that you would use to create +a program from several object files. - -L*) - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - notinst_path="$notinst_path $dir" - fi - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac - continue - ;; +The following components of LINK-COMMAND are treated specially: - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs -framework System" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - deplibs="$deplibs $arg" - continue - ;; + -all-static do not do any dynamic linking at all + -avoid-version do not add a version suffix if possible + -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE + try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX + try to export only the symbols matching REGEX + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened + -no-fast-install disable the fast-install mode + -no-install link a not-installable executable + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects + -precious-files-regex REGEX + don't remove output files matching REGEX + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -shared only do dynamic linking of libtool libraries + -shrext SUFFIX override the standard shared library file extension + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] + specify library version info [each variable defaults to 0] + -weak LIBNAME declare that the target provides the LIBNAME interface - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - -model) - compile_command="$compile_command $arg" - compiler_flags="$compiler_flags $arg" - finalize_command="$finalize_command $arg" - prev=xcompiler - continue - ;; +All other options (arguments beginning with \`-') are ignored. - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; +Every other argument is treated as a filename. Files ending in \`.la' are +treated as uninstalled libtool libraries, other files are standard or library +object files. - -module) - module=yes - continue - ;; +If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +only library objects (\`.lo' files) may be specified, and \`-rpath' is +required, except when creating a convenience library. - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m* pass through architecture-specific compiler args for GCC - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) +If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +using \`ar' and \`ranlib', or on Windows using \`lib'. - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - compiler_flags="$compiler_flags $arg" - continue +If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +is created, otherwise an executable program is created." ;; - -shrext) - prev=shrext - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; + uninstall) + $ECHO \ +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; +Remove libraries from an installation directory. - -no-undefined) - allow_undefined=no - continue - ;; +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. - -objectlist) - prev=objectlist - continue - ;; +If FILE is a libtool library, all the files associated with it are deleted. +Otherwise, only FILE itself is deleted using RM." + ;; - -o) prev=output ;; + *) + func_fatal_help "invalid operation mode \`$mode'" + ;; + esac - -precious-files-regex) - prev=precious_regex - continue - ;; + $ECHO + $ECHO "Try \`$progname --help' for more information about other modes." - -release) - prev=release - continue - ;; + exit $? +} - -rpath) - prev=rpath - continue - ;; + # Now that we've collected a possible --mode arg, show help if necessary + $opt_help && func_mode_help - -R) - prev=xrpath - continue - ;; - -R*) - dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - continue - ;; +# func_mode_execute arg... +func_mode_execute () +{ + $opt_debug + # The first argument is the command name. + cmd="$nonopt" + test -z "$cmd" && \ + func_fatal_help "you must specify a COMMAND" - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; + # Handle -dlopen flags immediately. + for file in $execute_dlfiles; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" - -thread-safe) - thread_safe=yes - continue - ;; + dir= + case $file in + *.la) + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" - -version-info) - prev=vinfo - continue - ;; - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; + # Read the libtool library. + dlname= + library_names= + func_source "$file" - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; + # Skip this library if it cannot be dlopened. + if test -z "$dlname"; then + # Warn if it was a shared library. + test -n "$library_names" && \ + func_warning "\`$file' was not linked with \`-export-dynamic'" + continue + fi - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $wl$flag" - linker_flags="$linker_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; + func_dirname "$file" "" "." + dir="$func_dirname_result" - -Xcompiler) - prev=xcompiler - continue + if test -f "$dir/$objdir/$dlname"; then + dir="$dir/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + fi + fi ;; - -Xlinker) - prev=xlinker - continue + *.lo) + # Just add the directory containing the .lo file. + func_dirname "$file" "" "." + dir="$func_dirname_result" ;; - -XCClinker) - prev=xcclinker + *) + func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" continue ;; + esac - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - - *.$objext) - # A standard object. - objs="$objs $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= + # Get the absolute pathname. + absdir=`cd "$dir" && pwd` + test -n "$absdir" && dir="$absdir" - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then + eval "$shlibpath_var=\"\$dir\"" + else + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. + libtool_execute_magic="$magic" - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi + # Check if any of the arguments is a wrapper script. + args= + for file + do + case $file in + -*) ;; + *) + # Do a test to see if this is really a libtool program. + if func_ltwrapper_script_p "$file"; then + func_source "$file" + # Transform arg to wrapped name. + file="$progdir/$program" + elif func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + func_source "$func_ltwrapper_scriptname_result" + # Transform arg to wrapped name. + file="$progdir/$program" + fi + ;; + esac + # Quote arguments (to preserve shell metacharacters). + func_quote_for_eval "$file" + args="$args $func_quote_for_eval_result" + done - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + if test "X$opt_dry_run" = Xfalse; then + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" + fi - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue + # Restore saved environment variables + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi + $lt_unset $lt_var + fi" + done - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi + # Now prepare to actually exec the command. + exec_cmd="\$cmd$args" + else + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + $ECHO "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + fi +} - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi +test "$mode" = execute && func_mode_execute ${1+"$@"} - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. +# func_mode_finish arg... +func_mode_finish () +{ + $opt_debug + libdirs="$nonopt" + admincmds= - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for dir + do + libdirs="$libdirs $dir" + done - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. + func_execute_cmds "$finish_cmds" 'admincmds="$admincmds +'"$cmd"'"' fi - ;; - - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" - continue - ;; + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" + $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $cmds" + fi + done + fi - *.la) - # A libtool-controlled library. + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" + $ECHO "X----------------------------------------------------------------------" | $Xsed + $ECHO "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + $ECHO + $ECHO "If you ever happen to want to link against installed libraries" + $ECHO "in a given directory, LIBDIR, you must either use libtool, and" + $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" + $ECHO "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" + $ECHO " during execution" + fi + if test -n "$runpath_var"; then + $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" + $ECHO " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + $ECHO + + $ECHO "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" + $ECHO "pages." + ;; + *) + $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + $ECHO "X----------------------------------------------------------------------" | $Xsed + exit $EXIT_SUCCESS +} + +test "$mode" = finish && func_mode_finish ${1+"$@"} + + +# func_mode_install arg... +func_mode_install () +{ + $opt_debug + # There may be an optional sh(1) argument at the beginning of + # install_prog (especially on Windows NT). + if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + # Allow the use of GNU shtool's install command. + $ECHO "X$nonopt" | $GREP shtool >/dev/null; then + # Aesthetically quote it. + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " + arg=$1 + shift + else + install_prog= + arg=$nonopt + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" + install_prog="$install_prog$func_quote_for_eval_result" + + # We need to accept at least all the BSD install flags. + dest= + files= + opts= + prev= + install_type= + isdir=no + stripme= + for arg + do + if test -n "$dest"; then + files="$files $dest" + dest=$arg + continue + fi + + case $arg in + -d) isdir=yes ;; + -f) + case " $install_prog " in + *[\\\ /]cp\ *) ;; + *) prev=$arg ;; + esac + ;; + -g | -m | -o) + prev=$arg + ;; + -s) + stripme=" -s" + continue + ;; + -*) + ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then prev= else - deplibs="$deplibs $arg" + dest=$arg + continue fi - continue ;; + esac - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - esac # arg + # Aesthetically quote the argument. + func_quote_for_eval "$arg" + install_prog="$install_prog $func_quote_for_eval_result" + done - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done # argument parsing loop + test -z "$install_prog" && \ + func_fatal_help "you must specify an install program" - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + test -n "$prev" && \ + func_fatal_help "the \`$prev' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" + if test -z "$files"; then + if test -z "$dest"; then + func_fatal_help "no file or destination specified" + else + func_fatal_help "you must specify a destination" + fi fi - oldlibs= - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" + # Strip any trailing slash from the destination. + func_stripname '' '/' "$dest" + dest=$func_stripname_result - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` + # Check to see that the destination is a directory. + test -d "$dest" && isdir=yes + if test "$isdir" = yes; then + destdir="$dest" + destname= else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + func_dirname_and_basename "$dest" "" "." + destdir="$func_dirname_result" + destname="$func_basename_result" - output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` - if test "X$output_objdir" = "X$output"; then - output_objdir="$objdir" - else - output_objdir="$output_objdir/$objdir" - fi - # Create the object directory. - if test ! -d "$output_objdir"; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then - exit $exit_status - fi + # Not a directory, so check to see that there is only one file specified. + set dummy $files; shift + test "$#" -gt 1 && \ + func_fatal_help "\`$dest' is not a directory" fi - - # Determine the type of output - case $output in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - case $host in - *cygwin* | *mingw* | *pw32*) - # don't eliminate duplications in $postdeps and $predeps - duplicate_compiler_generated_deps=yes - ;; + case $destdir in + [\\/]* | [A-Za-z]:[\\/]*) ;; *) - duplicate_compiler_generated_deps=$duplicate_deps + for file in $files; do + case $file in + *.lo) ;; + *) + func_fatal_help "\`$destdir' must be an absolute directory name" + ;; + esac + done ;; esac - specialdeplibs= - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if test "X$duplicate_deps" = "Xyes" ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$libs $deplib" - done + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" + staticlibs= + future_libdirs= + current_libdirs= + for file in $files; do - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + # Do each installation. + case $file in + *.$libext) + # Do the static libraries later. + staticlibs="$staticlibs $file" + ;; + + *.la) + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" + + library_names= + old_library= + relink_command= + func_source "$file" + + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) current_libdirs="$current_libdirs $libdir" ;; esac - pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= - fi + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) future_libdirs="$future_libdirs $libdir" ;; + esac + fi - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - case $linkmode in - lib) - passes="conv link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit $EXIT_FAILURE + func_dirname "$file" "/" "" + dir="$func_dirname_result" + dir="$dir$objdir" + + if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. + test "$inst_prefix_dir" = "$destdir" && \ + func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` + fi + + func_warning "relinking \`$file'" + func_show_eval "$relink_command" \ + 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + fi + + # See the names of the shared library. + set dummy $library_names; shift + if test -n "$1"; then + realname="$1" + shift + + srcname="$realname" + test -n "$relink_command" && srcname="$realname"T + + # Install the shared library and build the symlinks. + func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + 'exit $?' + tstripme="$stripme" + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme="" + ;; + esac ;; esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - for pass in $passes; do - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - compiler_flags="$compiler_flags $deplib" - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 - continue + if test -n "$tstripme" && test -n "$striplib"; then + func_show_eval "$striplib $destdir/$realname" 'exit $?' fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. + # Try `ln -sf' first, because the `ln' binary might depend on + # the symlink we replace! Solaris /bin/ln does not understand -f, + # so we also need to try rm && ln -s. + for linkname + do + test "$linkname" != "$realname" \ + && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if (${SED} -e '2q' $lib | - grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - library_names= - old_library= - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) - $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - if eval $echo \"$deplib\" 2>/dev/null \ - | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - $echo - $echo "*** Warning: Trying to link with static lib archive $deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because the file extensions .$libext of this argument makes me believe" - $echo "*** that it is just a static archive that I should not used here." - else - $echo - $echo "*** Warning: Linking the shared library $output against the" - $echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" - fi fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 - exit $EXIT_FAILURE - fi - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE + # Do each command in the postinstall commands. + lib="$destdir/$realname" + func_execute_cmds "$postinstall_cmds" 'exit $?' fi - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= + # Install the pseudo-library for information purposes. + func_basename "$file" + name="$func_basename_result" + instname="$dir/$name"i + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + ;; - # Read the .la file - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac + *.lo) + # Install (i.e. copy) a libtool object. - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" fi - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit $EXIT_FAILURE - fi - continue - fi # $pass = conv + # Deduce the name of the destination old-style object file. + case $destfile in + *.lo) + func_lo2o "$destfile" + staticdest=$func_lo2o_result + ;; + *.$objext) + staticdest="$destfile" + destfile= + ;; + *) + func_fatal_help "cannot copy a libtool object to \`$destfile'" + ;; + esac + # Install the libtool object if requested. + test -n "$destfile" && \ + func_show_eval "$install_prog $file $destfile" 'exit $?' - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE + # Install the old object if enabled. + if test "$build_old_libs" = yes; then + # Deduce the name of the old-style object file. + func_lo2o "$file" + staticobj=$func_lo2o_result + func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' fi + exit $EXIT_SUCCESS + ;; - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$newdlfiles $lib" - fi - continue - fi # $pass = dlopen + *) + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" + fi - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + # If the file is missing, and there is a .exe on the end, strip it + # because it is most likely a libtool script we actually want to + # install + stripped_ext="" + case $file in + *.exe) + if test ! -f "$file"; then + func_stripname '' '.exe' "$file" + file=$func_stripname_result + stripped_ext=".exe" + fi + ;; + esac + + # Do a test to see if this is really a libtool program. + case $host in + *cygwin* | *mingw*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result + else + func_stripname '' '.exe' "$file" + wrapper=$func_stripname_result + fi + ;; *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 - $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 - abs_ladir="$ladir" + wrapper=$file + ;; + esac + if func_ltwrapper_script_p "$wrapper"; then + notinst_deplibs= + relink_command= + + func_source "$wrapper" + + # Check the variables that should have been set. + test -z "$generated_by_libtool_version" && \ + func_fatal_error "invalid libtool wrapper script \`$wrapper'" + + finalize=yes + for lib in $notinst_deplibs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + func_source "$lib" + fi + libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test + if test -n "$libdir" && test ! -f "$libfile"; then + func_warning "\`$lib' has not been installed in \`$libdir'" + finalize=no + fi + done + + relink_command= + func_source "$wrapper" + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + $opt_dry_run || { + if test "$finalize" = yes; then + tmpdir=`func_mktempdir` + func_basename "$file$stripped_ext" + file="$func_basename_result" + outputname="$tmpdir/$file" + # Replace the output file specification. + relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + + $opt_silent || { + func_quote_for_expand "$relink_command" + eval "func_echo $func_quote_for_expand_result" + } + if eval "$relink_command"; then : + else + func_error "error: relink \`$file' with the above command before installing it" + $opt_dry_run || ${RM}r "$tmpdir" + continue + fi + file="$outputname" + else + func_warning "cannot relink \`$file'" + fi + } + else + # Install the binary that we compiled earlier. + file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` fi + fi + + # remove .exe since cygwin /usr/bin/install will append another + # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in + *.exe:*.exe) + # this is ok + ;; + *.exe:*) + destfile=$destfile.exe + ;; + *:*.exe) + func_stripname '' '.exe' "$destfile" + destfile=$func_stripname_result + ;; + esac ;; esac - laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` + func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' + $opt_dry_run || if test -n "$outputname"; then + ${RM}r "$tmpdir" + fi + ;; + esac + done - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - $echo "$modename: warning: library \`$lib' was moved." 1>&2 - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$libdir" + for file in $staticlibs; do + func_basename "$file" + name="$func_basename_result" + + # Set up the ranlib parameters. + oldlib="$destdir/$name" + + func_show_eval "$install_prog \$file \$oldlib" 'exit $?' + + if test -n "$stripme" && test -n "$old_striplib"; then + func_show_eval "$old_striplib $oldlib" 'exit $?' + fi + + # Do each command in the postinstall commands. + func_execute_cmds "$old_postinstall_cmds" 'exit $?' + done + + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" + + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + else + exit $EXIT_SUCCESS + fi +} + +test "$mode" = install && func_mode_install ${1+"$@"} + + +# func_generate_dlsyms outputname originator pic_p +# Extract symbols from dlprefiles and create ${outputname}S.o with +# a dlpreopen symbol table. +func_generate_dlsyms () +{ + $opt_debug + my_outputname="$1" + my_originator="$2" + my_pic_p="${3-no}" + my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + my_dlsyms= + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then + my_dlsyms="${my_outputname}S.c" + else + func_error "not configured to extract global symbols from dlpreopened files" + fi + fi + + if test -n "$my_dlsyms"; then + case $my_dlsyms in + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. + nlist="$output_objdir/${my_outputname}.nm" + + func_show_eval "$RM $nlist ${nlist}S ${nlist}T" + + # Parse the name list into a source file. + func_verbose "creating $output_objdir/$my_dlsyms" + + $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ +/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ + +#ifdef __cplusplus +extern \"C\" { +#endif + +/* External symbol declarations for the compiler. */\ +" + + if test "$dlself" = yes; then + func_verbose "generating symbol list for \`$output'" + + $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" + + # Add our own program objects to the symbol list. + progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + for progfile in $progfiles; do + func_verbose "extracting global C symbols from \`$progfile'" + $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + $opt_dry_run || { + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } fi - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + fi - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE + for dlprefile in $dlprefiles; do + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + done + + $opt_dry_run || { + # Make sure we have at least an empty file. + test -f "$nlist" || : > "$nlist" + + if test -n "$exclude_expsyms"; then + $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $MV "$nlist"T "$nlist" fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" + + # Try sorting and uniquifying the output. + if $GREP -v "^: " < "$nlist" | + if sort -k 3 /dev/null 2>&1; then + sort -k 3 + else + sort +2 + fi | + uniq > "$nlist"S; then + : else - newdlprefiles="$newdlprefiles $dir/$linklib" + $GREP -v "^: " < "$nlist" > "$nlist"S fi - fi # $pass = dlpreopen - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" + if test -f "$nlist"S; then + eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - deplibs="$lib $deplibs" # used for prog,scan pass + $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - continue - fi + $ECHO >> "$output_objdir/$my_dlsyms" "\ - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" +/* The mapping between symbol names and symbols. */ +typedef struct { + const char *name; + void *address; +} lt_dlsymlist; +" + case $host in + *cygwin* | *mingw* | *cegcc* ) + $ECHO >> "$output_objdir/$my_dlsyms" "\ +/* DATA imports from DLLs on WIN32 con't be const, because + runtime relocations are performed -- see ld's documentation + on pseudo-relocs. */" + lt_dlsym_const= ;; + *osf5*) + echo >> "$output_objdir/$my_dlsyms" "\ +/* This system does not cope well with relocations in const data */" + lt_dlsym_const= ;; + *) + lt_dlsym_const=const ;; + esac - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi + $ECHO >> "$output_objdir/$my_dlsyms" "\ +extern $lt_dlsym_const lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[]; +$lt_dlsym_const lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[] = +{\ + { \"$my_originator\", (void *) 0 }," - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... + case $need_lib_prefix in + no) + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + *) + eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + esac + $ECHO >> "$output_objdir/$my_dlsyms" "\ + {0, (void *) 0} +}; - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $absdir" ;; - esac - fi +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt_${my_prefix}_LTX_preloaded_symbols; +} +#endif - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi # $linkmode,$pass = prog,link... +#ifdef __cplusplus +} +#endif\ +" + } # !$opt_dry_run - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi + pic_flag_for_symtable= + case "$compile_command " in + *" -static "*) ;; + *) + case $host in + # compiling the symbol table file with pic_flag works around + # a FreeBSD bug that causes programs to crash when -lm is + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; + *-*-hpux*) + pic_flag_for_symtable=" $pic_flag" ;; + *) + if test "X$my_pic_p" != Xno; then + pic_flag_for_symtable=" $pic_flag" + fi + ;; + esac + ;; + esac + symtab_cflags= + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; + *) symtab_cflags="$symtab_cflags $arg" ;; + esac + done - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes ; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - # This is a shared library + # Now compile the dynamic symbol file. + func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - # Warn about portability, can't link against -module's on - # some systems (darwin) - if test "$shouldnotlink" = yes && test "$pass" = link ; then - $echo - if test "$linkmode" = prog; then - $echo "*** Warning: Linking the executable $output against the loadable module" - else - $echo "*** Warning: Linking the shared library $output against the loadable module" - fi - $echo "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac + # Clean up the generated files. + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + + # Transform the symbol file into the correct name. + symfileobj="$output_objdir/${my_outputname}S.$objext" + case $host in + *cygwin* | *mingw* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + else + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` fi + ;; + *) + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + ;; + esac + ;; + *) + func_fatal_error "unknown suffix for \`$my_dlsyms'" + ;; + esac + else + # We keep going just in case the user didn't refer to + # lt_preloaded_symbols. The linker will fail if global_symbol_pipe + # really was required. + + # Nullify the symbol file. + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + fi +} - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - realname="$2" - shift; shift - libname=`eval \\$echo \"$libname_spec\"` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw*) - major=`expr $current - $age` - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi +# func_win32_libid arg +# return the library type of file 'arg' +# +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +func_win32_libid () +{ + $opt_debug + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | + $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | + $SED -n -e ' + 1,100{ + / I /{ + s,.*,import, + p + q + } + }'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac + fi + ;; + *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... + case $win32_fileres in + *MS\ Windows\ PE\ Intel*) + win32_libid_type="x86 DLL" + ;; + esac + ;; + esac + $ECHO "$win32_libid_type" +} - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - soname=`$echo $soroot | ${SED} -e 's/^.*\///'` - newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" +# func_extract_an_archive dir oldlib +func_extract_an_archive () +{ + $opt_debug + f_ex_an_ar_dir="$1"; shift + f_ex_an_ar_oldlib="$1" + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' + if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then + : + else + func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" + fi +} - if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a module then we can not link against - # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | - $EGREP ": [^:]* bundle" >/dev/null ; then - $echo "** Warning, lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - $echo - $echo "** And there doesn't seem to be a static archive available" - $echo "** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" - exit $EXIT_FAILURE - fi +# func_extract_archives gentop oldlib ... +func_extract_archives () +{ + $opt_debug + my_gentop="$1"; shift + my_oldlibs=${1+"$@"} + my_oldobjs="" + my_xlib="" + my_xabs="" + my_xdir="" - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && \ - test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in + [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + func_basename "$my_xlib" + my_xlib="$func_basename_result" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + func_arith $extracted_serial + 1 + extracted_serial=$func_arith_result + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" - if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi + func_mkdir_p "$my_xdir" - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" + case $host in + *-darwin*) + func_verbose "Extracting $my_xabs" + # Do not bother doing anything if just a dry run + $opt_dry_run || { + darwin_orig_dir=`pwd` + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` + darwin_base_archive=`basename "$darwin_archive"` + darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` + if test -n "$darwin_arches"; then + darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" + for darwin_arch in $darwin_arches ; do + func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" + $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" + cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" + func_extract_an_archive "`pwd`" "${darwin_base_archive}" + cd "$darwin_curdir" + $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + done # $darwin_arches + ## Okay now we've a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ + cd "$darwin_orig_dir" else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. + cd $darwin_orig_dir + func_extract_an_archive "$my_xdir" "$my_xabs" + fi # $darwin_arches + } # !$opt_dry_run + ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - $echo - $echo "*** Warning: This system can not link to static lib archive $lib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - $echo "*** But as you try to build a module library, libtool will still create " - $echo "*** a static module, that should work as long as the dlopening application" - $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? + func_extract_archives_result="$my_oldobjs" +} - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - newlib_search_path="$newlib_search_path $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) - dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$deplib" && dir="." - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - fi - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi - path="$absdir" - fi - depdepl= - case $host in - *-*-darwin*) - # we do not want to link against static libs, - # but need to link against shared - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" - fi - # do not add paths which are already there - case " $newlib_search_path " in - *" $path "*) ;; - *) newlib_search_path="$newlib_search_path $path";; - esac - fi - path="" - ;; - *) - path="-L$path" - ;; - esac - ;; - -l*) - case $host in - *-*-darwin*) - # Again, we only want to link against shared libraries - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` - for tmp in $newlib_search_path ; do - if test -f "$tmp/lib$tmp_libs.dylib" ; then - eval depdepl="$tmp/lib$tmp_libs.dylib" - break - fi - done - path="" - ;; - *) continue ;; - esac - ;; - *) continue ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in - *" $depdepl "*) ;; - *) deplibs="$depdepl $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; - esac - done - newlib_search_path= +# func_emit_wrapper_part1 [arg=no] +# +# Emit the first part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part1 () +{ + func_emit_wrapper_part1_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part1_arg1=$1 fi - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - tmp_libs="$tmp_libs $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" - fi + $ECHO "\ +#! $SHELL - case $linkmode in - oldlib) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 - fi +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='${SED} -e 1s/^X//' +sed_quote_subst='$sed_quote_subst' - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 - fi +# 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 - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 - fi +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 - fi +relink_command=\"$relink_command\" - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 - fi +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variables: + generated_by_libtool_version='$macro_version' + notinst_deplibs='$notinst_deplibs' +else + # When we are sourced in execute mode, \$file and \$ECHO are already set. + if test \"\$libtool_execute_magic\" != \"$magic\"; then + ECHO=\"$qecho\" + file=\"\$0\" + # Make sure echo works. + if test \"X\$1\" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then + # Yippee, \$ECHO works! + : + else + # Restart under the correct shell, and then maybe \$ECHO will work. + exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} + fi + fi\ +" + $ECHO "\ - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 - fi + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + test \"x\$thisdir\" = \"x\$file\" && thisdir=. - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; + # Follow symbolic links until we get to the real thisdir. + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` + while test -n \"\$file\"; do + destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - fi - ;; + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; esac + fi - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit $EXIT_FAILURE - else - $echo - $echo "*** Warning: Linking the shared library $output against the non-libtool" - $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" - fi - fi + file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + done +" +} +# end: func_emit_wrapper_part1 - if test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 - fi +# func_emit_wrapper_part2 [arg=no] +# +# Emit the second part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part2 () +{ + func_emit_wrapper_part2_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part2_arg1=$1 + fi + + $ECHO "\ + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then + # special case for '.' + if test \"\$thisdir\" = \".\"; then + thisdir=\`pwd\` + fi + # remove .libs from thisdir + case \"\$thisdir\" in + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + $objdir ) thisdir=. ;; + esac + fi - set dummy $rpath - if test "$#" -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" +" + + if test "$fast_install" = yes; then + $ECHO "\ + program=lt-'$outputname'$exeext + progdir=\"\$thisdir/$objdir\" + + if test ! -f \"\$progdir/\$program\" || + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then + + file=\"\$\$-\$program\" + + if test ! -d \"\$progdir\"; then + $MKDIR \"\$progdir\" + else + $RM \"\$progdir/\$file\" + fi" + + $ECHO "\ + + # relink executable if necessary + if test -n \"\$relink_command\"; then + if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" + exit 1 fi - install_libdir="$2" + fi - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes + $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $RM \"\$progdir/\$program\"; + $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $RM \"\$progdir/\$file\" + fi" + else + $ECHO "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" fi - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 + $ECHO "\ + + if test -f \"\$progdir/\$program\"; then" + + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed + $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + + export $shlibpath_var +" fi - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 + # fixup the dll searchpath if we need to. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" fi - else - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - IFS="$save_ifs" + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 + fi + else + # The program doesn't exist. + \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 + $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 + fi +fi\ +" +} +# end: func_emit_wrapper_part2 + - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=no + if test -n "$1" ; then + func_emit_wrapper_arg1=$1 fi - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible + # split this up so that func_emit_cwrapperexe_src + # can call each part independently. + func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" + func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" +} - case $vinfo_number in - yes) - number_major="$2" - number_minor="$3" - number_revision="$4" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - darwin|linux|osf|windows|none) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - esac - ;; - no) - current="$2" - revision="$3" - age="$4" - ;; - esac - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac +# func_to_host_path arg +# +# Convert paths to host format when used with build tools. +# Intended for use with "native" mingw (where libtool itself +# is running under the msys shell), or in the following cross- +# build environments: +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# where wine is equipped with the `winepath' executable. +# In the native mingw case, the (msys) shell automatically +# converts paths for any non-msys applications it launches, +# but that facility isn't available from inside the cwrapper. +# Similar accommodations are necessary for $host mingw and +# $build cygwin. Calling this function does no harm for other +# $host/$build combinations not listed above. +# +# ARG is the path (on $build) that should be converted to +# the proper representation for $host. The result is stored +# in $func_to_host_path_result. +func_to_host_path () +{ + func_to_host_path_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + case $build in + *mingw* ) # actually, msys + # awkward: cmd appends spaces to result + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_path_tmp1=`( cmd //c echo "$1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_path_tmp1=`cygpath -w "$1"` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # Unfortunately, winepath does not exit with a non-zero + # error code, so we are forced to check the contents of + # stdout. On the other hand, if the command is not + # found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both + # error code of zero AND non-empty stdout, which explains + # the odd construction: + func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + else + # Allow warning below. + func_to_host_path_result="" + fi + ;; + esac + if test -z "$func_to_host_path_result" ; then + func_error "Could not determine host path corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_path_result="$1" + fi + ;; + esac + fi +} +# end: func_to_host_path - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac +# func_to_host_pathlist arg +# +# Convert pathlists to host format when used with build tools. +# See func_to_host_path(), above. This function supports the +# following $build/$host combinations (but does no harm for +# combinations not listed here): +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# +# Path separators are also converted from $build format to +# $host format. If ARG begins or ends with a path separator +# character, it is preserved (but converted to $host format) +# on output. +# +# ARG is a pathlist (on $build) that should be converted to +# the proper representation on $host. The result is stored +# in $func_to_host_pathlist_result. +func_to_host_pathlist () +{ + func_to_host_pathlist_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_to_host_pathlist_tmp2="$1" + # Once set for this call, this variable should not be + # reassigned. It is used in tha fallback case. + func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e 's|^:*||' -e 's|:*$||'` + case $build in + *mingw* ) # Actually, msys. + # Awkward: cmd appends spaces to result. + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # unfortunately, winepath doesn't convert pathlists + func_to_host_pathlist_result="" + func_to_host_pathlist_oldIFS=$IFS + IFS=: + for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do + IFS=$func_to_host_pathlist_oldIFS + if test -n "$func_to_host_pathlist_f" ; then + func_to_host_path "$func_to_host_pathlist_f" + if test -n "$func_to_host_path_result" ; then + if test -z "$func_to_host_pathlist_result" ; then + func_to_host_pathlist_result="$func_to_host_path_result" + else + func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" + fi + fi + fi + IFS=: + done + IFS=$func_to_host_pathlist_oldIFS + ;; + esac + if test -z "$func_to_host_pathlist_result" ; then + func_error "Could not determine the host path(s) corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This may break if $1 contains DOS-style drive + # specifications. The fix is not to complicate the expression + # below, but for the user to provide a working wine installation + # with winepath so that path translation in the cross-to-mingw + # case works properly. + lt_replace_pathsep_nix_to_dos="s|:|;|g" + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_replace_pathsep_nix_to_dos"` + fi + # Now, add the leading and trailing path separators back + case "$1" in + :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" + ;; + esac + case "$1" in + *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" + ;; + esac + ;; + esac + fi +} +# end: func_to_host_pathlist - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac +# func_emit_cwrapperexe_src +# emit the source code for a wrapper executable on stdout +# Must ONLY be called from within func_mode_link because +# it depends on a number of variable set therein. +func_emit_cwrapperexe_src () +{ + cat <&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - fi +/* $cwrappersource - temporary wrapper executable for $objdir/$outputname + Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; + The $output program cannot be directly executed until all the libtool + libraries that it depends on are installed. - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; + Currently, it simply execs the wrapper *script* "$SHELL $output", + but could eventually absorb all of the scripts functionality and + exec $objdir/$outputname directly. +*/ +EOF + cat <<"EOF" +#include +#include +#ifdef _MSC_VER +# include +# include +# include +# define setmode _setmode +#else +# include +# include +# ifdef __CYGWIN__ +# include +# define HAVE_SETENV +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +# endif +#endif +#include +#include +#include +#include +#include +#include +#include +#include - freebsd-elf) - major=".$current" - versuffix=".$current"; - ;; +#if defined(PATH_MAX) +# define LT_PATHMAX PATH_MAX +#elif defined(MAXPATHLEN) +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - major=`expr $current - $age` - else - major=`expr $current - $age + 1` - fi - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" +#ifndef S_IXOTH +# define S_IXOTH 0 +#endif +#ifndef S_IXGRP +# define S_IXGRP 0 +#endif - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` - verstring="$verstring_prefix$major.$iface:$verstring" - done +#ifdef _MSC_VER +# define S_IXUSR _S_IEXEC +# define stat _stat +# ifndef _INTPTR_T_DEFINED +# define intptr_t int +# endif +#endif - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; +#ifndef DIR_SEPARATOR +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' +#endif - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +# define HAVE_DOS_BASED_FILE_SYSTEM +# define FOPEN_WB "wb" +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif +#endif - osf) - major=.`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; +#ifdef __CYGWIN__ +# define FOPEN_WB "wb" +#endif - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; +#ifndef FOPEN_WB +# define FOPEN_WB "w" +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - major=`expr $current - $age` - versuffix="-$major" - ;; +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ +} while (0) - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac +#undef LTWRAPPER_DEBUGPRINTF +#if defined DEBUGWRAPPER +# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +static void +ltwrapper_debugprintf (const char *fmt, ...) +{ + va_list args; + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); +} +#else +# define LTWRAPPER_DEBUGPRINTF(args) +#endif - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi +const char *program_name = NULL; - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi +void *xmalloc (size_t num); +char *xstrdup (const char *string); +const char *base_name (const char *name); +char *find_executable (const char *wrapper); +char *chase_symlinks (const char *pathspec); +int make_executable (const char *path); +int check_executable (const char *path); +char *strendzap (char *str, const char *pat); +void lt_fatal (const char *message, ...); +void lt_setenv (const char *name, const char *value); +char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_opt_process_env_set (const char *arg); +void lt_opt_process_env_prepend (const char *arg); +void lt_opt_process_env_append (const char *arg); +int lt_split_name_value (const char *arg, char** name, char** value); +void lt_update_exe_path (const char *name, const char *value); +void lt_update_lib_path (const char *name, const char *value); - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - fi +static const char *script_text_part1 = +EOF - if test "$mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$echo "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - removelist="$removelist $p" - ;; - *) ;; - esac - done - if test -n "$removelist"; then - $show "${rm}r $removelist" - $run ${rm}r $removelist - fi - fi + func_emit_wrapper_part1 yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ "/' -e 's/$/\\n"/' + echo ";" + cat <"))); + for (i = 0; i < newargc; i++) + { + LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); + } - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $rm conftest.c - cat > conftest.c </dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null \ - | grep " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for file magic test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a file magic. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval $echo \"$potent_lib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a regex pattern. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e 's/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` - done - fi - if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ - | grep . >/dev/null; then - $echo - if test "X$deplibs_check_method" = "Xnone"; then - $echo "*** Warning: inter-library dependencies are not supported in this platform." - else - $echo "*** Warning: inter-library dependencies are not known to be supported." - fi - $echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - $echo - $echo "*** Warning: libtool could not satisfy all declared inter-library" - $echo "*** dependencies of module $libname. Therefore, libtool will create" - $echo "*** a static module, that should work as long as the dlopening" - $echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - $echo "*** The inter-library dependencies that have been dropped here will be" - $echo "*** automatically added whenever a program is linked with this library" - $echo "*** or is declared to -dlopen it." + case $host_os in + mingw*) + cat <<"EOF" + /* execv doesn't actually work on mingw as expected on unix */ + rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); + if (rval == -1) + { + /* failed to start process */ + LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); + return 127; + } + return rval; +EOF + ;; + *) + cat <<"EOF" + execv (lt_argv_zero, newargz); + return rval; /* =127, but avoids unused variable warning */ +EOF + ;; + esac - if test "$allow_undefined" = no; then - $echo - $echo "*** Since this library must not contain undefined symbols," - $echo "*** because either the platform does not support them or" - $echo "*** it was explicitly requested with -no-undefined," - $echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi + cat <<"EOF" +} +void * +xmalloc (size_t num) +{ + void *p = (void *) malloc (num); + if (!p) + lt_fatal ("Memory exhausted"); - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - deplibs="$new_libs" + return p; +} +char * +xstrdup (const char *string) +{ + return string ? strcpy ((char *) xmalloc (strlen (string) + 1), + string) : NULL; +} - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= +const char * +base_name (const char *name) +{ + const char *base; - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - case $archive_cmds in - *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; - *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; - esac - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + /* Skip over the disk name in MSDOS pathnames. */ + if (isalpha ((unsigned char) name[0]) && name[1] == ':') + name += 2; +#endif - shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi + for (base = name; *name; name++) + if (IS_DIR_SEPARATOR (*name)) + base = name + 1; + return base; +} - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift +int +check_executable (const char *path) +{ + struct stat st; - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi + LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); + if ((!path) || (!*path)) + return 0; - lib="$output_objdir/$realname" - linknames= - for link - do - linknames="$linknames $link" - done + if ((stat (path, &st) >= 0) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else + return 0; +} - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` +int +make_executable (const char *path) +{ + int rval = 0; + struct stat st; - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - if len=`expr "X$cmd" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - $show "$cmd" - $run eval "$cmd" || exit $? - skipped_export=false - else - # The command line is too long to execute in one step. - $show "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex"; then - $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi - fi - fi + LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); + if ((!path) || (!*path)) + return 0; - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi + if (stat (path, &st) >= 0) + { + rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); + } + return rval; +} - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise + Does not chase symlinks, even on platforms that support them. +*/ +char * +find_executable (const char *wrapper) +{ + int has_slash = 0; + const char *p; + const char *p_next; + /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; + int tmp_len; + char *concat_name; - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", + wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" - fi + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? - fi + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + } +#endif - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char *path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char *q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR (*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = + XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); - if test "X$skipped_export" != "X:" && - len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise. - $echo "creating reloadable object files..." + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + return NULL; +} - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - output_la=`$echo "X$output" | $Xsed -e "$basename"` +char * +chase_symlinks (const char *pathspec) +{ +#ifndef S_ISLNK + return xstrdup (pathspec); +#else + char buf[LT_PATHMAX]; + struct stat s; + char *tmp_pathspec = xstrdup (pathspec); + char *p; + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { + LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", + tmp_pathspec)); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) + { + has_symlinks = 1; + break; + } - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - delfiles= - last_robj= - k=1 - output=$output_objdir/$output_la-${k}.$objext - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - eval test_cmds=\"$reload_cmds $objlist $last_robj\" - if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; }; then - objlist="$objlist $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" - else - # All subsequent reloadable object files will link in - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - k=`expr $k + 1` - output=$output_objdir/$output_la-${k}.$objext - objlist=$obj - len=1 - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + /* search backwards for last DIR_SEPARATOR */ + p = tmp_pathspec + strlen (tmp_pathspec) - 1; + while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + p--; + if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + { + /* no more DIR_SEPARATORS left */ + break; + } + *p = '\0'; + } + else + { + char *errstr = strerror (errno); + lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); + } + } + XFREE (tmp_pathspec); - if ${skipped_export-false}; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - libobjs=$output - # Append the command to create the export file. - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" - fi - - # Set up a command to remove the reloadable object files - # after they are used. - i=0 - while test "$i" -lt "$k" - do - i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" - done + if (!has_symlinks) + { + return xstrdup (pathspec); + } - $echo "creating a temporary reloadable object file: $output" + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { + lt_fatal ("Could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); +#endif +} - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" +char * +strendzap (char *str, const char *pat) +{ + size_t len, patlen; - libobjs=$output - # Restore the value of output. - output=$save_output + assert (str != NULL); + assert (pat != NULL); - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. + len = strlen (str); + patlen = strlen (pat); - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi + if (patlen <= len) + { + str += len - patlen; + if (strcmp (str, pat) == 0) + *str = '\0'; + } + return str; +} - # Append the command to remove the reloadable object files - # to the just-reset $cmds. - eval cmds=\"\$cmds~\$rm $delfiles\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? +static void +lt_error_core (int exit_status, const char *mode, + const char *message, va_list ap) +{ + fprintf (stderr, "%s: %s: ", program_name, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi + if (exit_status >= 0) + exit (exit_status); +} - exit $lt_exit - } - done - IFS="$save_ifs" +void +lt_fatal (const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + va_end (ap); +} - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? +void +lt_setenv (const char *name, const char *value) +{ + LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", + (name ? name : ""), + (value ? value : ""))); + { +#ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ + char *str = xstrdup (value); + setenv (name, str, 1); +#else + int len = strlen (name) + 1 + strlen (value) + 1; + char *str = XMALLOC (char, len); + sprintf (str, "%s=%s", name, value); + if (putenv (str) != EXIT_SUCCESS) + { + XFREE (str); + } +#endif + } +} - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - fi - fi +char * +lt_extend_str (const char *orig_value, const char *add, int to_end) +{ + char *new_value; + if (orig_value && *orig_value) + { + int orig_value_len = strlen (orig_value); + int add_len = strlen (add); + new_value = XMALLOC (char, add_len + orig_value_len + 1); + if (to_end) + { + strcpy (new_value, orig_value); + strcpy (new_value + orig_value_len, add); + } + else + { + strcpy (new_value, add); + strcpy (new_value + add_len, orig_value); + } + } + else + { + new_value = xstrdup (add); + } + return new_value; +} - exit $EXIT_SUCCESS - fi +int +lt_split_name_value (const char *arg, char** name, char** value) +{ + const char *p; + int len; + if (!arg || !*arg) + return 1; - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? - fi - done + p = strchr (arg, (int)'='); - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; + if (!p) + return 1; - obj) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 - fi + *value = xstrdup (++p); - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 - fi + len = strlen (arg) - strlen (*value); + *name = XMALLOC (char, len); + strncpy (*name, arg, len-1); + (*name)[len - 1] = '\0'; - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 - fi + return 0; +} - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 - fi +void +lt_opt_process_env_set (const char *arg) +{ + char *name = NULL; + char *value = NULL; - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 - fi + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); + } - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 - fi + lt_setenv (name, value); + XFREE (name); + XFREE (value); +} - case $output in - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` - ;; - *) - libobj= - obj="$output" - ;; - esac +void +lt_opt_process_env_prepend (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; - # Delete the old objects. - $run $rm $obj $libobj + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); + } - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= + new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - generated="$generated $gentop" +void +lt_opt_process_env_append (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); + } - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + new_value = lt_extend_str (getenv (name), value, 1); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} - output="$obj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" +void +lt_update_exe_path (const char *name, const char *value) +{ + LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + /* some systems can't cope with a ':'-terminated path #' */ + int len = strlen (new_value); + while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { + new_value[len-1] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); + } +} - exit $EXIT_SUCCESS - fi +void +lt_update_lib_path (const char *name, const char *value) +{ + LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + } +} - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $run eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi +EOF +} +# end: func_emit_cwrapperexe_src - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi +# func_mode_link arg... +func_mode_link () +{ + $opt_debug + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra + # flag for every libtool invocation. + # allow_undefined=no - exit $EXIT_SUCCESS + # FIXME: Unfortunately, there are problems with the above when trying + # to make a dll which has undefined symbols, in which case not + # even a static library is built. For now, we need to specify + # -no-undefined on the libtool link line when we can be certain + # that all symbols are satisfied, otherwise we get a static library. + allow_undefined=yes ;; + *) + allow_undefined=yes + ;; + esac + libtool_args=$nonopt + base_compile="$nonopt $@" + compile_command=$nonopt + finalize_command=$nonopt - prog) - case $host in - *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; - esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 - fi + compile_rpath= + finalize_rpath= + compile_shlibpath= + finalize_shlibpath= + convenience= + old_convenience= + deplibs= + old_deplibs= + compiler_flags= + linker_flags= + dllsearchpath= + lib_search_path=`pwd` + inst_prefix_dir= + new_inherited_linker_flags= - if test "$preload" = yes; then - if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && - test "$dlopen_self_static" = unknown; then - $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." - fi - fi + avoid_version=no + dlfiles= + dlprefiles= + dlself=no + export_dynamic=no + export_symbols= + export_symbols_regex= + generated= + libobjs= + ltlibs= + module=no + no_install=no + objs= + non_pic_objects= + precious_files_regex= + prefer_static_libs=no + preload=no + prev= + prevarg= + release= + rpath= + xrpath= + perm_rpath= + temp_rpath= + thread_safe=no + vinfo= + vinfo_number=no + weak_libs= + single_module="${wl}-single_module" + func_infer_tag $base_compile - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + break + ;; + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + func_warning "complete static linking is impossible in this configuration" + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=built + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac + build_libtool_libs=no + build_old_libs=yes + break ;; esac + done - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - if test "$tagname" = CXX ; then - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - fi - ;; - esac + # See if our shared archives depend on static archives. + test -n "$old_archive_from_new_cmds" && build_old_libs=yes + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg="$1" + shift + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result + func_append libtool_args " $func_quote_for_eval_result" - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + output) + func_append compile_command " @OUTPUT@" + func_append finalize_command " @OUTPUT@" ;; - *) new_libs="$new_libs $deplib" ;; esac - done - compile_deplibs="$new_libs" - - - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + case $prev in + dlfiles|dlprefiles) + if test "$preload" = no; then + # Add the symbol object into the linking commands. + func_append compile_command " @SYMFILE@" + func_append finalize_command " @SYMFILE@" + preload=yes + fi + case $arg in + *.la | *.lo) ;; # We handle these cases below. + force) + if test "$dlself" = no; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + self) + if test "$prev" = dlprefiles; then + dlself=yes + elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + dlself=yes else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac + dlself=needless + export_dynamic=yes fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + prev= + continue + ;; + *) + if test "$prev" = dlfiles; then + dlfiles="$dlfiles $arg" + else + dlprefiles="$dlprefiles $arg" + fi + prev= + continue + ;; esac ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; + expsyms) + export_symbols="$arg" + test -f "$arg" \ + || func_fatal_error "symbol file \`$arg' does not exist" + prev= + continue + ;; + expsyms_regex) + export_symbols_regex="$arg" + prev= + continue + ;; + framework) + case $host in + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; + *) deplibs="$deplibs $qarg.ltframework" # this is fixed later + ;; esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + ;; esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - fi - - dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${outputname}S.c" - else - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - fi - fi - - if test -n "$dlsyms"; then - case $dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${outputname}.nm" - - $show "$rm $nlist ${nlist}S ${nlist}T" - $run $rm "$nlist" "${nlist}S" "${nlist}T" - - # Parse the name list into a source file. - $show "creating $output_objdir/$dlsyms" - - test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ + prev= + continue + ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg + moreargs= + for fil in `cat "$save_arg"` + do +# moreargs="$moreargs $fil" + arg=$fil + # A libtool-controlled object. -#ifdef __cplusplus -extern \"C\" { -#endif + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= -/* Prevent the only kind of declaration conflicts we can make. */ -#define lt_preloaded_symbols some_other_symbol + # Read the .lo file + func_source "$arg" -/* External symbol declarations for the compiler. */\ -" + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi - if test "$dlself" = yes; then - $show "generating symbol list for \`$output'" + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" - test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" - # Add our own program objects to the symbol list. - progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for arg in $progfiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + dlfiles="$dlfiles $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi - if test -n "$exclude_expsyms"; then - $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then - $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - else - $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - fi - fi + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles $pic_object" + prev= + fi - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` - $run eval '$echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi - if test -z "$run"; then - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $mv "$nlist"T "$nlist" - fi + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" - # Try sorting and uniquifying the output. - if grep -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - grep -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' - else - $echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi - - $echo >> "$output_objdir/$dlsyms" "\ - -#undef lt_preloaded_symbols - -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -" - - case $host in - *cygwin* | *mingw* ) - $echo >> "$output_objdir/$dlsyms" "\ -/* DATA imports from DLLs on WIN32 can't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs */ -struct { -" - ;; - * ) - $echo >> "$output_objdir/$dlsyms" "\ -const struct { -" - ;; - esac - - - $echo >> "$output_objdir/$dlsyms" "\ - const char *name; - lt_ptr address; -} -lt_preloaded_symbols[] = -{\ -" - - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" - - $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_preloaded_symbols; -} -#endif + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" -#ifdef __cplusplus -} -#endif\ -" + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + done + else + func_fatal_error "link input file \`$arg' does not exist" fi - - pic_flag_for_symtable= - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag";; - esac + arg=$save_arg + prev= + continue + ;; + precious_regex) + precious_files_regex="$arg" + prev= + continue + ;; + release) + release="-$arg" + prev= + continue + ;; + rpath | xrpath) + # We need an absolute path. + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; esac - - # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" - - # Transform the symbol file into the correct name. - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - else - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - fi - ;; - * ) - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - ;; - esac + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; + *) rpath="$rpath $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; + *) xrpath="$xrpath $arg" ;; + esac + fi + prev= + continue + ;; + shrext) + shrext_cmds="$arg" + prev= + continue + ;; + weak) + weak_libs="$weak_libs $arg" + prev= + continue + ;; + xcclinker) + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) + compiler_flags="$compiler_flags $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" + continue ;; *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit $EXIT_FAILURE + eval "$prev=\"\$arg\"" + prev= + continue ;; esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - fi - - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` - link_command="$compile_command$compile_rpath" + fi # test -n "$prev" - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" - exit_status=$? + prevarg="$arg" - # Delete the generated files. - if test -n "$dlsyms"; then - $show "$rm $output_objdir/${outputname}S.${objext}" - $run $rm "$output_objdir/${outputname}S.${objext}" + case $arg in + -all-static) + if test -n "$link_static_flag"; then + # See comment for -static flag below, for more details. + func_append compile_command " $link_static_flag" + func_append finalize_command " $link_static_flag" fi + continue + ;; - exit $exit_status - fi - - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - fi + -allow-undefined) + # FIXME: remove this flag sometime in the future. + func_fatal_error "\`-allow-undefined' must not be used because it is the default" + ;; - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi + -avoid-version) + avoid_version=yes + continue + ;; - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi + -dlopen) + prev=dlfiles + continue + ;; - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $run $rm $output - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? - exit $EXIT_SUCCESS - fi + -dlpreopen) + prev=dlprefiles + continue + ;; - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" + -export-dynamic) + export_dynamic=yes + continue + ;; - $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 - $echo "$modename: \`$output' will be relinked during installation" 1>&2 - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` - else - # fast_install is set to needless - relink_command= - fi + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + func_fatal_error "more than one -exported-symbols argument is not allowed" + fi + if test "X$arg" = "X-export-symbols"; then + prev=expsyms else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" + prev=expsyms_regex fi - fi - - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + continue + ;; - # Delete the old output files. - $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname + -framework) + prev=framework + continue + ;; - $show "$link_command" - $run eval "$link_command" || exit $? + -inst-prefix-dir) + prev=inst_prefix + continue + ;; - # Now create the wrapper script. - $show "creating $output" + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* + # so, if we see these flags be careful not to treat them like -L + -L[A-Z][A-Z]*:*) + case $with_gcc/$host in + no/*-*-irix* | /*-*-irix*) + func_append compile_command " $arg" + func_append finalize_command " $arg" + ;; + esac + continue + ;; - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" + -L*) + func_stripname '-L' '' "$arg" + dir=$func_stripname_result + if test -z "$dir"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" + func_fatal_error "need path for \`-L' option" fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - fi - - # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + fi + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ + func_fatal_error "cannot determine absolute directory name of \`$dir'" + dir="$absdir" + ;; esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; + case "$deplibs " in + *" -L$dir "*) ;; + *) + deplibs="$deplibs -L$dir" + lib_search_path="$lib_search_path $dir" + ;; esac - # test for cygwin because mv fails w/o .exe extensions case $host in - *cygwin*) - exeext=.exe - outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; + *) dllsearchpath="$dllsearchpath:$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac + ;; esac - case $host in - *cygwin* | *mingw* ) - output_name=`basename $output` - output_path=`dirname $output` - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - cat > $cwrappersource <> $cwrappersource<<"EOF" -#include -#include -#include -#include -#include -#include -#include -#include -#include + -module) + module=yes + continue + ;; -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. + -model|-arch|-isysroot) + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler + continue + ;; -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; + esac + continue + ;; -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif + -multi_module) + single_module="${wl}-multi_module" + continue + ;; -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ + -no-fast-install) + fast_install=no + continue + ;; -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ + -no-install) + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + # The PATH hackery in wrapper scripts is required on Windows + # and Darwin in order for the loader to find any dlls it needs. + func_warning "\`-no-install' is ignored for $host" + func_warning "assuming \`-no-fast-install' instead" + fast_install=no + ;; + *) no_install=yes ;; + esac + continue + ;; -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) + -no-undefined) + allow_undefined=no + continue + ;; -/* -DDEBUG is fairly common in CFLAGS. */ -#undef DEBUG -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif + -objectlist) + prev=objectlist + continue + ;; -const char *program_name = NULL; + -o) prev=output ;; -void * xmalloc (size_t num); -char * xstrdup (const char *string); -const char * base_name (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); -char * strendzap(char *str, const char *pat); -void lt_fatal (const char *message, ...); + -precious-files-regex) + prev=precious_regex + continue + ;; -int -main (int argc, char *argv[]) -{ - char **newargz; - int i; + -release) + prev=release + continue + ;; - program_name = (char *) xstrdup (base_name (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); - newargz = XMALLOC(char *, argc+2); -EOF + -rpath) + prev=rpath + continue + ;; - cat >> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); - /* we know the script has the same name, without the .exe */ - /* so make sure newargz[1] doesn't end in .exe */ - strendzap(newargz[1],".exe"); - for (i = 1; i < argc; i++) - newargz[i+1] = xstrdup(argv[i]); - newargz[argc+1] = NULL; + -R*) + func_stripname '-R' '' "$arg" + dir=$func_stripname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; + *) xrpath="$xrpath $dir" ;; + esac + continue + ;; - for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - return 127; -} + -thread-safe) + thread_safe=yes + continue + ;; -void * -xmalloc (size_t num) -{ - void * p = (void *) malloc (num); - if (!p) - lt_fatal ("Memory exhausted"); + -version-info) + prev=vinfo + continue + ;; - return p; -} + -version-number) + prev=vinfo + vinfo_number=yes + continue + ;; -char * -xstrdup (const char *string) -{ - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -; -} + -weak) + prev=weak + continue + ;; -const char * -base_name (const char *name) -{ - const char *base; + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha ((unsigned char)name[0]) && name[1] == ':') - name += 2; -#endif + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" + linker_flags="$linker_flags $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; - for (base = name; *name; name++) - if (IS_DIR_SEPARATOR (*name)) - base = name + 1; - return base; -} + -Xcompiler) + prev=xcompiler + continue + ;; -int -check_executable(const char * path) -{ - struct stat st; + -Xlinker) + prev=xlinker + continue + ;; - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); - if ((!path) || (!*path)) - return 0; + -XCClinker) + prev=xcclinker + continue + ;; - if ((stat (path, &st) >= 0) && - ( - /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -#if defined (S_IXOTH) - ((st.st_mode & S_IXOTH) == S_IXOTH) || -#endif -#if defined (S_IXGRP) - ((st.st_mode & S_IXGRP) == S_IXGRP) || -#endif - ((st.st_mode & S_IXUSR) == S_IXUSR)) - ) - return 1; - else - return 0; -} + # -msg_* for osf cc + -msg_*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise */ -char * -find_executable (const char* wrapper) -{ - int has_slash = 0; - const char* p; - const char* p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char* concat_name; + # -64, -mips[0-9] enable 64-bit mode on the SGI compiler + # -r[0-9][0-9]* specifies the processor on the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" + compiler_flags="$compiler_flags $arg" + continue + ;; - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + # Some other compiler flag. + -* | +*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; + *.$objext) + # A standard object. + objs="$objs $arg" + ;; - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif + *.lo) + # A libtool-controlled object. - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char* path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char* q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR(*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - return NULL; -} + # Read the .lo file + func_source "$arg" -char * -strendzap(char *str, const char *pat) -{ - size_t len, patlen; + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi - assert(str != NULL); - assert(pat != NULL); + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" - len = strlen(str); - patlen = strlen(pat); + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" - if (patlen <= len) - { - str += len - patlen; - if (strcmp(str, pat) == 0) - *str = '\0'; - } - return str; -} + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + dlfiles="$dlfiles $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi -static void -lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) -{ - fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles $pic_object" + prev= + fi - if (exit_status >= 0) - exit (exit_status); -} + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi -void -lt_fatal (const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); -} -EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" - $echo > $output "\ -#! $SHELL + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + ;; -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' -sed_quote_subst='$sed_quote_subst' + *.$libext) + # An archive. + deplibs="$deplibs $arg" + old_deplibs="$old_deplibs $arg" + continue + ;; -# Be Bourne compatible (taken from Autoconf:_AS_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 + *.la) + # A libtool-controlled library. -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. + dlfiles="$dlfiles $arg" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. + dlprefiles="$dlprefiles $arg" + prev= + else + deplibs="$deplibs $arg" + fi + continue + ;; -relink_command=\"$relink_command\" + # Some other compiler argument. + *) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + esac # arg -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variable: - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$echo are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - echo=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$echo works! - : - else - # Restart under the correct shell, and then maybe \$echo will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ -" - $echo >> $output "\ + # Now actually substitute the argument into the commands. + if test -n "$arg"; then + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + done # argument parsing loop - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. + test -n "$prev" && \ + func_fatal_help "the \`$prevarg' option requires an argument" - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac + oldlibs= + # calculate the name of the file, without its directory + func_basename "$output" + outputname="$func_basename_result" + libobjs_save="$libobjs" + + if test -n "$shlibpath_var"; then + # get the directories listed in $shlibpath_var + eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` + else + shlib_search_path= fi + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" + # Create the object directory. + func_mkdir_p "$output_objdir" + + # Determine the type of output + case $output in + "") + func_fatal_help "you must specify an output file" + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; + *.la) linkmode=lib ;; + *) linkmode=prog ;; # Anything else should be a program. + esac + + specialdeplibs= + + libs= + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do + if $opt_duplicate_deps ; then + case "$libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + libs="$libs $deplib" + done + + if test "$linkmode" = lib; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + esac + pre_post_deps="$pre_post_deps $pre_post_dep" + done + fi + pre_post_deps= + fi + + deplibs= + newdependency_libs= + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries + + case $linkmode in + lib) + passes="conv dlpreopen link" + for file in $dlfiles $dlprefiles; do + case $file in + *.la) ;; + *) + func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + ;; + esac + done + ;; + prog) + compile_deplibs= + finalize_deplibs= + alldeplibs=no + newdlfiles= + newdlprefiles= + passes="conv scan dlopen dlpreopen link" + ;; + *) passes="conv" + ;; + esac + + for pass in $passes; do + # The preopen pass in lib mode reverses $deplibs; put it back here + # so that -L comes before libs that need it for instance... + if test "$linkmode,$pass" = "lib,link"; then + ## FIXME: Find the place where the list is rebuilt in the wrong + ## order, and fix it there properly + tmp_deplibs= + for deplib in $deplibs; do + tmp_deplibs="$deplib $tmp_deplibs" + done + deplibs="$tmp_deplibs" + fi + + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan"; then + libs="$deplibs" + deplibs= + fi + if test "$linkmode" = prog; then + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then + # Collect and forward deplibs of preopened libtool libs + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= + case $lib in + *.la) func_source "$lib" ;; + esac + + # Collect preopened libtool deplibs, except any this library + # has declared as weak libs + for deplib in $dependency_libs; do + deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` + case " $weak_libs " in + *" $deplib_base "*) ;; + *) deplibs="$deplibs $deplib" ;; + esac + done + done + libs="$dlprefiles" + fi + if test "$pass" = dlopen; then + # Collect dlpreopened libraries + save_deplibs="$deplibs" + deplibs= + fi + + for deplib in $libs; do + lib= + found=no + case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + compiler_flags="$compiler_flags $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + esac + fi + fi + continue + ;; + -l*) + if test "$linkmode" != lib && test "$linkmode" != prog; then + func_warning "\`-l' is ignored for archives/objects" + continue + fi + func_stripname '-l' '' "$deplib" + name=$func_stripname_result + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then + if test "$search_ext" = ".la"; then + found=yes + else + found=no + fi + break 2 + fi + done + done + if test "$found" != yes; then + # deplib doesn't seem to be a libtool library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + else # deplib is a libtool library + # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, + # We need to do some special things here, and not later. + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + fi + fi + ;; # -l + *.ltframework) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + esac + fi + fi + continue + ;; + -L*) + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" + newlib_search_path="$newlib_search_path $func_stripname_result" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" + newlib_search_path="$newlib_search_path $func_stripname_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" + ;; + esac # linkmode + continue + ;; # -L + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" + dir=$func_stripname_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; + *) xrpath="$xrpath $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; + *.la) lib="$deplib" ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + case $linkmode in + lib) + # Linking convenience modules into shared libraries is allowed, + # but linking other static libraries is non-portable. + case " $dlpreconveniencelibs " in + *" $deplib "*) ;; + *) + valid_a_lib=no + case $deplibs_check_method in + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then + valid_a_lib=yes + fi + ;; + pass_all) + valid_a_lib=yes + ;; + esac + if test "$valid_a_lib" != yes; then + $ECHO + $ECHO "*** Warning: Trying to link with static lib archive $deplib." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because the file extensions .$libext of this argument makes me believe" + $ECHO "*** that it is just a static archive that I should not use here." + else + $ECHO + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + fi + ;; + esac + continue + ;; + prog) + if test "$pass" != link; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + continue + ;; + esac # linkmode + ;; # *.$libext + *.lo | *.$objext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + elif test "$linkmode" = prog; then + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + newdlprefiles="$newdlprefiles $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + newdlfiles="$newdlfiles $deplib" + fi + fi + continue + ;; + %DEPLIBS%) + alldeplibs=yes + continue + ;; + esac # case $deplib + + if test "$found" = yes || test -f "$lib"; then : + else + func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" + fi + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$lib" \ + || func_fatal_error "\`$lib' is not a valid libtool archive" + + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + + dlname= + dlopen= + dlpreopen= + libdir= + library_names= + old_library= + inherited_linker_flags= + # If the library was installed with an old release of libtool, + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no + avoidtemprpath= + + + # Read the .la file + func_source "$lib" + + # Convert "-framework foo" to "foo.ltframework" + if test -n "$inherited_linker_flags"; then + tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; + *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; + esac + done + fi + dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then + test -n "$dlopen" && dlfiles="$dlfiles $dlopen" + test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" + fi + + if test "$pass" = conv; then + # Only check for convenience libraries + deplibs="$lib $deplibs" + if test -z "$libdir"; then + if test -z "$old_library"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done + continue + fi # $pass = conv + + + # Get the name of the library we link against. + linklib= + for l in $old_library $library_names; do + linklib="$l" + done + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + + # This library was specified with -dlopen. + if test "$pass" = dlopen; then + if test -z "$libdir"; then + func_fatal_error "cannot -dlopen a convenience library: \`$lib'" + fi + if test -z "$dlname" || + test "$dlopen_support" != yes || + test "$build_libtool_libs" = no; then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. + dlprefiles="$dlprefiles $lib $dependency_libs" + else + newdlfiles="$newdlfiles $lib" + fi + continue + fi # $pass = dlopen + + # We need an absolute path. + case $ladir in + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + *) + abs_ladir=`cd "$ladir" && pwd` + if test -z "$abs_ladir"; then + func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "passing it literally to the linker, although it might fail" + abs_ladir="$ladir" + fi + ;; + esac + func_basename "$lib" + laname="$func_basename_result" + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then + if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else + dir="$libdir" + absdir="$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" + name=$func_stripname_result + + # This library was specified with -dlpreopen. + if test "$pass" = dlpreopen; then + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + newdlprefiles="$newdlprefiles $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + newdlprefiles="$newdlprefiles $dir/$dlname" + else + newdlprefiles="$newdlprefiles $dir/$linklib" + fi + fi # $pass = dlpreopen + + if test -z "$libdir"; then + # Link the convenience library + if test "$linkmode" = lib; then + deplibs="$dir/$old_library $deplibs" + elif test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$dir/$old_library $compile_deplibs" + finalize_deplibs="$dir/$old_library $finalize_deplibs" + else + deplibs="$lib $deplibs" # used for prog,scan pass + fi + continue + fi + + + if test "$linkmode" = prog && test "$pass" != link; then + newlib_search_path="$newlib_search_path $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no + if test "$link_all_deplibs" != no || test -z "$library_names" || + test "$build_libtool_libs" = no; then + linkalldeplibs=yes + fi + + tmp_libs= + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + newlib_search_path="$newlib_search_path $func_stripname_result" + ;; + esac + # Need to link against all dependency_libs? + if test "$linkalldeplibs" = yes; then + deplibs="$deplib $deplibs" + else + # Need to hardcode shared library paths + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done # for deplib + continue + fi # $linkmode = prog... + + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then + # We need to hardcode the library path + if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; + *) temp_rpath="$temp_rpath$absdir:" ;; + esac + fi + + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) compile_rpath="$compile_rpath $absdir" + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" + esac + ;; + esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && + { test "$deplibs_check_method" = pass_all || + { test "$build_libtool_libs" = yes && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue + fi + fi + + link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes; then + use_static_libs=no + fi + if test -n "$library_names" && + { test "$use_static_libs" = no || test -z "$old_library"; }; then + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded + notinst_deplibs="$notinst_deplibs $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then + notinst_deplibs="$notinst_deplibs $lib" + need_relink=yes + fi + ;; + esac + # This is a shared library + + # Warn about portability, can't link against -module's on some + # systems (darwin). Don't bleat about dlopened modules though! + dlopenmodule="" + for dlpremoduletest in $dlprefiles; do + if test "X$dlpremoduletest" = "X$lib"; then + dlopenmodule="$dlpremoduletest" + break + fi + done + if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + $ECHO + if test "$linkmode" = prog; then + $ECHO "*** Warning: Linking the executable $output against the loadable module" + else + $ECHO "*** Warning: Linking the shared library $output against the loadable module" + fi + $ECHO "*** $linklib is not portable!" + fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) compile_rpath="$compile_rpath $absdir" + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" + esac + ;; + esac + fi + + if test -n "$old_archive_from_expsyms_cmds"; then + # figure out the soname + set dummy $library_names + shift + realname="$1" + shift + libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" + elif test -n "$soname_spec"; then + # bleh windows + case $host in + *cygwin* | mingw* | *cegcc*) + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + esac + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + + # Make a new name for the extract_expsyms_cmds to use + soroot="$soname" + func_basename "$soroot" + soname="$func_basename_result" + func_stripname 'lib' '.dll' "$soname" + newlib=libimp-$func_stripname_result.a + + # If the library has no export list, then create one now + if test -f "$output_objdir/$soname-def"; then : + else + func_verbose "extracting exported symbol list from \`$soname'" + func_execute_cmds "$extract_expsyms_cmds" 'exit $?' + fi + + # Create $newlib + if test -f "$output_objdir/$newlib"; then :; else + func_verbose "generating import library for \`$soname'" + func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' + fi + # make sure the library variables are pointing to the new library + dir=$output_objdir + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + + if test "$linkmode" = prog || test "$mode" != relink; then + add_shlibpath= + add_dir= + add= + lib_linked=yes + case $hardcode_action in + immediate | unsupported) + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + case $host in + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; + *-*-darwin* ) + # if the lib is a (non-dlopened) module then we can not + # link against it, someone is ignoring the earlier warnings + if /usr/bin/file -L $add 2> /dev/null | + $GREP ": [^:]* bundle" >/dev/null ; then + if test "X$dlopenmodule" != "X$lib"; then + $ECHO "*** Warning: lib $linklib is a module, not a shared library" + if test -z "$old_library" ; then + $ECHO + $ECHO "*** And there doesn't seem to be a static archive available" + $ECHO "*** The link will probably fail, sorry" + else + add="$dir/$old_library" + fi + elif test -n "$old_library"; then + add="$dir/$old_library" + fi + fi + esac + elif test "$hardcode_minus_L" = no; then + case $host in + *-*-sunos*) add_shlibpath="$dir" ;; + esac + add_dir="-L$dir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = no; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + relink) + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$dir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$dir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + *) lib_linked=no ;; + esac + + if test "$lib_linked" != yes; then + func_fatal_configuration "unsupported hardcode properties" + fi + + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; + *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then + test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" + test -n "$add" && compile_deplibs="$add $compile_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + if test "$hardcode_direct" != yes && + test "$hardcode_minus_L" != yes && + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + esac + fi + fi + fi + + if test "$linkmode" = prog || test "$mode" = relink; then + add_shlibpath= + add_dir= + add= + # Finalize command for both is simple: just hardcode it. + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$libdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$libdir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" + fi + else + # We cannot seem to hardcode it, guess we'll fake it. + add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + fi + + if test "$linkmode" = prog; then + test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" + test -n "$add" && finalize_deplibs="$add $finalize_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + fi + fi + elif test "$linkmode" = prog; then + # Here we assume that one of hardcode_direct or hardcode_minus_L + # is not unsupported. This is valid on all known static and + # shared platforms. + if test "$hardcode_direct" != unsupported; then + test -n "$old_library" && linklib="$old_library" + compile_deplibs="$dir/$linklib $compile_deplibs" + finalize_deplibs="$dir/$linklib $finalize_deplibs" + else + compile_deplibs="-l$name -L$dir $compile_deplibs" + finalize_deplibs="-l$name -L$dir $finalize_deplibs" + fi + elif test "$build_libtool_libs" = yes; then + # Not a shared library + if test "$deplibs_check_method" != pass_all; then + # We're trying link a shared library against a static one + # but the system doesn't support it. + + # Just print a warning and add the library to dependency_libs so + # that the program can be linked against the static library. + $ECHO + $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have." + if test "$module" = yes; then + $ECHO "*** But as you try to build a module library, libtool will still create " + $ECHO "*** a static module, that should work as long as the dlopening application" + $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." + if test -z "$global_symbol_pipe"; then + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + else + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test "$linkmode" = lib; then + if test -n "$dependency_libs" && + { test "$hardcode_into_libs" != yes || + test "$build_old_libs" = yes || + test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do + case $libdir in + -R*) func_stripname '-R' '' "$libdir" + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; + *) xrpath="$xrpath $temp_xrpath";; + esac;; + *) temp_deplibs="$temp_deplibs $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + + newlib_search_path="$newlib_search_path $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done + + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do + case $deplib in + -L*) path="$deplib" ;; + *.la) + func_dirname "$deplib" "" "." + dir="$func_dirname_result" + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + func_warning "cannot determine absolute directory name of \`$dir'" + absdir="$dir" + fi + ;; + esac + if $GREP "^installed=no" $deplib > /dev/null; then + case $host in + *-*-darwin*) + depdepl= + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done + if test -f "$absdir/$objdir/$depdepl" ; then + depdepl="$absdir/$objdir/$depdepl" + darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -z "$darwin_install_name"; then + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi + compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" + path= + fi + fi + ;; + *) + path="-L$absdir/$objdir" + ;; + esac + else + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ + func_warning "\`$deplib' seems to be moved" + + path="-L$absdir" + fi + ;; + esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$path $deplibs" ;; + esac + done + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs + if test "$pass" = link; then + if test "$linkmode" = "prog"; then + compile_deplibs="$new_inherited_linker_flags $compile_deplibs" + finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" + else + compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + fi + fi + dependency_libs="$newdependency_libs" + if test "$pass" = dlpreopen; then + # Link the dlpreopened libraries before other libraries + for deplib in $save_deplibs; do + deplibs="$deplib $deplibs" + done + fi + if test "$pass" != dlopen; then + if test "$pass" != conv; then + # Make sure lib_search_path contains only unique directories. + lib_search_path= + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; + *) lib_search_path="$lib_search_path $dir" ;; + esac + done + newlib_search_path= + fi + + if test "$linkmode,$pass" != "prog,link"; then + vars="deplibs" + else + vars="compile_deplibs finalize_deplibs" + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order + eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so + # that some nasty dependency loop isn't accidentally + # broken: + #new_libs="$deplib $new_libs" + # Pragmatically, this seems to cause very few problems in + # practice: + case $deplib in + -L*) new_libs="$deplib $new_libs" ;; + -R*) ;; + *) + # And here is the reason: when a library appears more + # than once as an explicit dependence of a library, or + # is implicitly linked in more than once by the + # compiler, it is considered special, and multiple + # occurrences thereof are not removed. Compare this + # with having the same library being listed as a + # dependency of multiple other libraries: in this case, + # we know (pedantically, we assume) the library does not + # need to be listed more than once, so we keep only the + # last copy. This is not always right, but it is rare + # enough that we require users that really mean to play + # such unportable linking tricks to link the library + # using -Wl,-lname, so that libtool does not consider it + # for duplicate removal. + case " $specialdeplibs " in + *" $deplib "*) new_libs="$deplib $new_libs" ;; + *) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$deplib $new_libs" ;; + esac + ;; + esac + ;; + esac + done + tmp_libs= + for deplib in $new_libs; do + case $deplib in + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; + *) tmp_libs="$tmp_libs $deplib" ;; + esac + ;; + *) tmp_libs="$tmp_libs $deplib" ;; + esac + done + eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) + i="" + ;; + esac + if test -n "$i" ; then + tmp_libs="$tmp_libs $i" + fi + done + dependency_libs=$tmp_libs + done # for pass + if test "$linkmode" = prog; then + dlfiles="$newdlfiles" + fi + if test "$linkmode" = prog || test "$linkmode" = lib; then + dlprefiles="$newdlprefiles" + fi + + case $linkmode in + oldlib) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for archives" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for archives" ;; + esac + + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for archives" + + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for archives" + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for archives" + + test -n "$release" && \ + func_warning "\`-release' is ignored for archives" + + test -n "$export_symbols$export_symbols_regex" && \ + func_warning "\`-export-symbols' is ignored for archives" + + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" + objs="$objs$old_deplibs" + ;; + + lib) + # Make sure we only generate libraries of the form `libNAME.la'. + case $outputname in + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ + func_fatal_help "libtool library \`$output' must begin with \`lib'" + + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result + fi + ;; + esac + + if test -n "$objs"; then + if test "$deplibs_check_method" != pass_all; then + func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + else + $ECHO + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" + libobjs="$libobjs $objs" + fi + fi + + test "$dlself" != no && \ + func_warning "\`-dlopen self' is ignored for libtool libraries" + + set dummy $rpath + shift + test "$#" -gt 1 && \ + func_warning "ignoring multiple \`-rpath's for a libtool library" + + install_libdir="$1" + + oldlibs= + if test -z "$rpath"; then + if test "$build_libtool_libs" = yes; then + # Building a libtool convenience library. + # Some compilers have problems with a `.al' extension so + # convenience libraries should have the same extension an + # archive normally would. + oldlibs="$output_objdir/$libname.$libext $oldlibs" + build_libtool_libs=convenience + build_old_libs=yes + fi + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + + test -n "$release" && \ + func_warning "\`-release' is ignored for convenience libraries" + else + + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 + shift + IFS="$save_ifs" + + test -n "$7" && \ + func_fatal_help "too many parameters to \`-version-info'" + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible + + case $vinfo_number in + yes) + number_major="$1" + number_minor="$2" + number_revision="$3" + # + # There are really only two kinds -- those that + # use the current revision as the major version + # and those that subtract age and use age as + # a minor version. But, then there is irix + # which has an extra 1 added just for fun + # + case $version_type in + darwin|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|sunos) + current="$number_major" + revision="$number_minor" + age="0" + ;; + irix|nonstopux) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_minor" + lt_irix_increment=no + ;; + esac + ;; + no) + current="$1" + revision="$2" + age="$3" + ;; + esac + + # Check that each of the things are valid numbers. + case $current in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "CURRENT \`$current' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $revision in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "REVISION \`$revision' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $age in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "AGE \`$age' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + if test "$age" -gt "$current"; then + func_error "AGE \`$age' is greater than the current interface number \`$current'" + func_fatal_error "\`$vinfo' is not valid version information" + fi + + # Calculate the version variables. + major= + versuffix= + verstring= + case $version_type in + none) ;; + + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... + func_arith $current + 1 + minor_current=$func_arith_result + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + + freebsd-aout) + major=".$current" + versuffix=".$current.$revision"; + ;; + + freebsd-elf) + major=".$current" + versuffix=".$current" + ;; + + irix | nonstopux) + if test "X$lt_irix_increment" = "Xno"; then + func_arith $current - $age + else + func_arith $current - $age + 1 + fi + major=$func_arith_result + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; + esac + verstring="$verstring_prefix$major.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$revision + while test "$loop" -ne 0; do + func_arith $revision - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring_prefix$major.$iface:$verstring" + done + + # Before this point, $major must not contain `.'. + major=.$major + versuffix="$major.$revision" + ;; + + linux) + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + ;; + + osf) + func_arith $current - $age + major=.$func_arith_result + versuffix=".$current.$age.$revision" + verstring="$current.$age.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$age + while test "$loop" -ne 0; do + func_arith $current - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring:${iface}.0" + done + + # Make executables depend on our current version. + verstring="$verstring:${current}.0" + ;; + + qnx) + major=".$current" + versuffix=".$current" + ;; + + sunos) + major=".$current" + versuffix=".$current.$revision" + ;; + + windows) + # Use '-' rather than '.', since we only want one + # extension on DOS 8.3 filesystems. + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + + *) + func_fatal_configuration "unknown library version type \`$version_type'" + ;; + esac + + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring= + ;; + *) + verstring="0.0" + ;; + esac + if test "$need_version" = no; then + versuffix= + else + versuffix=".0.0" + fi + fi + + # Remove version info from name if versioning should be avoided + if test "$avoid_version" = yes && test "$need_version" = no; then + major= + versuffix= + verstring="" + fi + + # Check to see if the archive will have undefined symbols. + if test "$allow_undefined" = yes; then + if test "$allow_undefined_flag" = unsupported; then + func_warning "undefined symbols not allowed in $host shared libraries" + build_libtool_libs=no + build_old_libs=yes + fi + else + # Don't allow undefined symbols. + allow_undefined_flag="$no_undefined_flag" + fi + + fi + + func_generate_dlsyms "$libname" "$libname" "yes" + libobjs="$libobjs $symfileobj" + test "X$libobjs" = "X " && libobjs= + + if test "$mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= + tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in + *.$objext | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then + if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi + removelist="$removelist $p" + ;; + *) ;; + esac + done + test -n "$removelist" && \ + func_show_eval "${RM}r \$removelist" + fi + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + oldlibs="$oldlibs $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + fi + + # Eliminate all temporary directories. + #for path in $notinst_path; do + # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` + # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` + # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` + #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do + temp_xrpath="$temp_xrpath -R$libdir" + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi + + # Make sure dlfiles contains only unique files that won't be dlpreopened + old_dlfiles="$dlfiles" + dlfiles= + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; + *) dlfiles="$dlfiles $lib" ;; + esac + done + + # Make sure dlprefiles contains only unique files + old_dlprefiles="$dlprefiles" + dlprefiles= + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; + *) dlprefiles="$dlprefiles $lib" ;; + esac + done + + if test "$build_libtool_libs" = yes; then + if test -n "$rpath"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + # these systems don't actually have a c library (as such)! + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + deplibs="$deplibs System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then + deplibs="$deplibs -lc" + fi + ;; + esac + fi + + # Transform deplibs into only deplibs that can be linked in shared. + name_save=$name + libname_save=$libname + release_save=$release + versuffix_save=$versuffix + major_save=$major + # I'm not sure if I'm treating the release correctly. I think + # release should show up in the -l (ie -lgmp5) so we don't want to + # add it in twice. Is that correct? + release="" + versuffix="" + major="" + newdeplibs= + droppeddeps=no + case $deplibs_check_method in + pass_all) + # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behavior. + newdeplibs=$deplibs + ;; + test_compile) + # This code stresses the "libraries are programs" paradigm to its + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. + $opt_dry_run || $RM conftest.c + cat > conftest.c </dev/null` + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | + $GREP " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an + # endless loop below, in case of cyclic links. + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? + potlib="$potent_lib" + while test -h "$potlib" 2>/dev/null; do + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + case $potliblink in + [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; + *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + esac + done + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + $ECHO + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for file magic test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a file magic. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + newdeplibs="$newdeplibs $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + for a_deplib in $deplibs; do + case $a_deplib in + -l*) + func_stripname -l '' "$a_deplib" + name=$func_stripname_result + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then + libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + $ECHO + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a regex pattern. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + newdeplibs="$newdeplibs $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + none | unknown | *) + newdeplibs="" + tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ + -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + for i in $predeps $postdeps ; do + # can't use Xsed below, because $i might contain '/' + tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` + done + fi + if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | + $GREP . >/dev/null; then + $ECHO + if test "X$deplibs_check_method" = "Xnone"; then + $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + else + $ECHO "*** Warning: inter-library dependencies are not known to be supported." + fi + $ECHO "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + fi + ;; + esac + versuffix=$versuffix_save + major=$major_save + release=$release_save + libname=$libname_save + name=$name_save + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library with the System framework + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + ;; + esac + + if test "$droppeddeps" = yes; then + if test "$module" = yes; then + $ECHO + $ECHO "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO "*** dependencies of module $libname. Therefore, libtool will create" + $ECHO "*** a static module, that should work as long as the dlopening" + $ECHO "*** application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + else + $ECHO "*** The inter-library dependencies that have been dropped here will be" + $ECHO "*** automatically added whenever a program is linked with this library" + $ECHO "*** or is declared to -dlopen it." + + if test "$allow_undefined" = no; then + $ECHO + $ECHO "*** Since this library must not contain undefined symbols," + $ECHO "*** because either the platform does not support them or" + $ECHO "*** it was explicitly requested with -no-undefined," + $ECHO "*** libtool will only create a static version of it." + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + fi + fi + # Done checking deplibs! + deplibs=$newdeplibs + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + case $host in + *-*-darwin*) + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= + dlname= + + # Test again, we may have decided not to build it any more + if test "$build_libtool_libs" = yes; then + if test "$hardcode_into_libs" = yes; then + # Hardcode the library paths + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" + test "$mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + dep_rpath="$dep_rpath $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + rpath="$rpath$dir:" + done + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" + shlibpath="$finalize_shlibpath" + test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi - if test "$fast_install" = yes; then - $echo >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" + # Get the real and link names of the library. + eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift - if test ! -f \"\$progdir/\$program\" || \\ - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + if test -z "$dlname"; then + dlname=$soname + fi - file=\"\$\$-\$program\" + lib="$output_objdir/$realname" + linknames= + for link + do + linknames="$linknames $link" + done - if test ! -d \"\$progdir\"; then - $mkdir \"\$progdir\" - else - $rm \"\$progdir/\$file\" - fi" + # Use standard objects if they are pic + test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + test "X$libobjs" = "X " && libobjs= - $echo >> $output "\ + delfiles= + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" + delfiles="$delfiles $export_symbols" + fi + + orig_export_symbols= + case $host_os in + cygwin* | mingw* | cegcc*) + if test -n "$export_symbols" && test -z "$export_symbols_regex"; then + # exporting using user supplied symfile + if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + # and it's NOT already a .def file. Must figure out + # which of the given symbols are data symbols and tag + # them as such. So, trigger use of export_symbols_cmds. + # export_symbols gets reassigned inside the "prepare + # the list of exported symbols" if statement, so the + # include_expsyms logic still works. + orig_export_symbols="$export_symbols" + export_symbols= + always_export_symbols=yes + fi + fi + ;; + esac - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" - exit $EXIT_FAILURE - fi - fi + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + eval cmd=\"$cmd\" + func_len " $cmd" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + else + # The command line is too long to execute in one step. + func_verbose "using reloadable object file for export list..." + skipped_export=: + # Break out early, otherwise skipped_export may be + # set to false by a later but shorter cmd. + break + fi + done + IFS="$save_ifs" + if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + fi - $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $rm \"\$progdir/\$program\"; - $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $rm \"\$progdir/\$file\" - fi" - else - $echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - $echo >> $output "\ + tmp_deplibs= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) + tmp_deplibs="$tmp_deplibs $test_deplib" + ;; + esac + done + deplibs="$tmp_deplibs" - if test -f \"\$progdir/\$program\"; then" + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec" && + test "$compiler_needs_object" = yes && + test -z "$libobjs"; then + # extract the archives, so we have objects to list. + # TODO: could optimize this to just extract one archive. + whole_archive_flag_spec= + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + func_extract_archives $gentop $convenience + libobjs="$libobjs $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + linker_flags="$linker_flags $flag" + fi - export $shlibpath_var -" + # Make a backup of the uninstalled library when relinking + if test "$mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $echo >> $output "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi fi - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; + if test "X$skipped_export" != "X:" && + func_len " $test_cmds" && + len=$func_len_result && + test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # The command line is too long to link in one step, link piecewise + # or, if using GNU ld and skipped_export is not :, use a linker + # script. - *) - $echo >> $output "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \$*\" - exit $EXIT_FAILURE - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - $echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit $EXIT_FAILURE - fi -fi\ -" - chmod +x $output - fi - exit $EXIT_SUCCESS - ;; - esac + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we + # want to use save_libobjs as it was before + # whole_archive_flag_spec was expanded, because we can't + # assume the linker understands whole_archive_flag_spec. + # This may have to be revisited, in case too many + # convenience libraries get linked in and end up exceeding + # the spec. + if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + fi + save_output=$output + output_la=`$ECHO "X$output" | $Xsed -e "$basename"` - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= + last_robj= + k=1 - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - fi - addlibs="$old_convenience" - fi + if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then + output=${output_objdir}/${output_la}.lnkscript + func_verbose "creating GNU ld script: $output" + $ECHO 'INPUT (' > $output + for obj in $save_libobjs + do + $ECHO "$obj" >> $output + done + $ECHO ')' >> $output + delfiles="$delfiles $output" + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" + : > $output + set x $save_libobjs + shift + firstobj= + if test "$compiler_needs_object" = yes; then + firstobj="$1 " + shift + fi + for obj + do + $ECHO "$obj" >> $output + done + delfiles="$delfiles $output" + output=$firstobj\"$file_list_spec$output\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext + eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + if test "X$objlist" = X || + test "$len" -lt "$max_cmd_len"; then + func_append objlist " $obj" + else + # The command $test_cmds is almost too long, add a + # command to the queue. + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + eval concat_cmds=\"$reload_cmds $objlist $last_robj\" + else + # All subsequent reloadable object files will link in + # the last one created. + eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 + k=$func_arith_result + output=$output_objdir/$output_la-${k}.$objext + objlist=$obj + func_len " $last_robj" + func_arith $len0 + $func_len_result + len=$func_arith_result + fi + done + # Handle the remaining objects by creating one last + # reloadable object file. All subsequent reloadable object + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + if test -n "$last_robj"; then + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi + delfiles="$delfiles $output" - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + else + output= + fi - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" - fi + if ${skipped_export-false}; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "copying selected object files to avoid basename conflicts..." + test -n "$save_libobjs" && + func_verbose "creating a temporary reloadable object file: $output" - if test -z "$gentop"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + # Loop through the commands generated above and execute them. + save_ifs="$IFS"; IFS='~' + for cmd in $concat_cmds; do + IFS="$save_ifs" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$gentop"; then - exit $exit_status + exit $lt_exit + } + done + IFS="$save_ifs" + + if test -n "$export_symbols_regex" && ${skipped_export-false}; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi fi - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - $run ln "$obj" "$gentop/$newobj" || - $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi + if ${skipped_export-false}; then + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + fi - eval cmds=\"$old_archive_cmds\" + libobjs=$output + # Restore the value of output. + output=$save_output - if len=`expr "X$cmds" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - $echo "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - for obj in $save_oldobjs - do - oldobjs="$objlist $obj" - objlist="$objlist $obj" - eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; then - : + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= + cmds=$module_cmds fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + cmds=$archive_expsym_cmds + else + cmds=$archive_cmds + fi fi fi - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - eval cmd=\"$cmd\" - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - if test -n "$generated"; then - $show "${rm}r$generated" - $run ${rm}r$generated - fi + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. + eval cmds=\"\$cmds~\$RM $delfiles\" + fi - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - $show "creating $output" + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" + func_extract_archives $gentop $dlprefiles + libobjs="$libobjs $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? - # Only create the output if not a dry run. - if test -z "$run"; then - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break + # Restore the uninstalled library and exit + if test "$mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlfiles="$newdlfiles $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlprefiles="$newdlprefiles $abs" - done - dlprefiles="$newdlprefiles" - fi - $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $echo > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' -# Version information for $libname. -current=$current -age=$age -revision=$revision + exit $lt_exit + } + done + IFS="$save_ifs" -# Is this an already installed library? -installed=$installed + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? -# Should we warn about portability when linking against -modules? -shouldnotlink=$module + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then + func_show_eval '${RM}r "$gentop"' + fi + fi -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' + exit $EXIT_SUCCESS + fi -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $echo >> $output "\ -relink_command=\"$relink_command\"" + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' fi done - fi - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? + # If -module or -export-dynamic was specified, set the dlname. + if test "$module" = yes || test "$export_dynamic" = yes; then + # On all known operating systems, these are identical. + dlname="$soname" + fi + fi ;; - esac - exit $EXIT_SUCCESS - ;; - # libtool install mode - install) - modename="$modename: install" + obj) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for objects" + fi - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for objects" ;; esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg=$nonopt - fi - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for objects" + + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for objects" + + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for objects" + + test -n "$release" && \ + func_warning "\`-release' is ignored for objects" - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest=$arg - continue - fi + case $output in + *.lo) + test -n "$objs$old_deplibs" && \ + func_fatal_error "cannot build library object \`$output' from non-libtool objects" - case $arg in - -d) isdir=yes ;; - -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac - ;; - -g | -m | -o) prev=$arg ;; - -s) - stripme=" -s" - continue - ;; - -*) + libobj=$output + func_lo2o "$libobj" + obj=$func_lo2o_result ;; *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest=$arg - continue - fi + libobj= + obj="$output" ;; esac - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done + # Delete the old objects. + $opt_dry_run || $RM $obj $libobj - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # the extraction. + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. + wl= - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + else + gentop="$output_objdir/${obj}x" + generated="$generated $gentop" - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi fi - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` + output="$obj" + func_execute_cmds "$reload_cmds" 'exit $?' - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + # Exit if we aren't doing a library object file. + if test -z "$libobj"; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS fi - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done + + if test "$build_libtool_libs" != yes; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi + + if test -n "$pic_flag" || test "$pic_mode" != default; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" + func_execute_cmds "$reload_cmds" 'exit $?' + fi + + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS ;; - esac - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" + prog) + case $host in + *cygwin*) func_stripname '' '.exe' "$output" + output=$func_stripname_result.exe;; + esac + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for programs" - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do + test -n "$release" && \ + func_warning "\`-release' is ignored for programs" - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - staticlibs="$staticlibs $file" + test "$preload" = yes \ + && test "$dlopen_support" = unknown \ + && test "$dlopen_self" = unknown \ + && test "$dlopen_self_static" = unknown && \ + func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ;; + esac - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + case $host in + *-*-darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + # But is supposedly fixed on 10.4 or later (yay!). + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" + ;; + esac fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac - library_names= - old_library= - relink_command= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; esac - fi + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - if test "$inst_prefix_dir" = "$destdir"; then - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit $EXIT_FAILURE - fi + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. + for libdir in $rpath $xrpath; do + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; + esac + done + fi - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` + # Now hardcode the library paths + rpath= + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi else - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` + eval flag=\"$hardcode_libdir_flag_spec\" + rpath="$rpath $flag" fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; + *) dllsearchpath="$dllsearchpath:$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac + ;; + esac + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" - $echo "$modename: warning: relinking \`$file'" 1>&2 - $show "$relink_command" - if $run eval "$relink_command"; then : + rpath= + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit $EXIT_FAILURE + eval flag=\"$hardcode_libdir_flag_spec\" + rpath="$rpath $flag" fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; + *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + esac fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift + if test -n "$libobjs" && test "$build_old_libs" = yes; then + # Transform all the library objects into standard objects. + compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + fi - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$srcname $destdir/$realname" - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? - if test -n "$stripme" && test -n "$striplib"; then - $show "$striplib $destdir/$realname" - $run eval "$striplib $destdir/$realname" || exit $? - fi + # template prelinking step + if test -n "$prelink_cmds"; then + func_execute_cmds "$prelink_cmds" 'exit $?' + fi - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - if test "$linkname" != "$realname"; then - $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - fi - done - fi + wrappers_required=yes + case $host in + *cygwin* | *mingw* ) + if test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + *cegcc) + # Disable wrappers for cegcc, we are cross compiling anyway. + wrappers_required=no + ;; + *) + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + esac + if test "$wrappers_required" = no; then + # Replace the output file specification. + compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + link_command="$compile_command$compile_rpath" - # Do each command in the postinstall commands. - lib="$destdir/$realname" - cmds=$postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi + # We have no uninstalled library dependencies, so finalize right now. + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' - exit $lt_exit - } - done - IFS="$save_ifs" + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' fi - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; + exit $exit_status + fi - *.lo) - # Install (i.e. copy) a libtool object. + if test -n "$compile_shlibpath$finalize_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" + compile_var= + finalize_var= + if test -n "$runpath_var"; then + if test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + rpath="$rpath$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? + if test -n "$finalize_perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do + rpath="$rpath$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi + fi - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi + if test "$no_install" = yes; then + # We don't need to create a wrapper script. + link_command="$compile_var$compile_command$compile_rpath" + # Replace the output file specification. + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + # Delete the old output file. + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' exit $EXIT_SUCCESS - ;; + fi - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" + if test "$hardcode_action" = relink; then + # Fast installation is not supported + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "\`$output' will be relinked during installation" + else + if test "$fast_install" != no; then + link_command="$finalize_var$compile_command$finalize_rpath" + if test "$fast_install" = yes; then + relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + else + # fast_install is set to needless + relink_command= + fi else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" fi + fi - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - file=`$echo $file|${SED} 's,.exe$,,'` - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin*|*mingw*) - wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` - ;; - *) - wrapper=$file - ;; - esac - if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then - notinst_deplibs= - relink_command= - - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit $EXIT_FAILURE - fi + # Replace the output file specification. + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done + # Delete the old output files. + $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - relink_command= - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac + func_show_eval "$link_command" 'exit $?' - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - if test "$finalize" = yes && test -z "$run"; then - tmpdir=`func_mktempdir` - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` + # Now create the wrapper script. + func_verbose "creating $output" - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - ${rm}r "$tmpdir" - continue - fi - file="$outputname" - else - $echo "$modename: warning: cannot relink \`$file'" 1>&2 - fi + # Quote the relink command for shipping. + if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" else - # Install the binary that we compiled earlier. - file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi - fi + done + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + fi - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` - ;; - esac - ;; + # Quote $ECHO for shipping. + if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then + case $progpath in + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; + *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + esac + qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` + else + qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` + fi + + # Only actually do things if not in dry run mode. + $opt_dry_run || { + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in + *.exe) func_stripname '' '.exe' "$output" + output=$func_stripname_result ;; + esac + # test for cygwin because mv fails w/o .exe extensions + case $host in + *cygwin*) + exeext=.exe + func_stripname '' '.exe' "$outputname" + outputname=$func_stripname_result ;; + *) exeext= ;; esac - $show "$install_prog$stripme $file $destfile" - $run eval "$install_prog\$stripme \$file \$destfile" || exit $? - test -n "$outputname" && ${rm}r "$tmpdir" - ;; - esac - done + case $host in + *cygwin* | *mingw* ) + func_dirname_and_basename "$output" "" "." + output_name=$func_basename_result + output_path=$func_dirname_result + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $RM $cwrappersource $cwrapper + trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + func_emit_cwrapperexe_src > $cwrappersource + + # The wrapper executable is built using the $host compiler, + # because it contains $host paths and files. If cross- + # compiling, it, like the target executable, must be + # executed on the $host or under an emulation environment. + $opt_dry_run || { + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + $STRIP $cwrapper + } - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + # Now, create the wrapper script for func_source use: + func_ltwrapper_scriptname $cwrapper + $RM $func_ltwrapper_scriptname_result + trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 + $opt_dry_run || { + # note: this script will not be executed, so do not chmod. + if test "x$build" = "x$host" ; then + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result + fi + } + ;; + * ) + $RM $output + trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - # Set up the ranlib parameters. - oldlib="$destdir/$name" + func_emit_wrapper no > $output + chmod +x $output + ;; + esac + } + exit $EXIT_SUCCESS + ;; + esac - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? + # See if we need to build an old-fashioned archive. + for oldlib in $oldlibs; do - if test -n "$stripme" && test -n "$old_striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? + if test "$build_libtool_libs" = convenience; then + oldobjs="$libobjs_save $symfileobj" + addlibs="$convenience" + build_libtool_libs=no + else + if test "$build_libtool_libs" = module; then + oldobjs="$libobjs_save" + build_libtool_libs=no + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then + oldobjs="$oldobjs $symfileobj" + fi + fi + addlibs="$old_convenience" fi - # Do each command in the postinstall commands. - cmds=$old_postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi + func_extract_archives $gentop $addlibs + oldobjs="$oldobjs $func_extract_archives_result" + fi - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi - ;; + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + cmds=$old_archive_from_new_cmds + else - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - admincmds= + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + func_extract_archives $gentop $dlprefiles + oldobjs="$oldobjs $func_extract_archives_result" + fi - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - cmds=$finish_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" + # POSIX demands no paths to be encoded in archives. We have + # to avoid creating archives with duplicate basenames if we + # might have to extract them afterwards, e.g., when creating a + # static archive out of a convenience library, or when linking + # the entirety of a libtool archive into another (currently + # not supported by libtool). + if (for obj in $oldobjs + do + func_basename "$obj" + $ECHO "$func_basename_result" + done | sort | sort -uc >/dev/null 2>&1); then + : + else + $ECHO "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= + counter=1 + for obj in $save_oldobjs + do + func_basename "$obj" + objbase="$func_basename_result" + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) + while :; do + # Make sure we don't pick an alternate name that also + # overlaps. + newobj=lt$counter-$objbase + func_arith $counter + 1 + counter=$func_arith_result + case " $oldobjs " in + *[\ /]"$newobj "*) ;; + *) if test ! -f "$gentop/$newobj"; then break; fi ;; + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" + oldobjs="$oldobjs $gentop/$newobj" + ;; + *) oldobjs="$oldobjs $obj" ;; + esac done - IFS="$save_ifs" fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" || admincmds="$admincmds - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS + eval cmds=\"$old_archive_cmds\" - $echo "X----------------------------------------------------------------------" | $Xsed - $echo "Libraries have been installed in:" - for libdir in $libdirs; do - $echo " $libdir" + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs + oldobjs= + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj + done + eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + for obj in $save_oldobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + func_append objlist " $obj" + if test "$len" -lt "$max_cmd_len"; then + : + else + # the above command should be used before it gets too long + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi + done + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + func_execute_cmds "$cmds" 'exit $?' done - $echo - $echo "If you ever happen to want to link against installed libraries" - $echo "in a given directory, LIBDIR, you must either use libtool, and" - $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - $echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - $echo " during execution" - fi - if test -n "$runpath_var"; then - $echo " - add LIBDIR to the \`$runpath_var' environment variable" - $echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $echo " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $echo " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - $echo - $echo "See any operating system documentation about shared libraries for" - $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "X----------------------------------------------------------------------" | $Xsed - exit $EXIT_SUCCESS - ;; - # libtool execute mode - execute) - modename="$modename: execute" - - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit $EXIT_FAILURE - fi + test -n "$generated" && \ + func_show_eval "${RM}r$generated" - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + # Now create the libtool archive. + case $output in + *.la) + old_library= + test "$build_old_libs" = yes && old_library="$libname.$libext" + func_verbose "creating $output" - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi + done + # Quote the link command for shipping. + relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + if test "$hardcode_automatic" = yes ; then + relink_command= + fi - # Read the libtool library. - dlname= - library_names= + # Only create the output if not a dry run. + $opt_dry_run || { + for installed in no yes; do + if test "$installed" = yes; then + if test -z "$install_libdir"; then + break + fi + output="$output_objdir/$outputname"i + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do + case $deplib in + *.la) + func_basename "$deplib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + newdependency_libs="$newdependency_libs $libdir/$name" + ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" + newdlfiles= + + for lib in $dlfiles; do + case $lib in + *.la) + func_basename "$lib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + newdlfiles="$newdlfiles $libdir/$name" + ;; + *) newdlfiles="$newdlfiles $lib" ;; + esac + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + *.la) + # Only pass preopened files to the pseudo-archive (for + # eventual linking with the app. that links it) if we + # didn't already link the preopened objects directly into + # the library: + func_basename "$lib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + newdlprefiles="$newdlprefiles $libdir/$name" + ;; + esac + done + dlprefiles="$newdlprefiles" + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlfiles="$newdlfiles $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlprefiles="$newdlprefiles $abs" + done + dlprefiles="$newdlprefiles" + fi + $RM $output + # place dlname in correct position for cygwin + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + esac + $ECHO > $output "\ +# $outputname - a libtool library file +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# Please DO NOT delete this file! +# It is necessary for linking the library. - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac +# The name that we can dlopen(3). +dlname='$tdlname' - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi +# Names of this library. +library_names='$library_names' - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. +# The name of the static archive. +old_library='$old_library' - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - if test ! -f "$dir/$dlname"; then - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE - fi - fi - ;; +# Linker flags that can not go in dependency_libs. +inherited_linker_flags='$new_inherited_linker_flags' - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; +# Libraries that this one depends upon. +dependency_libs='$dependency_libs' - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue - ;; - esac +# Names of additional weak libraries provided by this library +weak_library_names='$weak_libs' - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" +# Version information for $libname. +current=$current +age=$age +revision=$revision - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done +# Is this an already installed library? +installed=$installed - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" +# Should we warn about portability when linking against -modules? +shouldnotlink=$module - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac +# Files to dlopen/dlpreopen +dlopen='$dlfiles' +dlpreopen='$dlprefiles' - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done +# Directory that this library needs to be installed in: +libdir='$install_libdir'" + if test "$installed" = no && test "$need_relink" = yes; then + $ECHO >> $output "\ +relink_command=\"$relink_command\"" + fi + done + } - if test -z "$run"; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. + func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' + ;; + esac + exit $EXIT_SUCCESS +} - # Restore saved environment variables - for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - fi" - done +{ test "$mode" = link || test "$mode" = relink; } && + func_mode_link ${1+"$@"} - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" - exit $EXIT_SUCCESS - fi - ;; - # libtool clean and uninstall mode - clean | uninstall) - modename="$modename: $mode" - rm="$nonopt" +# func_mode_uninstall arg... +func_mode_uninstall () +{ + $opt_debug + RM="$nonopt" files= rmforce= exit_status=0 @@ -6513,30 +8202,28 @@ for arg do case $arg in - -f) rm="$rm $arg"; rmforce=yes ;; - -*) rm="$rm $arg" ;; + -f) RM="$RM $arg"; rmforce=yes ;; + -*) RM="$RM $arg" ;; *) files="$files $arg" ;; esac done - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + test -z "$RM" && \ + func_fatal_help "you must specify an RM program" rmdirs= origobjdir="$objdir" for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then objdir="$origobjdir" else objdir="$dir/$origobjdir" fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + func_basename "$file" + name="$func_basename_result" test "$mode" = uninstall && objdir="$dir" # Remember objdir for removal later, being careful to avoid duplicates @@ -6548,9 +8235,9 @@ fi # Don't error if the file doesn't exist and rm -f was used. - if (test -L "$file") >/dev/null 2>&1 \ - || (test -h "$file") >/dev/null 2>&1 \ - || test -f "$file"; then + if { test -L "$file"; } >/dev/null 2>&1 || + { test -h "$file"; } >/dev/null 2>&1 || + test -f "$file"; then : elif test -d "$file"; then exit_status=1 @@ -6564,8 +8251,8 @@ case $name in *.la) # Possibly a libtool archive, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name + if func_lalib_p "$file"; then + func_source $dir/$name # Delete the libtool libraries and symlinks. for n in $library_names; do @@ -6580,39 +8267,17 @@ *" $dlname "*) ;; *) rmfiles="$rmfiles $objdir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ;; uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - cmds=$postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" + func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - cmds=$old_postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" + func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -6622,20 +8287,20 @@ *.lo) # Possibly a libtool object, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + if func_lalib_p "$file"; then # Read the .lo file - . $dir/$name + func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" \ - && test "$pic_object" != none; then + if test -n "$pic_object" && + test "$pic_object" != none; then rmfiles="$rmfiles $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" \ - && test "$non_pic_object" != none; then + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then rmfiles="$rmfiles $dir/$non_pic_object" fi fi @@ -6646,17 +8311,26 @@ noexename=$name case $file in *.exe) - file=`$echo $file|${SED} 's,.exe$,,'` - noexename=`$echo $name|${SED} 's,.exe$,,'` + func_stripname '' '.exe' "$file" + file=$func_stripname_result + func_stripname '' '.exe' "$name" + noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe rmfiles="$rmfiles $file" ;; esac # Do a test to see if this is a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$noexename + if func_ltwrapper_p "$file"; then + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result + rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename + fi # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles @@ -6671,239 +8345,38 @@ fi ;; esac - $show "$rm $rmfiles" - $run $rm $rmfiles || exit_status=1 + func_show_eval "$RM $rmfiles" 'exit_status=1' done objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then - $show "rmdir $dir" - $run rmdir $dir >/dev/null 2>&1 + func_show_eval "rmdir $dir >/dev/null 2>&1" fi done exit $exit_status - ;; +} - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - ;; - esac +{ test "$mode" = uninstall || test "$mode" = clean; } && + func_mode_uninstall ${1+"$@"} - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - fi -fi # test -z "$show_help" +test -z "$mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" +} + +test -z "$exec_cmd" && \ + func_fatal_help "invalid operation mode \`$mode'" if test -n "$exec_cmd"; then - eval exec $exec_cmd + eval exec "$exec_cmd" exit $EXIT_FAILURE fi -# We need to display help for each of the modes. -case $mode in -"") $echo \ -"Usage: $modename [OPTION]... [MODE-ARG]... - -Provide generalized library-building support services. - - --config show all configuration variables - --debug enable verbose shell tracing --n, --dry-run display commands without modifying any files - --features display basic configuration information and exit - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --tag=TAG use configuration variables from tag TAG - --version print version information - -MODE must be one of the following: - - clean remove files from the build directory - compile compile a source file into a libtool object - execute automatically set library path, then run a program - finish complete the installation of libtool libraries - install install libraries or executables - link create a library or an executable - uninstall remove libraries from an installed directory - -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE. - -Report bugs to ." - exit $EXIT_SUCCESS - ;; - -clean) - $echo \ -"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - -compile) - $echo \ -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only - -static always build a \`.o' file suitable for static linking - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - -execute) - $echo \ -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - -finish) - $echo \ -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - -install) - $echo \ -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. +exit $exit_status -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - -uninstall) - $echo \ -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; -esac - -$echo -$echo "Try \`$modename --help' for more information about other modes." - -exit $? # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting @@ -6917,14 +8390,17 @@ # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared +build_libtool_libs=no +build_old_libs=yes # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static +build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: # mode:shell-script # sh-indentation:2 # End: +# vi:sw=2 + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/abicollab_config.mk /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/abicollab_config.mk --- abiword-2.6.2/abiword-plugins/tools/abicollab/abicollab_config.mk 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/abicollab_config.mk 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,38 @@ +#! gmake + +## AbiWord +## Copyright (C) 2008 AbiSource Corporation B.V. +## +## This program is free software; you can redistribute it and/or +## modify it under the terms of the GNU General Public License +## as published by the Free Software Foundation; either version 2 +## of the License, or (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. + +# specify here which backends to build +BUILD_TCP_BACKEND=1 +BUILD_SERVICE_BACKEND=0 + +# ======================== + +ifeq ($(BUILD_TCP_BACKEND),1) +BACKEND_INCLUDES += -DABICOLLAB_HANDLER_TCP +BACKEND_LIBS+= +RCFLAGS += -DABICOLLAB_HANDLER_TCP +endif + +ifeq ($(BUILD_SERVICE_BACKEND),1) +BACKEND_INCLUDES += -DABICOLLAB_HANDLER_SERVICE $(shell pkg-config --cflags libsoup-2.4) -DSOUP24 -D_WIN32_WINNT=0x0500 +BACKEND_LIBS += $(shell pkg-config --libs libsoup-2.4 gnutls) +BACKEND_LIBS += -lgcrypt ## for some reason, -lgcrypt does not get added by pkg-config when using gnutls +RCFLAGS += -DABICOLLAB_HANDLER_SERVICE +endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/fake/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/fake/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -302,8 +317,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -409,8 +424,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -446,13 +461,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.cpp 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -293,7 +293,7 @@ } addBuddy(pCollaborator); - m_pSession = new AbiCollab(sSessionId, m_pDoc, sDocUUID /* FIXME: this is the local doc uuid, is that valid?? */, jsrre.m_iRev, pCollaborator, true); + m_pSession = new AbiCollab(sSessionId, m_pDoc, sDocUUID /* FIXME: this is the local doc uuid, is that valid?? */, jsrre.m_iRev, pCollaborator, false, true); pManager->joinSession(m_pSession, pCollaborator); } @@ -368,7 +368,7 @@ } // a remote m_packets has been received; let it walk the normal path for incoming m_packets - pManager->processPacket(*this, sp, rp.m_buddyName.utf8_str()); + pManager->processPacket(*this, sp, getBuddy(rp.m_buddyName)); } else { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.h 2009-07-15 16:56:23.000000000 +0100 @@ -28,7 +28,7 @@ class FakeBuddy; class PD_Document; -class ABI_EXPORT FakeAccountHandler : public AccountHandler +class FakeAccountHandler : public AccountHandler { public: FakeAccountHandler(const UT_UTF8String& sSessionURI, XAP_Frame* pFrame); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeBuddy.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeBuddy.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeBuddy.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeBuddy.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ class DocHandle; -ABI_EXPORT class FakeBuddy : public Buddy + class FakeBuddy : public Buddy { public: FakeBuddy(AccountHandler* handler, const UT_UTF8String& name) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/fake/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/fake/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -88,6 +88,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_FAKE_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libAbiCollabFakeHandler.la @@ -338,8 +353,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -415,8 +430,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -428,8 +443,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -439,13 +454,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,6 +72,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -137,14 +139,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -161,6 +163,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -177,6 +182,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -187,7 +195,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -253,7 +266,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -284,6 +297,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -297,6 +311,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \ @@ -311,8 +326,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -418,8 +433,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -444,8 +459,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -455,13 +470,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/Makefile 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -20,13 +20,22 @@ ABI_ROOT:=$(shell pwd)/../../../../abi include $(ABI_ROOT)/src/config/abi_defs.mk +include $(shell pwd)/../abicollab_config.mk -DIRS= xp tcp +DIRS= xp + +ifeq ($(BUILD_TCP_BACKEND),1) +DIRS += tcp +endif + +ifeq ($(BUILD_SERVICE_BACKEND),1) +DIRS += service +endif TARGETS= $(OBJS) -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/cacert.pem /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/cacert.pem --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/cacert.pem 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/cacert.pem 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,69 @@ +## +## ca-bundle.crt -- Bundle of CA Root Certificates +## Converted by the service run by Daniel Stenberg +## URL: http://curl.haxx.se/docs/caextract.html +## Converted at: Wed Jun 4 03:12:09 UTC 2008 +CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.47.2.1 $ $Date: 2008/05/03 03:13:22 $" +## +## This is a bundle of X.509 certificates of public Certificate Authorities +## (CA). These were automatically extracted from Mozilla's root certificates +## file (certdata.txt). This file can be found in the mozilla source tree: +## '/mozilla/security/nss/lib/ckfw/builtins/certdata.txt' +## +## This file was automatically converted and downloaded through the services +## provided by http://curl.haxx.se/docs/caextract.html +## +## +## The contents of this file are subject to the Mozilla Public License Version +## 1.1 (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## http://www.mozilla.org/MPL/ +## +## Software distributed under the License is distributed on an "AS IS" basis, +## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +## for the specific language governing rights and limitations under the +## License. +## +## The Original Code is the Netscape security libraries. +## +## The Initial Developer of the Original Code is Netscape Communications +## Corporation. Portions created by Netscape are Copyright (C) 1994-2000 +## Netscape Communications Corporation. All Rights Reserved. +## +## Contributor(s): +## +## Alternatively, the contents of this file may be used under the terms of the +## GNU General Public License Version 2 or later (the "GPL"), in which case +## the provisions of the GPL are applicable instead of those above. If you +## wish to allow use of your version of this file only under the terms of the +## GPL and not to allow others to use your version of this file under the MPL, +## indicate your decision by deleting the provisions above and replace them +## with the notice and other provisions required by the GPL. If you do not +## delete the provisions above, a recipient may use your version of this file +## under either the MPL or the GPL. +## +## +## Sat Jun 07 2008 - stripped all CA Root Certificates except the +## Thawte Premium Server CA, which is the only one the abicollab.net backend +## for the AbiWord AbiCollab plugin needs. - Marc Maurer + +-----BEGIN CERTIFICATE----- +MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx +FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD +VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv +biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy +dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t +MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB +MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG +A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp +b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl +cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv +bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE +VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ +ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR +uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG +9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI +hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM +pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg== +-----END CERTIFICATE----- + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.am 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -1 +1,10 @@ -SUBDIRS = unix xp \ No newline at end of file +SUBDIRS = unix xp + +# TODO: fix the hardcoded cert dir +certdir=$(datadir)/abiword-2.6/certs + +cert_DATA = \ + cacert.pem + +EXTRA_DIST = \ + $(cert_DATA) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,6 +13,7 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,6 +56,15 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(certdir)" +certDATA_INSTALL = $(INSTALL_DATA) +DATA = $(cert_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive ETAGS = etags @@ -67,6 +77,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +144,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +168,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +187,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +200,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +271,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +302,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,9 +316,19 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = unix xp + +# TODO: fix the hardcoded cert dir +certdir = $(datadir)/abiword-2.6/certs +cert_DATA = \ + cacert.pem + +EXTRA_DIST = \ + $(cert_DATA) + all: all-recursive .SUFFIXES: @@ -302,8 +336,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -333,6 +367,23 @@ clean-libtool: -rm -rf .libs _libs +install-certDATA: $(cert_DATA) + @$(NORMAL_INSTALL) + test -z "$(certdir)" || $(MKDIR_P) "$(DESTDIR)$(certdir)" + @list='$(cert_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(certDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(certdir)/$$f'"; \ + $(certDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(certdir)/$$f"; \ + done + +uninstall-certDATA: + @$(NORMAL_UNINSTALL) + @list='$(cert_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(certdir)/$$f'"; \ + rm -f "$(DESTDIR)$(certdir)/$$f"; \ + done # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -409,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -435,8 +486,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -446,13 +497,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -510,9 +560,12 @@ done check-am: all-am check: check-recursive -all-am: GNUmakefile +all-am: GNUmakefile $(DATA) installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(certdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -555,7 +608,7 @@ info-am: -install-data-am: +install-data-am: install-certDATA install-dvi: install-dvi-recursive @@ -589,7 +642,7 @@ ps-am: -uninstall-am: +uninstall-am: uninstall-certDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ install-strip @@ -598,15 +651,15 @@ all all-am check check-am clean clean-generic clean-libtool \ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + html-am info info-am install install-am install-certDATA \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-certDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,124 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#include "xap_App.h" +#include "ap_UnixApp.h" +#include "xap_UnixApp.h" +#include "xap_Frame.h" +#include "xap_UnixDialogHelper.h" +#include "ut_string_class.h" +#include + +#include "ap_UnixDialog_GenericInput.h" + +static void s_ok_clicked(GtkWidget * wid, AP_UnixDialog_GenericInput * dlg) +{ + dlg->event_Ok(); +} + +XAP_Dialog * AP_UnixDialog_GenericInput::static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id) +{ + return static_cast(new AP_UnixDialog_GenericInput(pFactory, id)); +} +pt2Constructor ap_Dialog_GenericInput_Constructor = &AP_UnixDialog_GenericInput::static_constructor; + +AP_UnixDialog_GenericInput::AP_UnixDialog_GenericInput(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id) + : AP_Dialog_GenericInput(pDlgFactory, id), + m_wWindowMain(NULL), + m_wOk(NULL) +{ +} + +void AP_UnixDialog_GenericInput::runModal(XAP_Frame * pFrame) +{ + UT_return_if_fail(pFrame); + + // Build the dialog's window + m_wWindowMain = _constructWindow(); + UT_return_if_fail(m_wWindowMain); + + _populateWindowData(); + + switch ( abiRunModalDialog ( GTK_DIALOG(m_wWindowMain), + pFrame, this, GTK_RESPONSE_CANCEL, false ) ) + { + case GTK_RESPONSE_CANCEL: + m_answer = AP_UnixDialog_GenericInput::a_CANCEL; + break; + case GTK_RESPONSE_OK: + m_answer = AP_UnixDialog_GenericInput::a_OK; + break; + default: + m_answer = AP_UnixDialog_GenericInput::a_CANCEL; + break; + } + + abiDestroyWidget(m_wWindowMain); +} + +/*****************************************************************/ +GtkWidget * AP_UnixDialog_GenericInput::_constructWindow(void) +{ + GtkWidget* window; + //const XAP_StringSet * pSS = XAP_App::getApp()->getStringSet(); + + // get the path where our glade file is located + XAP_UnixApp * pApp = static_cast(XAP_App::getApp()); + UT_String glade_path( pApp->getAbiSuiteAppGladeDir() ); + glade_path += "/ap_UnixDialog_GenericInput.glade"; + // load the dialog from the glade file + GladeXML *xml = abiDialogNewFromXML( glade_path.c_str() ); + if (!xml) + return NULL; + + // Update our member variables with the important widgets that + // might need to be queried or altered later + window = glade_xml_get_widget(xml, "ap_UnixDialog_GenericInput"); + m_wOk = glade_xml_get_widget(xml, "btOK"); + m_wInput = glade_xml_get_widget(xml, "edInput"); + + // set the dialog title + abiDialogSetTitle(window, getTitle().utf8_str()); + + // set the question + gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "lbQuestion")), getQuestion().utf8_str()); + gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "lbLabel")), getLabel().utf8_str()); + + // connect our signals + g_signal_connect(G_OBJECT(m_wOk), + "clicked", + G_CALLBACK(s_ok_clicked), + static_cast(this)); + + return window; +} + +void AP_UnixDialog_GenericInput::_populateWindowData() +{ + // set the focus on the text input + // TODO: implement me + + // set the password style input if requested + gtk_entry_set_visibility(GTK_ENTRY(m_wInput), !isPassword()); +} + +void AP_UnixDialog_GenericInput::event_Ok() +{ + _setInput(gtk_entry_get_text(GTK_ENTRY(m_wInput))); +} + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.glade /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.glade --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.glade 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.glade 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,223 @@ + + + + + + + + 5 + Input + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + False + + + + True + False + 2 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 18 + + + + True + 2 + 2 + False + 6 + 0 + + + + True + %s + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 2 + 0 + 1 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + 1 + 2 + False + 0 + 6 + + + + True + %s: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + True + True + 0 + + True + + False + + + 1 + 2 + 0 + 1 + + + + + + 1 + 2 + 1 + 2 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,45 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef AP_UNIXDIALOG_GENERICINPUT_H +#define AP_UNIXDIALOG_GENERICINPUT_H + +#include +#include + +class XAP_Frame; + +class AP_UnixDialog_GenericInput : public AP_Dialog_GenericInput +{ +public: + AP_UnixDialog_GenericInput(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); + static XAP_Dialog * static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id); + void runModal(XAP_Frame * pFrame); + + void event_Ok(); + +private: + GtkWidget* _constructWindow(void); + void _populateWindowData(void); + + GtkWidget* m_wWindowMain; + GtkWidget* m_wOk; + GtkWidget* m_wInput; +}; + +#endif /* AP_UNIXDIALOG_GENERICINPUT_H */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,119 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#include "xap_App.h" +#include "ap_UnixApp.h" +#include "xap_UnixApp.h" +#include "xap_Frame.h" +#include "xap_UnixDialogHelper.h" +#include "ut_string_class.h" +#include + +#include "ap_UnixDialog_GenericProgress.h" + +XAP_Dialog * AP_UnixDialog_GenericProgress::static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id) +{ + return static_cast(new AP_UnixDialog_GenericProgress(pFactory, id)); +} +pt2Constructor ap_Dialog_GenericProgress_Constructor = &AP_UnixDialog_GenericProgress::static_constructor; + +AP_UnixDialog_GenericProgress::AP_UnixDialog_GenericProgress(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id) + : AP_Dialog_GenericProgress(pDlgFactory, id), + m_wWindowMain(NULL), + m_wCancel(NULL), + m_wProgress(NULL) +{ +} + +void AP_UnixDialog_GenericProgress::runModal(XAP_Frame * pFrame) +{ + UT_return_if_fail(pFrame); + + // Build the dialog's window + m_wWindowMain = _constructWindow(); + UT_return_if_fail(m_wWindowMain); + + _populateWindowData(); + + switch ( abiRunModalDialog ( GTK_DIALOG(m_wWindowMain), + pFrame, this, AP_Dialog_GenericProgress::a_CANCEL, false ) ) + { + case GTK_RESPONSE_CANCEL: + m_answer = AP_Dialog_GenericProgress::a_CANCEL; + break; + case GTK_RESPONSE_OK: + m_answer = AP_Dialog_GenericProgress::a_OK; + break; + default: + m_answer = AP_Dialog_GenericProgress::a_OK; + break; + } + + abiDestroyWidget(m_wWindowMain); +} + +void AP_UnixDialog_GenericProgress::close() +{ + UT_return_if_fail(m_wWindowMain); + gtk_dialog_response(GTK_DIALOG(m_wWindowMain), AP_Dialog_GenericProgress::a_OK); +} + +void AP_UnixDialog_GenericProgress::setProgress(UT_uint32 progress) +{ + UT_return_if_fail(m_wProgress); + UT_return_if_fail(progress >= 0 && progress <= 100); + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(m_wProgress), progress / 100.0f); +} + +/*****************************************************************/ +GtkWidget * AP_UnixDialog_GenericProgress::_constructWindow(void) +{ + GtkWidget* window; + //const XAP_StringSet * pSS = XAP_App::getApp()->getStringSet(); + + // get the path where our glade file is located + XAP_UnixApp * pApp = static_cast(XAP_App::getApp()); + UT_String glade_path( pApp->getAbiSuiteAppGladeDir() ); + glade_path += "/ap_UnixDialog_GenericProgress.glade"; + // load the dialog from the glade file + GladeXML *xml = abiDialogNewFromXML( glade_path.c_str() ); + if (!xml) + return NULL; + + // Update our member variables with the important widgets that + // might need to be queried or altered later + window = glade_xml_get_widget(xml, "ap_UnixDialog_GenericProgress"); + m_wCancel = glade_xml_get_widget(xml, "btCancel"); + m_wProgress = glade_xml_get_widget(xml, "pbProgress"); + + // set the dialog title + abiDialogSetTitle(window, getTitle().utf8_str()); + + // set the informative label + gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "lbInformation")), getInformation().utf8_str()); + //gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "lbLabel")), getLabel().utf8_str()); + + return window; +} + +void AP_UnixDialog_GenericProgress::_populateWindowData() +{ + // set the focus on the text input + // TODO: implement me +} + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.glade /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.glade --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.glade 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.glade 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,134 @@ + + + + + + + + 5 + Please wait... + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + False + + + + True + False + 2 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 18 + + + + True + 2 + 1 + False + 6 + 0 + + + + True + %s + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + GTK_PROGRESS_LEFT_TO_RIGHT + 0 + 0.10000000149 + + PANGO_ELLIPSIZE_NONE + + + 0 + 1 + 1 + 2 + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,46 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef AP_UNIXDIALOG_GENERICPROGRESS_H +#define AP_UNIXDIALOG_GENERICPROGRESS_H + +#include +#include + +class XAP_Frame; + +class AP_UnixDialog_GenericProgress : public AP_Dialog_GenericProgress +{ +public: + AP_UnixDialog_GenericProgress(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); + static XAP_Dialog * static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id); + void runModal(XAP_Frame * pFrame); + + virtual void close(); + virtual void setProgress(UT_uint32 progress); + +private: + GtkWidget* _constructWindow(void); + void _populateWindowData(void); + + GtkWidget* m_wWindowMain; + GtkWidget* m_wCancel; + GtkWidget* m_wProgress; +}; + +#endif /* AP_UNIXDIALOG_GENERICPROGRESS_H */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.am 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -1,17 +1,33 @@ CPPFLAGS = \ -I$(srcdir) \ + -I$(srcdir)/.. \ -I$(srcdir)/../../.. \ -I$(srcdir)/../../../core/packet \ + -I$(srcdir)/../../../core/session \ @ABI_CPPFLAGS@ @CPPFLAGS@ @ABICOLLAB_SERVICE_CPPFLAGS@ @PLATFORM_CPPFLAGS@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_SERVICE_LIBS@ @PLATFORM_LDFLAGS@ +# TODO: fix the hardcoded glade dir +gladedir=$(datadir)/abiword-2.6/glade + +glade_DATA = \ + ap_UnixDialog_GenericInput.glade \ + ap_UnixDialog_GenericProgress.glade + noinst_LTLIBRARIES = libAbiCollabServiceUnixHandler.la libAbiCollabServiceUnixHandler_la_SOURCES = \ + ap_UnixDialog_GenericInput.cpp \ + ap_UnixDialog_GenericInput.h \ + ap_UnixDialog_GenericProgress.cpp \ + ap_UnixDialog_GenericProgress.h \ ServiceUnixAccountHandler.cpp \ ServiceUnixAccountHandler.h libAbiCollabServiceUnixHandler_la_LIBADD= @ABI_LIBS@ libAbiCollabServiceUnixHandler_la_LDFLAGS = -no-undefined -module -avoid-version + +EXTRA_DIST = \ + $(glade_DATA) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,6 +51,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) libAbiCollabServiceUnixHandler_la_DEPENDENCIES = am_libAbiCollabServiceUnixHandler_la_OBJECTS = \ + ap_UnixDialog_GenericInput.lo ap_UnixDialog_GenericProgress.lo \ ServiceUnixAccountHandler.lo libAbiCollabServiceUnixHandler_la_OBJECTS = \ $(am_libAbiCollabServiceUnixHandler_la_OBJECTS) @@ -80,6 +82,15 @@ $(LDFLAGS) -o $@ SOURCES = $(libAbiCollabServiceUnixHandler_la_SOURCES) DIST_SOURCES = $(libAbiCollabServiceUnixHandler_la_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(gladedir)" +gladeDATA_INSTALL = $(INSTALL_DATA) +DATA = $(glade_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -89,6 +100,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -148,8 +161,10 @@ CPP = @CPP@ CPPFLAGS = \ -I$(srcdir) \ + -I$(srcdir)/.. \ -I$(srcdir)/../../.. \ -I$(srcdir)/../../../core/packet \ + -I$(srcdir)/../../../core/session \ @ABI_CPPFLAGS@ @CPPFLAGS@ @ABICOLLAB_SERVICE_CPPFLAGS@ @PLATFORM_CPPFLAGS@ CXX = @CXX@ @@ -159,14 +174,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +198,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_SERVICE_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +217,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +230,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +301,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +332,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,15 +346,30 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ + +# TODO: fix the hardcoded glade dir +gladedir = $(datadir)/abiword-2.6/glade +glade_DATA = \ + ap_UnixDialog_GenericInput.glade \ + ap_UnixDialog_GenericProgress.glade + noinst_LTLIBRARIES = libAbiCollabServiceUnixHandler.la libAbiCollabServiceUnixHandler_la_SOURCES = \ + ap_UnixDialog_GenericInput.cpp \ + ap_UnixDialog_GenericInput.h \ + ap_UnixDialog_GenericProgress.cpp \ + ap_UnixDialog_GenericProgress.h \ ServiceUnixAccountHandler.cpp \ ServiceUnixAccountHandler.h libAbiCollabServiceUnixHandler_la_LIBADD = @ABI_LIBS@ libAbiCollabServiceUnixHandler_la_LDFLAGS = -no-undefined -module -avoid-version +EXTRA_DIST = \ + $(glade_DATA) + all: all-am .SUFFIXES: @@ -336,8 +378,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -380,6 +422,8 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServiceUnixAccountHandler.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap_UnixDialog_GenericInput.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap_UnixDialog_GenericProgress.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -407,14 +451,31 @@ clean-libtool: -rm -rf .libs _libs +install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) + test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ + $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ + done + +uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ + rm -f "$(DESTDIR)$(gladedir)/$$f"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -426,8 +487,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -437,13 +498,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -484,8 +544,11 @@ done check-am: all-am check: check-am -all-am: GNUmakefile $(LTLIBRARIES) +all-am: GNUmakefile $(LTLIBRARIES) $(DATA) installdirs: + for dir in "$(DESTDIR)$(gladedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -531,7 +594,7 @@ info-am: -install-data-am: +install-data-am: install-gladeDATA install-dvi: install-dvi-am @@ -567,7 +630,7 @@ ps-am: -uninstall-am: +uninstall-am: uninstall-gladeDATA .MAKE: install-am install-strip @@ -576,13 +639,14 @@ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am + install-dvi-am install-exec install-exec-am install-gladeDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-gladeDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.cpp 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -43,7 +43,7 @@ GtkVBox* parent = (GtkVBox*)pEmbeddingParent; // username - GtkWidget* username_label = gtk_label_new("Username:"); + GtkWidget* username_label = gtk_label_new("E-mail address:"); gtk_misc_set_alignment(GTK_MISC(username_label), 0, 0.5); gtk_table_attach_defaults(GTK_TABLE(table), username_label, 0, 1, 0, 1); username_entry = gtk_entry_new(); @@ -80,8 +80,10 @@ { UT_DEBUGMSG(("ServiceUnixAccountHandler::storeProperties()\n")); + addProperty("uri", "https://abicollab.net/soap/"); + if (username_entry && GTK_IS_ENTRY(username_entry)) - addProperty("username", gtk_entry_get_text(GTK_ENTRY(username_entry))); + addProperty("email", gtk_entry_get_text(GTK_ENTRY(username_entry))); if (password_entry && GTK_IS_ENTRY(password_entry)) addProperty("password", gtk_entry_get_text(GTK_ENTRY(password_entry))); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.h 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.h 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,5 @@ /* Copyright (C) 2006,2007 Marc Maurer + * Copyright (C) 2008 AbiSource Corporation B.V. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,260 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#include +#include "xap_App.h" +#include "xap_DialogFactory.h" +#include "ServiceAccountHandler.h" +#include "ap_Dialog_GenericInput.h" +#include +#include "AbiCollabImport.h" +#include "ServiceErrorCodes.h" + +class XmlDocDeleter { +public: + void operator()(xmlDocPtr* doc) { + if (!doc || !*doc) + return; + xmlFreeDoc(*doc); + } +}; + +IE_Imp_AbiCollabSniffer abicollab_sniffer; // FIXME: this is not really nice if we allow plugin-unloading in the future again + +IE_Imp_AbiCollabSniffer::IE_Imp_AbiCollabSniffer() + : IE_ImpSniffer("AbiWord::AbiCollab-1.0") +{ + IE_Imp::registerImporter(this); +} + +IE_Imp_AbiCollabSniffer::~IE_Imp_AbiCollabSniffer() +{ + IE_Imp::unregisterImporter(this); +} + +static IE_SuffixConfidence IE_Imp_AbiCollabSniffer__SuffixConfidence[] = { + { "abicollab", UT_CONFIDENCE_PERFECT }, + { "", UT_CONFIDENCE_ZILCH } +}; + +const IE_SuffixConfidence * IE_Imp_AbiCollabSniffer::getSuffixConfidence () +{ + return IE_Imp_AbiCollabSniffer__SuffixConfidence; +} + +UT_Confidence_t IE_Imp_AbiCollabSniffer::recognizeContents (const char * szBuf, UT_uint32 iNumbytes) +{ + std::string contents(szBuf, iNumbytes); + if (contents.find("") != std::string::npos && + contents.find("") != std::string::npos && + contents.find("") != std::string::npos && + contents.find("") != std::string::npos) + return UT_CONFIDENCE_PERFECT; + return UT_CONFIDENCE_ZILCH; +} + +bool IE_Imp_AbiCollabSniffer::getDlgLabels (const char ** pszDesc, const char ** pszSuffixList, IEFileType * ft) +{ + // TODO: should we hide this from the menu ? + *pszDesc = "Collaborative File Descriptor (.abicollab)"; + *pszSuffixList = "*.abicollab"; + *ft = getFileType(); + return true; +} + +UT_Error IE_Imp_AbiCollabSniffer::constructImporter (PD_Document * pDocument, IE_Imp ** ppie) +{ + *ppie = new IE_Imp_AbiCollab(pDocument); + return UT_OK; +} + +// ****** +// ** IE_Imp_AbiCollab +// ****** + +IE_Imp_AbiCollab::IE_Imp_AbiCollab(PD_Document* pDocument) + : IE_Imp(pDocument) +{ + UT_DEBUGMSG(("IE_Imp_AbiCollab::IE_Imp_AbiCollab()\n")); +} + +UT_Error IE_Imp_AbiCollab::_loadFile(GsfInput * input) +{ + UT_DEBUGMSG(("IE_Imp_AbiCollab::_loadFile()\n")); + UT_return_val_if_fail(input, UT_ERROR); + + std::string email; + std::string server; + UT_sint64 doc_id; + UT_sint64 revision; + + // get the information needed to open the document + if (!_parse(input, email, server, doc_id, revision)) + return UT_ERROR; + + // get an account handler to use for these settings + ServiceAccountHandler* pAccount = _getAccount(email, server); + UT_return_val_if_fail(pAccount, UT_ERROR); + + return _openDocument(input, pAccount, email, server, doc_id, revision); +} + +UT_Error IE_Imp_AbiCollab::_openDocument(GsfInput * input, ServiceAccountHandler* pAccount, + const std::string& email, const std::string& server, UT_sint64 doc_id, UT_sint64 revision) +{ + UT_DEBUGMSG(("IE_Imp_AbiCollab::_openDocument()\n")); + UT_return_val_if_fail(input, UT_ERROR); + UT_return_val_if_fail(pAccount, UT_ERROR); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_val_if_fail(pManager, UT_ERROR); + + // NOTE: the document id is a valid session identifier, as abicollab.net + // has one ever lasting session per document really + PD_Document* pDoc = getDoc(); + UT_return_val_if_fail(pDoc, UT_ERROR); + UT_ASSERT_HARMLESS(XAP_App::getApp()->getLastFocussedFrame() != NULL); + acs::SOAP_ERROR err = pAccount->openDocument(doc_id, revision, + boost::lexical_cast(doc_id), + &pDoc, XAP_App::getApp()->getLastFocussedFrame()); + switch (err) + { + case acs::SOAP_ERROR_OK: + return UT_OK; + case acs::SOAP_ERROR_INVALID_PASSWORD: + { + // TODO: asking for user input is not really nice in an async function + std::string password; + if (ServiceAccountHandler::askPassword(email, password)) + { + // try again with the new password + pAccount->addProperty("password", password); + pManager->storeProfile(); + return _openDocument(input, pAccount, email, server, doc_id, revision); + } + } + break; + default: + return UT_ERROR; + } + + return UT_ERROR; +} + +bool IE_Imp_AbiCollab::_parse(GsfInput * input, std::string& email, std::string& server, UT_sint64& doc_id, UT_sint64& revision) +{ + guint8 const* contents = gsf_input_read(input, gsf_input_size(input), NULL); + UT_return_val_if_fail(contents, UT_ERROR); + + // FIXME: put this in a boost shared ptr + xmlDocPtr reader = xmlReadMemory(reinterpret_cast(contents), + strlen(reinterpret_cast(contents)), 0, "UTF-8", 0); + UT_return_val_if_fail(reader, UT_ERROR); + boost::shared_ptr reader_ptr(&reader, XmlDocDeleter()); + + xmlNode* root = xmlDocGetRootElement(*reader_ptr); + UT_return_val_if_fail(root, false); + UT_return_val_if_fail(strcmp(reinterpret_cast(root->name), "abicollab") == 0, false); + + std::string doc_id_; + std::string revision_; + for (xmlNode* child = root->children; child; child = child->next) + { + if (child->type != XML_ELEMENT_NODE) + continue; + if (strcmp(reinterpret_cast(child->name), "email") == 0) + email = reinterpret_cast(xmlNodeGetContent(child)); // FIXME: memory leak + else if (strcmp(reinterpret_cast(child->name), "server") == 0) + server = reinterpret_cast(xmlNodeGetContent(child)); // FIXME: memory leak + else if (strcmp(reinterpret_cast(child->name), "doc_id") == 0) + doc_id_ = reinterpret_cast(xmlNodeGetContent(child)); // FIXME: memory leak + else if (strcmp(reinterpret_cast(child->name), "revision") == 0) + revision_ = reinterpret_cast(xmlNodeGetContent(child)); // FIXME: memory leak + } + + UT_return_val_if_fail(email != "" && server != "" && doc_id_ != "" && revision_ != "", false); + + try { + doc_id = boost::lexical_cast(doc_id_); + } catch (boost::bad_lexical_cast &) { + UT_DEBUGMSG(("Error casting doc_id (%s) to an UT_sint64\n", doc_id_.c_str())); + return false; + } + + try { + revision = boost::lexical_cast(revision_); + } catch (boost::bad_lexical_cast &) { + UT_DEBUGMSG(("Error casting revision (%s) to an UT_sint64\n", revision_.c_str())); + return false; + } + + return true; +} + +ServiceAccountHandler* IE_Imp_AbiCollab::_getAccount(const std::string& email, const std::string& server) +{ + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_val_if_fail(pManager, NULL); + + // check if we already have an account handler for this server; + // if not, we'll create it + ServiceAccountHandler* pExistingServiceAccount = NULL; + const UT_GenericVector accounts = pManager->getAccounts(); + for (UT_sint32 i = 0; i < accounts.getItemCount(); i++) + { + AccountHandler* pAccount = accounts.getNthItem(i); + UT_continue_if_fail(pAccount); + // FIXME: don't hardcode this storage type; make it a static class variable + if (pAccount->getStorageType() == "com.abisource.abiword.abicollab.backend.service") + { + ServiceAccountHandler* pServiceAccount = static_cast(pAccount); + // TODO: check trailing '/' for the server name + if (pServiceAccount->getProperty("uri") == server && + pServiceAccount->getProperty("email") == email) + { + UT_DEBUGMSG(("Found an existing account for server %s, email: %s!\n", server.c_str(), email.c_str())); + pExistingServiceAccount = pServiceAccount; + break; + } + } + } + + if (!pExistingServiceAccount) + { + UT_DEBUGMSG(("No existing account exists for server %s, email: %s\n", server.c_str(), email.c_str())); + + std::string password; + if (!ServiceAccountHandler::askPassword(email, password)) + return NULL; + + // create the new account + pExistingServiceAccount = static_cast(ServiceAccountHandlerConstructor()); + pExistingServiceAccount->addProperty("email", email); + pExistingServiceAccount->addProperty("password", password); + pExistingServiceAccount->addProperty("uri", server); + pExistingServiceAccount->addProperty("autoconnect", "true"); + bool success = pManager->addAccount(pExistingServiceAccount); + if (success) + pManager->storeProfile(); + } + + if (!pExistingServiceAccount->isOnline()) + pExistingServiceAccount->connect(); + + return pExistingServiceAccount; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,53 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __ABICOLLAB_IMPORT__ +#define __ABICOLLAB_IMPORT__ + +#include "ie_imp.h" +#include "ut_types.h" + +class IE_Imp_AbiCollabSniffer : public IE_ImpSniffer +{ +public: + IE_Imp_AbiCollabSniffer(); + virtual ~IE_Imp_AbiCollabSniffer(); + + virtual const IE_SuffixConfidence * getSuffixConfidence (); + virtual UT_Confidence_t recognizeContents(const char * szBuf, UT_uint32 iNumbytes); + virtual const IE_MimeConfidence * getMimeConfidence () { return NULL; } + virtual bool getDlgLabels (const char ** pszDesc, const char ** pszSuffixList, IEFileType * ft); + virtual UT_Error constructImporter (PD_Document * pDocument, IE_Imp ** ppie); +}; + +class IE_Imp_AbiCollab : public IE_Imp +{ +public: + IE_Imp_AbiCollab(PD_Document* pDocument); + +protected: + virtual UT_Error _loadFile(GsfInput * input); + +private: + UT_Error _openDocument(GsfInput * input, ServiceAccountHandler* pAccount, + const std::string& email, const std::string& server, UT_sint64 doc_id, UT_sint64 revision); + bool _parse(GsfInput * input, std::string& email, std::string& server, UT_sint64& doc_id, UT_sint64& revision); + ServiceAccountHandler* _getAccount(const std::string& email, const std::string& server); +}; + +#endif /* __ABICOLLAB_IMPORT__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,192 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#include +#include "xap_App.h" +#include "ev_Menu_Actions.h" +#include "ap_Menu_Id.h" +#include "ap_Menu_Functions.h" +#include "ev_Toolbar_Actions.h" +#include "ap_Toolbar_Id.h" +#include "ap_Toolbar_Functions.h" +#include "ap_LoadBindings.h" +#include "ev_EditEventMapper.h" +#include "xap_Dlg_MessageBox.h" +#include "fv_View.h" +#include "xap_Frame.h" +#include "ut_debugmsg.h" +#include "AsyncWorker.h" +#include "ServiceAccountHandler.h" +#include +#include +#include "AbiCollabSaveInterceptor.h" + +#define SAVE_INTERCEPTOR_EM "com.abisource.abiword.abicollab.servicesaveinterceptor" + +static bool AbiCollabSaveInterceptor_interceptor(AV_View * v, EV_EditMethodCallData * d) +{ + return ServiceAccountHandler::m_saveInterceptor.intercept(v, d); +} + +#define DO_NOT_USE "" + +static ap_bs_Char CharTable[] = +{ +// {char, /* desc */ { none, _C, _A, _A_C }}, + {0x53, /* S */ { "insertData", "fileSaveAs", DO_NOT_USE, "" }}, + {0x73, /* s */ { "insertData", SAVE_INTERCEPTOR_EM, DO_NOT_USE, "" }}, +}; + +AbiCollabSaveInterceptor::AbiCollabSaveInterceptor() + : m_pOldSaveEM(NULL) +{ + UT_DEBUGMSG(("Installing Save menu interceptor!\n")); + EV_EditMethodContainer *pEMC = XAP_App::getApp()->getEditMethodContainer(); + + // store the old/normale editmethod to fall back when a document is not under service control + m_pOldSaveEM = pEMC->findEditMethodByName("fileSave"); + UT_return_if_fail(m_pOldSaveEM); + // install the edit method we will use to save to the webapp + EV_EditMethod* mySaveInterceptor = new EV_EditMethod ( + SAVE_INTERCEPTOR_EM, + &AbiCollabSaveInterceptor_interceptor, + 0, "AbiCollab Service Save Interceptor" + ); + pEMC->addEditMethod(mySaveInterceptor); + + // install the new menu action with our custom save edit method + XAP_App::getApp()->getMenuActionSet()->setAction( + AP_MENU_ID_FILE_SAVE, + false, /* holds submenu */ + false, /* raises dialog */ + false, /* is checkable */ + false, /* is radio */ + SAVE_INTERCEPTOR_EM, + ap_GetState_Changes, + NULL, /* state label */ + NULL + ); + + // install the new toolbar action with our custom save edit method + XAP_App::getApp()->getToolbarActionSet()->setAction( + AP_TOOLBAR_ID_FILE_SAVE, + EV_TBIT_PushButton, + SAVE_INTERCEPTOR_EM, + AV_CHG_ALL, + ap_ToolbarGetState_Changes + ); + + // install the new CTRL-s hook + // TODO: what to the with Save As? + const char * szCurrMode = XAP_App::getApp()->getInputMode(); + EV_EditBindingMap* pEbMap = XAP_App::getApp()->getBindingMap(szCurrMode); + UT_return_if_fail(pEbMap); + + AP_BindingSet* pBindingSet = static_cast(XAP_App::getApp()->getBindingSet()); + UT_return_if_fail(pBindingSet); + + pBindingSet->_loadChar(pEbMap, CharTable, 2, NULL, 0); +} + +bool AbiCollabSaveInterceptor::intercept(AV_View * v, EV_EditMethodCallData * d) +{ + UT_DEBUGMSG(("AbiCollabSaveInterceptor_intercept\n")); + UT_return_val_if_fail(v, false); + FV_View* pView = static_cast(v); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_val_if_fail(pManager, false); + + PD_Document* pDoc = pView->getDocument(); + UT_return_val_if_fail(pDoc, false); + + if (!pManager->isInSession(pDoc)) + return m_pOldSaveEM->Fn(v, d); + + UT_DEBUGMSG(("Document is in a collaboration session!\n")); + AbiCollab* pSession = pManager->getSession(pDoc); + UT_return_val_if_fail(pSession, m_pOldSaveEM->Fn(v, d)); + + // the session id should be unique on a specific account handler; let's + // just look it up amonst all our account handlers (not too efficient or + // elegant, but it works) + for (UT_uint32 i = 0; i < pManager->getAccounts().getItemCount(); i++) + { + AccountHandler* pHandler = pManager->getAccounts().getNthItem(i); + UT_continue_if_fail(pHandler); + if (pHandler->hasSession(pSession->getSessionId()) && + pHandler->getStorageType() == SERVICE_ACCOUNT_HANDLER_TYPE) + { + ServiceAccountHandler* pServiceHandler = static_cast(pHandler); + UT_DEBUGMSG(("Found the abicollab webservice account handler that controls this session!\n")); + + pManager->beginAsyncOperation(pSession); + // FIXME: guarantee save order! + boost::shared_ptr > async_save_ptr( + new AsyncWorker( + boost::bind(&ServiceAccountHandler::saveDocument, pServiceHandler, pDoc, pSession->getSessionId()), + boost::bind(&AbiCollabSaveInterceptor::_save_cb, this, _1, pSession) + ) + ); + async_save_ptr->start(); + + // make the document clean (even if it isn't _yet_) + pSession->getDocument()->setClean(); + pSession->getDocument()->signalListeners(PD_SIGNAL_DOCNAME_CHANGED); + pSession->getDocument()->signalListeners(PD_SIGNAL_DOCSAVED); + + XAP_Frame * pFrame = static_cast (pView->getParentData()); + if (pFrame->getViewNumber() > 0) + XAP_App::getApp()->updateClones(pFrame); + return true; + } + } + + UT_DEBUGMSG(("This session does not use the abicollab webservice; saving the old fashioned way...\n")); + return m_pOldSaveEM->Fn(v, d); +} + +void AbiCollabSaveInterceptor::_save_cb(UT_Error error, AbiCollab* pSession) +{ + UT_DEBUGMSG(("AbiCollabSaveInterceptor::_save_cb()\n")); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); + + pManager->endAsyncOperation(pSession); + + // WARNING: do NOT assume we have a valid view or frame here: it could already + // have been deleted if the frame was closed (or abiword shutdown) before this + // callback came back. + // You can safely use the AbiCollab pointer or PD_Document pointer though, as + // the AbiCollabSessionManager makes sure those are still valid. + + if (error != UT_OK) + { + // idealy we would use the same frame that was used to save the document, + // but we don't know if that one is still valid + if (XAP_App::getApp()->getLastFocussedFrame()) + { + // TODO: add the document name, error type and perhaps the server name + // TODO: offer some kind of solution to the user + UT_UTF8String msg("An error occured while saving this document to the web-service!"); + XAP_App::getApp()->getLastFocussedFrame()->showMessageBox(msg.utf8_str(), XAP_Dialog_MessageBox::b_O, XAP_Dialog_MessageBox::a_OK); + } + } + return; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,41 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __ABICOLLAB_SAVE_INTERCEPTOR__ +#define __ABICOLLAB_SAVE_INTERCEPTOR__ + +#include "ev_EditMethod.h" + +class AV_View; +class EV_EditMethodCallData; +class EV_EditMethod; + +class AbiCollabSaveInterceptor +{ +public: + AbiCollabSaveInterceptor(); + + bool intercept(AV_View * v, EV_EditMethodCallData * d); + +private: + void _save_cb(UT_Error error, AbiCollab* pSession); + + EV_EditMethod* m_pOldSaveEM; +}; + +#endif /* __ABICOLLAB_SAVE_INTERCEPTOR__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.cpp 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -109,8 +109,8 @@ m_pDoc->ignoreSignals(); pService->saveDocumentAsync(m_iID,m_pDoc); m_pDoc->dontIgnoreSignals(); - } - return true;*/ + }*/ + return true; } /*! diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.h 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.h 2009-07-15 16:56:23.000000000 +0100 @@ -36,7 +36,7 @@ class PX_ChangeRecord; class ChangeAdjust; -class ABI_EXPORT AbiCollabService_Export : public PL_DocChangeListener +class AbiCollabService_Export : public PL_DocChangeListener { public: AbiCollabService_Export(PD_Document* pDoc, UT_sint64 iID); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/abicollab_types.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/abicollab_types.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/abicollab_types.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/abicollab_types.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,113 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __ABICOLLAB_TYPES__ +#define __ABICOLLAB_TYPES__ + +#include +#include "soa.h" + +namespace abicollab { + +class File { +public: + static boost::shared_ptr construct(soa::GenericPtr value) { + if (soa::CollectionPtr coll = value->as()) { + boost::shared_ptr file(new File()); + if (soa::StringPtr doc_id_ = coll->get("doc_id")) + file->doc_id = doc_id_->value(); + if (soa::StringPtr filename_ = coll->get("filename")) + file->filename = filename_->value(); + if (soa::StringPtr tags_ = coll->get("tags")) + file->tags = tags_->value(); + if (soa::StringPtr filesize_ = coll->get("filesize")) + file->filesize = filesize_->value(); + if (soa::StringPtr lastchanged_ = coll->get("lastchanged")) + file->lastchanged = lastchanged_->value(); + if (soa::IntPtr lastrevision_ = coll->get("lastrevision")) + file->lastrevision = lastrevision_->value(); + if (soa::StringPtr access_ = coll->get("access")) + file->access = access_->value(); + return file; + } + return boost::shared_ptr(); + } + + std::string doc_id; + std::string filename; + std::string tags; + std::string filesize; + std::string lastchanged; + int64_t lastrevision; + std::string access; +}; +typedef boost::shared_ptr FilePtr; +typedef boost::shared_ptr< soa::Array< abicollab::FilePtr > > FileArrayPtr; + +class Friend : public soa::Collection { +public: + Friend(const std::string& name) + : soa::Collection(name) + {} + + static boost::shared_ptr construct(soa::GenericPtr value) { + if (soa::CollectionPtr coll = value->as()) { + boost::shared_ptr friend_(new Friend(coll->name())); + if (soa::StringPtr name_ = coll->get("name")) + friend_->name = name_->value(); + if (soa::StringPtr email_ = coll->get("email")) + friend_->email = email_->value(); + friend_->files = coll->get< soa::Array >("files"); + return friend_; + } + return boost::shared_ptr(); + } + + std::string name; + std::string email; + soa::ArrayPtr files; +}; +typedef boost::shared_ptr FriendPtr; +typedef boost::shared_ptr< soa::Array< FriendPtr > > FriendArrayPtr; + +class Group : public soa::Collection { +public: + Group(const std::string& name) + : soa::Collection(name) + {} + + static boost::shared_ptr construct(soa::GenericPtr value) { + if (soa::CollectionPtr coll = value->as()) { + boost::shared_ptr group_(new Group(coll->name())); + if (soa::StringPtr name_ = coll->get("name")) + group_->name = name_->value(); + group_->files = coll->get< soa::Array >("files"); + return group_; + } + return boost::shared_ptr(); + } + + std::string name; + soa::ArrayPtr files; +}; +typedef boost::shared_ptr GroupPtr; +typedef boost::shared_ptr< soa::Array< GroupPtr > > GroupArrayPtr; + +} + +#endif /* __ABICOLLAB_TYPES__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,33 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#include "xap_App.h" +#include "xap_Dialog_Id.h" +#include "xap_DialogFactory.h" + +#include "ap_Dialog_GenericInput.h" + +AP_Dialog_GenericInput::AP_Dialog_GenericInput(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id) + : XAP_Dialog_NonPersistent(pDlgFactory, id, "interface/dialogcollaborationinput"), + m_bIsPassword(false) +{ +} + +AP_Dialog_GenericInput::~AP_Dialog_GenericInput(void) +{ +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,82 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef AP_DIALOG_GENERICINPUT_H +#define AP_DIALOG_GENERICINPUT_H + +#include "ut_types.h" +#include "xap_Dialog.h" + +extern pt2Constructor ap_Dialog_GenericInput_Constructor; + +class AP_Dialog_GenericInput : public XAP_Dialog_NonPersistent +{ +public: + AP_Dialog_GenericInput(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); + virtual ~AP_Dialog_GenericInput(void); + + virtual void runModal(XAP_Frame * pFrame) = 0; + + // functions related to password style input + bool isPassword() + { return m_bIsPassword; } + void setPassword(bool bIsPassword) + { m_bIsPassword = bIsPassword; } + + // messages to display + void setTitle(const UT_UTF8String& sTitle) + { m_sTitle = sTitle; } + + const UT_UTF8String& getTitle() + { return m_sTitle; } + + void setQuestion(const UT_UTF8String& sQuestion) + { m_sQuestion = sQuestion; } + + const UT_UTF8String& getQuestion() + { return m_sQuestion; } + + void setLabel(const UT_UTF8String& sLabel) + { m_sLabel = sLabel; } + + const UT_UTF8String& getLabel() + { return m_sLabel; } + + typedef enum { a_OK, a_CANCEL } tAnswer; + + AP_Dialog_GenericInput::tAnswer getAnswer(void) const + { return m_answer; } + + const UT_UTF8String& getInput() const + { return m_input; } + +protected: + void _setInput(const UT_UTF8String& input) + { m_input = input; } + + AP_Dialog_GenericInput::tAnswer m_answer; + +private: + UT_UTF8String m_sTitle; + UT_UTF8String m_sQuestion; + UT_UTF8String m_sLabel; + bool m_bIsPassword; + UT_UTF8String m_input; +}; + +#endif /* AP_DIALOG_GENERICINPUT_H */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,32 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#include "xap_App.h" +#include "xap_Dialog_Id.h" +#include "xap_DialogFactory.h" + +#include "ap_Dialog_GenericProgress.h" + +AP_Dialog_GenericProgress::AP_Dialog_GenericProgress(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id) + : XAP_Dialog_NonPersistent(pDlgFactory, id, "interface/dialogcollaborationprogress") +{ +} + +AP_Dialog_GenericProgress::~AP_Dialog_GenericProgress(void) +{ +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,63 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef AP_DIALOG_GENERICPROGRESS_H +#define AP_DIALOG_GENERICPROGRESS_H + +#include "ut_types.h" +#include "xap_Dialog.h" + +extern pt2Constructor ap_Dialog_GenericProgress_Constructor; + +class AP_Dialog_GenericProgress : public XAP_Dialog_NonPersistent +{ +public: + AP_Dialog_GenericProgress(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); + virtual ~AP_Dialog_GenericProgress(void); + + virtual void runModal(XAP_Frame * pFrame) = 0; + + void setTitle(const UT_UTF8String& sTitle) + { m_sTitle = sTitle; } + + const UT_UTF8String& getTitle() + { return m_sTitle; } + + void setInformation(const UT_UTF8String& sInformation) + { m_sInformation = sInformation; } + + const UT_UTF8String& getInformation() + { return m_sInformation; } + + virtual void close() = 0; + virtual void setProgress(UT_uint32 progress) = 0; + + typedef enum { a_OK, a_CANCEL } tAnswer; + + AP_Dialog_GenericProgress::tAnswer getAnswer(void) const + { return m_answer; } + +protected: + AP_Dialog_GenericProgress::tAnswer m_answer; + +private: + UT_UTF8String m_sTitle; + UT_UTF8String m_sInformation; +}; + +#endif /* AP_DIALOG_GENERICPROGRESS_H */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AsioRealmProtocol.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AsioRealmProtocol.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AsioRealmProtocol.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AsioRealmProtocol.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,59 @@ +#ifndef __ASIO_REALM_PROTOCOL__ +#define __ASIO_REALM_PROTOCOL__ + +#include "RealmProtocol.h" + +namespace realm { + +namespace protocolv1 { + + template + static void send(const RoutingPacket& p, asio::ip::tcp::socket& socket, WriteHandler handler) { + std::vector bufs(4); + bufs.push_back(asio::buffer(&p.type(), 1)); + bufs.push_back(asio::buffer(&p.getPayloadSize(), 4)); // FIXME: not Big Endian safe! + bufs.push_back(asio::buffer(&p.getAddressCount(), 1)); + bufs.push_back(asio::buffer(&(p.getConnectionIds()[0]), p.getConnectionIds().size())); + bufs.push_back(asio::buffer(*p.getMessage())); + asio::async_write(socket, bufs, handler); + } + + template + static void send(const DeliverPacket& p, asio::ip::tcp::socket& socket, WriteHandler handler) { + std::vector bufs(4); + bufs.push_back(asio::buffer(&p.type(), 1)); + bufs.push_back(asio::buffer(&p.getPayloadSize(), 4)); // FIXME: not Big Endian safe! + bufs.push_back(asio::buffer(&p.getConnectionId(), 1)); + bufs.push_back(asio::buffer(*p.getMessage())); + asio::async_write(socket, bufs, handler); + } + + template + static void send(const UserJoinedPacket& p, asio::ip::tcp::socket& socket, WriteHandler handler) { + std::vector bufs(4); + bufs.push_back(asio::buffer(&p.type(), 1)); + bufs.push_back(asio::buffer(&p.getPayloadSize(), 4)); // FIXME: not Big Endian safe! + bufs.push_back(asio::buffer(&p.getConnectionId(), 1)); + bufs.push_back(asio::buffer(&p.isMaster(), 1)); + bufs.push_back(asio::buffer(*p.getUserInfo())); + asio::async_write(socket, bufs, handler); + } + + template + static void send(const UserLeftPacket& p, asio::ip::tcp::socket& socket, WriteHandler handler) { + std::vector bufs(2); + bufs.push_back(asio::buffer(&p.type(), 1)); + bufs.push_back(asio::buffer(&p.getConnectionId(), 1)); + asio::async_write(socket, bufs, handler); + } + + template + static void send(const SessionTakeOverPacket& p, asio::ip::tcp::socket& socket, WriteHandler handler) { + asio::async_write(socket, asio::buffer(&p.type(), 1), handler); + } + +} + +} + +#endif /* ASIO_REALM_PROTOCOL__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AsyncWorker.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AsyncWorker.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AsyncWorker.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/AsyncWorker.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,83 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __ASYNC_WORKER__ +#define __ASYNC_WORKER__ + +#include +#include +#include +#include +#include +#include "ut_debugmsg.h" +#include + +template +class AsyncWorker : private boost::noncopyable, public boost::enable_shared_from_this > +{ +public: + AsyncWorker(boost::function async_func, boost::function async_callback) + : m_async_func(async_func), + m_async_callback(async_callback), + m_synchronizer() // can't initialize the synchronizer here yet, because you can't call shared_from_this() from a constructor + { + } + + virtual ~AsyncWorker() + { + UT_DEBUGMSG(("~AsyncWorker()\n")); + if (m_thread_ptr) + m_thread_ptr->join(); + } + + virtual void start() + { + m_synchronizer.reset(new Synchronizer(boost::bind(&AsyncWorker::_signal, + boost::enable_shared_from_this >::shared_from_this()))); + m_thread_ptr.reset( + new asio::thread( + boost::bind(&AsyncWorker::_thread_func, + AsyncWorker::shared_from_this()) + ) + ); + } + +private: + void _signal() + { + UT_DEBUGMSG(("Calling async callback function from the main loop\n")); + m_async_callback(m_func_result); + m_synchronizer.reset(); + } + + void _thread_func() + { + UT_DEBUGMSG(("Starting async function...\n")); + m_func_result = m_async_func(); + UT_DEBUGMSG(("Async function completed...\n")); + m_synchronizer->signal(); + } + + boost::function m_async_func; + boost::function m_async_callback; + boost::shared_ptr m_synchronizer; + boost::shared_ptr m_thread_ptr; + T m_func_result; +}; + +#endif /* __ASYNC_WORKER__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.am 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -11,11 +11,37 @@ noinst_LTLIBRARIES = libAbiCollabServiceHandler.la libAbiCollabServiceHandler_la_SOURCES = \ + AbiCollabSaveInterceptor.cpp \ + AbiCollabSaveInterceptor.h \ + ap_Dialog_GenericInput.cpp \ + ap_Dialog_GenericInput.h \ + ap_Dialog_GenericProgress.cpp \ + ap_Dialog_GenericProgress.h \ ServiceAccountHandler.cpp \ ServiceAccountHandler.h \ + ServiceBuddy.h \ + AbiCollabImport.h \ + AbiCollabImport.cpp \ AbiCollabService_Export.cpp \ - AbiCollabService_Export.h - + AbiCollabService_Export.h \ + AsioRealmProtocol.h \ + AsyncWorker.h \ + InterruptableAsyncWorker.h \ + ProgressiveSoapCall.h \ + RealmBuddy.h \ + RealmConnection.h \ + RealmConnection.cpp \ + RealmGrowBuffer.h \ + RealmProtocol.cpp \ + RealmProtocol.h \ + ServiceErrorCodes.h \ + soa.h \ + soa_result.h \ + soa_soup.h \ + soa_types.h \ + tls_tunnel.cpp \ + tls_tunnel.h \ + abicollab_types.h libAbiCollabServiceHandler_la_LIBADD = ../unix/libAbiCollabServiceUnixHandler.la @ABI_LIBS@ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,8 +50,11 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) libAbiCollabServiceHandler_la_DEPENDENCIES = \ ../unix/libAbiCollabServiceUnixHandler.la -am_libAbiCollabServiceHandler_la_OBJECTS = ServiceAccountHandler.lo \ - AbiCollabService_Export.lo +am_libAbiCollabServiceHandler_la_OBJECTS = \ + AbiCollabSaveInterceptor.lo ap_Dialog_GenericInput.lo \ + ap_Dialog_GenericProgress.lo ServiceAccountHandler.lo \ + AbiCollabImport.lo AbiCollabService_Export.lo \ + RealmConnection.lo RealmProtocol.lo tls_tunnel.lo libAbiCollabServiceHandler_la_OBJECTS = \ $(am_libAbiCollabServiceHandler_la_OBJECTS) libAbiCollabServiceHandler_la_LINK = $(LIBTOOL) --tag=CXX \ @@ -90,6 +93,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -161,14 +166,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -185,6 +190,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_SERVICE_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -201,6 +209,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -211,7 +222,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -277,7 +293,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -308,6 +324,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -321,14 +338,42 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libAbiCollabServiceHandler.la libAbiCollabServiceHandler_la_SOURCES = \ + AbiCollabSaveInterceptor.cpp \ + AbiCollabSaveInterceptor.h \ + ap_Dialog_GenericInput.cpp \ + ap_Dialog_GenericInput.h \ + ap_Dialog_GenericProgress.cpp \ + ap_Dialog_GenericProgress.h \ ServiceAccountHandler.cpp \ ServiceAccountHandler.h \ + ServiceBuddy.h \ + AbiCollabImport.h \ + AbiCollabImport.cpp \ AbiCollabService_Export.cpp \ - AbiCollabService_Export.h + AbiCollabService_Export.h \ + AsioRealmProtocol.h \ + AsyncWorker.h \ + InterruptableAsyncWorker.h \ + ProgressiveSoapCall.h \ + RealmBuddy.h \ + RealmConnection.h \ + RealmConnection.cpp \ + RealmGrowBuffer.h \ + RealmProtocol.cpp \ + RealmProtocol.h \ + ServiceErrorCodes.h \ + soa.h \ + soa_result.h \ + soa_soup.h \ + soa_types.h \ + tls_tunnel.cpp \ + tls_tunnel.h \ + abicollab_types.h libAbiCollabServiceHandler_la_LIBADD = ../unix/libAbiCollabServiceUnixHandler.la @ABI_LIBS@ libAbiCollabServiceHandler_la_LDFLAGS = -no-undefined -module -avoid-version @@ -340,8 +385,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -383,8 +428,15 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AbiCollabImport.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AbiCollabSaveInterceptor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AbiCollabService_Export.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RealmConnection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RealmProtocol.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServiceAccountHandler.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap_Dialog_GenericInput.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap_Dialog_GenericProgress.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tls_tunnel.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -418,8 +470,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -431,8 +483,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -442,13 +494,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/InterruptableAsyncWorker.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/InterruptableAsyncWorker.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/InterruptableAsyncWorker.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/InterruptableAsyncWorker.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,152 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __INTERRUPTABLE_ASYNC_WORKER__ +#define __INTERRUPTABLE_ASYNC_WORKER__ + +#include +#include +#include "xap_App.h" +#include "xap_DialogFactory.h" +#include "AsyncWorker.h" +#include "ap_Dialog_GenericProgress.h" +#include "ServiceAccountHandler.h" + +class InterruptedException {}; +class InternalErrorException {}; + +template +class InterruptableAsyncWorker : public boost::enable_shared_from_this< InterruptableAsyncWorker > +{ +public: + InterruptableAsyncWorker(boost::function async_func) + : m_async_func(async_func), + m_worker_ptr(), + m_pProgressDlg(NULL), + m_progress(0), + m_cancelled(false), + m_finished(false), + m_progressSynchronizerPtr(), + m_result() + {} + + T run() + { + UT_DEBUGMSG(("InterruptableAsyncWorker::run()\n")); + + m_worker_ptr.reset(new AsyncWorker(m_async_func, boost::bind(&InterruptableAsyncWorker::invoke_cb, InterruptableAsyncWorker::shared_from_this(), _1))); + m_progressSynchronizerPtr.reset(new Synchronizer(boost::bind(&InterruptableAsyncWorker::_updateDialog, InterruptableAsyncWorker::shared_from_this()))); + + // get the progress dialog + XAP_Frame* pFrame = XAP_App::getApp()->getLastFocussedFrame(); + if (!pFrame) + throw InternalErrorException(); + + XAP_DialogFactory* pFactory = static_cast(XAP_App::getApp()->getDialogFactory()); + if (!pFactory) + throw InternalErrorException(); + + m_pProgressDlg = static_cast( + pFactory->requestDialog(ServiceAccountHandler::getDialogGenericProgressId()) + ); + m_pProgressDlg->setTitle("Retrieving Document"); + m_pProgressDlg->setInformation("Please wait while retrieving document..."); + + // start the asynchronous process + m_worker_ptr->start(); + + // run the dialog + m_pProgressDlg->runModal(pFrame); + UT_DEBUGMSG(("Progress dialog destroyed...\n")); + m_cancelled = m_pProgressDlg->getAnswer() == AP_Dialog_GenericProgress::a_CANCEL; + pFactory->releaseDialog(m_pProgressDlg); + m_pProgressDlg = NULL; + if (m_cancelled) + throw InterruptedException(); + return m_result; + } + + bool cancelled() + { + return m_cancelled; + } + + void progress(uint32_t progress) + { + UT_DEBUGMSG(("InterruptableAsyncWorker::_progress_cb() - %d\n", progress)); + UT_return_if_fail(m_progressSynchronizerPtr); + + if (progress > 100) + progress = 100; + + m_progress = progress; + m_progressSynchronizerPtr->signal(); + } + + // the result of run() is undefined when using this function + void forceFinished() + { + m_finished = true; + m_progressSynchronizerPtr->signal(); + } + +private: + void invoke_cb(T result) + { + UT_DEBUGMSG(("InterruptableAsyncWorker::invoke_cb()\n")); + m_result = result; + + // signal the mainloop that we are done + m_finished = true; + m_progressSynchronizerPtr->signal(); + } + + void _updateDialog() + { + UT_DEBUGMSG(("InterruptableAsyncWorker::_updateDialog()\n")); + if (m_finished) + { + UT_DEBUGMSG(("We are finished, closing dialog...\n")); + if (m_pProgressDlg) + m_pProgressDlg->close(); + else + UT_DEBUGMSG(("Skipping dialog closure; it is destructed already\n")); + } + else + { + UT_DEBUGMSG(("Setting progress value to %d%%\n", m_progress)); + if (m_pProgressDlg) // it could be that we have no dialog when we have been cancelled + m_pProgressDlg->setProgress(m_progress); + else + UT_DEBUGMSG(("Skipping dialog progress update; it is destructed already\n")); + } + } + + boost::function m_async_func; + boost::shared_ptr< AsyncWorker > m_worker_ptr; + + AP_Dialog_GenericProgress* m_pProgressDlg; + uint32_t m_progress; + bool m_cancelled; + bool m_finished; + boost::shared_ptr m_progressSynchronizerPtr; + + T m_result; +}; + +#endif /* __INTERRUPTABLE_ASYNC_WORKER__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ProgressiveSoapCall.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ProgressiveSoapCall.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ProgressiveSoapCall.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ProgressiveSoapCall.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,107 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __PROGRESSIVE_SOAP_CALL__ +#define __PROGRESSIVE_SOAP_CALL__ + +#include +#include +#include "InterruptableAsyncWorker.h" +#include "soa_soup.h" + +class ProgressiveSoapCall : public boost::enable_shared_from_this +{ +public: + ProgressiveSoapCall(const std::string& uri, soa::function_call& fc, const std::string& ssl_ca_file) + : m_uri(uri), + m_fc(fc), + m_ssl_ca_file(ssl_ca_file), + m_worker_ptr(), + m_soapFault() + {} + + soa::GenericPtr run() + { + UT_DEBUGMSG(("ProgressiveSoapCall::run()\n")); + + m_worker_ptr.reset(new InterruptableAsyncWorker( + boost::bind(&ProgressiveSoapCall::invoke, shared_from_this()) + )); + + // start the asynchronous process and display the dialog + try + { + soa::GenericPtr res = m_worker_ptr->run(); + if (m_soapFault) + throw *m_soapFault; + return res; + } + catch (InterruptedException e) + { + UT_DEBUGMSG(("Soap call interrupted!\n")); + return soa::GenericPtr(); + } + } + +private: + soa::GenericPtr invoke() + { + UT_DEBUGMSG(("ProgressiveSoapCall::invoke()\n")); + try { + return soup_soa::invoke( + m_uri, soa::method_invocation("urn:AbiCollabSOAP", m_fc), m_ssl_ca_file, + boost::bind(&ProgressiveSoapCall::_progress_cb, this, _1, _2, _3) + ); + } catch (soa::SoapFault& fault) { + m_soapFault.reset(new soa::SoapFault(fault)); + return soa::GenericPtr(); + } + } + + void _progress_cb(SoupSession* session, SoupMessage* msg, uint32_t progress) + { + UT_DEBUGMSG(("ProgressiveSoapCall::_progress_cb()\n")); + UT_return_if_fail(session && msg); + UT_return_if_fail(m_worker_ptr); + + if (m_worker_ptr->cancelled()) + { +#ifdef SOUP24 + soup_session_cancel_message(session, msg, SOUP_STATUS_CANCELLED); +#else + soup_message_set_status(msg, SOUP_STATUS_CANCELLED); + soup_session_cancel_message(session, msg); +#endif + return; + } + + m_worker_ptr->progress(progress); + } + + std::string m_uri; + soa::function_call& m_fc; + std::string m_ssl_ca_file; + + boost::shared_ptr< InterruptableAsyncWorker > + m_worker_ptr; + + boost::shared_ptr m_soapFault; + soa::GenericPtr m_result; +}; + +#endif /* __PROGRESSIVE_SOAP_CALL__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmBuddy.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmBuddy.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmBuddy.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmBuddy.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,83 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __REALM_BUDDY__ +#define __REALM_BUDDY__ + +#include +#include +#include +#include "ut_string_class.h" +#include +#include + +class RealmConnection; + +class RealmBuddy : public Buddy , public boost::enable_shared_from_this +{ +public: + RealmBuddy(AccountHandler* handler, UT_uint8 realm_connection_id, bool master, RealmConnection& connection) + : Buddy(handler, boost::lexical_cast(realm_connection_id).c_str()), + m_realm_connection_id(realm_connection_id), + m_master(master), + m_connection(connection) + { + setVolatile(true); + } + + virtual Buddy* clone() const { return new RealmBuddy( *this ); } + + virtual UT_UTF8String getDescription() const + { + return getName(); + } + + virtual const DocTreeItem* getDocTreeItems() const + { + return NULL; + } + + boost::shared_ptr ptr() { + return shared_from_this(); + } + + boost::shared_ptr ptr() const { + return shared_from_this(); + } + + RealmConnection& connection() const { + return m_connection; + } + + UT_uint8 realm_connection_id() const { + return m_realm_connection_id; + } + + bool master() const { + return m_master; + } + +private: + UT_uint8 m_realm_connection_id; + bool m_master; + RealmConnection& m_connection; +}; + +typedef boost::shared_ptr RealmBuddyPtr; + +#endif /* __REALM_BUDDY__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,308 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#include +#include +#include +#include "ut_assert.h" +#include "ut_debugmsg.h" +#include "RealmConnection.h" + +namespace rpv1 = realm::protocolv1; + +RealmConnection::RealmConnection(const std::string& ca_file, const std::string& address, int port, + const std::string& cookie, UT_sint64 doc_id, bool master, const std::string& session_id, + boost::function sig) + : m_io_service(), + m_socket(m_io_service), + m_ca_file(ca_file), + m_address(address), + m_port(port), + m_thread_ptr(), + m_cookie(cookie), + m_doc_id(doc_id), + m_master(master), + m_session_id(session_id), + m_buf(1024), // always have a reasonable block of free memory available to cut back on the memory allocations a bit, + m_packet_queue(boost::bind(&RealmConnection::_signal, this)), // TODO: shouldn't this be a shared pointer? Can't we handle signals in this way while this object has been already deleted? - MARCM + m_sig(sig), + m_buddies(), + m_pdp_ptr(), + m_tls_tunnel_ptr() +{ +} + +bool RealmConnection::connect() +{ + UT_DEBUGMSG(("RealmConnection::connect()\n")); + UT_return_val_if_fail(!m_thread_ptr, false); + + try { + // setup our local TLS tunnel to the realm + m_tls_tunnel_ptr.reset(new tls_tunnel::ClientProxy(m_address, m_port, m_ca_file, false)); + asio::thread thread(boost::bind(&tls_tunnel::ClientProxy::run, m_tls_tunnel_ptr)); + + // connect to the tunnel + asio::ip::tcp::resolver::query query(m_tls_tunnel_ptr->local_address(), boost::lexical_cast(m_tls_tunnel_ptr->local_port())); + asio::ip::tcp::resolver resolver(m_io_service); + asio::ip::tcp::resolver::iterator iterator(resolver.resolve(query)); + m_socket.connect(*iterator); + } + catch (tls_tunnel::Exception& e) + { + UT_DEBUGMSG(("tls_tunnel exception connecting to realm: %s\n", e.message().c_str())); + return false; + } + catch (asio::system_error& se) + { + UT_DEBUGMSG(("Error connecting to realm: %s\n", se.what())); + return false; + } + catch (...) + { + UT_DEBUGMSG(("Error connecting to realm!\n")); + return false; + } + + if (!_login()) + { + UT_DEBUGMSG(("RealmConnection login failed!\n")); + _disconnect(); + return false; + } + + UT_DEBUGMSG(("RealmConnection connected\n")); + + // start reading realm messages + _receive(); + + m_thread_ptr.reset(new asio::thread(boost::bind(&asio::io_service::run, &m_io_service))); + return true; +} + +void RealmConnection::disconnect() +{ + UT_DEBUGMSG(("RealmConnection::disconnect()\n")); + if (m_socket.is_open()) + { + asio::error_code ac; + m_socket.shutdown(asio::ip::tcp::socket::shutdown_both, ac); + m_socket.close(ac); + } +} + +bool RealmConnection::isConnected() +{ + return m_socket.is_open(); +} + +void RealmConnection::addBuddy(RealmBuddyPtr buddy_ptr) +{ + m_buddies.push_back(buddy_ptr); +} + +void RealmConnection::removeBuddy(UT_uint8 realm_connection_id) +{ + for (std::vector >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) + { + UT_continue_if_fail(*it); + if ((*it)->realm_connection_id() == realm_connection_id) + { + m_buddies.erase(it); + return; + } + } + + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); +} + +RealmBuddyPtr RealmConnection::getBuddy(UT_uint8 realm_connection_id) +{ + for (std::vector >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) + { + UT_continue_if_fail(*it); + if ((*it)->realm_connection_id() == realm_connection_id) + { + return *it; + } + } + return RealmBuddyPtr(); +} + +void RealmConnection::_disconnect() +{ + UT_DEBUGMSG(("RealmConnection::_disconnect()\n")); + + if (m_socket.is_open()) + { + asio::error_code ac; + m_socket.shutdown(asio::ip::tcp::socket::shutdown_both, ac); + m_socket.close(ac); + } + + if (m_thread_ptr) + { + m_io_service.stop(); + m_thread_ptr->join(); + m_thread_ptr.reset(); + } + + if (m_tls_tunnel_ptr) + { + m_tls_tunnel_ptr->stop(); + m_tls_tunnel_ptr.reset(); + } + + // signal the packet queue, so the listener will be informed of the + // disconnect; this is a bit wacky (design wise), but it works + m_packet_queue.signal(); +} + +void RealmConnection::_signal() +{ + m_sig(*this); +} + +bool RealmConnection::_login() +{ + UT_DEBUGMSG(("RealmConnection::_login()\n")); + + // FIXME: make this a combined asio buffer + boost::shared_ptr header_ptr(new std::string(2*sizeof(UT_uint32) + m_cookie.size(), '\0')); + std::string& header = *header_ptr; + + UT_uint32 proto_magic = 0x000A0B01; + UT_uint32 proto_version = 0x01; + // FIXME: not Big Endian safe!! + memcpy(&header[0], &proto_magic, sizeof(UT_uint32)); + memcpy(&header[sizeof(UT_uint32)], &proto_version, sizeof(UT_uint32)); + memcpy(&header[2*sizeof(UT_uint32)], m_cookie.data(), m_cookie.size()); + + // holds the login response information + std::string response(1, '\0'); + + try + { + // send the login credententials + // TODO: we should check the number of bytes written + asio::write(m_socket, asio::buffer(header)); + + // read the login response + // TODO: we should check the number of bytes read + asio::read(m_socket, asio::buffer(&response[0], response.size())); + } + catch (asio::system_error e) + { + UT_DEBUGMSG(("Error while writing/writing protocol header: %s\n", e.what())); + return false; + } + + switch (response[0]) + { + case realm::protocol::HANDSHAKE_RESERVED: + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); + return false; + case realm::protocol::HANDSHAKE_OK: + UT_DEBUGMSG(("Login response OK!\n")); + break; + case realm::protocol::HANDSHAKE_BAD_IDENTIFIER: + UT_DEBUGMSG(("realm::protocol::HANDSHAKE_BAD_IDENTIFIER response!\n")); + return false; + case realm::protocol::HANDSHAKE_UNSUPPORTED_PROTOCOL: + UT_DEBUGMSG(("realm::protocol::HANDSHAKE_UNSUPPORTED_PROTOCOL response!\n")); + return false; + case realm::protocol::HANDSHAKE_INVALID_COOKIE: + UT_DEBUGMSG(("realm::protocol::HANDSHAKE_INVALID_COOKIE response!\n")); + return false; + default: + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); + return false; + } + + return true; +} + +void RealmConnection::_receive() +{ + UT_DEBUGMSG(("RealmConnection::_receive()\n")); + m_buf.clear(); + boost::shared_ptr msg_ptr(new std::string(1, '\0')); + asio::async_read(m_socket, asio::buffer(&(*msg_ptr)[0], msg_ptr->size()), + boost::bind(&RealmConnection::_message, shared_from_this(), + asio::placeholders::error, asio::placeholders::bytes_transferred, msg_ptr)); +} + +void RealmConnection::_message(const asio::error_code& e, std::size_t bytes_transferred, boost::shared_ptr msg_ptr) +{ + UT_DEBUGMSG(("RealmConnection::_message()\n")); + if (e) + { + UT_DEBUGMSG(("Error reading message: %s\n", e.message().c_str())); + _disconnect(); + return; + } + UT_DEBUGMSG(("Constructing packet of type: 0x%x\n", (*msg_ptr)[0])); + PacketPtr packet_ptr = realm::protocolv1::Packet::construct(static_cast((*msg_ptr)[0])); + if (!packet_ptr) { + UT_DEBUGMSG(("Error constructing packet for type 0x%x\n", (*msg_ptr)[0])); + return; + } + _complete_packet(packet_ptr); +} + +void RealmConnection::_complete_packet(PacketPtr packet_ptr) +{ + UT_DEBUGMSG(("RealmConnection::_complete_packet()\n")); + int bytes_needed = packet_ptr->complete(m_buf.data(), m_buf.size()); + switch (bytes_needed) + { + case -1: + UT_DEBUGMSG(("Error determining packet (type: 0x%x) completion state!\n", packet_ptr->type())); + return; + case 0: + { + UT_DEBUGMSG(("Read full packet\n")); + UT_return_if_fail(packet_ptr->parse(m_buf.data(), m_buf.size()) != -1); + m_packet_queue.push(packet_ptr); + _receive(); + } + break; + default: + UT_DEBUGMSG(("Need more data (%d bytes) for this packet...\n", bytes_needed)); + // read the needed number of bytes + char* ptr = m_buf.prepare(bytes_needed); + asio::async_read(m_socket, asio::buffer(ptr, bytes_needed), + boost::bind(&RealmConnection::_complete, shared_from_this(), + asio::placeholders::error, asio::placeholders::bytes_transferred, packet_ptr) + ); + break; + } +} + +void RealmConnection::_complete(const asio::error_code& e, std::size_t bytes_transferred, PacketPtr packet_ptr) +{ + UT_DEBUGMSG(("RealmConnection::_complete()\n")); + if (e) + { + UT_DEBUGMSG(("Error reading message: %s\n", e.message().c_str())); + _disconnect(); + return; + } + m_buf.commit(bytes_transferred); + _complete_packet(packet_ptr); +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,128 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __REALM_CONNECTION__ +#define __REALM_CONNECTION__ + +#include +#include +#include +#include +#include +#include "ut_types.h" +#include "RealmBuddy.h" +#include "RealmGrowBuffer.h" +#include "RealmProtocol.h" +#include "tls_tunnel.h" +#include + +class AP_Dialog_GenericProgress; + +using realm::protocolv1::PacketPtr; + +struct PendingDocumentProperties +{ + PendingDocumentProperties(AP_Dialog_GenericProgress* pDlg_, + PD_Document** pDoc_, XAP_Frame* pFrame_, const std::string& filename_) + : pDlg(pDlg_), pDoc(pDoc_), pFrame(pFrame_), filename(filename_) + {} + + AP_Dialog_GenericProgress* pDlg; + PD_Document** pDoc; + XAP_Frame* pFrame; + std::string filename; +}; + +class RealmConnection : public boost::enable_shared_from_this +{ +public: + RealmConnection(const std::string& ca_file, const std::string& address, int port, + const std::string& cookie, UT_sint64 doc_id, bool master, const std::string& session_id, + boost::function sig); + + bool connect(); + void disconnect(); + bool isConnected(); + + void addBuddy(RealmBuddyPtr buddy_ptr); + void removeBuddy(UT_uint8 realm_connection_id); + RealmBuddyPtr getBuddy(UT_uint8 realm_connection_id); + std::vector& getBuddies() + { return m_buddies; } + + UT_sint64 doc_id() + { return m_doc_id; } + bool master() + { return m_master; } + const std::string& session_id() + { return m_session_id; } + SynchronizedQueue& queue() + { return m_packet_queue; } + asio::ip::tcp::socket& socket() + { return m_socket; } + + void loadDocumentStart(AP_Dialog_GenericProgress* pDlg, + PD_Document** pDoc_, XAP_Frame* pFrame_, const std::string& filename_) + { + UT_return_if_fail(!m_pdp_ptr); + m_pdp_ptr.reset(new PendingDocumentProperties(pDlg, pDoc_, pFrame_, filename_)); + } + boost::shared_ptr + getPendingDocProps() + { return m_pdp_ptr; } + void loadDocumentEnd() + { m_pdp_ptr.reset(); } + + +private: + void _disconnect(); + void _signal(); + bool _login(); + void _receive(); + void _message(const asio::error_code& e, + std::size_t bytes_transferred, + boost::shared_ptr msg_ptr); + + void _complete_packet(PacketPtr packet_ptr); + void _complete(const asio::error_code& e, std::size_t bytes_transferred, + PacketPtr packet_ptr); + + asio::io_service m_io_service; + std::string m_ca_file; + std::string m_address; + int m_port; + asio::ip::tcp::socket m_socket; + boost::shared_ptr m_thread_ptr; + std::string m_cookie; + UT_sint64 m_doc_id; + bool m_master; + std::string m_session_id; + realm::GrowBuffer m_buf; + SynchronizedQueue m_packet_queue; + boost::function m_sig; + std::vector m_buddies; + + boost::shared_ptr + m_pdp_ptr; + boost::shared_ptr + m_tls_tunnel_ptr; +}; + +typedef boost::shared_ptr ConnectionPtr; + +#endif /* __REALM_CONNECTION__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmGrowBuffer.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmGrowBuffer.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmGrowBuffer.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmGrowBuffer.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,58 @@ +#ifndef __REALM_GROW_BUFFER__ +#define __REALM_GROW_BUFFER__ + +namespace realm { + +class GrowBuffer { +public: + GrowBuffer(size_t capacity) + : m_capacity(capacity), + m_buf(capacity, '\0'), + m_index(0) + {} + + GrowBuffer() + : m_capacity(0), + m_buf(), + m_index(0) + {} + + void clear() { + if (m_buf.size() > m_capacity) + m_buf.resize(m_capacity); + m_index = 0; + } + + char* data() { + return &m_buf[0]; + } + + size_t size() { + return m_index; + } + + size_t free() { + return m_buf.size() - m_index; + } + + char* prepare(size_t capacity) { + if (free() < capacity) + m_buf.resize(m_buf.size() + (capacity - free())); + return &m_buf[m_index]; + } + + void commit(size_t capacity) { + if (m_index + capacity > m_buf.size()) + return; // TODO: throw exception + m_index += capacity; + } + +private: + size_t m_capacity; + std::string m_buf; + size_t m_index; +}; + +} + +#endif /* __REALM_GROW_BUFFER__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,192 @@ +#include "RealmProtocol.h" + +namespace realm { + +namespace protocolv1 { + +#define MAX_PACKET_DATA_SIZE 64*1024*1024 + +#define RPV1_PACKET_NONEXISTENT -2 +#define RPV1_PACKET_VARIABLE -1 + +static uint32_t body_size[6] = { + RPV1_PACKET_NONEXISTENT, /* 0: reserved */ + RPV1_PACKET_VARIABLE, /* route; variable size */ + RPV1_PACKET_VARIABLE, /* deliver; variable size */ + RPV1_PACKET_VARIABLE, /* user joined */ + 1, /* user left */ + 0 /* session takeover */ +}; + +PacketPtr Packet::construct(uint8_t type) { + switch (type) { + case 0x00: /* reserved */ + return PacketPtr(); + case 0x01: /* route */ + return PacketPtr(new RoutingPacket()); + case 0x02: /* deliver */ + return PacketPtr(new DeliverPacket()); + case 0x03: /* user joined */ + return PacketPtr(new UserJoinedPacket()); + case 0x04: /* user left */ + return PacketPtr(new UserLeftPacket()); + case 0x05: /* session takeover */ + return PacketPtr(new SessionTakeOverPacket()); + } + + return PacketPtr(); +} + +Packet::Packet(uint8_t type) + : m_type(type) +{} + +bool Packet::s_valid(char type) { + return type > 0 && type < __LAST_PACKET__; +} + +uint32_t Packet::s_body_size(char type) { + return body_size[type]; +} + +int Packet::complete(const char* buf, size_t size) { + if (size >= body_size[m_type]) + return 0; + return body_size[m_type]-size; +} + +int PayloadPacket::complete(const char* buf, size_t size) { + if (size < 4+m_min_payload_size) + return 4+m_min_payload_size-size; + uint32_t payload_size = 0; + memcpy(&payload_size, &buf[0], 4); // FIXME: not Big Endian safe! + if (payload_size > MAX_PACKET_DATA_SIZE) + return -1; + if (size >= 4+payload_size) + return 0; + return 4+payload_size-size; +} + +int PayloadPacket::parse(const char* buf, size_t size) { + // read and check the payload size + if (size < 4+m_min_payload_size) + return -1; + uint32_t payload_size = 0; + memcpy(&payload_size, &buf[0], 4); // FIXME: not Big Endian safe! + if (size < 4 + payload_size || payload_size < m_min_payload_size || payload_size > MAX_PACKET_DATA_SIZE) + return -1; + m_payload_size = payload_size; + return 4; +} + +RoutingPacket::RoutingPacket() + : PayloadPacket(PACKET_ROUTE, 2), + m_address_count(0), + m_connection_ids(), + m_msg() +{} + +RoutingPacket::RoutingPacket(std::vector& connection_ids, boost::shared_ptr msg) + : PayloadPacket(PACKET_ROUTE, 2, 1 + connection_ids.size() + msg->size()), + m_address_count(connection_ids.size()), + m_connection_ids(connection_ids), + m_msg(msg) +{} + +int RoutingPacket::parse(const char* buf, size_t size) { + int parsed = PayloadPacket::parse(buf, size); + if (parsed == -1) + return -1; + // get the recipients + m_address_count = buf[parsed]; + if (m_address_count + 1 > getPayloadSize()) + return -1; + m_connection_ids.resize(m_address_count); + std::copy(buf+parsed+1, buf+parsed+1+m_address_count, m_connection_ids.begin()); + // get the message data + uint32_t msg_start = parsed+1+m_address_count; + uint32_t msg_size = getPayloadSize() - 1 - m_address_count; + m_msg.reset(new std::string(msg_size, '\0')); + std::copy(buf+msg_start, buf+msg_start+msg_size, (*m_msg).begin()); + return parsed + getPayloadSize(); +} + +DeliverPacket::DeliverPacket() + : PayloadPacket(PACKET_DELIVER, 1), + m_connection_id(0), + m_msg() +{} + +DeliverPacket::DeliverPacket(uint8_t connection_id, boost::shared_ptr msg) + : PayloadPacket(PACKET_DELIVER, 1, 1 + msg->size()), + m_connection_id(connection_id), + m_msg(msg) +{} + +int DeliverPacket::parse(const char* buf, size_t size) { + int parsed = PayloadPacket::parse(buf, size); + if (parsed == -1) + return -1; + // get the sender + m_connection_id = buf[parsed]; + // get the message data + uint32_t msg_start = parsed + 1; + uint32_t msg_size = getPayloadSize() - 1; + m_msg.reset(new std::string(msg_size, '\0')); + std::copy(buf+msg_start, buf+msg_start+msg_size, (*m_msg).begin()); + return parsed + getPayloadSize(); +} + +UserJoinedPacket::UserJoinedPacket() + : PayloadPacket(PACKET_USERJOINED, 2), + m_connection_id(0), + m_master(0), + m_userinfo() +{} + +UserJoinedPacket::UserJoinedPacket(uint8_t connection_id, bool master, boost::shared_ptr userinfo) + : PayloadPacket(PACKET_USERJOINED, 2, 2 + userinfo->size()), + m_connection_id(connection_id), + m_master(static_cast(master)), + m_userinfo(userinfo) +{} + +int UserJoinedPacket::parse(const char* buf, size_t size) { + int parsed = PayloadPacket::parse(buf, size); + if (parsed == -1) + return -1; + // get the user that joined + m_connection_id = buf[parsed]; + // get the master information + m_master = buf[parsed+1]; + // get the userinfo + uint32_t msg_start = parsed + 2; + uint32_t msg_size = getPayloadSize() - 2; + m_userinfo.reset(new std::string(msg_size, '\0')); + std::copy(buf+msg_start, buf+msg_start+msg_size, (*m_userinfo).begin()); + return parsed + getPayloadSize(); +} + +UserLeftPacket::UserLeftPacket() + : Packet(PACKET_USERLEFT), + m_connection_id(0) +{} + +UserLeftPacket::UserLeftPacket(uint8_t connection_id) + : Packet(PACKET_USERLEFT), + m_connection_id(connection_id) +{} + +int UserLeftPacket::parse(const char* buf, size_t size) { + if (size < 1) + return false; + m_connection_id = buf[0]; + return 1; +} + +SessionTakeOverPacket::SessionTakeOverPacket() + : Packet(PACKET_SESSIONTAKEOVER) +{} + +} +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,191 @@ +#ifndef __REALM_PROTOCOL__ +#define __REALM_PROTOCOL__ + +#include +#include +#include +#include +#include + +namespace realm { + +namespace protocol { + +enum handshake_response { + HANDSHAKE_RESERVED = 0, /* 0x00: reserved */ + HANDSHAKE_OK, /* 0x01: Login OK */ + HANDSHAKE_BAD_IDENTIFIER, /* 0x02: Unrecognized protocol magic */ + HANDSHAKE_UNSUPPORTED_PROTOCOL, /* 0x03: Unsupported protocol version */ + HANDSHAKE_INVALID_COOKIE /* 0x04: Invalid cookie */ +}; + +} + +namespace protocolv1 { + +class Packet; +typedef boost::shared_ptr PacketPtr; +typedef boost::shared_ptr StreamPtr; + +// the packet type values must match up the corresponding body_size in +// RealmProtocol.cpp (ugly, but it's fast)! +enum packet_type { + PACKET_RESERVED = 0x00, + PACKET_ROUTE, // 0x01 + PACKET_DELIVER, // 0x02 + PACKET_USERJOINED, // 0x03 + PACKET_USERLEFT, // 0x04 + PACKET_SESSIONTAKEOVER, // 0x05 + __LAST_PACKET__ +}; + +class Packet { +public: + virtual ~Packet() {} + + static PacketPtr construct(uint8_t type); + + static bool s_valid(char type); + static uint32_t s_body_size(char type); + + // Should be overwritten when the packet size is variable + // Returns: the minimal number of bytes additionally needed before we can + // re-assess if the packet is complete or not; -1 on error. + // Note that this several complete() calls on the same buffer may return + // several times with a value > 0. Only when complete() returns 0 the + // buffer contains enough information to call parse(). + virtual int complete(const char* buf, size_t size); + + // should be overwritten when the packet 'has a body' + // returns: the number of bytes read, -1 on error + virtual int parse(const char* buf, size_t size) { + return 0; + } + + const uint8_t& type() const { + return m_type; + } + +protected: + Packet(uint8_t type); + +private: + uint8_t m_type; +}; + +class PayloadPacket : public Packet { +public: + virtual int complete(const char* buf, size_t size); + virtual int parse(const char* buf, size_t size); + + const uint32_t& getPayloadSize() const { + return m_payload_size; + } +protected: + PayloadPacket(uint8_t type, uint32_t min_payload_size, uint32_t payload_size) + : Packet(type), + m_min_payload_size(min_payload_size), + m_payload_size(payload_size) + {} + PayloadPacket(uint8_t type, uint32_t min_payload_size) + : Packet(type), + m_min_payload_size(min_payload_size), + m_payload_size(0) + {} +private: + uint32_t m_min_payload_size; + uint32_t m_payload_size; +}; + +class RoutingPacket : public PayloadPacket { +public: + RoutingPacket(); + RoutingPacket(std::vector& connection_ids, boost::shared_ptr msg); + virtual int parse(const char* buf, size_t size); + + const uint8_t& getAddressCount() const { + return m_address_count; + } + + const std::vector& getConnectionIds() const { + return m_connection_ids; + } + + boost::shared_ptr getMessage() const { + return m_msg; + } + +private: + uint8_t m_address_count; // a bit redundant (as it can be derived from m_connection_ids.size()), + // but it's convenient to be able to get a reference to this value + // when sending this packet + std::vector m_connection_ids; + boost::shared_ptr m_msg; +}; + +class DeliverPacket : public PayloadPacket { +public: + DeliverPacket(); + DeliverPacket(uint8_t connection_id, boost::shared_ptr msg); + virtual int parse(const char* buf, size_t size); + + const uint8_t& getConnectionId() const { + return m_connection_id; + } + + boost::shared_ptr getMessage() const { + return m_msg; + } + +private: + uint8_t m_connection_id; + boost::shared_ptr m_msg; +}; + +class UserJoinedPacket : public PayloadPacket { +public: + UserJoinedPacket(); + UserJoinedPacket(uint8_t connection_id, bool master, boost::shared_ptr userinfo); + virtual int parse(const char* buf, size_t size); + + const uint8_t& getConnectionId() const { + return m_connection_id; + } + + const uint8_t& isMaster() const { + return m_master; + } + + boost::shared_ptr getUserInfo() const { + return m_userinfo; + } + +private: + uint8_t m_connection_id; + uint8_t m_master; + boost::shared_ptr m_userinfo; +}; + +class UserLeftPacket : public Packet { +public: + UserLeftPacket(); + UserLeftPacket(uint8_t connection_id); + virtual int parse(const char* buf, size_t size); + + const uint8_t& getConnectionId() const { + return m_connection_id; + } + +private: + uint8_t m_connection_id; +}; + +class SessionTakeOverPacket : public Packet { +public: + SessionTakeOverPacket(); +}; + +} +} + +#endif /* __REALM_PROTOCOL__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.cpp 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,5 @@ /* Copyright (C) 2006,2007 Marc Maurer + * Copyright (C) 2008 AbiSource Corporation B.V. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,32 +17,76 @@ * 02111-1307, USA. */ +#ifndef WIN32 +#include +#endif +#include +#include +#include "xap_App.h" +#include "xap_Frame.h" +#include "xap_DialogFactory.h" +#include "ut_debugmsg.h" +#include "ut_sleep.h" +#include "soa_soup.h" +#include "abicollab_types.h" +#include "AsyncWorker.h" +#include "ProgressiveSoapCall.h" +#include "RealmBuddy.h" +#include "ServiceBuddy.h" #include "ServiceAccountHandler.h" +#include "ap_Dialog_GenericInput.h" +#include +#include -/**************************************** - DocTreeItem -*****************************************/ -/*DocTreeItem::DocTreeItem() - : m_id(0), - m_name(""), - m_type(DOCTREEITEM_TYPE_NILL), - m_acl(DOCTREEITEM_ACL_PRIVATE), - m_data(0) -{ -} +namespace rpv1 = realm::protocolv1; -DocTreeItem::DocTreeItem(UT_sint64 id, const char* name, DocTreeItemType type, DocTreeItemAcl acl) - : m_id(id), - m_name(name), - m_type(type), - m_acl(acl), - m_data(0) +XAP_Dialog_Id ServiceAccountHandler::m_iDialogGenericInput = 0; +XAP_Dialog_Id ServiceAccountHandler::m_iDialogGenericProgress = 0; +AbiCollabSaveInterceptor ServiceAccountHandler::m_saveInterceptor = AbiCollabSaveInterceptor(); + +bool ServiceAccountHandler::askPassword(const std::string& email, std::string& password) { -}*/ + UT_DEBUGMSG(("ServiceAccountHandler::askPassword()\n")); + XAP_Frame* pFrame = XAP_App::getApp()->getLastFocussedFrame(); + UT_return_val_if_fail(pFrame, false); + + // ask for the service password + XAP_DialogFactory* pFactory = static_cast(XAP_App::getApp()->getDialogFactory()); + UT_return_val_if_fail(pFactory, false); + AP_Dialog_GenericInput* pDialog = static_cast( + pFactory->requestDialog(ServiceAccountHandler::getDialogGenericInputId()) + ); + + // Run the dialog + // TODO: make this translatable + pDialog->setTitle("AbiCollab.net Collaboration Service"); // FIXME: don't hardcode this title to abicollab.net + std::string msg = "Please enter your password for account '" + email + "'"; + pDialog->setQuestion(msg.c_str()); + pDialog->setLabel("Password:"); + pDialog->setPassword(true); + pDialog->runModal(pFrame); + + // get the results + bool cancel = pDialog->getAnswer() == AP_Dialog_GenericInput::a_CANCEL; + if (!cancel) + password = pDialog->getInput().utf8_str(); + pFactory->releaseDialog(pDialog); + + // the user terminated the input + return !cancel; +} ServiceAccountHandler::ServiceAccountHandler() - : AccountHandler() -{ + : AccountHandler(), + m_bOnline(false), + m_connections() +{ + m_ssl_ca_file = XAP_App::getApp()->getAbiSuiteLibDir(); +#if defined(WIN32) + m_ssl_ca_file += "\\certs\\cacert.pem"; +#else + m_ssl_ca_file += "/certs/cacert.pem"; +#endif } ServiceAccountHandler::~ServiceAccountHandler() @@ -51,17 +96,17 @@ UT_UTF8String ServiceAccountHandler::getDescription() { - return UT_UTF8String_sprintf("AbiWord Collaboration Service"); + return getProperty("email").c_str(); } UT_UTF8String ServiceAccountHandler::getDisplayType() { - return "AbiWord Collaboration Service"; + return "AbiCollab.net Collaboration Service"; } UT_UTF8String ServiceAccountHandler::getStorageType() { - return "com.abisource.abiword.abicollab.backend.service"; + return SERVICE_ACCOUNT_HANDLER_TYPE; } void ServiceAccountHandler::storeProperties() @@ -69,547 +114,809 @@ UT_DEBUGMSG(("ServiceAccountHandler::storeProperties() - TODO: implement me\n")); } +XAP_Dialog_Id ServiceAccountHandler::getDialogGenericInputId() +{ + // register the generic input dialog if we haven't already done that + // a bit hacky, but it works + if (m_iDialogGenericInput == 0) + { + XAP_DialogFactory * pFactory = static_cast(XAP_App::getApp()->getDialogFactory()); + m_iDialogGenericInput = pFactory->registerDialog(ap_Dialog_GenericInput_Constructor, XAP_DLGT_NON_PERSISTENT); + } + return m_iDialogGenericInput; +} + +XAP_Dialog_Id ServiceAccountHandler::getDialogGenericProgressId() +{ + // register the generic progress dialog if we haven't already done that + // a bit hacky, but it works + if (m_iDialogGenericProgress == 0) + { + XAP_DialogFactory * pFactory = static_cast(XAP_App::getApp()->getDialogFactory()); + m_iDialogGenericProgress = pFactory->registerDialog(ap_Dialog_GenericProgress_Constructor, XAP_DLGT_NON_PERSISTENT); + } + return m_iDialogGenericProgress; +} + ConnectResult ServiceAccountHandler::connect() { UT_DEBUGMSG(("ServiceAccountHandler::connect()\n")); - return CONNECT_INTERNAL_ERROR; + if (m_bOnline) + return CONNECT_SUCCESS; + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_val_if_fail(pManager, CONNECT_INTERNAL_ERROR); + + m_bOnline = true; + + // we are "connected" now, time to start sending out, and listening to messages (such as events) + pManager->registerEventListener(this); + + return CONNECT_SUCCESS; } bool ServiceAccountHandler::disconnect() { - UT_DEBUGMSG(("ServiceAccountHandler::disconnect() - TODO: implement me\n")); + UT_DEBUGMSG(("ServiceAccountHandler::disconnect()\n")); + UT_return_val_if_fail(m_bOnline, false); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_val_if_fail(pManager, false); + + m_bOnline = false; + + // TODO: send out an event we are going offline + // ... + + // we are disconnected now, no need to sent out messages (such as events) anymore + pManager->unregisterEventListener(this); + return true; } bool ServiceAccountHandler::isOnline() { - // TODO: implement me - return false; + return m_bOnline; } Buddy* ServiceAccountHandler::constructBuddy(const PropertyMap& props) { UT_DEBUGMSG(("ServiceAccountHandler::constructBuddy() - TODO: implement me\n")); - + UT_ASSERT_HARMLESS(UT_NOT_IMPLEMENTED); return NULL; // TODO: implement me } bool ServiceAccountHandler::send(const Packet* packet) { UT_DEBUGMSG(("ServiceAccountHandler::send(const Packet*)\n")); - return false; + // this are typically announce session broadcast events and the like, + // which we don't support in this backend + UT_ASSERT_HARMLESS(UT_NOT_IMPLEMENTED); + return true; } -bool ServiceAccountHandler::send(const Packet*, const Buddy& buddy) +bool ServiceAccountHandler::send(const Packet* packet, const Buddy& buddy) { UT_DEBUGMSG(("ServiceAccountHandler::send(const Packet*, const Buddy& buddy)\n")); - return false; + + const RealmBuddy& ourBuddy = static_cast(buddy); + uint8_t arr[] = { ourBuddy.realm_connection_id() }; + std::vector connection_ids(arr, arr+1); + + boost::shared_ptr data(new std::string()); + _createPacketStream( *data, packet ); + + _send(boost::shared_ptr(new rpv1::RoutingPacket(connection_ids, data)), ourBuddy.ptr()); + return true; } -/* -void s_parse_document(xmlNode* document, DocTreeItem* parent) +void ServiceAccountHandler::_write_handler(const asio::error_code& e, std::size_t bytes_transferred, + boost::shared_ptr recipient, boost::shared_ptr packet) { - if (!document || !parent) + if (e) + { + // TODO: disconnect buddy + UT_DEBUGMSG(("Error sending packet: %s\n", e.message().c_str())); return; + } + + UT_DEBUGMSG(("Packet sent: 0x%x\n", packet->type())); +} + +void ServiceAccountHandler::getSessionsAsync() +{ + UT_DEBUGMSG(("ServiceAccountHandler::getSessionsAsync()\n")); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); + + pManager->beginAsyncOperation(this); + SessionBuddyPtr sessions_ptr(new std::vector()); + boost::shared_ptr > async_list_docs_ptr( + new AsyncWorker( + boost::bind(&ServiceAccountHandler::_listDocuments, this, + getProperty("uri"), getProperty("email"), getProperty("password"), sessions_ptr), + boost::bind(&ServiceAccountHandler::_listDocuments_cb, this, _1, sessions_ptr) + ) + ); + async_list_docs_ptr->start(); +} + +void ServiceAccountHandler::getSessionsAsync(const Buddy& buddy) +{ + UT_DEBUGMSG(("ServiceAccountHandler::getSessionsAsync(const Buddy& buddy)\n")); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); + + // TODO: we shouldn't ignore the buddy parameter, but for now, we do ;) + + pManager->beginAsyncOperation(this); + SessionBuddyPtr sessions_ptr(new std::vector()); + boost::shared_ptr > async_list_docs_ptr( + new AsyncWorker( + boost::bind(&ServiceAccountHandler::_listDocuments, this, + getProperty("uri"), getProperty("email"), getProperty("password"), sessions_ptr), + boost::bind(&ServiceAccountHandler::_listDocuments_cb, this, _1, sessions_ptr) + ) + ); + async_list_docs_ptr->start(); +} - if (document->type == XML_ELEMENT_NODE) +bool ServiceAccountHandler::hasSession(const UT_UTF8String& sSessionId) +{ + for (std::vector >::iterator it = m_connections.begin(); it != m_connections.end(); it++) { - DocTreeItem* item = new DocTreeItem(); - // parse the document properties - for (xmlNode* prop = document->children; prop; prop = prop->next) - { - if (prop->type == XML_TEXT_NODE && prop->next) - { - prop = prop->next; - if (prop->type == XML_ELEMENT_NODE) - { - if (strcmp(reinterpret_cast(prop->name), "id") == 0) - { - UT_sint32 id = atoi(reinterpret_cast(xmlNodeGetContent(prop))); - if (id > 0) - item->m_id = id; - } - else if (strcmp(reinterpret_cast(prop->name), "name") == 0) - { - item->m_name = reinterpret_cast(xmlNodeGetContent(prop)); - } - else if (strcmp(reinterpret_cast(prop->name), "readonly") == 0) - { - // TODO: ... - } - else if (strcmp(reinterpret_cast(prop->name), "acl") == 0) - { - // TODO: ... - } - else - { - printf("unknown prop name: %s\n", prop->name); - UT_ASSERT_HARMLESS(false); - continue; - } - } - else - { - UT_DEBUGMSG(("Unexpected element in document - type: %d, name: %s", prop->type, prop->name)); - UT_ASSERT_HARMLESS(false); - } - } - } - parent->m_vecChildren.push_back(item); + boost::shared_ptr connection_ptr = *it; + UT_continue_if_fail(connection_ptr); + if (connection_ptr->session_id() == sSessionId.utf8_str()) + return true; } + return AccountHandler::hasSession(sSessionId); } -void s_parse_folder(xmlNode* folder, DocTreeItem* parent) +// NOTE: we don't implement the opening of documents asynchronous; we block on it, +// as it's annoying to opening them async. We need to change this API +void ServiceAccountHandler::joinSessionAsync(const Buddy& buddy, DocHandle& docHandle) { - if (!folder || !parent) + UT_DEBUGMSG(("ServiceAccountHandler::getSessionsAsync(const Buddy& buddy, DocHandle& docHandle)\n")); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); + + UT_DEBUGMSG(("Joining document %s\n", docHandle.getSessionId().utf8_str())); + + UT_sint64 doc_id; + try { + doc_id = boost::lexical_cast(docHandle.getSessionId().utf8_str()); + } catch (boost::bad_lexical_cast &) { + // TODO: report error + UT_DEBUGMSG(("Error casting doc_id (%s) to an UT_sint64\n", docHandle.getSessionId().utf8_str())); return; + } + UT_return_if_fail(doc_id != 0); + UT_DEBUGMSG(("doc_id: %lld\n", doc_id)); - if (folder->type == XML_ELEMENT_NODE) + PD_Document* pDoc = NULL; + acs::SOAP_ERROR err = openDocument(doc_id, 0, docHandle.getSessionId().utf8_str(), &pDoc, NULL); + switch (err) { - const char* name = reinterpret_cast(xmlGetProp(folder, reinterpret_cast("name"))); - if (!name) - { - name = "Unknown folder"; - } - // TODO: get a folderId here (but it is not in the XML atm) - DocTreeItem* item = new DocTreeItem(0, name, DOCTREEITEM_TYPE_FOLDER, DOCTREEITEM_ALC_NILL); - // folders can contain documents or folders - xmlNode *folder_child = NULL; - for (folder_child = folder->children; folder_child; folder_child = folder_child->next) - { - if (folder_child->type == XML_ELEMENT_NODE) - { - if (strcmp(reinterpret_cast(folder_child->name), "document") == 0) + case acs::SOAP_ERROR_OK: + return; + case acs::SOAP_ERROR_INVALID_PASSWORD: + { + // TODO: asking for user input is not really nice in an async function + const std::string email = getProperty("email"); + std::string password; + if (askPassword(email, password)) { - s_parse_document(folder_child, item); - } - else if (strcmp(reinterpret_cast(folder_child->name), "folder") == 0) - { - s_parse_folder(folder_child, item); + // try again with the new password + addProperty("password", password); + pManager->storeProfile(); + joinSessionAsync(buddy, docHandle); } } - } - parent->m_vecChildren.push_back(item); + return; + default: + { + // TODO: add the document name, error type and perhaps the server name + UT_UTF8String msg("Error importing document "); + msg += docHandle.getName(); + msg += "."; + XAP_App::getApp()->getLastFocussedFrame()->showMessageBox(msg.utf8_str(), XAP_Dialog_MessageBox::b_O, XAP_Dialog_MessageBox::a_OK); + } + break; } } -void s_parse_group_elements(xmlNode* group, DocTreeItem* parent) +acs::SOAP_ERROR ServiceAccountHandler::openDocument(UT_sint64 doc_id, UT_sint64 revision, const std::string& session_id, PD_Document** pDoc, XAP_Frame* pFrame) { - xmlNode *group_element = NULL; - for (group_element = group->children; group_element; group_element = group_element->next) + UT_DEBUGMSG(("ServiceAccountHandler::openDocument() - doc_id: %lld\n", doc_id)); + + const std::string uri = getProperty("uri"); + const std::string email = getProperty("email"); + const std::string password = getProperty("password"); + + // construct a SOAP method call to gets our documents + soa::function_call fc("openDocument", "openDocumentResponse"); + fc("email", email)("password", password)("doc_id", doc_id)("revision", static_cast(revision)); + + // execute the call + boost::shared_ptr call(new ProgressiveSoapCall(uri, fc, m_ssl_ca_file)); + soa::GenericPtr soap_result; + try { + soap_result = call->run(); + } catch (soa::SoapFault& fault) { + UT_DEBUGMSG(("Caught a soap fault: %s (error code: %s)!\n", + fault.detail() ? fault.detail()->value().c_str() : "(null)", + fault.string() ? fault.string()->value().c_str() : "(null)")); + return acs::error(fault); + } + UT_return_val_if_fail(soap_result, acs::SOAP_ERROR_GENERIC); + + // handle the result + soa::CollectionPtr rcp = soap_result->as("return"); + UT_return_val_if_fail(rcp, acs::SOAP_ERROR_GENERIC); + + soa::StringPtr realm_address = rcp->get("realm_address"); + soa::IntPtr realm_port = rcp->get("realm_port"); + soa::StringPtr cookie = rcp->get("cookie"); + + // some sanity checking + soa::BoolPtr master = rcp->get("master"); + if (!master) { - if (group_element->type == XML_ELEMENT_NODE) - { - if (strcmp(reinterpret_cast(group_element->name), "document") == 0) - { - s_parse_document(group_element, parent); - } - else if (strcmp(reinterpret_cast(group_element->name), "folder") == 0) - { - s_parse_folder(group_element, parent); - } - } + UT_DEBUGMSG(("Error reading master field\n")); + return acs::SOAP_ERROR_GENERIC; + } + if (!realm_address || realm_address->value().size() == 0 || !realm_port || realm_port->value() <= 0 || !cookie || cookie->value().size() == 0) + { + UT_DEBUGMSG(("Invalid realm login information\n")); + return acs::SOAP_ERROR_GENERIC; + } + soa::StringPtr filename_ptr = rcp->get("filename"); + if (!filename_ptr) + { + UT_DEBUGMSG(("Error reading filename field\n")); + return acs::SOAP_ERROR_GENERIC; + } + // check the filename; it shouldn't ever be empty, but just check nonetheless + // TODO: append a number if the filename happens to be empty + std::string filename = filename_ptr->value().size() > 0 ? filename_ptr->value() : "Untitled"; + + // open the realm connection! + UT_DEBUGMSG(("realm_address: %s, realm_port: %lld, cookie: %s\n", realm_address->value().c_str(), realm_port->value(), cookie->value().c_str())); + ConnectionPtr connection = + boost::shared_ptr(new RealmConnection(m_ssl_ca_file, realm_address->value(), + realm_port->value(), cookie->value(), doc_id, master->value(), session_id, + boost::bind(&ServiceAccountHandler::_handleRealmPacket, this, _1))); + + // TODO: this connect() call is blocking, so it _could_ take a while; we should + // display a progress bar in that case + if (!connection->connect()) + { + UT_DEBUGMSG(("Error connecting to realm %s:%d\n", realm_address->value().c_str(), realm_port->value())); + return acs::SOAP_ERROR_GENERIC; } + + // load the document + acs::SOAP_ERROR open_result = master->value() + ? _openDocumentMaster(rcp, pDoc, pFrame, session_id, filename) + : _openDocumentSlave(connection, pDoc, pFrame, filename); + + if (open_result != acs::SOAP_ERROR_OK) + { + UT_DEBUGMSG(("Error opening document!\n")); + // TODO: also nuke the queue! + connection->disconnect(); + return acs::SOAP_ERROR_GENERIC; + } + + UT_DEBUGMSG(("Document loaded successfully\n")); + m_connections.push_back(connection); + return acs::SOAP_ERROR_OK; +} + +acs::SOAP_ERROR ServiceAccountHandler::_openDocumentMaster(soa::CollectionPtr rcp, PD_Document** pDoc, XAP_Frame* pFrame, + const std::string& session_id, const std::string& filename) +{ + UT_return_val_if_fail(rcp || pDoc, acs::SOAP_ERROR_GENERIC); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_val_if_fail(pManager, acs::SOAP_ERROR_GENERIC); + + soa::StringPtr document = rcp->get("document"); + UT_return_val_if_fail(document, acs::SOAP_ERROR_GENERIC); + + // construct the document + UT_return_val_if_fail(AbiCollabSessionManager::deserializeDocument(pDoc, document->value(), true) == UT_OK, acs::SOAP_ERROR_GENERIC); + UT_return_val_if_fail(*pDoc, acs::SOAP_ERROR_GENERIC); + + // set the filename + gchar* fname = g_strdup(filename.c_str()); + (*pDoc)->setFilename(fname); + + // start the session + UT_UTF8String sSessionId = session_id.c_str(); + pManager->startSession(*pDoc, sSessionId, pFrame); + + return acs::SOAP_ERROR_OK; +} +acs::SOAP_ERROR ServiceAccountHandler::_openDocumentSlave(ConnectionPtr connection, PD_Document** pDoc, XAP_Frame* pFrame, const std::string& filename) +{ + UT_DEBUGMSG(("ServiceAccountHandler::_openDocumentSlave()\n")); + UT_return_val_if_fail(connection, acs::SOAP_ERROR_GENERIC); + UT_return_val_if_fail(pDoc, acs::SOAP_ERROR_GENERIC); + + // get the progress dialog + XAP_Frame* pDlgFrame = XAP_App::getApp()->getLastFocussedFrame(); + UT_return_val_if_fail(pDlgFrame, acs::SOAP_ERROR_GENERIC); + + XAP_DialogFactory* pFactory = static_cast(XAP_App::getApp()->getDialogFactory()); + UT_return_val_if_fail(pFactory, acs::SOAP_ERROR_GENERIC); + + AP_Dialog_GenericProgress* pDlg = static_cast( + pFactory->requestDialog(ServiceAccountHandler::getDialogGenericProgressId()) + ); + pDlg->setTitle("Retrieving Document"); + pDlg->setInformation("Please wait while retrieving document..."); + + // setup the information for the callback to use when the document comes in + connection->loadDocumentStart(pDlg, pDoc, pFrame, filename); + + // run the dialog + pDlg->runModal(pDlgFrame); + UT_DEBUGMSG(("Progress dialog destroyed...\n")); + bool m_cancelled = pDlg->getAnswer() == AP_Dialog_GenericProgress::a_CANCEL; + pFactory->releaseDialog(pDlg); + connection->loadDocumentEnd(); + + if (m_cancelled) + return acs::SOAP_ERROR_GENERIC; + + return acs::SOAP_ERROR_OK; } -void s_parse_groups(xmlNode* root, std::vector& vecDocTreeItems) +// FIXME: this function can be called from another thread; +// don't allow it to access data from the main thread +// NOTE: saveDocument can be called from a thread other than our mainloop; +// Don't let access or modify any data from the mainloop! +// FIXME FIXME FIXME: we should NOT touch m_connections!!!! +UT_Error ServiceAccountHandler::saveDocument(PD_Document* pDoc, const UT_UTF8String& sSessionId) { - xmlNode *group = NULL; - for (group = root->children; group; group = group->next) + UT_DEBUGMSG(("Saving document with session id %s to webservice!\n", sSessionId.utf8_str())); + UT_return_val_if_fail(pDoc, UT_ERROR); + + // find the realm connection beloning to this session to fetch the document id + for (std::vector >::iterator it = m_connections.begin(); it != m_connections.end(); it++) { - if (group->type == XML_ELEMENT_NODE) + boost::shared_ptr connection_ptr = *it; + UT_continue_if_fail(connection_ptr); + if (connection_ptr->session_id() == sSessionId.utf8_str()) { - UT_UTF8String prettyName; - if (strcmp(reinterpret_cast(group->name), "owner") == 0) - { - prettyName = "My Documents"; - } - else if (strcmp(reinterpret_cast(group->name), "friends") == 0) - { - prettyName = "My Friends' Documents"; - } - else if (strcmp(reinterpret_cast(group->name), "groups") == 0) - { - prettyName = "My Groups' Documents"; - } - else - { - UT_ASSERT_HARMLESS(false); - continue; + UT_DEBUGMSG(("Saving document id %lld\n", connection_ptr->doc_id())); + + const std::string uri = getProperty("uri"); + const std::string email = getProperty("email"); + const std::string password = getProperty("password"); + boost::shared_ptr document(new std::string("")); + if (AbiCollabSessionManager::serializeDocument(pDoc, *document, true) != UT_OK) + return UT_ERROR; + + // construct a SOAP method call to gets our documents + soa::function_call fc("saveDocument", "saveDocumentResponse"); + fc("email", email) + ("password", password) + ("doc_id", connection_ptr->doc_id()) + (soa::Base64Bin("data", document)); + + // execute the call and ignore the result (the revision number stored) + try { + soa::GenericPtr soap_result = soup_soa::invoke(uri, soa::method_invocation("urn:AbiCollabSOAP", fc), m_ssl_ca_file); + UT_return_val_if_fail(soap_result, UT_ERROR); + } catch (soa::SoapFault& fault) { + UT_DEBUGMSG(("Caught a soap fault: %s (error code: %s)!\n", + fault.detail() ? fault.detail()->value().c_str() : "(null)", + fault.string() ? fault.string()->value().c_str() : "(null)")); + return UT_ERROR; } - // First param on the next line is unused for groups - DocTreeItem* item = new DocTreeItem(0, prettyName.utf8_str(), DOCTREEITEM_TYPE_ROOT, DOCTREEITEM_ALC_NILL); - vecDocTreeItems.push_back(item); - s_parse_group_elements(group, item); + return UT_OK; } } -}*/ -void ServiceAccountHandler::populateDocuments(const UT_UTF8String& packet) + return UT_ERROR; +} + +void ServiceAccountHandler::signal(const Event& event, const Buddy* pSource) { -/* m_vecDocTreeItems.clear(); // TODO: we have to free all items + UT_DEBUGMSG(("ServiceAccountHandler::signal()\n")); + + // NOTE: do NOT let AccountHandler::signal() send broadcast packets! + // It will send them to all buddies, including the ones we created + // to list the available documents: ServiceBuddies. They are just fake + // buddies however, and can't receive real packets. Only RealmBuddy's + // can be sent packets - UT_DEBUGMSG(("Incoming packet:\n%s\n", packet.utf8_str())); - xmlNode *root_element = NULL; - xmlDocPtr doc = xmlReadMemory (packet.utf8_str(), packet.length(), 0, "UTF-8", 0); - if (doc == NULL) - { - UT_DEBUGMSG(("Error parsing document XML tree!\n")); - UT_ASSERT(UT_SHOULD_NOT_HAPPEN); - return; - } + // Note: there is no real need to pass the PCT_CloseSessionEvent and + // PCT_DisjoinSessionEvent signals to the AccountHandler::signal() + // function: that one will send all buddies the 'session is closed' + // signal. However, on this backend, the abicollab.net realm will + // handle that for us - root_element = xmlDocGetRootElement(doc); - if (root_element) + switch (event.getClassType()) { - // we only expect 1 root element (GetDocumentResponse) - UT_ASSERT(root_element->next == 0); - s_parse_groups(root_element, m_vecDocTreeItems); + case PCT_CloseSessionEvent: + { + UT_DEBUGMSG(("Got a PCT_CloseSessionEvent, disconnecting the realm connection...\n")); + const CloseSessionEvent cse = static_cast(event); + UT_return_if_fail(!pSource); // we shouldn't receive these events over the wire on this backend + ConnectionPtr connection_ptr = _getConnection(cse.getSessionId().utf8_str()); + UT_return_if_fail(connection_ptr); + connection_ptr->disconnect(); + } + break; + case PCT_DisjoinSessionEvent: + { + UT_DEBUGMSG(("Got a PCT_DisjoinSessionEvent, disconnecting the realm connection...\n")); + const DisjoinSessionEvent dse = static_cast(event); + UT_return_if_fail(!pSource); // we shouldn't receive these events over the wire on this backend + ConnectionPtr connection_ptr = _getConnection(dse.getSessionId().utf8_str()); + UT_return_if_fail(connection_ptr); + connection_ptr->disconnect(); + } + break; + case PCT_StartSessionEvent: + // TODO: users should get this I guess, but I don't know a proper way to implement this yet + break; + default: + // TODO: implement me + break; } - xmlCleanupParser(); - xmlFreeDoc(doc); - - // signal the listeners we have (atm, that is only the Documents dialog) - if (m_pDocDialog) - { - m_pDocDialog->repopulate(); - }*/ } -void ServiceAccountHandler::updateDocumentsAsync() -{ -/* UT_return_if_fail(m_pHandler); - - m_pHandler->send( - UT_UTF8String(""), - getAbiterString() - ); - */ -} - -void ServiceAccountHandler::openDocumentAsync(UT_sint64 docId) -{ -/* UT_return_if_fail(m_pHandler); - char buf[24]; // ick - snprintf(buf, sizeof(buf), "%d", docId); +// NOTE: _listDocuments can be called from a thread other than our mainloop; +// Don't let access or modify any data from the mainloop! +acs::SOAP_ERROR ServiceAccountHandler::_listDocuments( + const std::string uri, const std::string email, const std::string password, + SessionBuddyPtr sessions_ptr) +{ + UT_DEBUGMSG(("ServiceAccountHandler::_listDocuments()\n")); + UT_return_val_if_fail(sessions_ptr, acs::SOAP_ERROR_GENERIC); + + // construct a SOAP method call to gets our documents + soa::function_call fc("listDocuments", "listDocumentsResponse"); + fc("email", email)("password", password); + + soa::GenericPtr soap_result; + try { + soap_result = soup_soa::invoke(uri, soa::method_invocation("urn:AbiCollabSOAP", fc), m_ssl_ca_file); + } catch (soa::SoapFault& fault) { + UT_DEBUGMSG(("Caught a soap fault: %s (error code: %s)!\n", + fault.detail() ? fault.detail()->value().c_str() : "(null)", + fault.string() ? fault.string()->value().c_str() : "(null)")); + return acs::error(fault); + } + if (!soap_result) + return acs::SOAP_ERROR_GENERIC; - UT_UTF8String odr; - odr += ""; - odr += ""; - odr += &buf[0]; - odr += ""; - odr += ""; - XAP_Frame * pFrame = XAP_App::getApp()->getLastFocussedFrame(); - pFrame->setCursor(GR_Graphics::GR_CURSOR_WAIT); - m_pHandler->send(odr, getAbiterString());*/ + // handle the result + soa::CollectionPtr rcp = soap_result->as("return"); + UT_return_val_if_fail(rcp, acs::SOAP_ERROR_GENERIC); + + // load our own files + GetSessionsResponseEvent gsre; + _parseSessionFiles(rcp->get< soa::Array >("files"), gsre); + sessions_ptr->push_back( std::make_pair(gsre, new ServiceBuddy(this, email.c_str()) )); + + // load the files from our friends + if (soa::ArrayPtr friends_array = rcp->get< soa::Array >("friends")) + if (abicollab::FriendArrayPtr friends = friends_array->construct()) + for (size_t i = 0; i < friends->size(); i++) + if (abicollab::FriendPtr friend_ = friends->operator[](i)) + { + UT_DEBUGMSG(("Got a friend: %s <%s>\n", friend_->name.c_str(), friend_->email.c_str())); + if (friend_->email != "") + { + // add this friend's documents by generating a GetSessionsResponseEvent + // to populate all the required document structures + GetSessionsResponseEvent gsre; + _parseSessionFiles(friend_->files, gsre); + sessions_ptr->push_back( std::make_pair(gsre, new ServiceBuddy(this, friend_->email.c_str()) )); + } + } + + // load the files from our groups + if (soa::ArrayPtr groups_array = rcp->get< soa::Array >("groups")) + if (abicollab::GroupArrayPtr groups = groups_array->construct()) + for (size_t i = 0; i < groups->size(); i++) + if (abicollab::GroupPtr group_ = groups->operator[](i)) + { + UT_DEBUGMSG(("Got a group: %s\n", group_->name.c_str())); + if (group_->name != "") + { + // add this friend's documents by generating a GetSessionsResponseEvent + // to populate all the required document structures + GetSessionsResponseEvent gsre; + _parseSessionFiles(group_->files, gsre); + sessions_ptr->push_back( std::make_pair(gsre, new ServiceBuddy(this, group_->name.c_str()) )); + } + } + + return acs::SOAP_ERROR_OK; } -void ServiceAccountHandler::saveDocumentAsync(UT_sint64 docId, PD_Document * pDoc) +void ServiceAccountHandler::_listDocuments_cb(acs::SOAP_ERROR error, SessionBuddyPtr sessions_ptr) { -/* UT_return_if_fail(m_pHandler); // TODO: notify the user + UT_DEBUGMSG(("ServiceAccountHandler::_listDocuments_cb()\n")); + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); - UT_UTF8String odr; - odr += ""; + pManager->endAsyncOperation(this); + + UT_return_if_fail(sessions_ptr); + + switch (error) + { + case acs::SOAP_ERROR_OK: + { + std::vector& sessions = *sessions_ptr; + for (std::vector::iterator it = sessions.begin(); it != sessions.end(); it++) + { + ServiceBuddy* pBuddy = (*it).second; + UT_continue_if_fail(pBuddy); + Buddy* pExistingBuddy = getBuddy(pBuddy->getName()); + if (!pExistingBuddy) + { + pExistingBuddy = pBuddy; + addBuddy(pBuddy); + } + else + DELETEP(pBuddy); + _handlePacket(&((*it).first), pExistingBuddy, false); + } + } + break; + case acs::SOAP_ERROR_INVALID_PASSWORD: + { + // FIXME: should we ask for a password in an async callback? + const std::string email = getProperty("email"); + std::string password; + if (askPassword(email, password)) + { + // store the new password + addProperty("password", password); + pManager->storeProfile(); + + // re-attempt to fetch the documents list + pManager->beginAsyncOperation(this); + SessionBuddyPtr new_sessions_ptr(new std::vector()); + boost::shared_ptr > async_list_docs_ptr( + new AsyncWorker( + boost::bind(&ServiceAccountHandler::_listDocuments, this, + getProperty("uri"), getProperty("email"), getProperty("password"), new_sessions_ptr), + boost::bind(&ServiceAccountHandler::_listDocuments_cb, this, _1, new_sessions_ptr) + ) + ); + async_list_docs_ptr->start(); + } + } + return; + default: + // FIXME: maybe determine the exact error + /// TODO: show a message box? + UT_DEBUGMSG(("Caught SOAP error: %d\n", error)); + UT_return_if_fail(error == acs::SOAP_ERROR_OK); + } +} - UT_UTF8String document; - bool b = s_CollabFactoryContainer.fillDocumentString(document, pDoc); - UT_return_if_fail(b); // TODO: notify the user +void ServiceAccountHandler::_handleJoinSessionRequestResponse( + JoinSessionRequestResponseEvent* jsre, Buddy* pBuddy, + XAP_Frame* pFrame, PD_Document** pDoc, const std::string& filename) +{ + UT_return_if_fail(jsre); + UT_return_if_fail(pBuddy); + UT_return_if_fail(pDoc); + + UT_DEBUGMSG(("_handleJoinSessionRequestResponse() - pFrame: 0x%x\n", pFrame)); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); + + UT_return_if_fail(AbiCollabSessionManager::deserializeDocument(pDoc, jsre->m_sZABW, false) == UT_OK); + UT_return_if_fail(*pDoc); - odr += "setFilename(fname); - odr += ""; - UT_UTF8String sCAC = getAbiterString(); - m_pHandler->send(odr, sCAC.utf8_str());*/ + pManager->joinSession(jsre->getSessionId(), *pDoc, jsre->m_sDocumentId, jsre->m_iRev, pBuddy, pFrame); } -void ServiceAccountHandler::closeDocument(UT_sint64 docId, PD_Document * pDoc) +void ServiceAccountHandler::_handleRealmPacket(RealmConnection& connection) { -/* UT_return_if_fail(m_pHandler); + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); - UT_UTF8String odr; - odr += "\n"; - odr += ""; - odr += UT_UTF8String_sprintf("%d",docId); - odr += "\n"; - odr += ""; - UT_UTF8String sCAC = getAbiterString(); - UT_DEBUGMSG(("sending |%s| \n to |%s| \n",odr.utf8_str(),sCAC.utf8_str())); - m_pHandler->send(odr, sCAC.utf8_str());*/ -} + // make sure we have handled _all_ packets in the queue before checking + // the disconnected status + bool disconnected = !connection.isConnected(); + _handleMessages(connection); -/* + if (disconnected) + { + UT_DEBUGMSG(("RealmConnection is not connected anymore (this was a %s connection)!\n", connection.master() ? "master" : "slave")); + std::vector buddies = connection.getBuddies(); + for (std::vector::iterator it = buddies.begin(); it != buddies.end(); it++) + { + RealmBuddyPtr realm_buddy_ptr = *it; + UT_continue_if_fail(realm_buddy_ptr); + UT_DEBUGMSG(("Lost connection to buddy with connection id: %d\n", realm_buddy_ptr->realm_connection_id())); + pManager->removeBuddy(realm_buddy_ptr.get(), false); + } + + // remove the connection from our connection list + _removeConnection(connection.session_id()); + } + + // check other things here if needed... +} -void s_handle_service_import_event(UT_Worker * pWorker) +ConnectionPtr ServiceAccountHandler::_getConnection(const std::string& session_id) { - AbiCollab* pCollab = reinterpret_cast(pWorker->getInstanceData()); - pCollab->handleImportEvent(); + for (std::vector::iterator it = m_connections.begin(); it != m_connections.end(); it++) + { + UT_continue_if_fail(*it); + if ((*it)->session_id() == session_id) + return *it; + } + return ConnectionPtr(); } -static bool s_handle_service_message(const AbiCollab_Packet_Data *pAPD) +void ServiceAccountHandler::_removeConnection(const std::string& session_id) { - AbiCollabService* pService = AbiCollabService::getService(); - UT_return_val_if_fail(pService, false); - - xmlDocPtr doc = xmlReadMemory (pAPD->packet.utf8_str(), pAPD->packet.length(), 0, "UTF-8", 0); - UT_return_val_if_fail(doc, false); - UT_DEBUGMSG(("Received service packet\n")); - xmlNode *response_element = xmlDocGetRootElement(doc); - if (response_element) + UT_DEBUGMSG(("ServiceAccountHandler::_removeConnection()\n")); + for (std::vector::iterator it = m_connections.begin(); it != m_connections.end(); it++) { - // we only expect 1 root element (GetDocumentResponse) - UT_ASSERT(response_element->next == 0); - - UT_DEBUGMSG(("got resp: %s\n", reinterpret_cast(response_element->name))); - - if (strcmp(reinterpret_cast(response_element->name), "GetDocumentsResponse") == 0) + UT_continue_if_fail(*it); + ConnectionPtr connection = *it; + UT_DEBUGMSG(("looking at connection with session id <%s>, closing session <%s>\n", connection->session_id().c_str(), session_id.c_str())); + if (connection->session_id() == session_id) { - // FIXME FIXME: don't re-parse!!! - pService->populateDocuments(pAPD->packet); + UT_DEBUGMSG(("connection dropped\n")); + m_connections.erase(it); + return; } - else if(strcmp(reinterpret_cast(response_element->name), "SaveDocumentResponse") == 0) + } +} + +void ServiceAccountHandler::_handleMessages(RealmConnection& connection) +{ + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); + + while (connection.queue().peek()) + { + rpv1::PacketPtr packet = connection.queue().pop(); + UT_continue_if_fail(packet); + + switch (packet->type()) { - UT_DEBUGMSG(("SaveResponsePacked |%s| \n",pAPD->packet.utf8_str())); - bool bSavedOK = false; - for (xmlNode* document_node = response_element->children; document_node; document_node = document_node->next) - { - UT_DEBUGMSG(("Document_node type %d \n",document_node->type)); - if (document_node->type == XML_ELEMENT_NODE) + case rpv1::PACKET_DELIVER: { - UT_DEBUGMSG(("Inside Document_node name |%s| \n",document_node->name)); - if (strcmp(reinterpret_cast(document_node->name),"status") == 0) + UT_DEBUGMSG(("Received a 'Deliver' packet!\n")); + boost::shared_ptr dp = + boost::static_pointer_cast(packet); + UT_return_if_fail(dp->getMessage()); + + boost::shared_ptr buddy_ptr = + connection.getBuddy(dp->getConnectionId()); + UT_return_if_fail(buddy_ptr); + + Packet* pPacket = _createPacket(*dp->getMessage(), buddy_ptr.get()); + UT_return_if_fail(pPacket); + + if (pPacket->getClassType() == PCT_JoinSessionRequestResponseEvent) { - UT_DEBUGMSG(("Found Status \n")); - const char* statusVal = reinterpret_cast(xmlNodeGetContent(document_node)); - if(statusVal) - { - UT_UTF8String sStatusVal =statusVal; - FREEP(statusVal); - if(strcmp(sStatusVal.utf8_str(),"success")==0) - { - bSavedOK = true; - } - } - else - { - break; - } + UT_DEBUGMSG(("Trapped a JoinSessionRequestResponseEvent!\n")); + boost::shared_ptr pdp = connection.getPendingDocProps(); + UT_return_if_fail(pdp); + + UT_DEBUGMSG(("Joining received document...")); + _handleJoinSessionRequestResponse(static_cast(pPacket), buddy_ptr.get(), pdp->pFrame, pdp->pDoc, pdp->filename); + DELETEP(pPacket); + UT_return_if_fail(pdp->pDlg); + pdp->pDlg->close(); + continue; } + + // let the default handler handle this packet + // NOTE: this will delete the packet as well (ugly design) + handleMessage(pPacket, buddy_ptr.get()); } - } - if(!bSavedOK) - { - XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame(); - pFrame->showMessageBox(szFailedToSave, - XAP_Dialog_MessageBox::b_O, - XAP_Dialog_MessageBox::a_OK); - - } - else - { - XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame(); - PD_Document* pDoc = static_cast(pFrame->getCurrentDoc()); - FV_View * pView = static_cast(pFrame->getCurrentView()); - pDoc->setClean(); - pView->notifyListeners(AV_CHG_SAVE); - } - } - else if (strcmp(reinterpret_cast(response_element->name), "OpenDocumentResponse") == 0) - { - for (xmlNode* document_node = response_element->children; document_node; document_node = document_node->next) - { - UT_DEBUGMSG(("Outside Document_node name |%s| \n",document_node->name)); - UT_DEBUGMSG(("Document_node type %d \n",document_node->type)); - if (document_node->type == XML_ELEMENT_NODE) + break; + case rpv1::PACKET_USERJOINED: { - UT_DEBUGMSG(("Inside Document_node name |%s| \n",document_node->name)); - if (strcmp(reinterpret_cast(document_node->name),"document") == 0) - { - UT_UTF8String sID = reinterpret_cast(xmlGetProp(document_node, reinterpret_cast("id"))); - UT_DEBUGMSG(("got document!!!!! %s id = %s \n", document_node->name,sID.utf8_str())); - UT_sint64 iID = atoi(sID.utf8_str()); - //printf("doc content:\n%s\n", reinterpret_cast(xmlNodeGetContent(document_node))); - - // TODO: move this out - // - // Get Document name - // - const char *szDocname = reinterpret_cast(xmlGetProp(document_node, reinterpret_cast("name"))); - const char* base64gzBuf = reinterpret_cast(xmlNodeGetContent(document_node)); - //printf("from xml: %s\n", base64gzBuf); - size_t gzbufLen = gsf_base64_decode_simple((guint8*)base64gzBuf, strlen(base64gzBuf)); - char* gzBuf = (char*) base64gzBuf; - // TODO: do we need to pass false here? - GsfInput *source = gsf_input_memory_new((guint8*)gzBuf, gzbufLen, false); - GsfInput *gzabwBuf = gsf_input_gzip_new (source, NULL); // todo: don't pass null here, but check for errors - // unzip the document - gsf_off_t abwLen = gsf_input_size(gzabwBuf); - char* abwBuf = (char*)malloc(abwLen+1); - gsf_input_seek(gzabwBuf, 0, G_SEEK_SET); - gsf_input_read(gzabwBuf, abwLen, (guint8*)abwBuf); - abwBuf[abwLen] = '\0'; - - XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame(); - if(!pFrame || pFrame->isDirty() || (pFrame->getFilename() != NULL)) - { - pFrame = XAP_App::getApp()->newFrame(); - if (!pFrame) - { - return false; - } - - // Open a complete but blank frame, then load the document into it - - UT_Error errorCode = pFrame->loadDocument(NULL, IEFT_Unknown); - if (!errorCode) - { - pFrame->show(); - } - else - { - return false; - } - } - PD_Document* pDoc = new PD_Document(XAP_App::getApp()); - pDoc->createRawDocument(); - IE_Imp_XML* imp = (IE_Imp_XML*)new IE_Imp_AbiWord_1(pDoc); - imp->importFile(abwBuf, abwLen); // todo: check for errors - pDoc->finishRawCreation(); - pFrame->loadDocument(pDoc); - FREEP(abwBuf); - DELETEP(imp); - - g_object_unref(G_OBJECT(source)); - AbiCollabService_Export * pExport = new AbiCollabService_Export(pDoc,iID); - UT_uint32 lid = 0; - pDoc->addListener(static_cast(pExport), &lid); - UT_UTF8String sUTF8(""); - AbiCollab* pCollab = s_CollabFactoryContainer.create(0, sUTF8, false, NULL); - const UT_UTF8String sServer(CAC_SERVER); - bool b = pCollab->createHandler(sServer,5222,s_UserName,s_Password,NULL); - if(!b) - return false; - pCollab->setDocument(pDoc); - pCollab->setServiceID(iID); - pCollab->setOffering(true); - pCollab->startRemoteListener(); - if(szDocname) - { - UT_DEBUGMSG(("Docname %s \n",szDocname)); - pDoc->setFilename(const_cast(szDocname)); - } - pFrame->updateTitle(); - UT_DEBUGMSG(("We are offering a collaboration from a c.a.c doc!\n")); + UT_DEBUGMSG(("Received a 'User Joined' packet!\n")); + boost::shared_ptr ujp = + boost::static_pointer_cast(packet); + if (connection.master()) + { + UT_DEBUGMSG(("We're master, adding buddy to our buddy list\n")); + UT_return_if_fail(!ujp->isMaster()); + connection.addBuddy(boost::shared_ptr( + new RealmBuddy(this, static_cast(ujp->getConnectionId()), false, connection))); } - else if(strcmp(reinterpret_cast(document_node->name),"host")==0) + else { - UT_DEBUGMSG(("Host_node name |%s| \n",document_node->name)); - UT_UTF8String sID = reinterpret_cast(xmlGetProp(document_node, reinterpret_cast("docId"))); - UT_sint64 iID = atoi(sID.utf8_str()); - const char* szName = reinterpret_cast(xmlNodeGetContent(document_node)); - // - // strip off the resource - // - UT_String sName = szName; - UT_sint32 i = 0; - for(i=0; iisMaster()) { - if(sName[i] == '/') - break; + UT_DEBUGMSG(("Received master buddy (id: %d); we're slave, adding it to our buddy list!\n", ujp->getConnectionId())); + boost::shared_ptr master_buddy( + new RealmBuddy(this, static_cast(ujp->getConnectionId()), true, connection)); + connection.addBuddy(master_buddy); + + UT_DEBUGMSG(("Sending join session request to master!\n")); + JoinSessionRequestEvent event( connection.session_id().c_str() ); + send(&event, *master_buddy); } - UT_UTF8String sHostUsername = szName; - if(icreateHandler(sServer,5222,s_UserName,s_Password,sHostUsername.utf8_str()); - if(!b) - return false; - pCollab->setServiceID(iID); - // - // Need to attach a CAC listener to the - // document after it has been loaded. - // We'll create one here and make - // AbiCollab finish the attachments after - // loading the remote doc - // - pCollab->setExportServiceListener(static_cast(new AbiCollabService_Export(NULL,iID))); - pCollab->startRemoteListener(); + else + UT_DEBUGMSG(("Received a slave buddy (id: %d); we're slave; dropping it on the floor for now\n", ujp->getConnectionId())); } } - } - } - else - { - // - // Authorise a remote user to join the collaboration - // + break; + case rpv1::PACKET_USERLEFT: + { + UT_DEBUGMSG(("Received a 'User Left' packet!\n")); + boost::shared_ptr ulp = + boost::static_pointer_cast(packet); + RealmBuddyPtr realm_buddy_ptr = connection.getBuddy(ulp->getConnectionId()); + if (!realm_buddy_ptr) + return; // we don't store slave buddies at the moment, so this happens when a slave disconnects + UT_DEBUGMSG(("removing %s buddy with connection id %d from all sessions\n", realm_buddy_ptr->master() ? "master" : "slave", realm_buddy_ptr->realm_connection_id())); + pManager->removeBuddy(realm_buddy_ptr.get(), false); + connection.removeBuddy(ulp->getConnectionId()); + // if this was the master, then we can close the realm connection + if (realm_buddy_ptr->master()) + { + UT_DEBUGMSG(("The master buddy left; disconnecting the realm connection!\n")); + connection.disconnect(); + return; + } + } + break; + default: + UT_DEBUGMSG(("Dropping unrecognized packet on the floor (type: 0x%x)!\n", packet->type())); + UT_ASSERT(UT_SHOULD_NOT_HAPPEN); + break; } } - // - // TODO connect to jabber server and offer this document for - // collaboration - // - xmlFreeDoc(doc); } - -static bool s_handle_service_event(void* data) +// NOTE: _parseSessionFiles can be called from a thread other than our mainloop; +// Don't let access or modify any data from the mainloop! +void ServiceAccountHandler::_parseSessionFiles(soa::ArrayPtr files_array, GetSessionsResponseEvent& gsre) { - AbiCollabService* pService = AbiCollabService::getService(); - UT_return_val_if_fail(pService, false); - AbiCollab_ConnectionHandler* pHandler = pService->getConnectionHandler(); - if(pHandler == NULL) - { - return false; - } - UT_return_val_if_fail(pHandler, false); - - - if (pHandler->receive().size() > 0) + UT_return_if_fail(files_array); + + if (abicollab::FileArrayPtr files = files_array->construct()) { - for (std::list::iterator lpos = pHandler->receive().begin(); lpos != pHandler->receive().end(); ) + for (size_t i = 0; i < files->size(); i++) { - const AbiCollab_Packet_Data* pAPD = pHandler->receive().front(); - lpos = pHandler->receive().erase(lpos); - if (!pAPD) - { - UT_ASSERT(UT_SHOULD_NOT_HAPPEN); - break; - } - - // TODO: Check if this message really came from abiter@collaborate.abisource.com/AbiCollabService - // If not, we'll ignore it. We don't want people to flood us with fake content - // TODO: Don't hardcode the abiter/server/resource names - // TODO: there are more message types than this one :) - if (strcmp("abiter@collaborate.abisource.com/AbiCollabService", pAPD->buddy.utf8_str()) == 0) + if (abicollab::FilePtr file = files->operator[](i)) { - s_handle_service_message(pAPD); - } - else - { - // we've received a service message from someone other than the official - // arbiter; ignore it; - UT_DEBUGMSG(("Received message from |%s|, content |%s| \n",pAPD->buddy.utf8_str(), pAPD->packet.utf8_str())); - UT_DEBUGMSG(("Can't handle this!!!! \n")); - - UT_ASSERT(UT_SHOULD_NOT_HAPPEN); + UT_DEBUGMSG(("Got a file: %s (%s bytes, id: %s)\n", file->filename.c_str(), file->filesize.c_str(), file->doc_id.c_str())); + // NOTE: we can safely use the (unique) document id as the session identifier, + // as there is basically only one _ever lasting_ session for each + // document stored on abicollab.net + if (file->doc_id != "" && file->access == "readwrite") { + gsre.m_Sessions[file->doc_id.c_str()] = file->filename.c_str(); + } } } } - - return true; } -*/ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.h 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.h 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,5 @@ /* Copyright (C) 2006,2007 Marc Maurer + * Copyright (C) 2008 AbiSource Corporation B.V. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,22 +20,44 @@ #ifndef __SERVICEACCOUNTHANDLER__ #define __SERVICEACCOUNTHANDLER__ +#include +#include +#include #include +#include "xap_Types.h" #include "ut_string_class.h" - #include +#include "soa.h" +#include "AbiCollabSaveInterceptor.h" +#include "RealmBuddy.h" +#include "RealmConnection.h" +#include "RealmProtocol.h" +#include "AsioRealmProtocol.h" +#include "ServiceErrorCodes.h" + +namespace acs = abicollab::service; +namespace rpv1 = realm::protocolv1; class PD_Document; -typedef long long UT_sint64; +class GetSessionsResponseEvent; +class JoinSessionRequestResponseEvent; +class ServiceBuddy; extern AccountHandlerConstructor ServiceAccountHandlerConstructor; +typedef std::pair SessionBuddyPair; +typedef boost::shared_ptr > SessionBuddyPtr; + +#define SERVICE_ACCOUNT_HANDLER_TYPE "com.abisource.abiword.abicollab.backend.service" + class ServiceAccountHandler : public AccountHandler { public: ServiceAccountHandler(); virtual ~ServiceAccountHandler(); + static bool askPassword(const std::string& email, std::string& password); + // housekeeping virtual UT_UTF8String getDescription(); virtual UT_UTF8String getDisplayType(); @@ -42,6 +65,8 @@ // dialog management virtual void storeProperties(); + static XAP_Dialog_Id getDialogGenericInputId(); + static XAP_Dialog_Id getDialogGenericProgressId(); // connection management virtual ConnectResult connect(); @@ -55,16 +80,61 @@ // packet management virtual bool send(const Packet* packet); - virtual bool send(const Packet*, const Buddy& buddy); + virtual bool send(const Packet* packet, const Buddy& buddy); - // service specific functions - void updateDocumentsAsync(); - void saveDocumentAsync(UT_sint64 docId, PD_Document * pDoc); - void populateDocuments(const UT_UTF8String& packet); - void openDocumentAsync(UT_sint64 docId); - void closeDocument(UT_sint64 docId, PD_Document * pDoc); + // session management + virtual void getSessionsAsync(); + virtual void getSessionsAsync(const Buddy& buddy); + virtual bool hasSession(const UT_UTF8String& sSessionId); + virtual void joinSessionAsync(const Buddy& buddy, DocHandle& docHandle); + acs::SOAP_ERROR openDocument(UT_sint64 doc_id, UT_sint64 revision, const std::string& session_id, PD_Document** pDoc, XAP_Frame* pFrame); + UT_Error saveDocument(PD_Document* pDoc, const UT_UTF8String& sSessionId); + + // signal management + virtual void signal(const Event& event, const Buddy* pSource); + + static XAP_Dialog_Id m_iDialogGenericInput; + static XAP_Dialog_Id m_iDialogGenericProgress; + static AbiCollabSaveInterceptor m_saveInterceptor; private: + template + void _send(boost::shared_ptr packet, boost::shared_ptr recipient) + { + realm::protocolv1::send(*packet, recipient->connection().socket(), + boost::bind(&ServiceAccountHandler::_write_handler, this, + asio::placeholders::error, asio::placeholders::bytes_transferred, recipient, + boost::static_pointer_cast(packet))); + } + + void _write_handler(const asio::error_code& e, std::size_t bytes_transferred, + boost::shared_ptr recipient, boost::shared_ptr packet); + + acs::SOAP_ERROR _listDocuments(const std::string uri, const std::string email, const std::string password, + SessionBuddyPtr sessions_ptr); + void _listDocuments_cb(acs::SOAP_ERROR error, SessionBuddyPtr sessions_ptr); + + acs::SOAP_ERROR _openDocumentMaster(soa::CollectionPtr rcp, PD_Document** pDoc, XAP_Frame* pFrame, + const std::string& session_id, const std::string& filename); + acs::SOAP_ERROR _openDocumentSlave(ConnectionPtr connection, PD_Document** pDoc, XAP_Frame* pFrame, + const std::string& filename); + + void _handleJoinSessionRequestResponse( + JoinSessionRequestResponseEvent* jsre, Buddy* pBuddy, + XAP_Frame* pFrame, PD_Document** pDoc, const std::string& filename); + void _handleRealmPacket(RealmConnection& connection); + ConnectionPtr _getConnection(const std::string& session_id); + void _removeConnection(const std::string& session_id); + void _handleMessages(RealmConnection& connection); + void _parseSessionFiles(soa::ArrayPtr files_array, GetSessionsResponseEvent& gsre); + virtual void _handlePacket(Packet* packet, Buddy* buddy, bool autoAddBuddyOnJoin) + { AccountHandler::_handlePacket(packet, buddy, false); } + + + bool m_bOnline; // only used to determine if we are allowed to + // communicate with abicollab.net or not + std::vector m_connections; + std::string m_ssl_ca_file; }; #endif /* __SERVICEACCOUNTHANDLER__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceBuddy.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceBuddy.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceBuddy.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceBuddy.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,67 @@ +/* Copyright (C) 2006,2007 Marc Maurer + * Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __SERVICEBUDDY__ +#define __SERVICEBUDDY__ + +#include "ut_string_class.h" +#include +#include + +class ServiceBuddy : public Buddy +{ +public: + ServiceBuddy(AccountHandler* handler, const UT_UTF8String& name) + : Buddy(handler, name) + { + setVolatile(true); + } + + virtual Buddy* clone() const { return new ServiceBuddy( *this ); } + + virtual UT_UTF8String getDescription() const + { + // TODO: append the group name or something like that + return getName(); + } + + virtual const DocTreeItem* getDocTreeItems() const + { + const vector& docHandles = getDocHandles(); + DocTreeItem* first = 0; + DocTreeItem* prev = 0; + for (vector::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++) + { + DocTreeItem* item = new DocTreeItem(); + item->m_type = DOCTREEITEM_TYPE_DOCUMENT; + item->m_docHandle = *pos; + item->m_child = 0; + item->m_next = 0; + + if (!first) + first = item; + if (prev) + prev->m_next = item; + prev = item; + } + return first; + } +}; + +#endif /* __SERVICEBUDDY__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceErrorCodes.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceErrorCodes.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceErrorCodes.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceErrorCodes.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,64 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __SERVICE_ERRORCODES__ +#define __SERVICE_ERRORCODES__ + +#include +#include "soa.h" + +namespace abicollab { +namespace service { + +enum SOAP_ERROR +{ + // generic error (reserved) + SOAP_ERROR_OK = 0x00, + SOAP_ERROR_GENERIC = 0x01, + + // exception soap errors + SOAP_ERROR_GENERIC_EXCEPTION = 0x101, + SOAP_ERROR_DATABASE_EXCEPTION = 0x102, + + // abicollab soap errors + SOAP_ERROR_INVALID_PASSWORD = 0x201, + SOAP_ERROR_INVALID_EMAIL = 0x202 + // TODO: add more errors + + // saveDocument soap errors + // TODO: add more errors + + // openDocument soap errors + // TODO: add more errors +}; + +static SOAP_ERROR error(const soa::SoapFault& fault) +{ + if (!fault.string()) + return SOAP_ERROR_GENERIC; + try { + return static_cast(boost::lexical_cast(fault.string()->value())); + } catch (boost::bad_lexical_cast&) { + return SOAP_ERROR_GENERIC; + } +} + +} +} + +#endif /* __SERVICE_ERRORCODES__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/soa.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/soa.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/soa.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/soa.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,273 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __SOA__ +#define __SOA__ + +#include +#include +#include +#include +#include +#include "soa_types.h" +#include "soa_result.h" + +namespace soa { + +class function_arg { +public: + function_arg(const std::string& name, Type type) + : name_(name), + type_(type) + {} + + virtual ~function_arg() {} + + const std::string& name() const { + return name_; + } + + Type type() const { + return type_; + } + + // FIXME: returning an std::string is inefficient for large blocks of + // data; we should make it a boost::shared_ptr + virtual std::string str() const = 0; + +private: + std::string name_; + Type type_; +}; + +class function_arg_string : public function_arg { +public: + function_arg_string(const std::string& name, const std::string& value) + : function_arg(name, STRING_TYPE), + value_(value) + {} + + virtual std::string str() const { + return value_; + } + +private: + std::string value_; +}; + +class function_arg_int : public function_arg { +public: + function_arg_int(const std::string& name, int64_t value) + : function_arg(name, INT_TYPE), + value_(value) + {} + + virtual std::string str() const { + try { + return boost::lexical_cast(value_); + } catch (boost::bad_lexical_cast &) { + return "0"; + } + } + +private: + int64_t value_; +}; + +class function_arg_bool : public function_arg { +public: + function_arg_bool(const std::string& name, bool value) + : function_arg(name, BOOL_TYPE), + value_(value) + {} + + virtual std::string str() const { + return value_ ? "true" : "false"; + } + +private: + bool value_; +}; + +class function_arg_base64bin : public function_arg { +public: + function_arg_base64bin(Base64Bin value) + : function_arg(value.name(), BASE64BIN_TYPE), + value_(value) + {} + + virtual std::string str() const { + return value_.value(); + } + +private: + Base64Bin value_; +}; + +class function_call { +public: + function_call() {} + + function_call(const std::string& request, const std::string& response) + : request_(request), + response_(response) + {} + + function_call& operator()(std::string name, const char* value) { + args.push_back(boost::shared_ptr(new function_arg_string(name, value))); + return *this; + } + + function_call& operator()(std::string name, std::string value) { + args.push_back(boost::shared_ptr(new function_arg_string(name, value))); + return *this; + } + + function_call& operator()(std::string name, int64_t value) { + args.push_back(boost::shared_ptr(new function_arg_int(name, value))); + return *this; + } + + function_call& operator()(std::string name, bool value) { + args.push_back(boost::shared_ptr(new function_arg_bool(name, value))); + return *this; + } + + function_call& operator()(Base64Bin value) { + args.push_back(boost::shared_ptr(new function_arg_base64bin(value))); + return *this; + } + + const std::string& request() const { + return request_; + } + + const std::string& response() const { + return response_; + } + + void add_arg(boost::shared_ptr arg) { + args.push_back(arg); + } + + std::string str() const { + std::string ret; + // TODO: XML escape args/values + for (std::vector< boost::shared_ptr >::const_iterator cit = args.begin(); cit != args.end(); cit++) { + const function_arg& arg = **cit; + ret += "<" + arg.name() + " " + soap_type(arg.type()) + ">" + arg.str() + "\n"; + } + return ret; + } + +private: + std::string request_; + std::string response_; + std::vector< boost::shared_ptr > args; +}; + +class header { +public: + std::string str() const { + return ""; + } +}; + +class body { +public: + body(const std::string& ns_ref_) + : ns_ref(ns_ref_) + {} + + body(const std::string& ns_ref_, const function_call& fc) + : ns_ref(ns_ref_), + fc_(fc) + {} + + const function_call& function() const { + return fc_; + } + + void set_function(function_call fc) { + fc_ = fc; + } + + std::string str() const { + return "\n" \ + "<" + ns_ref + ":" + fc_.request() + ">\n" + + fc_.str() + + "\n" \ + "\n"; + } + +private: + std::string ns_ref; + function_call fc_; +}; + +class method_invocation { +public: + method_invocation(const std::string& custom_ns) + : custom_ns_(custom_ns), + custom_ns_ref_("nsref"), + body_(custom_ns_ref_) + {} + + method_invocation(const std::string& custom_ns, function_call fc) + : custom_ns_(custom_ns), + custom_ns_ref_("nsref"), + body_(custom_ns_ref_, fc) + {} + + const function_call& function() const { + return body_.function(); + } + + std::string str() const { + return "\n" \ + "\n" + + header_.str() + + body_.str() + + ""; + } + +private: + std::string default_namespaces() const { + return "xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\"" \ + " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"" \ + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" \ + " xmlns:SOAP-ENC=\"http://schemas.xmlsoap.org/soap/encoding/\""; + } + + std::string encoding_style() const { + return "SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\""; + } + + std::string input_name_; + std::string output_name_; + std::string custom_ns_; + std::string custom_ns_ref_; + header header_; + body body_; +}; +} + +#endif /* __SOA__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/soa_result.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/soa_result.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/soa_result.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/soa_result.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,271 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __SOA_RESULT__ +#define __SOA_RESULT__ + +#include +#include +#include "soa_types.h" +#include +#include + +namespace soa { + + static Type element_type(char* type) { + if (!type) + return COLLECTION_TYPE; // FIXME: well, just say it's a generic type for now + + const std::string& type_(type); + if (type_ == "xsd:string") + return STRING_TYPE; + if (type_ == "xsd:int") + return INT_TYPE; + if (type_ == "xsd:boolean") + return BOOL_TYPE; + if (type_ == "xsd:base64Binary") + return BASE64BIN_TYPE; + if (type_ == "xsd:QName") + return QNAME_TYPE; + if (type_ == "SOAP-ENC:Array") + return ARRAY_TYPE; + + return COLLECTION_TYPE; // FIXME: well, just say it's a generic type for now + } + + static std::string soap_type(Type type) { + switch (type) { + case STRING_TYPE: + return "xsi:type=\"xsd:string\""; + case INT_TYPE: + return "xsi:type=\"xsd:int\""; + case BOOL_TYPE: + return "xsi:type=\"xsd:boolean\""; + case BASE64BIN_TYPE: + return "xsi:type=\"xsd:base64Binary\""; + case QNAME_TYPE: + return "xsi:type=\"xsd:QName\""; + default: + // FIXME: should throw exception + return ""; + } + } + + static bool arg_value(const std::string& val, bool& b) { + if (val == "true" || val == "1") { + b = true; + return true; + } + if (val == "false" || val == "0") { + b = false; + return true; + } + return false; + } + + static bool arg_value(const std::string& val, int64_t& i) { + try { + i = boost::lexical_cast(val); + } catch (boost::bad_lexical_cast &) { + return false; + } + return true; + } + + // private class; should't be in the public api + class XmlDocDeleter { + public: + void operator()(xmlDocPtr* doc) { + // printf("Destructing xml doc ptr!\n"); + if (!doc || !*doc) + return; + xmlFreeDoc(*doc); + } + }; + + static GenericPtr parse_elements(xmlNode* element, GenericPtr parent) { + if (!element || element->type != XML_ELEMENT_NODE) + return parent; + + if (parent && !parent->complex()) { + //printf("ERROR: ADDING CHILD TO NON-COMPLEX TYPE!\n"); + return GenericPtr(); + } + + // parse this node + + char* type_str = reinterpret_cast(xmlGetProp(element, reinterpret_cast("type"))); + Type elem_type = element_type(type_str); + free(type_str); + + GenericPtr t; + switch (elem_type) { + case ARRAY_TYPE: + t.reset(new Array(reinterpret_cast(element->name))); + break; + case COLLECTION_TYPE: + t.reset(new Collection(reinterpret_cast(element->name))); + break; + case STRING_TYPE: + { + xmlChar* value = xmlNodeGetContent(element); + t.reset(new String(reinterpret_cast(element->name), reinterpret_cast(value))); + xmlFree(value); + } + break; + case INT_TYPE: + { + xmlChar* value = xmlNodeGetContent(element); + int64_t i; + if (arg_value(reinterpret_cast(value), i)) + t.reset(new Int(reinterpret_cast(element->name), i)); + xmlFree(value); + } + break; + case BOOL_TYPE: + { + xmlChar* value = xmlNodeGetContent(element); + bool b; + if (arg_value(reinterpret_cast(value), b)) + t.reset(new Bool(reinterpret_cast(element->name), b)); + xmlFree(value); + } + break; + case BASE64BIN_TYPE: + { + xmlChar* value = xmlNodeGetContent(element); + t.reset(new Base64Bin( + reinterpret_cast(element->name), + boost::shared_ptr(new std::string(reinterpret_cast(value))) + )); + xmlFree(value); + } + break; + case QNAME_TYPE: + { + xmlChar* value = xmlNodeGetContent(element); + t.reset(new QName(reinterpret_cast(element->name), reinterpret_cast(value))); + xmlFree(value); + } + break; + } + if (!t) { + return GenericPtr(); + } + + // parse the child nodes + if (t->complex()) { + for (xmlNode* child = element->children; child; child = child->next) { + parse_elements(child, t); + } + } + + // we have no parent; return what we found + if (!parent) { + return t; + } + + // attach the new element to the parent ellement + // FIXME: generalize + switch (parent->type()) { + case ARRAY_TYPE: + { + ArrayPtr a = parent->as< Array >(); + a->add(t); + } + break; + case COLLECTION_TYPE: + { + CollectionPtr c = parent->as(); + c->add(t); + } + break; + default: + // should not happen; + break; + } + + return parent; + } + + static GenericPtr parse_response(const std::string& response, const std::string& method_name) { + + // process the soap request + xmlDocPtr doc = xmlReadMemory(&response[0], response.size(), "noname.xml", NULL, 0); + if (!doc) { + return GenericPtr(); + } + + boost::shared_ptr reader(&doc, XmlDocDeleter()); + xmlNode* rootNode = xmlDocGetRootElement(*reader); + if (!rootNode) { + return GenericPtr(); + } + + if (strcasecmp(reinterpret_cast(rootNode->name), "Envelope") != 0) { + return GenericPtr(); + } + + for (xmlNode* soapNode = rootNode->children; soapNode; soapNode = soapNode->next) { + if (soapNode->type != XML_ELEMENT_NODE) + continue; + + if (strcasecmp(reinterpret_cast(soapNode->name), "Body") == 0) { + + for (xmlNode* methodNode = soapNode->children; methodNode; methodNode = methodNode->next) { + if (methodNode->type != XML_ELEMENT_NODE) + continue; + + if (strcasecmp(reinterpret_cast(methodNode->name), "Fault") == 0) { + GenericPtr soap_tree = parse_elements(methodNode, GenericPtr()); + if (!soap_tree) + throw SoapFault(); + + soa::CollectionPtr fault = boost::dynamic_pointer_cast(soap_tree); + if (!fault) + throw SoapFault(); + + throw SoapFault(fault->get("faultcode"), + fault->get("faultstring"), + fault->get("detail")); + } + + if (method_name != reinterpret_cast(methodNode->name)) + continue; + + for (xmlNode* child = methodNode->children; child; child = child->next) { + GenericPtr soap_tree = parse_elements(child, GenericPtr()); + if (soap_tree) // FIXME: are we right in assuming there is only 1 response element? + return soap_tree; + } + + return GenericPtr(); + } + } else if (strcasecmp(reinterpret_cast(soapNode->name), "Header") == 0) { + return GenericPtr(); + } + else { + return GenericPtr(); + } + } + return GenericPtr(); + } + +} + +#endif /* __SOA_RESULT__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/soa_soup.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/soa_soup.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/soa_soup.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/soa_soup.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,202 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __SOA_SOUP__ +#define __SOA_SOUP__ + +#include +#include +#include +#include +#include +#include +#include + +namespace soup_soa { + + /* public types */ + + struct SoaSoupSession + { + SoaSoupSession(SoupMessage* msg, const std::string& ssl_ca_file) + : m_session(NULL), + m_msg(msg), + progress_cb_ptr(), + received_content_length(0) + { + _set_session(ssl_ca_file); + } + + SoaSoupSession(SoupMessage* msg, const std::string& ssl_ca_file, boost::function progress_cb_) + : m_session(NULL), + m_msg(msg), + progress_cb_ptr(new boost::function(progress_cb_)), + received_content_length(0) + { + _set_session(ssl_ca_file); + } + + ~SoaSoupSession() { + if (m_session) + g_object_unref(m_session); + if (m_msg) + g_object_unref(m_msg); + } + + void callback(uint32_t progress) { + if (!progress_cb_ptr) + return; + (*progress_cb_ptr)(m_session, m_msg, progress); + } + + SoupSession* m_session; + SoupMessage* m_msg; + boost::shared_ptr > progress_cb_ptr; + uint32_t received_content_length; + + private: + void _set_session(const std::string& ssl_ca_file) { + m_session = + ssl_ca_file.size() == 0 + ? soup_session_sync_new_with_options(NULL) + : soup_session_sync_new_with_options( + SOUP_SESSION_SSL_CA_FILE, ssl_ca_file.c_str(), + /* TODO: add user agent */ + NULL + ); + } + + }; + + /* private function prototypes */ + +#ifdef SOUP24 + static void _got_chunk_cb(SoupMessage* msg, SoupBuffer *chunk, SoaSoupSession* progress_info); +#else + static void _got_chunk_cb(SoupMessage *msg, SoaSoupSession* user_data); +#endif + static soa::GenericPtr _invoke(const std::string& url, const soa::method_invocation& mi, SoaSoupSession& sess); + + /* public functions */ + + soa::GenericPtr invoke(const std::string& url, const soa::method_invocation& mi, const std::string& ssl_ca_file) { + std::string soap_msg = mi.str(); + UT_DEBUGMSG(("SOAP Request: %s\n", soap_msg.c_str())); + SoupMessage* msg = soup_message_new ("POST", url.c_str()); +#ifdef SOUP24 + soup_message_set_request(msg, "text/xml", SOUP_MEMORY_STATIC, &soap_msg[0], soap_msg.size()); +#else + soup_message_set_request(msg, "text/xml", SOUP_BUFFER_USER_OWNED, &soap_msg[0], soap_msg.size()); +#endif + SoaSoupSession sess(msg, ssl_ca_file); + return _invoke(url, mi, sess); + } + + soa::GenericPtr invoke(const std::string& url, const soa::method_invocation& mi, const std::string& ssl_ca_file, + boost::function progress_cb) { + std::string soap_msg = mi.str(); + UT_DEBUGMSG(("SOAP Request: %s\n", soap_msg.c_str())); + SoupMessage* msg = soup_message_new ("POST", url.c_str()); + SoaSoupSession sess(msg, ssl_ca_file, progress_cb); + g_signal_connect(G_OBJECT (msg), "got-chunk", G_CALLBACK(_got_chunk_cb), (gpointer)(&sess)); +#ifdef SOUP24 + soup_message_set_request(msg, "text/xml", SOUP_MEMORY_STATIC, &soap_msg[0], soap_msg.size()); +#else + soup_message_set_request(msg, "text/xml", SOUP_BUFFER_USER_OWNED, &soap_msg[0], soap_msg.size()); +#endif + return _invoke(url, mi, sess); + } + + /* private functions */ + + static soa::GenericPtr _invoke(const std::string& url, const soa::method_invocation& mi, SoaSoupSession& sess) { + if (!sess.m_session || !sess.m_msg ) + return soa::GenericPtr(); + + guint status = soup_session_send_message (sess.m_session, sess.m_msg); + if (!(SOUP_STATUS_IS_SUCCESSFUL (status) || + status == SOUP_STATUS_INTERNAL_SERVER_ERROR /* used for SOAP Faults */)) + { + UT_DEBUGMSG(("Error executing SOAP call: %s\n", sess.m_msg->reason_phrase)); + return soa::GenericPtr(); + } + + // store the SOAP result in a string + // FIXME: ineffecient copy + std::string result; +#ifdef SOUP24 + if (!sess.m_msg->response_body || !sess.m_msg->response_body->data) + return soa::GenericPtr(); + result.resize(sess.m_msg->response_body->length); + std::copy(sess.m_msg->response_body->data, sess.m_msg->response_body->data+sess.m_msg->response_body->length, result.begin()); +#else + result.resize(sess.m_msg->response.length); + std::copy(sess.m_msg->response.body, sess.m_msg->response.body+sess.m_msg->response.length, result.begin()); +#endif + UT_DEBUGMSG(("SOAP Response: %s\n", result.c_str())); + return soa::parse_response(result, mi.function().response()); + } + +#ifdef SOUP24 + static void _got_chunk_cb(SoupMessage* msg, SoupBuffer *chunk, SoaSoupSession* progress_info) +#else + static void _got_chunk_cb(SoupMessage* msg, SoaSoupSession* progress_info) +#endif + { + UT_return_if_fail(msg && msg->response_headers); + if (!progress_info) + return; + + uint32_t content_length = 0; +#ifdef SOUP24 + content_length = (uint32_t)soup_message_headers_get_content_length(msg->response_headers); +#else + const char* content_length_str = soup_message_get_header(msg->response_headers, "Content-Length"); + if (!content_length_str) + return; + + try + { + content_length = boost::lexical_cast(content_length_str); + } + catch (boost::bad_lexical_cast &) + { + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); // unless the server is really broken + return; + } +#endif + + if (content_length == 0) + return; + +#ifdef SOUP24 + if (!msg->response_body) + return; + progress_info->received_content_length = msg->response_body->length; +#else + progress_info->received_content_length += msg->response.length; +#endif + uint32_t progress = (uint32_t)(((float)progress_info->received_content_length / content_length)*100); + if (progress > 100) + progress = 100; + progress_info->callback(progress); + } + +} + +#endif /* __SOA_SOUP__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/soa_types.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/soa_types.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/soa_types.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/soa_types.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,242 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __SOA_TYPES__ +#define __SOA_TYPES__ + +#include +#include +#include +#include + +namespace soa { + +enum Type { + ARRAY_TYPE = 0, + COLLECTION_TYPE, + STRING_TYPE, + INT_TYPE, + BOOL_TYPE, + BASE64BIN_TYPE, + QNAME_TYPE +}; + +class Generic : public boost::enable_shared_from_this { +public: + Generic(const std::string& name, Type type) + : name_(name), + type_(type) + {} + + virtual ~Generic() { + } + + virtual bool complex() { + return false; + } + + const std::string& name() const { + return name_; + } + + const Type type() const { + return type_; + } + + template + boost::shared_ptr as() { + return boost::dynamic_pointer_cast(shared_from_this()); + } + + template + boost::shared_ptr as(const std::string& name) { + if (name_ != name) + return boost::shared_ptr(); + return boost::dynamic_pointer_cast(shared_from_this()); + } + +private: + std::string name_; + Type type_; +}; +typedef boost::shared_ptr GenericPtr; + +template +class Primitive : public Generic { +public: + Primitive(const std::string& name, T t) + : Generic(name, Y), + value_(t) + {} + + const T& value() const { + return value_; + } + +private: + T value_; +}; + +typedef Primitive String; +typedef boost::shared_ptr StringPtr; + +typedef Primitive Int; +typedef boost::shared_ptr IntPtr; + +typedef Primitive Bool; +typedef boost::shared_ptr BoolPtr; + +class Base64Bin : public Generic { +public: + Base64Bin(const std::string& name, boost::shared_ptr data) + : Generic(name, BASE64BIN_TYPE), + m_data(data) + {} + + const std::string& value() const { + return *m_data; + } + +private: + boost::shared_ptr m_data; +}; +typedef boost::shared_ptr Base64BinPtr; + +typedef Primitive QName; // FIXME: QName's are not simple strings, but they have a Namespace URI, local part and prefix +typedef boost::shared_ptr QNamePtr; + +class Complex : public Generic { +public: + Complex(const std::string& name, Type t) + : Generic(name, t) + {} + + virtual bool complex() { + return true; + } +}; + +template +class Array : public Complex { +public: + Array(const std::string& name) + : Complex(name, ARRAY_TYPE) + {} + + size_t size() const { + return values_.size(); + } + + template + boost::shared_ptr< Array< boost::shared_ptr > > construct() const { + boost::shared_ptr< Array< boost::shared_ptr > > conv(new Array< boost::shared_ptr >(name())); + for (typename std::vector< T >::const_iterator it = values_.begin(); it != values_.end(); it++) { + conv->add(Y::construct(*it)); + } + return conv; + } + + T get(size_t i) { + return values_[i]; + } + + T operator[](size_t i) { + return values_[i]; + } + + virtual void add(T element) { + values_.push_back(element); + } + +private: + std::vector< T > values_; +}; +typedef boost::shared_ptr< Array > ArrayPtr; + +class Collection : public Complex { +public: + Collection(const std::string& name) + : Complex(name, COLLECTION_TYPE) + {} + + // TODO: back this by a multimap + + size_t size() const { + return values_.size(); + } + + template + boost::shared_ptr get(const std::string& name) { + for (std::vector::iterator it = values_.begin(); it != values_.end(); it++) { + if ((*it)->name() == name) { + return (*it)->as(); + } + } + return boost::shared_ptr(); + } + + template + boost::shared_ptr operator[](const std::string& name) { + return get(name); + } + + virtual void add(GenericPtr element) { + values_.push_back(element); + } + + std::vector& values() { + return values_; + } + +private: + std::vector values_; +}; +typedef boost::shared_ptr CollectionPtr; + +class SoapFault { +public: + SoapFault() + : code_(), string_(), detail_() { + } + + SoapFault(QNamePtr code, StringPtr string, StringPtr detail) + : code_(code), string_(string), detail_(detail) { + } + + QNamePtr code() const { + return code_; + } + + StringPtr string() const { + return string_; + } + + StringPtr detail() const { + return detail_; + } + +private: + QNamePtr code_; + StringPtr string_; + // TODO: add faultactor actor_; + StringPtr detail_; +}; + +} + +#endif /* __SOA_TYPES__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/tls_tunnel.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/tls_tunnel.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/tls_tunnel.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/tls_tunnel.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,507 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#include "tls_tunnel.h" + +#define return_val_if_neg(C, val) { if (C < 0) {return val;} } + +namespace tls_tunnel { + +#define MIN_CLIENT_PORT 50000 +#define MAX_CLIENT_PORT 50100 + +#define TUNNEL_BUFFER_SIZE 4096 +#define LOCAL_BUFFER_SIZE 4096 + +#define TRANSPORT_ERROR "Transport exception: " +#define TLS_SETUP_ERROR "Error setting up TLS connection" +#define TLS_CREDENTIALS_ERROR "Error setting up TLS connection" +#define TLS_VERIFY_PEER_ERROR "Error verifying peer" +#define TLS_VERIFY_HOSTNAME_ERROR "Error verifying hostname" +#define TLS_CANT_GET_PEER_CERT_ERROR "Failed to get peer certificate" + +typedef boost::shared_ptr socket_ptr_t; +typedef boost::shared_ptr session_ptr_t; +typedef boost::shared_ptr< std::vector > buffer_ptr_t; + +class mutex { +public: + mutex() { +#ifdef WIN32 + repr = CreateMutex(0, FALSE, 0); +#else + pthread_mutex_init(&repr, NULL); +#endif + } + + void lock() { +#ifdef WIN32 + WaitForSingleObject(repr, INFINITE); +#else + pthread_mutex_lock(&repr); +#endif + } + + void unlock() { +#ifdef WIN32 + ReleaseMutex(repr); +#else + pthread_mutex_unlock(&repr); +#endif + } + + ~mutex() + { +#ifdef WIN32 + CloseHandle(repr); +#else + pthread_mutex_destroy(&repr); +#endif + } + +private: + mutex( const mutex& ); + const mutex& operator=( const mutex& ); + +#ifdef WIN32 + HANDLE repr; +#else + pthread_mutex_t repr; +#endif +}; + +static int gcry_tunnel_mutex_init(void **priv) +{ + if (!priv) + return -1; + *priv = new mutex(); + return 0; +} + +static int gcry_tunnel_mutex_destroy(void **priv) +{ + if (!priv || !*priv) + return -1; + delete reinterpret_cast(*priv); + return 0; +} + +static int gcry_tunnel_mutex_lock(void **priv) +{ + reinterpret_cast(*priv)->lock(); + return 0; +} + +static int gcry_tunnel_mutex_unlock(void **priv) +{ + reinterpret_cast(*priv)->unlock(); + return 0; +} + +static struct gcry_thread_cbs gcry_threads_tunnel = +{ GCRY_THREAD_OPTION_USER, NULL, + gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy, + gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + +bool Proxy::tls_tunnel_init() { + if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0) + return false; + if (gnutls_global_init() != 0) + return false; + return true; +} + +void Proxy::tls_tunnel_deinit() { + gnutls_global_deinit(); +} + +Exception::Exception(const std::string& message) + : message_(message) +{ +} + +const std::string& Exception::message() const { + return message_; +} + +// private class; should't be in the public api +class _SessionPtrDestuctor { +public: + void operator()(gnutls_session_t* session) { + if (!session || !*session) + return; + gnutls_deinit(*session); + delete session; + } +}; + +asio::io_service& Transport::io_service() { + return io_service_; +} + +void Transport::run() { + asio::error_code ec; + io_service_.run(ec); +} + +void Transport::stop() { + io_service_.stop(); +} + +Transport::Transport() + : io_service_(), + work_(io_service_) +{ +} + +ClientTransport::ClientTransport(const std::string& host, unsigned short port, boost::function on_connect) + : Transport(), + host_(host), + port_(port), + on_connect_(on_connect) +{ +} + +void ClientTransport::connect() { + asio::ip::tcp::resolver resolver(io_service()); + asio::ip::tcp::resolver::query query(host_, boost::lexical_cast(port_)); + asio::ip::tcp::resolver::iterator iterator(resolver.resolve(query)); + socket_ptr_t socket_ptr(new asio::ip::tcp::socket(io_service())); + socket_ptr->connect(*iterator); + on_connect_(socket_ptr); +} + +ServerTransport::ServerTransport(const std::string& ip, unsigned short port, boost::function on_connect) + : Transport(), + acceptor_(io_service(), asio::ip::tcp::endpoint(asio::ip::address_v4::from_string(ip), port)), + on_connect_(on_connect) +{ +} + +void ServerTransport::accept() { + socket_ptr_t socket_ptr(new asio::ip::tcp::socket(io_service())); + acceptor_.async_accept(*socket_ptr, boost::bind(&ServerTransport::on_accept, this, asio::placeholders::error, socket_ptr)); +} + +void ServerTransport::on_accept(const asio::error_code& error, socket_ptr_t socket_ptr) { + if (error) { + return; + } + on_connect_(socket_ptr); + accept(); +} + +static ssize_t read(gnutls_transport_ptr_t ptr, void* buffer, size_t size) { + asio::ip::tcp::socket* socket = reinterpret_cast(ptr); + try { + return asio::read(*socket, asio::buffer(buffer, size)); + } catch (asio::system_error& se) { + return -1; + } +} + +static ssize_t write(gnutls_transport_ptr_t ptr, const void* buffer, size_t size) { + asio::ip::tcp::socket* socket = reinterpret_cast(ptr); + try { + return asio::write(*socket, asio::buffer(buffer, size)); + } catch (asio::system_error& se) { + return -1; + } +} + +Proxy::~Proxy() { + gnutls_certificate_free_credentials(x509cred); +} + +void Proxy::run() { + transport().run(); +} + +void Proxy::stop() { + transport().stop(); +} + +Proxy::Proxy(const std::string& ca_file) +{ + // setup certificates + if (gnutls_certificate_allocate_credentials(&x509cred) < 0) + throw Exception(TLS_SETUP_ERROR); + if (gnutls_certificate_set_x509_trust_file(x509cred, ca_file.c_str(), GNUTLS_X509_FMT_PEM) < 0) + throw Exception(TLS_SETUP_ERROR); +} + +void Proxy::on_local_read(const asio::error_code& error, std::size_t bytes_transferred, + session_ptr_t session_ptr, socket_ptr_t local_socket_ptr, buffer_ptr_t local_buffer_ptr, socket_ptr_t remote_socket_ptr) { + if (error) { + disconnect_(session_ptr, local_socket_ptr, remote_socket_ptr); + return; + } + + // write the data to the tunnel connection + int num_forwarded = gnutls_record_send(*session_ptr, &(*local_buffer_ptr)[0], bytes_transferred); + if (num_forwarded < 0) { + disconnect_(session_ptr, local_socket_ptr, remote_socket_ptr); + return; + } + + local_socket_ptr->async_receive( + asio::buffer(&(*local_buffer_ptr)[0], local_buffer_ptr->size()), + boost::bind(&Proxy::on_local_read, this, asio::placeholders::error, asio::placeholders::bytes_transferred, + session_ptr, local_socket_ptr, local_buffer_ptr, remote_socket_ptr) + ); +} + +void Proxy::tunnel(session_ptr_t session_ptr, socket_ptr_t local_socket_ptr, socket_ptr_t remote_socket_ptr) { + buffer_ptr_t local_buffer_ptr(new std::vector(LOCAL_BUFFER_SIZE)); + asio::thread thread(boost::bind(&Proxy::tunnel_, this, session_ptr, local_socket_ptr, local_buffer_ptr, remote_socket_ptr)); +} + +void Proxy::disconnect_(session_ptr_t session_ptr, socket_ptr_t local_socket_ptr, socket_ptr_t remote_socket_ptr) { + // shutdown the tls session (ignore any error condition) + if (session_ptr) + gnutls_bye(*session_ptr, GNUTLS_SHUT_RDWR); + + // shutdown the sockets belonging to this tunnel + asio::error_code ec; + if (local_socket_ptr && local_socket_ptr->is_open()) { + local_socket_ptr->shutdown(asio::ip::tcp::socket::shutdown_both, ec); + local_socket_ptr->close(ec); + } + + if (remote_socket_ptr && remote_socket_ptr->is_open()) { + remote_socket_ptr->shutdown(asio::ip::tcp::socket::shutdown_both, ec); + remote_socket_ptr->close(ec); + } +} + +void Proxy::tunnel_(session_ptr_t session_ptr, socket_ptr_t local_socket_ptr, buffer_ptr_t local_buffer_ptr, socket_ptr_t remote_socket_ptr) { + local_socket_ptr->async_receive( + asio::buffer(&(*local_buffer_ptr)[0], local_buffer_ptr->size()), + boost::bind(&Proxy::on_local_read, this, asio::placeholders::error, asio::placeholders::bytes_transferred, + session_ptr, local_socket_ptr, local_buffer_ptr, remote_socket_ptr) + ); + + ssize_t bytes_transferred = 0; + std::vector tunnel_buffer(TUNNEL_BUFFER_SIZE); + while (true) { + bytes_transferred = gnutls_record_recv(*session_ptr, &tunnel_buffer[0], tunnel_buffer.size()); + + if (bytes_transferred == 0) + break; + + // TODO: check return code properly? + if (bytes_transferred < 0) + break; + + // forward the data over the local connection + try { + asio::write(*local_socket_ptr, asio::buffer(&tunnel_buffer[0], bytes_transferred)); + } catch (asio::system_error& se) { + break; + } + } + + disconnect_(session_ptr, local_socket_ptr, remote_socket_ptr); +} + +static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 }; +static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 }; + +// FIXME: this clientproxy can only handle 1 SSL connection at the same time +ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, + const std::string& ca_file, bool check_hostname) +try + : Proxy(ca_file), + transport_(connect_address, connect_port, boost::bind(&ClientProxy::on_transport_connect, this, _1)), + local_address_("127.0.0.1"), + local_port_(0), + connect_address_(connect_address), + acceptor_ptr(), + check_hostname_(check_hostname) +{ + for (unsigned short port = MIN_CLIENT_PORT; port <= MAX_CLIENT_PORT; port++) { + try { + acceptor_ptr.reset(new asio::ip::tcp::acceptor(transport_.io_service(), asio::ip::tcp::endpoint(asio::ip::address_v4::from_string(local_address_), port), false)); + local_port_ = port; + break; + } catch (asio::system_error& se) { + if (port == MAX_CLIENT_PORT) + throw se; + if (se.code() != asio::error::address_in_use) + throw se; + // this port is already in use, try another one + continue; + } + } + transport_.connect(); +} catch (asio::system_error& se) { + throw Exception(std::string(TRANSPORT_ERROR) + se.what()); +} + +const std::string& ClientProxy::local_address() const { + return local_address_; +} + +unsigned short ClientProxy::local_port() const { + return local_port_; +} + +Transport& ClientProxy::transport() { + return static_cast(transport_); +} + +void ClientProxy::on_transport_connect(socket_ptr_t remote_socket_ptr) { + session_ptr_t session_ptr = setup_tls_session(remote_socket_ptr); + if (!session_ptr) { + disconnect_(session_ptr_t(), socket_ptr_t(), remote_socket_ptr); + throw Exception(TLS_SETUP_ERROR); + } + + // start accepting connections on the local socket + socket_ptr_t local_socket_ptr(new asio::ip::tcp::socket(transport_.io_service())); + acceptor_ptr->async_accept(*local_socket_ptr, boost::bind(&ClientProxy::on_client_connect, this, + asio::placeholders::error, session_ptr, local_socket_ptr, remote_socket_ptr)); +} + +void ClientProxy::on_client_connect(const asio::error_code& error, + session_ptr_t session_ptr, socket_ptr_t local_socket_ptr, socket_ptr_t remote_socket_ptr) { + if (error) { + disconnect_(session_ptr, local_socket_ptr, remote_socket_ptr); + return; + } + + tunnel(session_ptr, local_socket_ptr, remote_socket_ptr); +} + +session_ptr_t ClientProxy::setup_tls_session(socket_ptr_t remote_socket_ptr) { + session_ptr_t session_ptr(new gnutls_session_t(), _SessionPtrDestuctor()); + + // setup session + return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t()); + return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t()); + return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t()); + return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t()); + return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t()); + + // setup transport + gnutls_transport_set_pull_function(*session_ptr,tls_tunnel::read); + gnutls_transport_set_push_function(*session_ptr,tls_tunnel::write); + gnutls_transport_set_ptr(*session_ptr, remote_socket_ptr.get()); + + // handshake + return_val_if_neg(gnutls_handshake(*session_ptr), session_ptr_t()); + + // verify peer + unsigned int status; + if (gnutls_certificate_verify_peers2(*session_ptr, &status) != 0) + throw Exception(TLS_VERIFY_PEER_ERROR); + + gnutls_x509_crt cert; + const gnutls_datum* cert_list; + unsigned int cert_list_size; + + // check hostname + return_val_if_neg(gnutls_x509_crt_init(&cert), session_ptr_t()); + cert_list = gnutls_certificate_get_peers(*session_ptr, &cert_list_size); + if (!cert_list) + throw Exception(TLS_CANT_GET_PEER_CERT_ERROR); + + return_val_if_neg(gnutls_x509_crt_import(cert, &cert_list[0], GNUTLS_X509_FMT_DER), session_ptr_t()); + char name[256] = {0}; + size_t namesize = sizeof(name); + return_val_if_neg(gnutls_x509_crt_get_dn(cert, name, &namesize), session_ptr_t()); + if (check_hostname_ && gnutls_x509_crt_check_hostname(cert, connect_address_.c_str()) == 0) + throw Exception(TLS_VERIFY_HOSTNAME_ERROR); + + return session_ptr; +} + +ServerProxy::ServerProxy(const std::string& bind_ip, unsigned short bind_port, unsigned short local_port, + const std::string& ca_file, const std::string& cert_file, const std::string& key_file) +try + : Proxy(ca_file), + transport_(bind_ip, bind_port, boost::bind(&ServerProxy::on_transport_connect, this, _1)), + local_port_(local_port) +{ + // setup tls server state + if (gnutls_certificate_set_x509_key_file (x509cred, cert_file.c_str(), key_file.c_str(), GNUTLS_X509_FMT_PEM) < 0) + throw Exception(TLS_SETUP_ERROR); + + if (gnutls_dh_params_init(&dh_params) < 0) + throw Exception(TLS_SETUP_ERROR); + + if (gnutls_dh_params_generate2(dh_params, 1024) < 0) + throw Exception(TLS_SETUP_ERROR); + + gnutls_certificate_set_dh_params(x509cred, dh_params); + + // start accepting connections + transport_.accept(); +} catch (asio::system_error& se) { + throw Exception(std::string(TRANSPORT_ERROR) + se.what()); +} + +Transport& ServerProxy::transport() { + return static_cast(transport_); +} + +void ServerProxy::ServerProxy::on_transport_connect(socket_ptr_t remote_socket_ptr) { + session_ptr_t session_ptr = setup_tls_session(remote_socket_ptr); + if (!session_ptr) { + disconnect_(session_ptr_t(), socket_ptr_t(), remote_socket_ptr); + return; + } + + socket_ptr_t local_socket_ptr(new asio::ip::tcp::socket(transport_.io_service())); + try { + asio::ip::tcp::resolver resolver(transport_.io_service()); + asio::ip::tcp::resolver::query query("127.0.0.1", boost::lexical_cast(local_port_)); + asio::ip::tcp::resolver::iterator iterator(resolver.resolve(query)); + local_socket_ptr->connect(*iterator); + } catch (asio::system_error& se) { + disconnect_(session_ptr, local_socket_ptr, remote_socket_ptr); + return; + } + + tunnel(session_ptr, local_socket_ptr, remote_socket_ptr); +} + +session_ptr_t ServerProxy::setup_tls_session(socket_ptr_t remote_socket_ptr) { + session_ptr_t session_ptr(new gnutls_session_t()); + + // setup session + return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_SERVER), session_ptr_t()); + return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t()); + return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t()); + gnutls_certificate_server_set_request(*session_ptr,GNUTLS_CERT_REQUEST); + gnutls_dh_set_prime_bits(*session_ptr, 1024); + + // setup ssl transport + gnutls_transport_set_pull_function(*session_ptr, tls_tunnel::read); + gnutls_transport_set_push_function(*session_ptr, tls_tunnel::write); + gnutls_transport_set_ptr(*session_ptr, remote_socket_ptr.get()); + + // execute ssl handshake + gnutls_certificate_server_set_request(*session_ptr, GNUTLS_CERT_REQUEST); + return_val_if_neg(gnutls_handshake(*session_ptr), session_ptr_t()); + + return session_ptr; +} + +} /* namespace tls_tunnel */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/tls_tunnel.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/tls_tunnel.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/tls_tunnel.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/service/xp/tls_tunnel.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,146 @@ +/* Copyright (C) 2008 AbiSource Corporation B.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __TLS_TUNNEL_H__ +#define __TLS_TUNNEL_H__ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace tls_tunnel { + +typedef boost::shared_ptr socket_ptr_t; +typedef boost::shared_ptr session_ptr_t; +typedef boost::shared_ptr< std::vector > buffer_ptr_t; + +class Exception { +public: + Exception(const std::string& message); + const std::string& message() const; +private: + std::string message_; +}; + +class Transport { +public: + asio::io_service& io_service(); + void run(); + void stop(); + +protected: + Transport(); + +private: + asio::io_service io_service_; + asio::io_service::work work_; +}; + +class ClientTransport : public Transport { +public: + ClientTransport(const std::string& host, unsigned short port, boost::function on_connect); + void connect(); +private: + std::string host_; + unsigned short port_; + boost::function on_connect_; +}; + +class ServerTransport : public Transport { +public: + ServerTransport(const std::string& ip, unsigned short port, boost::function on_connect); + void accept(); +private: + void on_accept(const asio::error_code& error, socket_ptr_t socket_ptr); + + asio::ip::tcp::acceptor acceptor_; + boost::function on_connect_; +}; + +class Proxy { +public: + virtual ~Proxy(); + static bool tls_tunnel_init(); + static void tls_tunnel_deinit(); + void run(); + void stop(); + virtual Transport& transport() = 0; + +protected: + Proxy(const std::string& ca_file); + + void on_local_read(const asio::error_code& error, std::size_t bytes_transferred, + session_ptr_t session_ptr, socket_ptr_t local_socket_ptr, buffer_ptr_t local_buffer_ptr, socket_ptr_t remote_socket_ptr); + void tunnel(session_ptr_t session_ptr, socket_ptr_t local_socket_ptr, socket_ptr_t remote_socket_ptr); + void disconnect_(session_ptr_t session_ptr, socket_ptr_t local_socket_ptr, socket_ptr_t remote_socket_ptr); + + gnutls_certificate_credentials_t x509cred; + +private: + void tunnel_(session_ptr_t session_ptr, socket_ptr_t local_socket_ptr, buffer_ptr_t local_buffer_ptr, socket_ptr_t remote_socket_ptr); +}; + +// FIXME: this clientproxy can only handle 1 SSL connection at the same time +class ClientProxy : public Proxy { +public: + ClientProxy(const std::string& connect_address, unsigned short connect_port, + const std::string& ca_file, bool check_hostname); + + const std::string& local_address() const; + unsigned short local_port() const; + +private: + Transport& transport(); + void on_transport_connect(socket_ptr_t remote_socket_ptr); + void on_client_connect(const asio::error_code& error, + session_ptr_t session_ptr, socket_ptr_t local_socket_ptr, socket_ptr_t remote_socket_ptr); + session_ptr_t setup_tls_session(socket_ptr_t remote_socket_ptr); + + ClientTransport transport_; + std::string local_address_; + unsigned short local_port_; + std::string connect_address_; + boost::shared_ptr acceptor_ptr; + bool check_hostname_; +}; + +class ServerProxy : public Proxy { +public: + ServerProxy(const std::string& bind_ip, unsigned short bind_port, unsigned short local_port, + const std::string& ca_file, const std::string& cert_file, const std::string& key_file); + +private: + Transport& transport(); + void on_transport_connect(socket_ptr_t remote_socket_ptr); + session_ptr_t setup_tls_session(socket_ptr_t remote_socket_ptr); + + ServerTransport transport_; + unsigned short local_port_; + gnutls_dh_params_t dh_params; +}; + +} /* namespace tls_tunnel */ + +#endif /* __TLS_TUNNEL_H__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/sugar/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/sugar/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/sugar/GNUmakefile.in 2008-04-06 22:37:37.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/sugar/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = unix @@ -302,8 +317,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -409,8 +424,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -446,13 +461,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/sugar/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/sugar/unix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/sugar/unix/GNUmakefile.in 2008-04-06 22:37:37.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/sugar/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -89,6 +89,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -161,14 +163,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -185,6 +187,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_SUGAR_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -201,6 +206,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -211,7 +219,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -277,7 +290,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -308,6 +321,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -321,6 +335,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libAbiCollabSugarUnixHandler.la @@ -339,8 +354,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -416,8 +431,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -429,8 +444,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -440,13 +455,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarBuddy.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarBuddy.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarBuddy.h 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarBuddy.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ class DocHandle; -ABI_EXPORT class SugarBuddy : public Buddy + class SugarBuddy : public Buddy { public: SugarBuddy(AccountHandler* handler, const UT_UTF8String& name, const UT_UTF8String dbusName) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarUnixAccountHandler.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarUnixAccountHandler.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarUnixAccountHandler.cpp 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarUnixAccountHandler.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -285,7 +285,7 @@ pManager->registerEventListener(this); // start hosting a session on the current document UT_UTF8String sID; - pManager->startSession(pDoc, sID); + pManager->startSession(pDoc, sID, NULL); return true; } else diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarUnixAccountHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarUnixAccountHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarUnixAccountHandler.h 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/sugar/unix/SugarUnixAccountHandler.h 2009-07-15 16:56:23.000000000 +0100 @@ -33,7 +33,7 @@ class Session; class FV_View; -class ABI_EXPORT SugarAccountHandler : public AccountHandler +class SugarAccountHandler : public AccountHandler { public: static SugarAccountHandler* getHandler(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/GNUmakefile.in 2008-04-06 22:37:37.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,6 +66,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -131,14 +133,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -155,6 +157,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -171,6 +176,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -181,7 +189,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -247,7 +260,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -278,6 +291,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -291,6 +305,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ UNCONDITIONAL_SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/Makefile 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ TARGETS= $(OBJS) -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/unix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/unix/GNUmakefile.in 2008-04-06 22:37:37.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -88,6 +88,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -158,14 +160,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -182,6 +184,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_TCP_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -198,6 +203,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -208,7 +216,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -274,7 +287,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -305,6 +318,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -318,6 +332,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libAbiCollabTCPUnixHandler.la @@ -335,8 +350,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -425,8 +440,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -436,13 +451,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/unix/TCPUnixAccountHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/unix/TCPUnixAccountHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/unix/TCPUnixAccountHandler.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/unix/TCPUnixAccountHandler.h 2009-07-15 16:56:23.000000000 +0100 @@ -21,7 +21,7 @@ #include -class ABI_EXPORT TCPUnixAccountHandler : public TCPAccountHandler +class TCPUnixAccountHandler : public TCPAccountHandler { public: TCPUnixAccountHandler(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/win/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/win/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/win/GNUmakefile.in 2008-04-06 22:37:37.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/win/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -88,6 +88,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -158,14 +160,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -182,6 +184,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_TCP_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -198,6 +203,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -208,7 +216,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -274,7 +287,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -305,6 +318,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -318,6 +332,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ @@ -338,8 +353,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -415,8 +430,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -428,8 +443,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -439,13 +454,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/win/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/win/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/win/Makefile 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/win/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ -I$(ABI_ROOT)/../libs/boost \ -I$(ABI_ROOT)/../libs/asio/include -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/win/TCPWin32AccountHandler.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/win/TCPWin32AccountHandler.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/win/TCPWin32AccountHandler.cpp 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/win/TCPWin32AccountHandler.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -20,6 +20,15 @@ #include #include "TCPWin32AccountHandler.h" +#define ABI_RID_DIALOG_COLLABTCP_SERVERENTRY 201 +#define ABI_RID_DIALOG_COLLABTCP_PORTENTRY 202 +#define ABI_RID_DIALOG_COLLABTCP_SERVERLABEL 203 +#define ABI_RID_DIALOG_COLLABTCP_PORTLABEL 204 +#define ABI_RID_DIALOG_COLLABTCP_SERVERRADIO 205 +#define ABI_RID_DIALOG_COLLABTCP_JOINRADIO 206 +#define ABI_RID_DIALOG_COLLABTCP_AUTOCONNECTCHECK 207 +#define ABI_RID_DIALOG_COLLABTCP_USESECURECHECK 208 + AccountHandlerConstructor TCPAccountHandlerConstructor = &TCPWin32AccountHandler::static_constructor; AccountHandler * TCPWin32AccountHandler::static_constructor() @@ -27,12 +36,10 @@ return static_cast(new TCPWin32AccountHandler()); } - +// return true if we process the command, false otherwise BOOL TCPWin32AccountHandler::_onCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { - WORD wNotifyCode = HIWORD(wParam); WORD wId = LOWORD(wParam); - HWND hWndCtrl = (HWND)lParam; bool serve = _isCheckedHwnd(m_hServerRadio); AP_Win32Dialog_CollaborationAddAccount * pThis; @@ -55,13 +62,13 @@ // enable the address entry EnableWindow(m_hServerEntry, true); } - + return true; case ABI_RID_DIALOG_COLLABTCP_SERVERENTRY: case ABI_RID_DIALOG_COLLABTCP_PORTENTRY: // These have the ability to enable or disable the "OK" button - pThis=(AP_Win32Dialog_CollaborationAddAccount *)GetWindowLong(m_hParentDlg,DWL_USER); + pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLong(m_hParentDlg,DWL_USER); // note: GetWindowTextLength may have a Unicode caveat, according to MSDN // It may return a value higher than the actual length. This is probably OK for @@ -96,21 +103,18 @@ // we have no port - disable the OK button! pThis->setBackendValidity(false); } - break; - - - + return true; default: - // unhandled: return 1 - return 1; + return false; } } TCPWin32AccountHandler::TCPWin32AccountHandler() : TCPAccountHandler(), - m_hBox(NULL), + m_pWin32Dialog(NULL), + m_hInstance(NULL), m_hServerEntry(NULL), m_hPortEntry(NULL), m_hServerRadio(NULL), @@ -119,163 +123,108 @@ m_hPortLabel(NULL), m_hAutoconnectCheck(NULL), m_hUseSecureCheck(NULL), - m_hInstance(NULL), - m_hParentDlg(NULL), - m_bEmbedded(false), - p_win32Dialog(NULL) + m_hParentDlg(NULL) { - AbiCollabSessionManager * pSessionManager= AbiCollabSessionManager::getManager(); + AbiCollabSessionManager * pSessionManager = AbiCollabSessionManager::getManager(); if (pSessionManager) { - m_hInstance=pSessionManager->getInstance(); + m_hInstance = pSessionManager->getInstance(); } - } void TCPWin32AccountHandler::embedDialogWidgets(void* pEmbeddingParent) { UT_DEBUGMSG(("TCPWin32AccountHandler::embedDialogWidgets()\n")); UT_return_if_fail(pEmbeddingParent); - m_hBox=pEmbeddingParent; - if (m_bEmbedded) - { - // if already embedded, remove first. - removeDialogWidgets(pEmbeddingParent); - } - - - - HWND hParentDlg=GetParent(m_hBox); - UT_return_if_fail(hParentDlg); - - AP_Win32Dialog_CollaborationAddAccount * pThis=(AP_Win32Dialog_CollaborationAddAccount *)GetWindowLong(m_hParentDlg,DWL_USER); - - // Get a DialogHelper - /* - if (p_win32Dialog) - { - delete p_win32Dialog; - } - p_win32Dialog = new XAP_Win32DialogHelper(hParentDlg); - */ - + + // our enclosing window must be a HWND + HWND hBox = reinterpret_cast(pEmbeddingParent); /* Non-Tabbable Labels */ // "Address:" m_hServerLabel = CreateWindowEx(WS_EX_NOPARENTNOTIFY, "STATIC", "Address:", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, - 15, 55, 51, 15, m_hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_SERVERLABEL, m_hInstance, (LPARAM) pThis); + 15, 57, 51, 15, hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_SERVERLABEL, m_hInstance, 0); UT_return_if_fail(m_hServerLabel); // "Port:" m_hPortLabel = CreateWindowEx(WS_EX_NOPARENTNOTIFY, "STATIC", "Port:", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, - 15, 75, 47, 15, m_hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_PORTLABEL, m_hInstance, (LPARAM) pThis); + 15, 87, 47, 15, hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_PORTLABEL, m_hInstance, 0); UT_return_if_fail(m_hPortLabel); /* Radio Button Group */ // Act As Server radio button m_hServerRadio = CreateWindowEx(WS_EX_NOPARENTNOTIFY | WS_EX_TRANSPARENT, "BUTTON", "Accept Incoming Connections", BS_NOTIFY | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE |WS_GROUP|WS_TABSTOP, - 15, 15, 200, 15, m_hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_SERVERRADIO, m_hInstance, (LPARAM) pThis); + 15, 15, 200, 15, hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_SERVERRADIO, m_hInstance, 0); UT_return_if_fail(m_hServerRadio); // Join a Server radio button m_hJoinRadio = CreateWindowEx(WS_EX_NOPARENTNOTIFY | WS_EX_TRANSPARENT, "BUTTON", "Connect to Another Computer", BS_NOTIFY | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, - 15, 35, 200, 15, m_hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_JOINRADIO, m_hInstance, (LPARAM) pThis); + 15, 35, 200, 15, hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_JOINRADIO, m_hInstance, 0); UT_return_if_fail(m_hJoinRadio); /* Tabbable */ // Entry box for IP address of server // should be disabled when in server mode, and OK should be disabled when this is empty in join mode - m_hServerEntry = CreateWindowEx(WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE, "EDIT", "", ES_LEFT | WS_CHILD | WS_BORDER | WS_VISIBLE | WS_TABSTOP | WS_GROUP, - 80, 55, 121, 20, m_hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_SERVERENTRY, m_hInstance, (LPARAM) pThis); + m_hServerEntry = CreateWindowEx(WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE, "EDIT", "", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_BORDER | WS_VISIBLE | WS_TABSTOP | WS_GROUP, + 80, 55, 121, 20, hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_SERVERENTRY, m_hInstance, 0); UT_return_if_fail(m_hServerEntry); // Port entry box // OK should be disabled when this is empty m_hPortEntry = CreateWindowEx(WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE, "EDIT", boost::lexical_cast(DEFAULT_TCP_PORT).c_str(), ES_LEFT | WS_CHILD | WS_BORDER | WS_VISIBLE | WS_TABSTOP| WS_GROUP, - 80, 85, 60, 20, m_hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_PORTENTRY, m_hInstance, (LPARAM) pThis); + 80, 85, 60, 20, hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_PORTENTRY, m_hInstance, 0); UT_return_if_fail(m_hPortEntry); // Checkbox for future secure support - currently disabled m_hUseSecureCheck = CreateWindowEx(WS_EX_NOPARENTNOTIFY, "BUTTON", "Use Secure Connection", BS_CHECKBOX | BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP | WS_GROUP, - 14, 115, 174, 15, m_hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_USESECURECHECK, m_hInstance, (LPARAM) pThis); + 14, 115, 174, 15, hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_USESECURECHECK, m_hInstance, 0); UT_return_if_fail(m_hUseSecureCheck); // Checkbox for Connect on Startup m_hAutoconnectCheck = CreateWindowEx(WS_EX_NOPARENTNOTIFY, "BUTTON", "Connect Automatically", BS_CHECKBOX | BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_GROUP, - 14, 135, 172, 15 , m_hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_AUTOCONNECTCHECK, m_hInstance, (LPARAM) pThis); + 14, 135, 172, 15 , hBox, (HMENU) ABI_RID_DIALOG_COLLABTCP_AUTOCONNECTCHECK, m_hInstance, 0); UT_return_if_fail(m_hAutoconnectCheck); - - // Font setting code borrowed from XAP_Win32Dlg_About - LOGFONT lf = { 0 }; strcpy(lf.lfFaceName, "MS Sans Serif"); - lf.lfHeight = 12; lf.lfWeight = 0; HFONT hfontPrimary = CreateFontIndirect(&lf); - HWND rgFontReceivers[] = { m_hServerRadio, m_hJoinRadio, m_hServerLabel, m_hPortLabel, m_hServerEntry, m_hPortEntry, m_hAutoconnectCheck, m_hUseSecureCheck}; - - for (int iWnd = 0; iWnd < G_N_ELEMENTS(rgFontReceivers); ++iWnd) - { + for (UT_uint32 iWnd = 0; iWnd < G_N_ELEMENTS(rgFontReceivers); iWnd++) SendMessage(rgFontReceivers[iWnd], WM_SETFONT, (WPARAM) hfontPrimary, 0); - } - // default to join - _checkButtonHwnd(m_hJoinRadio, true); + // default to serve + _checkButtonHwnd(m_hServerRadio, true); // default to autoconnect _checkButtonHwnd(m_hAutoconnectCheck, true); - } +#define DESTROY_WINDOW(M) if (M) { UT_ASSERT_HARMLESS(DestroyWindow(M)); M = 0; } + void TCPWin32AccountHandler::removeDialogWidgets(void* pEmbeddingParent) { UT_DEBUGMSG(("TCPAccountHandler::removeDialogWidgets()\n")); - if (m_hServerEntry) - { - UT_ASSERT(DestroyWindow(m_hServerEntry)); - } - - if (m_hPortEntry) - { - UT_ASSERT(DestroyWindow(m_hPortEntry)); - } - - if (m_hServerLabel) - { - UT_ASSERT(DestroyWindow(m_hServerLabel)); - } - - if (m_hPortLabel) - { - UT_ASSERT(DestroyWindow(m_hPortLabel)); - } - - if (m_hServerRadio) - { - UT_ASSERT(DestroyWindow(m_hServerRadio)); - } - - if (m_hJoinRadio) - { - UT_ASSERT(DestroyWindow(m_hJoinRadio)); - } + UT_return_if_fail(pEmbeddingParent); + + // our enclosing window must be a HWND + HWND hBox = reinterpret_cast(pEmbeddingParent); - if (m_hAutoconnectCheck) - { - UT_ASSERT(DestroyWindow(m_hAutoconnectCheck)); - } + DESTROY_WINDOW(m_hServerEntry); + DESTROY_WINDOW(m_hPortEntry); + DESTROY_WINDOW(m_hServerLabel); + DESTROY_WINDOW(m_hPortLabel); + DESTROY_WINDOW(m_hServerRadio); + DESTROY_WINDOW(m_hJoinRadio); + DESTROY_WINDOW(m_hAutoconnectCheck); + DESTROY_WINDOW(m_hUseSecureCheck); - if (m_hUseSecureCheck) - { - UT_ASSERT(DestroyWindow(m_hUseSecureCheck)); - } - /* boom! */ + // destroying a window does not repaint the area it owned, so do it here + RedrawWindow(GetParent(hBox), NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_UPDATENOW); } void TCPWin32AccountHandler::storeProperties() @@ -325,18 +274,12 @@ UT_return_if_fail(hCtrl); SendMessage(hCtrl, BM_SETCHECK, bChecked ? BST_CHECKED : BST_UNCHECKED, 0); } + bool TCPWin32AccountHandler::_isCheckedHwnd(HWND hCtrl) { // note - does not work for 3-state buttons, obviously, since it returns a bool UT_return_val_if_fail(hCtrl, false); - if (SendMessage(hCtrl, BM_GETCHECK, 0, 0)==BST_CHECKED) - { - return true; - } - else - { - return false; - } + return (SendMessage(hCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED); } int TCPWin32AccountHandler::_getControlTextHwnd(HWND hCtrl, int iLen, const char * p_szBuf) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/win/TCPWin32AccountHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/win/TCPWin32AccountHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/win/TCPWin32AccountHandler.h 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/win/TCPWin32AccountHandler.h 2009-07-15 16:56:23.000000000 +0100 @@ -29,17 +29,7 @@ #include -#define ABI_RID_DIALOG_COLLABTCP_SERVERENTRY 201 -#define ABI_RID_DIALOG_COLLABTCP_PORTENTRY 202 -#define ABI_RID_DIALOG_COLLABTCP_SERVERLABEL 203 -#define ABI_RID_DIALOG_COLLABTCP_PORTLABEL 204 -#define ABI_RID_DIALOG_COLLABTCP_SERVERRADIO 205 -#define ABI_RID_DIALOG_COLLABTCP_JOINRADIO 206 -#define ABI_RID_DIALOG_COLLABTCP_AUTOCONNECTCHECK 207 -#define ABI_RID_DIALOG_COLLABTCP_USESECURECHECK 208 - - -class ABI_EXPORT TCPWin32AccountHandler : public TCPAccountHandler +class TCPWin32AccountHandler : public TCPAccountHandler { public: TCPWin32AccountHandler(); @@ -53,13 +43,10 @@ BOOL _onCommand(HWND hWnd, WPARAM wParam, LPARAM lParam); private: - XAP_Win32DialogHelper * p_win32Dialog; - - bool m_bEmbedded; + XAP_Win32DialogHelper * m_pWin32Dialog; // handles HINSTANCE m_hInstance; - HWND m_hBox; HWND m_hServerEntry; HWND m_hPortEntry; HWND m_hServerRadio; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/GNUmakefile.am 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -12,12 +12,8 @@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_TCP_LIBS@ @PLATFORM_LDFLAGS@ noinst_LTLIBRARIES = libAbiCollabTCPHandler.la -libAbiCollabTCPHandler_la_SOURCES = IOClientHandler.h \ - IOHandler.h \ - IOServerHandler.h \ +libAbiCollabTCPHandler_la_SOURCES = IOServerHandler.h \ Session.h \ - Synchronizer.cpp \ - Synchronizer.h \ TCPAccountHandler.cpp \ TCPAccountHandler.h \ TCPBuddy.h diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/GNUmakefile.in 2008-04-06 22:37:37.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,8 +50,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) libAbiCollabTCPHandler_la_DEPENDENCIES = \ ../unix/libAbiCollabTCPUnixHandler.la -am_libAbiCollabTCPHandler_la_OBJECTS = Synchronizer.lo \ - TCPAccountHandler.lo +am_libAbiCollabTCPHandler_la_OBJECTS = TCPAccountHandler.lo libAbiCollabTCPHandler_la_OBJECTS = \ $(am_libAbiCollabTCPHandler_la_OBJECTS) libAbiCollabTCPHandler_la_LINK = $(LIBTOOL) --tag=CXX \ @@ -90,6 +89,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -161,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -185,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_TCP_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -201,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -211,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -277,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -308,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -321,18 +334,15 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile noinst_LTLIBRARIES = libAbiCollabTCPHandler.la -libAbiCollabTCPHandler_la_SOURCES = IOClientHandler.h \ - IOHandler.h \ - IOServerHandler.h \ +libAbiCollabTCPHandler_la_SOURCES = IOServerHandler.h \ Session.h \ - Synchronizer.cpp \ - Synchronizer.h \ TCPAccountHandler.cpp \ TCPAccountHandler.h \ TCPBuddy.h @@ -347,8 +357,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -390,7 +400,6 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Synchronizer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TCPAccountHandler.Plo@am__quote@ .cpp.o: @@ -425,8 +434,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +447,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +458,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOClientHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOClientHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOClientHandler.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOClientHandler.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -/* Copyright (C) 2007 by Marc Maurer - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#ifndef __IO_CLIENT_HANDLER__ -#define __IO_CLIENT_HANDLER__ - -#include -#include - -#include "Synchronizer.h" -#include "Session.h" -#include "IOHandler.h" - -class IOClientHandler : public IOHandler -{ -public: - IOClientHandler(std::string hostname, std::string port) - : io_service(), - thread(NULL), - work(NULL), - resolver(io_service), - query(hostname.c_str(), port.c_str()) - { - } - - virtual ~IOClientHandler() - { - UT_DEBUGMSG(("IOClientHandler::~IOClientHandler\n")); - } - - virtual void stop() - { - UT_DEBUGMSG(("IOClientHandler::stop()\n")); - DELETEP(work); - io_service.stop(); - if (thread) - { - thread->join(); - DELETEP(thread); - } - UT_DEBUGMSG(("IOClientHandler stopped\n")); - } - - Session* constructSession(void (*ef)(Session*), TCPAccountHandler& handler) - { - return new Session(io_service, ef, handler); - } - - void connect(Session& session) - { - UT_return_if_fail(work == NULL); - - work = new asio::io_service::work(io_service); - thread = new asio::thread(boost::bind(&asio::io_service::run, &io_service)); - - // TODO: catch exceptions - asio::ip::tcp::resolver::iterator iterator(resolver.resolve(query)); - session.getSocket().connect(*iterator); - session.asyncReadHeader(); - } - -private: - asio::io_service io_service; - asio::thread* thread; - asio::io_service::work* work; - asio::ip::tcp::resolver resolver; - asio::ip::tcp::resolver::query query; -}; - -#endif /* __IO_CLIENT_HANDLER__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOHandler.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOHandler.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -/* Copyright (C) 2007 by Marc Maurer - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#ifndef __IO_HANDLER__ -#define __IO_HANDLER__ - -class Session; -class IOServerHandler; - -class IOHandler -{ -public: - virtual ~IOHandler() {} - - virtual void stop() = 0; - -// virtual void asyncWrite(int size, const char* data) = 0; -// virtual bool isConnected() = 0; -}; - -#endif /* __IO_HANDLER__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOServerHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOServerHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOServerHandler.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/IOServerHandler.h 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007 by Marc Maurer +/* Copyright (C) 2007-2008 by Marc Maurer * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,109 +22,92 @@ #include "ut_debugmsg.h" #include +#include #include -#include "Synchronizer.h" +#include #include "Session.h" -#include "IOHandler.h" class TCPAccountHandler; using asio::ip::tcp; -class IOServerHandler : public IOHandler +class IOServerHandler { public: - IOServerHandler(int port, void (*af)(IOServerHandler*), TCPAccountHandler& handler) - : accept_synchronizer((void (*)(void*))af, (void*)this), - io_service(), - work(NULL), - thread(NULL), + IOServerHandler(int port, boost::function)> af, + boost::function ef, asio::io_service& io_service_) + : accept_synchronizer(boost::bind(&IOServerHandler::_signal, this)), + io_service(io_service_), m_pAcceptor(NULL), - m_handler(handler) + session_ptr(), + m_af(af), + m_ef(ef) { - UT_DEBUGMSG(("IOServerHandler()\n")); - work = new asio::io_service::work(io_service); - m_pAcceptor = new tcp::acceptor(io_service, tcp::endpoint(tcp::v4(), port)); - thread = new asio::thread(boost::bind(&asio::io_service::run, &io_service)); + UT_DEBUGMSG(("IOServerHandler()\n")); + m_pAcceptor = new tcp::acceptor(io_service, tcp::endpoint(tcp::v4(), port)); } virtual ~IOServerHandler() { UT_DEBUGMSG(("IOServerHandler::~IOServerHandler()\n")); - if (m_pAcceptor) - stop(); + if (m_pAcceptor) + stop(); } virtual void stop() { - UT_DEBUGMSG(("IOServerHandler::stop()\n")); + UT_DEBUGMSG(("IOServerHandler::stop()\n")); if (m_pAcceptor) { m_pAcceptor->close(); DELETEP(m_pAcceptor); } - DELETEP(work); - io_service.stop(); - if (thread) - thread->join(); - DELETEP(thread); } - - void run(Session& newSession) + + void run() { UT_DEBUGMSG(("IOServerHandler::run()\n")); - asyncAccept(newSession); + asyncAccept(); } - void asyncAccept(Session& newSession) + void asyncAccept() { - UT_DEBUGMSG(("IOServerHandler::asyncAccept()\n")); - UT_return_if_fail(m_pAcceptor); - m_pAcceptor->async_accept(newSession.getSocket(), + UT_DEBUGMSG(("IOServerHandler::asyncAccept()\n")); + UT_return_if_fail(m_pAcceptor); + session_ptr.reset(new Session(io_service, m_ef)); + m_pAcceptor->async_accept(session_ptr->getSocket(), boost::bind(&IOServerHandler::handleAsyncAccept, - this, asio::placeholders::error, - boost::ref(newSession))); - } - - Session* constructSession(void (*ef)(Session*), TCPAccountHandler& handler) - { - UT_DEBUGMSG(("IOServerHandler::constructSession()\n")); - return new Session(io_service, ef, handler); + this, asio::placeholders::error)); } - /* - Only called fron the abiword main loop - */ - void handleAccept(Session& newSession) - { - UT_DEBUGMSG(("IOServerHandler::handleAccept()\n")); - accept_synchronizer.consume(); - asyncAccept(newSession); - } - - TCPAccountHandler& getAccountHandler() +private: + void _signal() { - return m_handler; + UT_DEBUGMSG(("IOServerHandler::_signal()\n")); + UT_return_if_fail(session_ptr); + session_ptr->asyncReadHeader(); + m_af(this, session_ptr); } -private: - void handleAsyncAccept(const asio::error_code& ec, Session& session) + void handleAsyncAccept(const asio::error_code& ec) { - if (!ec) + UT_DEBUGMSG(("IOServerHandler::handleAsyncAccept()\n")); + if (ec) { - accept_synchronizer.signal(); - session.asyncReadHeader(); + UT_DEBUGMSG(("Error accepting connection: %s\n", ec.message().c_str())); + return; } + accept_synchronizer.signal(); } Synchronizer accept_synchronizer; - asio::io_service io_service; - asio::io_service::work* work; - asio::thread* thread; + asio::io_service& io_service; asio::ip::tcp::acceptor* m_pAcceptor; + boost::shared_ptr session_ptr; - TCPAccountHandler& m_handler; + boost::function)> m_af; + boost::function m_ef; }; #endif /* __IO_SERVER_HANDLER__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/Makefile 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -22,9 +22,8 @@ include $(ABI_ROOT)/src/config/abi_defs.mk TARGETS= $(OBJS) -CPPSRCS= TCPAccountHandler.cpp \ - Synchronizer.cpp - +CPPSRCS= TCPAccountHandler.cpp + INCLUDES+= -I$(shell pwd) \ -I$(shell pwd)/../../.. \ -I$(shell pwd)/../../../core/packet \ @@ -32,13 +31,14 @@ -I$(ABI_ROOT)/../libs/boost \ -I$(ABI_ROOT)/../libs/asio/include -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers # compiler (MinGW, MSVC, etc) specific ifeq ($(OS_NAME),MINGW32) + INCLUDES+= -D_WIN32_WINNT=0x0500 else OS_CFLAGS+=-GX endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/Session.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/Session.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/Session.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/Session.h 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007 by Marc Maurer +/* Copyright (C) 2007,2008 by Marc Maurer * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,36 +19,25 @@ #ifndef __SESSION__ #define __SESSION__ +#include +#include #include #include +#include class TCPAccountHandler; class Session : public Synchronizer, public boost::noncopyable { public: - Session(asio::io_service& io_service, void (*ef)(Session*), TCPAccountHandler& handler) - : Synchronizer((void (*)(void*))ef, (void*)this), + Session(asio::io_service& io_service, boost::function ef) + : Synchronizer(boost::bind(&Session::_signal, this)), socket(io_service), queue_protector(), - owner(handler) + m_ef(ef) { } - virtual ~Session() - { - UT_DEBUGMSG(("~Session()\n")); - asio::error_code ecs; - socket.shutdown(asio::ip::tcp::socket::shutdown_both, ecs); - if (ecs) - UT_DEBUGMSG(("Error shutting down socket: %s\n", ecs.message().c_str())); - - asio::error_code ecc; - socket.close(ecc); - if (ecc) - UT_DEBUGMSG(("Error closing socket: %s\n", ecc.message().c_str())); - } - asio::ip::tcp::socket& getSocket() { return socket; @@ -60,7 +49,7 @@ abicollab::scoped_lock lock(queue_protector); incoming.push_back( std::pair(size, data) ); } - signal(); + Synchronizer::signal(); } /* @@ -82,6 +71,7 @@ void asyncReadHeader() { + UT_DEBUGMSG(("Session::asyncReadHeader()\n")); packet_data = 0; // just to be sure we'll never touch a datablock we might have read before asio::async_read(socket, asio::buffer(&packet_size, 4), @@ -117,113 +107,121 @@ { return socket.is_open(); } - - TCPAccountHandler& getAccountHandler() + + void disconnect() { - return owner; + UT_DEBUGMSG(("Session::disconnect()\n")); + if (socket.is_open()) + { + asio::error_code ecs; + socket.shutdown(asio::ip::tcp::socket::shutdown_both, ecs); + if (ecs) + UT_DEBUGMSG(("Error shutting down socket: %s\n", ecs.message().c_str())); + + asio::error_code ecc; + socket.close(ecc); + if (ecc) + UT_DEBUGMSG(("Error closing socket: %s\n", ecc.message().c_str())); + } + UT_DEBUGMSG(("Socket closed, signalling mainloop\n")); + signal(); } private: + void _signal() + { + UT_DEBUGMSG(("Session::_signal()\n")); + m_ef(*this); + } + void asyncReadHeaderHandler(const asio::error_code& error, std::size_t bytes_transferred) { - if (!error) + if (error) { - if (bytes_transferred == 4) - { - UT_DEBUGMSG(("going to read datablock of length: %d\n", packet_size)); - - // now continue reading the packet data - packet_data = reinterpret_cast(malloc(packet_size)); - asio::async_read(socket, - asio::buffer(packet_data, packet_size), - boost::bind(&Session::asyncReadHandler, this, asio::placeholders::error, asio::placeholders::bytes_transferred)); - } - else - close(); // TODO: should not happen, handle this + UT_DEBUGMSG(("asyncReadHeaderHandler error: %s\n", error.message().c_str())); + disconnect(); + return; } - else + + if (bytes_transferred != 4) { - UT_DEBUGMSG(("asyncReadHeaderHandler generic error\n")); - close(); + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); + disconnect(); // TODO: should not happen, handle this + return; } + + UT_DEBUGMSG(("going to read datablock of length: %d\n", packet_size)); + // now continue reading the packet data + packet_data = reinterpret_cast(malloc(packet_size)); + asio::async_read(socket, + asio::buffer(packet_data, packet_size), + boost::bind(&Session::asyncReadHandler, this, asio::placeholders::error, asio::placeholders::bytes_transferred)); } void asyncReadHandler(const asio::error_code& error, std::size_t bytes_transferred) { - if (!error) + if (error) { - if (bytes_transferred == std::size_t(packet_size)) - { - push(packet_size, packet_data); - // start over for a new packet - asyncReadHeader(); - } - else - { - UT_DEBUGMSG(("asyncReadHandler error: wrong number of byes received: %d, expected: %d\n", bytes_transferred, packet_size)); - close(); - } + UT_DEBUGMSG(("asyncReadHandler generic error\n")); + disconnect(); + return; } - else + + if (bytes_transferred != std::size_t(packet_size)) { - UT_DEBUGMSG(("asyncReadHandler generic error\n")); - close(); + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); + disconnect(); // TODO: should not happen, handle this + return; } + push(packet_size, packet_data); + // start over for a new packet + asyncReadHeader(); } void asyncWriteHeaderHandler(const asio::error_code& ec) { UT_DEBUGMSG(("Session::asyncWriteHeaderHandler()\n")); - if (!ec) - { - // write the packet body - asio::async_write(socket, - asio::buffer(packet_data_write, packet_size_write), - boost::bind(&Session::asyncWriteHandler, this, asio::placeholders::error)); - } - else + if (ec) { UT_DEBUGMSG(("asyncWriteHeaderHandler generic error\n")); - close(); + disconnect(); + return; } + + // write the packet body + asio::async_write(socket, + asio::buffer(packet_data_write, packet_size_write), + boost::bind(&Session::asyncWriteHandler, this, asio::placeholders::error)); } void asyncWriteHandler(const asio::error_code& ec) { UT_DEBUGMSG(("Session::asyncWriteHandler()\n")); FREEP(packet_data_write); - if (!ec) - { - // TODO: this is a race condition, mutext this - outgoing.pop_front(); - if (outgoing.size() > 0) - { - std::pair p = outgoing.front(); - packet_size_write = p.first; - packet_data_write = p.second; - - UT_DEBUGMSG(("sending datablock of length: %d\n", packet_size_write)); - - asio::async_write(socket, - asio::buffer(&packet_size_write, 4), - boost::bind(&Session::asyncWriteHeaderHandler, this, asio::placeholders::error)); - } - } - else + if (ec) { UT_DEBUGMSG(("asyncWriteHandler generic error\n")); - close(); + disconnect(); + return; } - } - void close() - { - socket.close(); - UT_DEBUGMSG(("socket closed\n")); - signal(); + // TODO: this is a race condition, mutex this + outgoing.pop_front(); + if (outgoing.size() > 0) + { + std::pair p = outgoing.front(); + packet_size_write = p.first; + packet_data_write = p.second; + + UT_DEBUGMSG(("sending datablock of length: %d\n", packet_size_write)); + + asio::async_write(socket, + asio::buffer(&packet_size_write, 4), + boost::bind(&Session::asyncWriteHeaderHandler, this, asio::placeholders::error)); + } } asio::ip::tcp::socket socket; @@ -237,7 +235,7 @@ int packet_size_write; // state needed for async writes char* packet_data_write; // state needed for async writes - TCPAccountHandler& owner; + boost::function m_ef; }; #endif /* __SESSION__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/Synchronizer.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/Synchronizer.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/Synchronizer.cpp 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/Synchronizer.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,326 +0,0 @@ -/* AbiCollab - Code to enable the modification of remote documents. - * Copyright (C) 2007 by Marc Maurer - * Copyright (C) 2007 by Ryan Pavlik - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#include "Synchronizer.h" -// Danger Will Robinson: This file is icky to look at. -// Massive comment blocks used to aid reading in syntax-highlighting editors. - -#include - -#ifndef WIN32 -#include -#endif - -////////////////// -// WINDOWS STATIC MAGIC -////////////////// - -#ifdef WIN32 -#ifndef HWND_MESSAGE -#define HWND_MESSAGE ((HWND)(-3)) -#endif - -static int Synchronizer::sm_iMessageWindows=0; -ATOM sm_iClass = 0; - -static LRESULT CALLBACK Synchronizer::s_wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) // Win32-only -{ - Synchronizer * pThis; - int swlresult; - switch (msg) - { - - case WM_NCCREATE: - pThis = (Synchronizer *)((LPCREATESTRUCT(lParam))->lpCreateParams); - UT_return_val_if_fail(pThis, 0); - pThis->m_hWnd = hWnd; - SetLastError(0); - swlresult=SetWindowLong(hWnd,GWL_USERDATA,long(pThis)); - if (swlresult==0) - { - // we might have an error - int errorcode=GetLastError(); - if (errorcode) - { - UT_DEBUGMSG(("Error in setting the WindowLong GWL_USERDATA: %d\n", errorcode)); - } - - } - return 1; - - case WM_ABI_TCP_BACKEND: - pThis = (Synchronizer *)GetWindowLong(hWnd,GWL_USERDATA); - UT_return_val_if_fail(pThis, 0); - UT_DEBUGMSG(("Received a message in Synchronizer.h message loop! 0x%x\n", msg)); - pThis->fromMainloopCallback(); - return 1; - - default: - UT_DEBUGMSG(("return DefWindowProc for message 0x%x\n", msg)); - // We do not want to handle this message so pass back to Windows - // to handle it in a default way - return DefWindowProc(hWnd, msg, wParam, lParam); - } -} -static void Synchronizer::_registerWndClass() // Win32-only -{ - if (sm_iClass) - { - UT_DEBUGMSG(("Skipping window class registration\n")); - return; - } - - AbiCollabSessionManager * pSessionManager = AbiCollabSessionManager::getManager(); - UT_return_if_fail(pSessionManager); - - HINSTANCE hInstance = pSessionManager->getInstance(); - UT_return_if_fail(hInstance); - - WNDCLASS wc; - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = Synchronizer::s_wndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInstance; - wc.hIcon = NULL; - wc.hCursor = NULL; - wc.hbrBackground = NULL; - wc.lpszMenuName = NULL; - wc.lpszClassName = "AbiTCPSynchronizer"; - - sm_iClass = RegisterClass(&wc); - UT_return_if_fail(sm_iClass); - - sm_iMessageWindows = 0; -} - -static void Synchronizer::_unregisterWndClass() // Win32-only -{ - UT_DEBUGMSG(("Synchronizer::_unregisterWndClass()\n")); - UT_return_if_fail(sm_iClass); - - if (sm_iMessageWindows > 0) - { - UT_DEBUGMSG(("%d message windows still exist, skipping unregistering\n", sm_iMessageWindows)); - return; - } - - AbiCollabSessionManager * pManager = AbiCollabSessionManager::getManager(); - UT_return_if_fail(pManager); - - HINSTANCE hInstance = pManager->getInstance(); - UT_return_if_fail(hInstance); - - UT_DEBUGMSG(("Unregistrating message window class\n")); - UT_return_if_fail(UnregisterClass(sm_iClass, hInstance)); - sm_iClass = NULL; -} - -#endif - -////////////////// -// CONSTRUCTORS -////////////////// - -#ifdef WIN32 -Synchronizer::Synchronizer(void (*f)(void*), void* data) // Win32 Implementation - : f_(f), - data_(data), - m_hWnd(0) -{ - UT_DEBUGMSG(("Synchronizer()\n")); - - AbiCollabSessionManager * pSessionManager= AbiCollabSessionManager::getManager(); - UT_return_if_fail(pSessionManager); - - HINSTANCE hInstance = pSessionManager->getInstance(); - UT_return_if_fail(hInstance); - - _registerWndClass(); - - // HWND_MESSAGE as parent HWND is Win2k/xp/vista only - replaced with 0 - // (also HWND_MESSAGE doesn't compile in MinGW, weird bug. --RP 8 August 2007) - - m_hWnd = CreateWindow("AbiTCPSynchronizer", - "AbiCollab", - 0, - CW_USEDEFAULT, - SW_HIDE, - CW_USEDEFAULT, - CW_USEDEFAULT, - HWND_MESSAGE, - NULL, - hInstance, - (void *) this - ); - - UT_DEBUGMSG(("Created message window: HWND 0x%x\n", m_hWnd)); - switch ((int)m_hWnd) - { - case NULL: - UT_DEBUGMSG(("Win32 error: %d.\n", GetLastError())); - break; - default: - sm_iMessageWindows++; - break; - // ok! - }; -} - -#else - -Synchronizer::Synchronizer(void (*f)(void*), void* data) // Unix Implementation - : f_(f), - data_(data) -{ - UT_DEBUGMSG(("~Synchronizer()\n")); - // on unix, we use the self-pipe trick to signal the glib main loop - fdr = -1; - fdw = -1; - - int pfd[2]; - if (pipe(pfd) == -1) - { - UT_DEBUGMSG(("pipe error!\n")); - // FIXME: throw an exception here, don't just bail out! - exit(EXIT_FAILURE); - } - else - { - fdr = pfd[0]; - fdw = pfd[1]; - - // setup the glib main loop integration - io_channel = g_io_channel_unix_new(fdr); - io_channel_watch_id = g_io_add_watch(io_channel, G_IO_IN, (GIOFunc)s_glib_mainloop_callback, this); - } -} -#endif - -// end constructors -////////////////// - -////////////////// -// DESTRUCTORS -////////////////// - -#ifdef WIN32 -Synchronizer::~Synchronizer() // Win32 Implementation -{ - UT_DEBUGMSG(("~Synchronizer()\n")); - // destroy our window - if (m_hWnd) - { - DestroyWindow(m_hWnd); - m_hWnd = 0; - sm_iMessageWindows--; - } - else - { - UT_DEBUGMSG(("TCP Backend Synchronizer Window already destroyed!\n")); - } - - // Attempt to unregister class - it will check to make sure we're the last one out. - _unregisterWndClass(); -} - -#else - -Synchronizer::~Synchronizer() // Unix Implementation -{ - UT_DEBUGMSG(("~Synchronizer()\n")); - if (fdr != -1) - close(fdr); - if (fdw != -1) - close(fdw); - - g_source_remove(io_channel_watch_id); - //g_io_channel_shutdown(io_channel, TRUE, NULL); - g_io_channel_unref(io_channel); - io_channel_watch_id = 0; -} -#endif -// end destructors -////////////////// - -////////////////// -// SIGNAL -////////////////// -#ifdef WIN32 -void Synchronizer::signal() // Win32 Implementation -{ - UT_DEBUGMSG(("Synchronizer::signal()\n")); - // send a message to the main loop - int result=SendMessage(m_hWnd, WM_ABI_TCP_BACKEND, 0, 0); - UT_DEBUGMSG(("Synchronizer::signal() - SendMessage returned %d\n", result)); -} - -#else - -void Synchronizer::signal() // Unix Implementation -{ - UT_DEBUGMSG(("Synchronizer::signal()\n")); - UT_DEBUGMSG(("Signalling the main loop\n")); - unsigned char signal = 0xff; - if (write(fdw, &signal, 1) != 1) - UT_DEBUGMSG(("Error signaling main loop!\n")); -} -#endif - - - -////////////////// -// CONSUME -////////////////// -void Synchronizer::consume() -{ -#ifdef WIN32 - // void on win32 -#else - // Unix Implementation - char signal = 0; - if (read(fdr, &signal, 1) != 1) - UT_DEBUGMSG(("Error signaling main loop!\n")); -#endif -} - - -////////////////// -// CALLBACK -////////////////// - -void Synchronizer::fromMainloopCallback() // XP -{ - f_(data_); -} - - -////////////////// -// GLOBAL FUNCTIONS -////////////////// - -#ifndef WIN32 -// Unix-only -static gboolean s_glib_mainloop_callback(GIOChannel *channel, GIOCondition condition, Synchronizer* synchronizer) -{ - synchronizer->fromMainloopCallback(); - return TRUE; -} -#endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/Synchronizer.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/Synchronizer.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/Synchronizer.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/Synchronizer.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,88 +0,0 @@ -/* AbiCollab - Code to enable the modification of remote documents. - * Copyright (C) 2007 by Marc Maurer - * Copyright (C) 2007 by Ryan Pavlik - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#ifndef __SYNCHRONIZER__ -#define __SYNCHRONIZER__ - -#include - -class Synchronizer; - -#ifdef WIN32 -// Windows implementation requirements -#define WM_ABI_TCP_BACKEND WM_USER+15 -#include -#include - -#else - -// Unix implementation requirements -#include -static gboolean s_glib_mainloop_callback(GIOChannel *channel, GIOCondition condition, Synchronizer* synchronizer); -#endif - -class Synchronizer -{ -public: -#ifdef WIN32 - // Windows-only static stuff - static bool sm_bClassRegistered; - static int sm_iMessageWindows; - - static LRESULT CALLBACK s_wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); - static void _registerWndClass(); - static void _unregisterWndClass(); -#endif - - // XP prototypes - Synchronizer(void (*f)(void*), void* data); - virtual ~Synchronizer(); - - void signal(); - void consume(); - - void fromMainloopCallback(); - -private: -////////////////// -// PRIVATE DATA -////////////////// -#ifdef WIN32 - HWND m_hWnd; -#else - int fdr; - int fdw; - GIOChannel* io_channel; - guint io_channel_watch_id; -#endif - -// XP members - void (*f_)(void*); - void* data_; -}; - -////////////////// -// GLOBAL FUNCTIONS + STUFF -////////////////// -#ifndef WIN32 -static gboolean s_glib_mainloop_callback(GIOChannel *channel, GIOCondition condition, Synchronizer* synchronizer); -#endif - -#endif /* __SYNCHRONIZER__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPAccountHandler.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPAccountHandler.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPAccountHandler.cpp 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPAccountHandler.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2006,2007 by Marc Maurer +/* Copyright (C) 2006-2008 by Marc Maurer * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,26 +25,13 @@ #include -static void IOAcceptFunc(IOServerHandler* pHandler) -{ - UT_DEBUGMSG(("IOAcceptFunc()\n")); - UT_return_if_fail(pHandler); - pHandler->getAccountHandler().handleAccept(pHandler); -} - -static void IOEventFunc(Session* pSession) -{ - UT_DEBUGMSG(("IOEventFunc()\n")); - UT_return_if_fail(pSession); - pSession->consume(); - pSession->getAccountHandler().handleEvent(*pSession); -} - TCPAccountHandler::TCPAccountHandler() : AccountHandler(), + m_io_service(), + m_work(m_io_service), + m_thread(0), m_bConnected(false), - m_pDelegator(0), - m_pPendingSession(0) + m_pDelegator(0) { } @@ -88,9 +75,10 @@ UT_return_val_if_fail(pManager, CONNECT_INTERNAL_ERROR); UT_return_val_if_fail(!m_pDelegator, CONNECT_INTERNAL_ERROR); - - if (m_bConnected) - return CONNECT_ALREADY_CONNECTED; + UT_return_val_if_fail(!m_bConnected, CONNECT_ALREADY_CONNECTED); + UT_return_val_if_fail(!m_thread, CONNECT_INTERNAL_ERROR); + m_io_service.reset(); + m_thread = new asio::thread(boost::bind(&asio::io_service::run, &m_io_service)); // set up the connection if (getProperty("server") == "") @@ -100,12 +88,12 @@ try { - IOServerHandler* pDelegator = new IOServerHandler(port, IOAcceptFunc, *this); + IOServerHandler* pDelegator = new IOServerHandler(port, + boost::bind(&TCPAccountHandler::_handleAccept, this, _1, _2), + boost::bind(&TCPAccountHandler::handleEvent, this, _1), m_io_service); m_pDelegator = pDelegator; m_bConnected = true; // todo: ask it to the acceptor - - m_pPendingSession = pDelegator->constructSession(IOEventFunc, *this); - pDelegator->run(*m_pPendingSession); + pDelegator->run(); } catch (asio::system_error se) { @@ -123,27 +111,22 @@ else { UT_DEBUGMSG(("Connecting to server %s on port %d...\n", getProperty("server").c_str(), _getPort(getProperties()))); - - // TODO: catch exceptions + boost::shared_ptr session_ptr(new Session(m_io_service, boost::bind(&TCPAccountHandler::handleEvent, this, _1))); + asio::ip::tcp::resolver resolver(m_io_service); + asio::ip::tcp::resolver::query query(getProperty("server"), getProperty("port")); + asio::ip::tcp::resolver::iterator iterator(resolver.resolve(query)); try { - IOClientHandler* pDelegator = new IOClientHandler(getProperty("server"), getProperty("port")); - m_pDelegator = pDelegator; - - Session* pSession = pDelegator->constructSession(IOEventFunc, *this); - if (pSession) - { - pDelegator->connect(*pSession); - m_bConnected = true; // todo: ask it to the socket - - // Add a buddy - UT_UTF8String name = getProperty("server").c_str(); - name += ":"; - name += getProperty("port").c_str(); - TCPBuddy* pBuddy = new TCPBuddy(this, name); - addBuddy(pBuddy); - m_clients.insert(std::pair(pBuddy, pSession)); - } + session_ptr->getSocket().connect(*iterator); + session_ptr->asyncReadHeader(); + m_bConnected = true; // todo: ask it to the socket + // Add a buddy + UT_UTF8String name = getProperty("server").c_str(); + name += ":"; + name += getProperty("port").c_str(); + TCPBuddy* pBuddy = new TCPBuddy(this, name); + addBuddy(pBuddy); + m_clients.insert(std::pair >(pBuddy, session_ptr)); } catch (asio::system_error se) { @@ -151,12 +134,6 @@ _teardownAndDestroyHandler(); return CONNECT_FAILED; } - catch (...) - { - UT_DEBUGMSG(("Caught unhandled client exception!\n")); - _teardownAndDestroyHandler(); - return CONNECT_FAILED; - } } if (!m_bConnected) @@ -195,37 +172,53 @@ void TCPAccountHandler::_teardownAndDestroyHandler() { - UT_return_if_fail(m_pDelegator); - // stop accepting new connections - UT_DEBUGMSG(("Stop accepting connections\n")); - if (m_pPendingSession) - DELETEP(m_pPendingSession); + UT_DEBUGMSG(("Stop accepting connections/packets\n")); + m_io_service.stop(); + if (m_thread) + { + m_thread->join(); + DELETEP(m_thread); + } // ... then tear down all client connections UT_DEBUGMSG(("Tearing down client connections\n")); - for (std::map::iterator it = m_clients.begin(); it != m_clients.end();) - { - std::map::iterator next_it = it; - next_it++; + for (std::map >::iterator it = m_clients.begin(); it != m_clients.end();) + (*it).second->disconnect(); - // const TCPBuddy* pBuddy = (*it).first; - // TODO: signal the buddy leaving && free the buddy - - Session* pSession = (*it).second; - DELETEP(pSession); + // ... then stop the IOServerhandler (if any) + if (m_pDelegator) + { + UT_DEBUGMSG(("Stopping the IOServerhandler\n")); + m_pDelegator->stop(); - m_clients.erase(it); - it = next_it; + // ... and finally kill off the IO handler alltogether + UT_DEBUGMSG(("Deleting the IO handler\n")); + DELETEP(m_pDelegator); } +} - // ... then stop the IO handler - UT_DEBUGMSG(("Stopping the IO handler\n")); - m_pDelegator->stop(); - - // ... and finally kill off the IO handler alltogether - UT_DEBUGMSG(("Deleting the IO handler\n")); - DELETEP(m_pDelegator); +void TCPAccountHandler::_handleMessages(Session& session) +{ + UT_DEBUGMSG(("TCPAccountHandler::_handleMessages()\n")); + + // handle all packets waiting in our queue + int packet_size; + char* packet_data; + while (session.pop(packet_size, &packet_data)) + { + // setup raw packet struct + RawPacket pRp; + pRp.buddy = const_cast(_getBuddy(&session)); + pRp.packet.resize( packet_size ); + memcpy( &pRp.packet[0], packet_data, packet_size ); + + // cleanup packet + FREEP(packet_data); + + // handle! + handleMessage( pRp ); + } } bool TCPAccountHandler::isOnline() @@ -233,29 +226,23 @@ return m_bConnected; // TODO: ask the IO handler } -void TCPAccountHandler::handleAccept(IOServerHandler* pHandler) +void TCPAccountHandler::_handleAccept(IOServerHandler* pHandler, boost::shared_ptr session) { UT_DEBUGMSG(("TCPAccountHandler::handleAccept\n")); - UT_return_if_fail(pHandler); + UT_return_if_fail(session); - if (m_pPendingSession) - { - // store this buddy/session - UT_UTF8String name; - UT_UTF8String_sprintf(name, "%s:%d", - m_pPendingSession->getSocket().remote_endpoint().address().to_string().c_str(), - m_pPendingSession->getSocket().remote_endpoint().port()); - TCPBuddy* pBuddy = new TCPBuddy(this, name); - addBuddy(pBuddy); - m_clients.insert(std::pair(pBuddy, m_pPendingSession)); - } - else - UT_ASSERT_HARMLESS(UT_NOT_REACHED); + // store this buddy/session + UT_UTF8String name; + UT_UTF8String_sprintf(name, "%s:%d", + session->getSocket().remote_endpoint().address().to_string().c_str(), + session->getSocket().remote_endpoint().port()); + TCPBuddy* pBuddy = new TCPBuddy(this, name); + addBuddy(pBuddy); + m_clients.insert(std::pair >(pBuddy, session)); // accept a new buddy/session - m_pPendingSession = pHandler->constructSession(IOEventFunc, *this); - pHandler->handleAccept(*m_pPendingSession); + pHandler->asyncAccept(); } Buddy* TCPAccountHandler::constructBuddy(const PropertyMap& props) @@ -280,77 +267,64 @@ UT_DEBUGMSG(("TCPAccountHandler::forceDisconnectBuddy()\n")); // locate this buddy! - std::map::iterator it=m_clients.find( static_cast(buddy)/*ugly*/ ); - if (it==m_clients.end()) + std::map >::iterator it = m_clients.find( static_cast(buddy)/*ugly*/ ); + if (it == m_clients.end()) { - for (it=m_clients.begin(); it!=m_clients.end(); ++it) - { + for (it = m_clients.begin(); it != m_clients.end(); ++it) if ((*it).first->getName() == buddy->getName()) - { break; - } - } - UT_return_if_fail(it!=m_clients.end()); + UT_return_if_fail(it != m_clients.end()); } // disconnect it - UT_ASSERT(it!=m_clients.end()); - try - { - delete (*it).second; - } - catch (...) - { - UT_DEBUGMSG(("ERROR: exception during delete second\n")); - } - try - { - delete (*it).first; - } - catch (...) - { - UT_DEBUGMSG(("ERROR: exception during delete first\n")); - } - m_clients.erase( it ); + UT_return_if_fail(it != m_clients.end()); + (*it).second->disconnect(); } void TCPAccountHandler::handleEvent(Session& session) { UT_DEBUGMSG(("TCPAccountHandler::handleEvent()\n")); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); + + // make sure we have handled _all_ packets in the queue before checking + // the disconnected status + bool disconnected = !session.isConnected(); + _handleMessages(session); - // get an incoming packet, if any - // TODO: we could read all packets here in one go - int packet_size; - char* packet_data; - if (session.pop(packet_size, &packet_data)) + // check the connection status + if (disconnected) { - /* - printf("Got packet:\n"); - for (int i = 0; i < packet_size; i++) + UT_DEBUGMSG(("Socket is not connected anymore!\n")); + // drop all buddies that were on this connection + std::map >::iterator next; + for (std::map >::iterator it = m_clients.begin(); it != m_clients.end(); it = next) { - printf("%02x ", (UT_uint8)packet_data[i] ); - } - printf("\n"); - */ - - // setup raw packet struct - RawPacket pRp; - pRp.buddy = const_cast(_getBuddy(&session)); - pRp.packet.resize( packet_size ); - memcpy( &pRp.packet[0], packet_data, packet_size ); - - // cleanup packet - FREEP(packet_data); + next = it; + next++; - // handle! - handleMessage( pRp ); - } + UT_continue_if_fail((*it).first); + UT_continue_if_fail((*it).second); - // check the connection status - if (!session.isConnected()) - { - UT_DEBUGMSG(("Socket is not connected anymore!!!!!\n")); - // FIXME: handle this (delete the session, and remove it from the client list) + const TCPBuddy* pB = (*it).first; + + if ((*it).second.get() == &session) + { + UT_DEBUGMSG(("Lost connection to %s buddy %s\n", getProperty("server") == "" ? "client" : "server", pB->getName().utf8_str())); + // drop this buddy from all sessions + pManager->removeBuddy(pB, false); + + // erase the buddy <-> session mapping + m_clients.erase(it); + + deleteBuddy(pB->getName()); + } + } + + // if we were connected to a server, then we are basically disconnected now + if (getProperty("server") != "") + disconnect(); } // check other things here if needed... @@ -379,10 +353,10 @@ const TCPBuddy* TCPAccountHandler::_getBuddy(Session* pSession) { - for (std::map::iterator it = m_clients.begin(); it != m_clients.end(); it++) + for (std::map >::iterator it = m_clients.begin(); it != m_clients.end(); it++) { - std::pair pbs = *it; - if (pbs.second == pSession) + std::pair > pbs = *it; + if (pbs.second.get() == pSession) return pbs.first; } UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); @@ -401,9 +375,9 @@ _createPacketStream( data, packet ); // send it to everyone we know! - for (std::map::iterator it = m_clients.begin(); it != m_clients.end(); it++) + for (std::map >::iterator it = m_clients.begin(); it != m_clients.end(); it++) { - std::pair pbs = *it; + std::pair > pbs = *it; if (pbs.second) { pbs.second->asyncWrite(data.size(), data.c_str()); @@ -424,16 +398,16 @@ UT_return_val_if_fail( ourBuddy, false ); // find the session - std::map::iterator pos = m_clients.find( ourBuddy ); + std::map >::iterator pos = m_clients.find( ourBuddy ); if (pos != m_clients.end()) { - Session* pSession = pos->second; - UT_return_val_if_fail(pSession, false); + boost::shared_ptr session_ptr = pos->second; + UT_return_val_if_fail(session_ptr, false); std::string data; _createPacketStream( data, packet ); - pSession->asyncWrite( data.size(), data.c_str() ); + session_ptr->asyncWrite( data.size(), data.c_str() ); return true; } else diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPAccountHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPAccountHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPAccountHandler.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPAccountHandler.h 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2006,2007 by Marc Maurer +/* Copyright (C) 2006-2008 by Marc Maurer * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,18 +19,18 @@ #ifndef __TCPACCOUNTHANDLER__ #define __TCPACCOUNTHANDLER__ -#include "IOServerHandler.h" -#include "IOClientHandler.h" - +#include #include +#include "IOServerHandler.h" + class TCPBuddy; #define DEFAULT_TCP_PORT 25509 /* log2(e + pi) * 10^4 */ extern AccountHandlerConstructor TCPAccountHandlerConstructor; -class ABI_EXPORT TCPAccountHandler : public AccountHandler +class TCPAccountHandler : public AccountHandler { public: TCPAccountHandler(); @@ -48,7 +48,6 @@ virtual ConnectResult connect(); virtual bool disconnect(); virtual bool isOnline(); - void handleAccept(IOServerHandler* pHandler); // user management virtual Buddy* constructBuddy(const PropertyMap& props); @@ -61,7 +60,7 @@ virtual bool send(const Packet*, const Buddy& buddy); // event management - void handleEvent(Session& pSession); + void handleEvent(Session& session); protected: @@ -72,13 +71,18 @@ const TCPBuddy* _getBuddy(Session* pSession); private: + void _handleAccept(IOServerHandler* pHandler, boost::shared_ptr session); void _teardownAndDestroyHandler(); + void _handleMessages(Session& session); + + asio::io_service m_io_service; + asio::io_service::work m_work; + asio::thread* m_thread; bool m_bConnected; // TODO: drop this, ask the IO handler - IOHandler* m_pDelegator; + IOServerHandler* m_pDelegator; - Session* m_pPendingSession; // only used when accepting connections - std::map m_clients; // mapping buddies and their accompanying session + std::map > m_clients; // mapping buddies and their accompanying session }; #endif /* __TCPACCOUNTHANDLER__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPBuddy.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPBuddy.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPBuddy.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/tcp/xp/TCPBuddy.h 2009-07-15 16:56:23.000000000 +0100 @@ -28,7 +28,7 @@ class DocHandle; -ABI_EXPORT class TCPBuddy : public Buddy + class TCPBuddy : public Buddy { public: TCPBuddy(AccountHandler* handler, const UT_UTF8String& name) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/GNUmakefile.in 2008-04-06 22:37:38.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = unix xp @@ -302,8 +317,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -409,8 +424,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -446,13 +461,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/unix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/unix/GNUmakefile.in 2008-04-06 22:37:38.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -88,6 +88,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -158,14 +160,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -182,6 +184,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_XMPP_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -198,6 +203,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -208,7 +216,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -274,7 +287,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -305,6 +318,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -318,6 +332,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libAbiCollabXMPPUnixHandler.la @@ -335,8 +350,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -425,8 +440,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -436,13 +451,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/unix/XMPPUnixAccountHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/unix/XMPPUnixAccountHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/unix/XMPPUnixAccountHandler.h 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/unix/XMPPUnixAccountHandler.h 2009-07-15 16:56:23.000000000 +0100 @@ -23,7 +23,7 @@ #include "gtk/gtk.h" #include -class ABI_EXPORT XMPPUnixAccountHandler : public XMPPAccountHandler +class XMPPUnixAccountHandler : public XMPPAccountHandler { public: XMPPUnixAccountHandler(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/xp/GNUmakefile.in 2008-04-06 22:37:38.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -89,6 +89,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_XMPP_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libAbiCollabXMPPHandler.la @@ -334,8 +349,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -411,8 +426,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -424,8 +439,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -435,13 +450,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h 2009-07-15 16:56:23.000000000 +0100 @@ -43,7 +43,7 @@ extern AccountHandlerConstructor XMPPAccountHandlerConstructor; -class ABI_EXPORT XMPPAccountHandler : public AccountHandler +class XMPPAccountHandler : public AccountHandler { public: XMPPAccountHandler(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/xp/XMPPBuddy.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/xp/XMPPBuddy.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xmpp/xp/XMPPBuddy.h 2008-04-06 22:36:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xmpp/xp/XMPPBuddy.h 2009-07-15 16:56:23.000000000 +0100 @@ -28,7 +28,7 @@ class DocHandle; -ABI_EXPORT class XMPPBuddy : public Buddy + class XMPPBuddy : public Buddy { public: XMPPBuddy(AccountHandler* handler, const UT_UTF8String& name) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/AccountEvent.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/AccountEvent.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/AccountEvent.h 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/AccountEvent.h 2009-07-15 16:56:23.000000000 +0100 @@ -21,55 +21,55 @@ #include "Event.h" -ABI_EXPORT class AccountNewEvent : public Event + class AccountNewEvent : public Event { public: DECLARE_PACKET(AccountNewEvent); }; -ABI_EXPORT class AccountOnlineEvent : public Event + class AccountOnlineEvent : public Event { public: DECLARE_PACKET(AccountOnlineEvent); }; -ABI_EXPORT class AccountOfflineEvent : public Event + class AccountOfflineEvent : public Event { public: DECLARE_PACKET(AccountOfflineEvent); }; -ABI_EXPORT class AccountAddBuddyEvent : public Event + class AccountAddBuddyEvent : public Event { public: DECLARE_PACKET(AccountAddBuddyEvent); }; -ABI_EXPORT class AccountDeleteBuddyEvent : public Event + class AccountDeleteBuddyEvent : public Event { public: DECLARE_PACKET(AccountDeleteBuddyEvent); }; -ABI_EXPORT class AccountBuddyOnlineEvent : public Event + class AccountBuddyOnlineEvent : public Event { public: DECLARE_PACKET(AccountBuddyOnlineEvent); }; -ABI_EXPORT class AccountBuddyOfflineEvent : public Event + class AccountBuddyOfflineEvent : public Event { public: DECLARE_PACKET(AccountBuddyOfflineEvent); }; -ABI_EXPORT class AccountAddBuddyRequestEvent : public Event + class AccountAddBuddyRequestEvent : public Event { public: DECLARE_PACKET(AccountAddBuddyRequestEvent); }; -ABI_EXPORT class AccountBuddyAddDocumentEvent : public Event + class AccountBuddyAddDocumentEvent : public Event { public: DECLARE_PACKET(AccountBuddyAddDocumentEvent); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/AccountHandler.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/AccountHandler.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/AccountHandler.cpp 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/AccountHandler.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -94,6 +94,29 @@ return 0; } +void AccountHandler::deleteBuddy(const UT_UTF8String& name) +{ + for (UT_uint32 i = 0; i < m_vecBuddies.getItemCount(); i++) + { + Buddy* pBuddy = m_vecBuddies.getNthItem(i); + if (pBuddy->getName() == name) + { + m_vecBuddies.deleteNthItem(i); + return; + } + } +} + +void AccountHandler::deleteBuddies() +{ + for (UT_uint32 i = 0; i < m_vecBuddies.getItemCount(); i++) + { + Buddy* pBuddy = m_vecBuddies.getNthItem(i); + DELETEP(pBuddy); + } + m_vecBuddies.clear(); +} + void AccountHandler::forceDisconnectBuddy(Buddy* buddy) { } @@ -119,6 +142,17 @@ send(&event, buddy); } +bool AccountHandler::hasSession(const UT_UTF8String& sSessionId) +{ + for (UT_uint32 i = 0; i < m_vecBuddies.getItemCount(); i++) + { + const Buddy* pBuddy = m_vecBuddies.getNthItem(i); + if (pBuddy->getDocHandle(sSessionId)) + return true; + } + return false; +} + void AccountHandler::signal(const Event& event, const Buddy* pSource) { UT_DEBUGMSG(("AccountHandler::signal()\n")); @@ -148,23 +182,61 @@ } } +// TODO: deprecate this function void AccountHandler::handleMessage(const RawPacket& pRp) { UT_return_if_fail(pRp.buddy); + Packet* pPacket = _createPacket(pRp.packet, pRp.buddy); + UT_return_if_fail(pPacket); + + handleMessage(pPacket, pRp.buddy); +} + +void AccountHandler::handleMessage(Packet* pPacket, Buddy* pBuddy) +{ + UT_return_if_fail(pPacket); + UT_return_if_fail(pBuddy); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); + + // + // handle the incoming packet: first check for a protocol error, then ask the + // session manager to handle it, then try to handle it ourselves + // + if (_handleProtocolError(pPacket, pBuddy) || + pManager->processPacket(*this, pPacket, pBuddy)) + { + DELETEP(pPacket); + return; + } + + // it seems we need to handle the packet ourselves + _handlePacket(pPacket, pBuddy); + DELETEP(pPacket); +} + +Packet* AccountHandler::_createPacket(const std::string& packet, Buddy* pBuddy) +{ + UT_return_val_if_fail(pBuddy, NULL); + // create archive - IStrArchive isa( pRp.packet ); + IStrArchive isa( packet ); // serialize version int version; isa << COMPACT_INT(version); - if (version!=ABICOLLAB_PROTOCOL_VERSION) { - if (version>0) { + if (version != ABICOLLAB_PROTOCOL_VERSION) + { + if (version > 0) + { UT_DEBUGMSG(("Discarding packet, wrong version %d (expected %d)\n", version, ABICOLLAB_PROTOCOL_VERSION)); - _sendProtocolError( *pRp.buddy, PE_Invalid_Version ); - return; + _sendProtocolError(*pBuddy, PE_Invalid_Version); + return NULL; } - else { + else + { UT_DEBUGMSG(("Got error packet (hopefully), revision=%d\n", version)); // if it's a version 0 message, handle normally, picked up in _handlePacket } @@ -174,24 +246,19 @@ UT_uint8 classId; isa << classId; Packet* newPacket = Packet::createPacket( (PClassType)classId ); - if (!newPacket) { + if (!newPacket) + { UT_DEBUGMSG(("Discarding packet, got unknown class %d\n", classId)); - return; + return NULL; } // debug - UT_DEBUGMSG(("PACKET RECEIVED: [%s] %u bytes in serialized string\n", Packet::getPacketClassname( (PClassType)classId ), isa.Size())); + UT_DEBUGMSG(("PACKET DESERIALIZED: [%s] %u bytes in serialized string\n", Packet::getPacketClassname( (PClassType)classId ), isa.Size())); // serialize packet isa << *newPacket; - - // handle packet: - // NOTE: uwog didn't want a "packet->execute" like construction, - // so we're checking the packet type here - _handlePacket( newPacket, pRp.buddy ); - - // cleanup - DELETEP(newPacket); + + return newPacket; } void AccountHandler::_createPacketStream( std::string& sString, const Packet* pPacket ) @@ -218,7 +285,26 @@ UT_DEBUGMSG(("PACKET SENT: [%s] %u bytes in serialized string\n", Packet::getPacketClassname( (PClassType)classId ), osa.Size())); } -void AccountHandler::_handlePacket( Packet* packet, Buddy* buddy ) +bool AccountHandler::_handleProtocolError(Packet* packet, Buddy* buddy) +{ + // packet and buddy must always be set + UT_return_val_if_fail(packet, false); + UT_return_val_if_fail(buddy, false); + + // error report? + if (packet->getClassType() != PCT_ProtocolErrorPacket) + return false; + + // we have an error! + ProtocolErrorPacket* pee = static_cast( packet ); + // report the error + _reportProtocolError( pee->getRemoteVersion(), pee->getErrorEnum(), *buddy ); + // and remove buddy + forceDisconnectBuddy( buddy ); + return true; +} + +void AccountHandler::_handlePacket( Packet* packet, Buddy* buddy, bool autoAddBuddyOnJoin ) { // packet and buddy must always be set UT_return_if_fail(packet); @@ -228,58 +314,46 @@ AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); UT_return_if_fail(pManager); - // error report? - if (packet->getClassType()==PCT_ProtocolErrorPacket) - { - ProtocolErrorPacket* pee = static_cast( packet ); + // manager didn't handle it, see what we can do + switch (packet->getClassType()) + { + case PCT_JoinSessionRequestEvent: + { + JoinSessionRequestEvent* jse = static_cast( packet ); + + // lookup session + AbiCollab* pSession = pManager->getSessionFromSessionId( jse->getSessionId() ); + UT_return_if_fail(pSession); - // report error - _reportProtocolError( pee->getRemoteVersion(), pee->getErrorEnum(), *buddy ); + // lookup exporter + ABI_Collab_Export* pExport = pSession->getExport(); + UT_return_if_fail(pExport); + + // lookup adjusts + const UT_GenericVector* pExpAdjusts = pExport->getAdjusts(); + UT_return_if_fail(pExpAdjusts); - // and remove buddy - forceDisconnectBuddy( buddy ); - } - // see if manager can handle this - else if (!pManager->processPacket( *this, packet, buddy->getName() )) - { - // manager didn't handle it, see what we can do - switch (packet->getClassType()) - { - case PCT_JoinSessionRequestEvent: + // TODO: ask the user to authorize this request + bool bAuthorized = true; + if (bAuthorized) { - JoinSessionRequestEvent* jse = static_cast( packet ); + PD_Document* pDoc = pSession->getDocument(); - // lookup session - AbiCollab* pSession = pManager->getSessionFromSessionId( jse->getSessionId() ); - UT_return_if_fail(pSession); - - // lookup exporter - ABI_Collab_Export* pExport = pSession->getExport(); - UT_return_if_fail(pExport); - - // lookup adjusts - const UT_GenericVector* pExpAdjusts = pExport->getAdjusts(); - UT_return_if_fail(pExpAdjusts); - - // TODO: ask the user to authorize this request - bool bAuthorized = true; - if (bAuthorized) + // serialize entire document into string + JoinSessionRequestResponseEvent jsre( jse->getSessionId() ); + if (AbiCollabSessionManager::serializeDocument(pDoc, jsre.m_sZABW, false /* no base64 */) == UT_OK) { - PD_Document* pDoc = pSession->getDocument(); + // set more document properties + jsre.m_iRev = pDoc->getCRNumber(); + jsre.m_sDocumentId = pDoc->getDocUUIDString(); + if (pDoc->getFilename()) + jsre.m_sDocumentName = UT_go_basename_from_uri(pDoc->getFilename()); - // serialize entire document into string - JoinSessionRequestResponseEvent jsre( jse->getSessionId() ); - if (AbiCollabSessionManager::serializeDocument(pDoc, jsre.m_sZABW, false /* no base64 */) == UT_OK) + // send to buddy! + send( &jsre, *buddy ); + + if (autoAddBuddyOnJoin) { - // set more document properties - jsre.m_iRev = pDoc->getCRNumber(); - jsre.m_sDocumentId = pDoc->getDocUUIDString(); - if (pDoc->getFilename()) - jsre.m_sDocumentName = UT_go_basename_from_uri(pDoc->getFilename()); - - // send to buddy! - send( &jsre, *buddy ); - // check if we already know this buddy Buddy* existing = getBuddy(buddy->getName()); if (!existing) @@ -288,84 +362,92 @@ buddy->setVolatile(true); addBuddy(buddy); } - - // add this buddy to the collaboration session - pSession->addCollaborator(buddy); } + + // add this buddy to the collaboration session + pSession->addCollaborator(buddy); } - break; } - - case PCT_JoinSessionRequestResponseEvent: + break; + } + + case PCT_JoinSessionRequestResponseEvent: + { + JoinSessionRequestResponseEvent* jsre = static_cast( packet ); + PD_Document* pDoc = 0; + if (AbiCollabSessionManager::deserializeDocument(&pDoc, jsre->m_sZABW, false) == UT_OK) { - JoinSessionRequestResponseEvent* jsre = static_cast( packet ); - PD_Document* pDoc = 0; - if (AbiCollabSessionManager::deserializeDocument(&pDoc, jsre->m_sZABW, false) == UT_OK) + if (pDoc) { - if (pDoc) + // NOTE: we could adopt the same document name here, but i'd + // rather not at the moment - MARCM + pDoc->forceDirty(); + if (jsre->m_sDocumentName.size() > 0) { - // NOTE: we could adopt the same document name here, but i'd - // rather not at the moment - MARCM - pDoc->forceDirty(); - pManager->joinSession( jsre->getSessionId(), pDoc, jsre->m_sDocumentId, jsre->m_iRev, buddy ); + gchar* fname = g_strdup(jsre->m_sDocumentName.utf8_str()); + pDoc->setFilename(fname); } - else - UT_DEBUGMSG(("XMPPAccountHandler::_handleJoinSessionResponse() - deserializing document failed!\n")); + pManager->joinSession( jsre->getSessionId(), pDoc, jsre->m_sDocumentId, jsre->m_iRev, buddy, NULL ); } - break; + else + UT_DEBUGMSG(("AccountHandler::_handlePacket() - deserializing document failed!\n")); } - - case PCT_GetSessionsEvent: + break; + } + + case PCT_GetSessionsEvent: + { + GetSessionsResponseEvent gsre; + const UT_GenericVector sessions = pManager->getSessions(); + for (UT_uint32 i = 0; i < sessions.getItemCount(); i++) { - GetSessionsResponseEvent gsre; - const UT_GenericVector sessions = pManager->getSessions(); - for (UT_uint32 i = 0; i < sessions.getItemCount(); i++) + AbiCollab* pSession = sessions.getNthItem(i); + if (pSession && pSession->isLocallyControlled()) { - AbiCollab* pSession = sessions.getNthItem(i); - if (pSession && pSession->isLocallyControlled()) + const PD_Document * pDoc = pSession->getDocument(); + if (pDoc) { - const PD_Document * pDoc = pSession->getDocument(); - if (pDoc) - { - // determine name - UT_UTF8String documentBaseName; - if (pDoc->getFilename()) - documentBaseName = UT_go_basename_from_uri(pDoc->getFilename()); - // set session info - gsre.m_Sessions[ pSession->getSessionId() ] = documentBaseName; - } - else - UT_ASSERT(UT_SHOULD_NOT_HAPPEN); + // determine name + UT_UTF8String documentBaseName; + if (pDoc->getFilename()) + documentBaseName = UT_go_basename_from_uri(pDoc->getFilename()); + // set session info + gsre.m_Sessions[ pSession->getSessionId() ] = documentBaseName; } + else + UT_ASSERT(UT_SHOULD_NOT_HAPPEN); } - send(&gsre, *buddy); - break; - } - - case PCT_GetSessionsResponseEvent: - { - GetSessionsResponseEvent* gsre = static_cast( packet ); - UT_GenericVector vDocHandles; - for (std::map::iterator it=gsre->m_Sessions.begin(); it!=gsre->m_Sessions.end(); ++it) { - DocHandle* pDocHandle = new DocHandle((*it).first, (*it).second); - vDocHandles.addItem(pDocHandle); - } - pManager->setDocumentHandles( *buddy, vDocHandles ); - break; } - - default: - { - break; + send(&gsre, *buddy); + break; + } + + case PCT_GetSessionsResponseEvent: + { + GetSessionsResponseEvent* gsre = static_cast( packet ); + UT_GenericVector vDocHandles; + for (std::map::iterator it=gsre->m_Sessions.begin(); it!=gsre->m_Sessions.end(); ++it) { + DocHandle* pDocHandle = new DocHandle((*it).first, (*it).second); + vDocHandles.addItem(pDocHandle); } + pManager->setDocumentHandles( *buddy, vDocHandles ); + break; + } + + default: + { + UT_DEBUGMSG(("Unhandled packet class: 0x%x\n", packet->getClassType())); + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); + break; } } } #ifdef WIN32 +// return true if we process the command, false otherwise BOOL AccountHandler::_onCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { - return 1; // not handled by default + return false; } #endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/AccountHandler.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/AccountHandler.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/AccountHandler.h 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/AccountHandler.h 2009-07-15 16:56:23.000000000 +0100 @@ -54,7 +54,7 @@ typedef map PropertyMap; -ABI_EXPORT class ProtocolErrorPacket : public Packet + class ProtocolErrorPacket : public Packet { public: ProtocolErrorPacket(); @@ -72,7 +72,7 @@ UT_sint32 m_remoteVersion; }; -ABI_EXPORT class AccountHandler : public EventListener + class AccountHandler : public EventListener { public: AccountHandler() {} @@ -84,7 +84,7 @@ virtual UT_UTF8String getStorageType() = 0; void addProperty(const string& key, const string& value) - { m_properties.insert(PropertyMap::value_type(key, value)); } + { m_properties[key] = value; } const string getProperty(const string& key); PropertyMap& getProperties() { return m_properties; } @@ -115,8 +115,9 @@ void addBuddy(Buddy* buddy); const UT_GenericVector& getBuddies() const { return m_vecBuddies; } - Buddy* getBuddy(const UT_UTF8String& name); + void deleteBuddy(const UT_UTF8String& name); + void deleteBuddies(); virtual Buddy* constructBuddy(const PropertyMap& vProps) = 0; virtual bool allowsManualBuddies() = 0; virtual void forceDisconnectBuddy(Buddy* buddy); @@ -128,40 +129,41 @@ { m_bCanOffer = bCanOffer; } // session management - void getSessionsAsync(); - void getSessionsAsync(const Buddy& buddy); - void joinSessionAsync(const Buddy& buddy, DocHandle& docHandle); + virtual void getSessionsAsync(); + virtual void getSessionsAsync(const Buddy& buddy); + virtual void joinSessionAsync(const Buddy& buddy, DocHandle& docHandle); + virtual bool hasSession(const UT_UTF8String& sSessionId); // generic session management packet implementation virtual void handleMessage(const RawPacket& pRp); + virtual void handleMessage(Packet* pPacket, Buddy* pBuddy); // signal management virtual void signal(const Event& event, const Buddy* pSource); + // protocol error management + static void enableProtocolErrorReports(bool enable); // NOTE: enabled by default! + enum + { + PE_Invalid_Version = 1, // only possible error atm ^_^ + }; + protected: + Packet* _createPacket(const std::string& packet, Buddy* pBuddy); + void _createPacketStream(std::string& sString, const Packet* pPacket); // creates binary string! + void _sendProtocolError(const Buddy& buddy, UT_sint32 errorEnum); + virtual bool _handleProtocolError(Packet* packet, Buddy* buddy); + virtual void _handlePacket(Packet* packet, Buddy* buddy, bool autoAddBuddyOnJoin = false); // bad bad, protected variables are bad PropertyMap m_properties; - void _createPacketStream( std::string& sString, const Packet* pPacket ); // creates binary string! - private: + static void _reportProtocolError(UT_sint32 remoteVersion, UT_sint32 errorEnum, const Buddy& buddy); + static bool showProtocolErrorReports; + bool m_bCanOffer; UT_GenericVector m_vecBuddies; - - void _handlePacket( Packet* packet, Buddy* buddy ); - - -public: - static void enableProtocolErrorReports( bool enable ); // NOTE: enabled by default! - enum { - PE_Invalid_Version = 1, // only possible error atm ^_^ - }; -protected: - void _sendProtocolError( const Buddy& buddy, UT_sint32 errorEnum ); -private: - static void _reportProtocolError( UT_sint32 remoteVersion, UT_sint32 errorEnum, const Buddy& buddy ); - static bool showProtocolErrorReports; }; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/BackendPackets.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/BackendPackets.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/BackendPackets.cpp 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/BackendPackets.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -19,6 +19,26 @@ * 02111-1307, USA. */ +#include +#include + +#include +#include +#include + +#include "ut_vector.h" +#include "pd_Document.h" +#include "px_ChangeRecord.h" +#include "px_CR_SpanChange.h" +#include "px_CR_FmtMarkChange.h" +#include "px_CR_SpanChange.h" +#include "px_CR_FmtMark.h" +#include "px_CR_Span.h" +#include "px_CR_Glob.h" +#include "px_CR_StruxChange.h" +#include "px_CR_ObjectChange.h" +#include "px_CR_Strux.h" +#include "px_CR_Object.h" #include "DocHandle.h" #include #include "Event.h" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/Buddy.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/Buddy.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/Buddy.h 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/Buddy.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,7 +30,7 @@ using std::vector; -ABI_EXPORT class Buddy + class Buddy { public: Buddy(AccountHandler* handler, const UT_UTF8String& name) @@ -66,11 +66,11 @@ void addDocHandle(DocHandle* pDocHandle); const vector& getDocHandles() const { return m_docHandles; } - DocHandle* getDocHandle(const UT_UTF8String& sSessionId) + DocHandle* getDocHandle(const UT_UTF8String& sSessionId) const { - for (std::vector::iterator it = m_docHandles.begin(); it != m_docHandles.end(); it++) + for (std::vector::const_iterator cit = m_docHandles.begin(); cit != m_docHandles.end(); cit++) { - DocHandle* pHandle = *it; + DocHandle* pHandle = *cit; if (pHandle->getSessionId() == sSessionId) return pHandle; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/DocHandle.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/DocHandle.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/DocHandle.h 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/DocHandle.h 2009-07-15 16:56:23.000000000 +0100 @@ -22,7 +22,7 @@ #include "ut_string_class.h" class AbiCollab; -ABI_EXPORT class DocHandle + class DocHandle { public: DocHandle(const UT_UTF8String& sSessionId, const UT_UTF8String& name) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/Event.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/Event.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/Event.h 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/Event.h 2009-07-15 16:56:23.000000000 +0100 @@ -21,7 +21,7 @@ #include -ABI_EXPORT class Event : public EventPacket + class Event : public EventPacket { public: DECLARE_ABSTRACT_PACKET(Event); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/EventListener.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/EventListener.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/EventListener.h 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/EventListener.h 2009-07-15 16:56:23.000000000 +0100 @@ -22,7 +22,7 @@ class Event; class Buddy; -ABI_EXPORT class EventListener + class EventListener { public: virtual ~EventListener() diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/GNUmakefile.am 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -28,6 +28,9 @@ lock.h \ SessionEvent.cpp \ SessionEvent.h \ + Synchronizer.cpp \ + Synchronizer.h \ + SynchronizedQueue.h \ BackendPackets.cpp libAbiCollabBackends_la_LIBADD = @ABI_LIBS@ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/GNUmakefile.in 2008-04-06 22:37:38.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -56,7 +56,7 @@ libAbiCollabBackends_la_DEPENDENCIES = $(am__append_1) $(am__append_2) \ $(am__append_3) $(am__append_4) $(am__append_5) am_libAbiCollabBackends_la_OBJECTS = AccountEvent.lo AccountHandler.lo \ - Buddy.lo SessionEvent.lo BackendPackets.lo + Buddy.lo SessionEvent.lo Synchronizer.lo BackendPackets.lo libAbiCollabBackends_la_OBJECTS = \ $(am_libAbiCollabBackends_la_OBJECTS) libAbiCollabBackends_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -166,14 +168,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -190,6 +192,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -206,6 +211,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -216,7 +224,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -282,7 +295,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -313,6 +326,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -326,6 +340,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -347,6 +362,9 @@ lock.h \ SessionEvent.cpp \ SessionEvent.h \ + Synchronizer.cpp \ + Synchronizer.h \ + SynchronizedQueue.h \ BackendPackets.cpp libAbiCollabBackends_la_LIBADD = @ABI_LIBS@ $(am__append_1) \ @@ -361,8 +379,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -409,6 +427,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BackendPackets.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Buddy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SessionEvent.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Synchronizer.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -442,8 +461,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -455,8 +474,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -466,13 +485,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/lock.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/lock.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/lock.h 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/lock.h 2009-07-15 16:56:23.000000000 +0100 @@ -16,6 +16,9 @@ * 02111-1307, USA. */ +#ifndef __ABICOLLAB_LOCK__ +#define __ABICOLLAB_LOCK__ + #ifndef WIN32 #include #endif @@ -92,3 +95,4 @@ } +#endif /* __ABICOLLAB_LOCK__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/Makefile 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,7 @@ TARGETS= $(OBJS) CPPSRCS= AccountHandler.cpp \ AccountEvent.cpp \ + Synchronizer.cpp \ SessionEvent.cpp \ BackendPackets.cpp \ Buddy.cpp @@ -34,7 +35,7 @@ -I$(shell pwd)/../../core/session \ -I$(ABI_ROOT)/../libs/boost -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/SessionEvent.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/SessionEvent.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/SessionEvent.h 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/SessionEvent.h 2009-07-15 16:56:23.000000000 +0100 @@ -24,26 +24,26 @@ #include #include -ABI_EXPORT class StartSessionEvent : public Event + class StartSessionEvent : public Event { public: DECLARE_PACKET(StartSessionEvent); }; -ABI_EXPORT class GetSessionsEvent : public Event + class GetSessionsEvent : public Event { public: DECLARE_PACKET(GetSessionsEvent); }; -ABI_EXPORT class GetSessionsResponseEvent : public Event + class GetSessionsResponseEvent : public Event { public: DECLARE_PACKET(GetSessionsResponseEvent); std::map m_Sessions; // contains session/name pairs }; -ABI_EXPORT class JoinSessionEvent : public Event + class JoinSessionEvent : public Event { public: DECLARE_PACKET(JoinSessionEvent); @@ -56,14 +56,14 @@ virtual std::string toStr() const; - const UT_UTF8String& getSessionId() + const UT_UTF8String& getSessionId() const { return m_sSessionId; } private: UT_UTF8String m_sSessionId; }; -ABI_EXPORT class JoinSessionRequestEvent : public JoinSessionEvent { + class JoinSessionRequestEvent : public JoinSessionEvent { public: DECLARE_PACKET(JoinSessionRequestEvent); JoinSessionRequestEvent() {} @@ -71,7 +71,7 @@ : JoinSessionEvent(sessionId) {} }; -ABI_EXPORT class JoinSessionRequestResponseEvent : public Event + class JoinSessionRequestResponseEvent : public Event { public: DECLARE_PACKET(JoinSessionRequestResponseEvent); @@ -85,7 +85,7 @@ UT_ASSERT(m_sSessionId != ""); } - const UT_UTF8String& getSessionId() + const UT_UTF8String& getSessionId() const { return m_sSessionId; } virtual std::string toStr() const; @@ -99,7 +99,7 @@ UT_UTF8String m_sSessionId; }; -ABI_EXPORT class DisjoinSessionEvent : public Event + class DisjoinSessionEvent : public Event { public: DECLARE_PACKET(DisjoinSessionEvent); @@ -112,14 +112,14 @@ virtual std::string toStr() const; - const UT_UTF8String& getSessionId() + const UT_UTF8String& getSessionId() const { return m_sSessionId; } private: UT_UTF8String m_sSessionId; }; -ABI_EXPORT class CloseSessionEvent : public Event + class CloseSessionEvent : public Event { public: DECLARE_PACKET(CloseSessionEvent); @@ -132,7 +132,7 @@ virtual std::string toStr() const; - const UT_UTF8String& getSessionId() + const UT_UTF8String& getSessionId() const { return m_sSessionId; } private: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/SynchronizedQueue.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/SynchronizedQueue.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/SynchronizedQueue.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/SynchronizedQueue.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,74 @@ +/* Copyright (C) 2008 by Marc Maurer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __SYNCHRONIZED_QUEUE__ +#define __SYNCHRONIZED_QUEUE__ + +#include +#include +#include +#include +#include + +class EmptyQueueException {}; + +template +class SynchronizedQueue : public Synchronizer, public boost::noncopyable +{ +public: + SynchronizedQueue(boost::function sig) + : Synchronizer(boost::bind(&SynchronizedQueue::_signal, this)), + m_mutex(), + m_queue(), + m_sig(sig) + {} + + void push(T t) + { + abicollab::scoped_lock lock(m_mutex); + m_queue.push_back( t ); + Synchronizer::signal(); + } + + T pop() + { + if (m_queue.size() == 0) + throw EmptyQueueException(); + abicollab::scoped_lock lock(m_mutex); + T t = m_queue.front(); + m_queue.pop_front(); + return t; + } + + bool peek() + { + return m_queue.size() > 0; + } + +private: + void _signal() + { + m_sig(*this); + } + + abicollab::mutex m_mutex; + std::deque< T > m_queue; + boost::function m_sig; +}; + +#endif /* __SYNCHRONIZED_QUEUE__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/Synchronizer.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/Synchronizer.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/Synchronizer.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/Synchronizer.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,304 @@ +/* AbiCollab - Code to enable the modification of remote documents. + * Copyright (C) 2007,2008 by Marc Maurer + * Copyright (C) 2007 by Ryan Pavlik + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#include "Synchronizer.h" +// Danger Will Robinson: This file is icky to look at. +// Massive comment blocks used to aid reading in syntax-highlighting editors. + +#include + +#ifndef WIN32 +static gboolean s_glib_mainloop_callback(GIOChannel *channel, GIOCondition condition, Synchronizer* synchronizer) +{ + synchronizer->callMainloop(); + return TRUE; +} +#endif + +////////////////// +// WINDOWS STATIC MAGIC +////////////////// + +#ifdef WIN32 +#ifndef HWND_MESSAGE +#define HWND_MESSAGE ((HWND)(-3)) +#endif + +#define SYNC_CLASSNAME "AbiCollabSynchronizer" + +int Synchronizer::sm_iMessageWindows = 0; +ATOM sm_iClass = 0; + +LRESULT CALLBACK Synchronizer::s_wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) // Win32-only +{ + Synchronizer * pThis; + int swlresult; + switch (msg) + { + + case WM_NCCREATE: + pThis = (Synchronizer *)((LPCREATESTRUCT(lParam))->lpCreateParams); + UT_return_val_if_fail(pThis, 0); + pThis->m_hWnd = hWnd; + SetLastError(0); + swlresult=SetWindowLong(hWnd,GWL_USERDATA,long(pThis)); + if (swlresult==0) + { + // we might have an error + int errorcode=GetLastError(); + if (errorcode) + { + UT_DEBUGMSG(("Error in setting the WindowLong GWL_USERDATA: %d\n", errorcode)); + } + + } + return 1; + + case WM_ABI_SYNCHRONIZER: + UT_DEBUGMSG(("Received a message in Synchronizer message loop! 0x%x\n", msg)); + pThis = (Synchronizer *)GetWindowLong(hWnd,GWL_USERDATA); + UT_return_val_if_fail(pThis, 0); + pThis->callMainloop(); + return 1; + + default: + UT_DEBUGMSG(("return DefWindowProc for message 0x%x\n", msg)); + // We do not want to handle this message so pass back to Windows + // to handle it in a default way + return 0; + } +} + +void Synchronizer::_registerWndClass() // Win32-only +{ + if (sm_iClass) + { + UT_DEBUGMSG(("Skipping window class registration\n")); + return; + } + + AbiCollabSessionManager * pSessionManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pSessionManager); + + HINSTANCE hInstance = pSessionManager->getInstance(); + UT_return_if_fail(hInstance); + + WNDCLASS wc; + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = Synchronizer::s_wndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = NULL; + wc.hCursor = NULL; + wc.hbrBackground = NULL; + wc.lpszMenuName = NULL; + wc.lpszClassName = SYNC_CLASSNAME; + + sm_iClass = RegisterClass(&wc); + UT_return_if_fail(sm_iClass); + + sm_iMessageWindows = 0; +} + +void Synchronizer::_unregisterWndClass() // Win32-only +{ + UT_DEBUGMSG(("Synchronizer::_unregisterWndClass()\n")); + UT_return_if_fail(sm_iClass); + + if (sm_iMessageWindows > 0) + { + UT_DEBUGMSG(("%d message windows still exist, skipping unregistering\n", sm_iMessageWindows)); + return; + } + + AbiCollabSessionManager * pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); + + HINSTANCE hInstance = pManager->getInstance(); + UT_return_if_fail(hInstance); + + UT_DEBUGMSG(("Unregistrating message window class\n")); + UT_return_if_fail(UnregisterClass(SYNC_CLASSNAME, hInstance)); + sm_iClass = 0; +} + +#endif + +////////////////// +// CONSTRUCTORS +////////////////// + +#ifdef WIN32 +Synchronizer::Synchronizer(boost::function signalhandler) // Win32 Implementation + : m_signalhandler(signalhandler), + m_hWnd(0) +{ + UT_DEBUGMSG(("Synchronizer()\n")); + AbiCollabSessionManager * pSessionManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pSessionManager); + + HINSTANCE hInstance = pSessionManager->getInstance(); + UT_return_if_fail(hInstance); + + _registerWndClass(); + + // HWND_MESSAGE as parent HWND is Win2k/xp/vista only - replaced with 0 + // (also HWND_MESSAGE doesn't compile in MinGW, weird bug. --RP 8 August 2007) + + m_hWnd = CreateWindow(SYNC_CLASSNAME, + "AbiCollab", + 0, + CW_USEDEFAULT, + SW_HIDE, + CW_USEDEFAULT, + CW_USEDEFAULT, + HWND_MESSAGE, + NULL, + hInstance, + (void *) this + ); + UT_DEBUGMSG(("Created message window: HWND 0x%x\n", m_hWnd)); + switch ((int)m_hWnd) + { + case NULL: + UT_DEBUGMSG(("Win32 error: %d.\n", GetLastError())); + break; + default: + sm_iMessageWindows++; + break; + // ok! + }; +} + +#else + +Synchronizer::Synchronizer(boost::function signalhandler) // Unix Implementation + : m_signalhandler(signalhandler) +{ + UT_DEBUGMSG(("Synchronizer()\n")); + // on unix, we use the self-pipe trick to signal the glib main loop + fdr = -1; + fdw = -1; + + int pfd[2]; + if (pipe(pfd) == -1) + { + UT_DEBUGMSG(("pipe error!\n")); + // FIXME: throw an exception here, don't just bail out! + exit(EXIT_FAILURE); + } + else + { + fdr = pfd[0]; + fdw = pfd[1]; + + // setup the glib main loop integration + io_channel = g_io_channel_unix_new(fdr); + io_channel_watch_id = g_io_add_watch(io_channel, G_IO_IN, (GIOFunc)s_glib_mainloop_callback, this); + } +} +#endif + +// end constructors +////////////////// + +////////////////// +// DESTRUCTORS +////////////////// + +#ifdef WIN32 +Synchronizer::~Synchronizer() // Win32 Implementation +{ + UT_DEBUGMSG(("~Synchronizer()\n")); + // destroy our window + if (m_hWnd) + { + DestroyWindow(m_hWnd); + m_hWnd = 0; + sm_iMessageWindows--; + } + else + { + UT_DEBUGMSG(("AbiCollab Synchronizer Window already destroyed!\n")); + } + + // Attempt to unregister class - it will check to make sure we're the last one out. + _unregisterWndClass(); +} + +#else + +Synchronizer::~Synchronizer() // Unix Implementation +{ + UT_DEBUGMSG(("~Synchronizer()\n")); + if (fdr != -1) + close(fdr); + if (fdw != -1) + close(fdw); + + g_source_remove(io_channel_watch_id); + //g_io_channel_shutdown(io_channel, TRUE, NULL); + g_io_channel_unref(io_channel); + io_channel_watch_id = 0; +} +#endif +// end destructors +////////////////// + +////////////////// +// SIGNAL +////////////////// +#ifdef WIN32 +void Synchronizer::signal() // Win32 Implementation +{ + UT_DEBUGMSG(("Synchronizer::signal()\n")); + // send a message to the main loop + int result = PostMessage(m_hWnd, WM_ABI_SYNCHRONIZER, 0, 0); + UT_ASSERT(result != 0); +} + +#else + +void Synchronizer::signal() // Unix Implementation +{ + UT_DEBUGMSG(("Signalling the main loop\n")); + unsigned char signal = 0xff; + if (write(fdw, &signal, 1) != 1) + UT_DEBUGMSG(("Error signaling main loop!\n")); +} +#endif + + + +////////////////// +// CONSUME +////////////////// +void Synchronizer::_consume() +{ +#ifdef WIN32 + // void on win32 +#else + // Unix Implementation + char signal = 0; + if (read(fdr, &signal, 1) != 1) + UT_DEBUGMSG(("Error signaling main loop!\n")); +#endif +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/Synchronizer.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/Synchronizer.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/xp/Synchronizer.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/backends/xp/Synchronizer.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,84 @@ +/* AbiCollab - Code to enable the modification of remote documents. + * Copyright (C) 2007-2008 by Marc Maurer + * Copyright (C) 2007 by Ryan Pavlik + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __SYNCHRONIZER__ +#define __SYNCHRONIZER__ + +#include +#include + +class Synchronizer; + +#ifdef WIN32 +// Windows implementation requirements +#define WM_ABI_SYNCHRONIZER WM_USER+15 +#include +#include +#else +// Unix implementation requirements +#include +#include +#endif + +class Synchronizer +{ +public: +#ifdef WIN32 + // Windows-only static stuff + static bool sm_bClassRegistered; + static int sm_iMessageWindows; + + static LRESULT CALLBACK s_wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + static void _registerWndClass(); + static void _unregisterWndClass(); +#endif + + // XP prototypes + Synchronizer(boost::function signalhandler); + virtual ~Synchronizer(); + + void signal(); + + void callMainloop() + { + _consume(); + m_signalhandler(); + } + +private: + void _consume(); + +////////////////// +// PRIVATE DATA +////////////////// +// XP members + boost::function m_signalhandler; + +#ifdef WIN32 + HWND m_hWnd; +#else + int fdr; + int fdw; + GIOChannel* io_channel; + guint io_channel_watch_id; +#endif +}; + +#endif /* __SYNCHRONIZER__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/GNUmakefile.in 2008-04-06 22:37:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,6 +66,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -131,14 +133,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -155,6 +157,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -171,6 +176,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -181,7 +189,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -247,7 +260,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -278,6 +291,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -291,6 +305,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ UNCONDITIONAL_SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/Makefile 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ DIRS= xp win -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAccounts.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAccounts.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAccounts.cpp 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAccounts.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -34,27 +34,27 @@ HANDLER_COLUMN }; -static void s_add_clicked(GtkWidget * wid, AP_UnixDialog_CollaborationAccounts * dlg) +static void s_add_clicked(GtkWidget * /*wid*/, AP_UnixDialog_CollaborationAccounts * dlg) { dlg->eventAdd(); } -static void s_properties_clicked(GtkWidget * wid, AP_UnixDialog_CollaborationAccounts * dlg) +static void s_properties_clicked(GtkWidget * /*wid*/, AP_UnixDialog_CollaborationAccounts * dlg) { dlg->eventProperties(); } -static void s_delete_clicked(GtkWidget * wid, AP_UnixDialog_CollaborationAccounts * dlg) +static void s_delete_clicked(GtkWidget * /*wid*/, AP_UnixDialog_CollaborationAccounts * dlg) { dlg->eventDelete(); } -static void s_account_selected(GtkWidget * wid, AP_UnixDialog_CollaborationAccounts * dlg) +static void s_account_selected(GtkWidget * /*wid*/, AP_UnixDialog_CollaborationAccounts * dlg) { dlg->eventSelectAccount(); } -static void s_online_toggled (GtkCellRendererToggle *cell, +static void s_online_toggled (GtkCellRendererToggle * /*cell*/, gchar *path_str, gpointer data) { @@ -310,8 +310,8 @@ pHandler->getDisplayType().utf8_str() )); - AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); - pManager->destroyAccount(pHandler); + _deleteAccount(pHandler); + // for now, recreate the whole model; but we should really just delete // the iter we got above _setModel(_constructModel()); @@ -347,7 +347,7 @@ } } -void AP_UnixDialog_CollaborationAccounts::signal(const Event& event, const Buddy* pSource) +void AP_UnixDialog_CollaborationAccounts::signal(const Event& event, const Buddy* /*pSource*/) { UT_DEBUGMSG(("AP_UnixDialog_CollaborationAccounts::signal()\n")); switch (event.getClassType()) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAddAccount.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAddAccount.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAddAccount.cpp 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAddAccount.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -28,12 +28,12 @@ #include "ap_UnixDialog_CollaborationAddAccount.h" -static void s_ok_clicked(GtkWidget * wid, AP_UnixDialog_CollaborationAddAccount * dlg) +static void s_ok_clicked(GtkWidget * /*wid*/, AP_UnixDialog_CollaborationAddAccount * dlg) { dlg->eventOk(); } -static void s_account_type_changed(GtkWidget * wid, AP_UnixDialog_CollaborationAddAccount * dlg) +static void s_account_type_changed(GtkWidget * /*wid*/, AP_UnixDialog_CollaborationAddAccount * dlg) { dlg->eventAccountTypeChanged(); } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAddBuddy.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAddBuddy.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAddBuddy.cpp 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationAddBuddy.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ HANDLER_COLUMN }; -static void s_ok_clicked(GtkWidget * wid, AP_UnixDialog_CollaborationAddBuddy * dlg) +static void s_ok_clicked(GtkWidget * /*wid*/, AP_UnixDialog_CollaborationAddBuddy * dlg) { dlg->event_Ok(); } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.cpp 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2006,2007 by Marc Maurer +/* Copyright (C) 2006-2008 by Marc Maurer * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -32,23 +32,40 @@ enum { DESCRIPTION_COLUMN = 0, - JOINED_COLUMN, + CONNECTED_COLUMN, DOCHANDLE_COLUMN, BUDDY_COLUMN, VISIBLE_COLUMN, NUM_COLUMNS }; -static void s_add_buddy_clicked(GtkWidget * wid, AP_UnixDialog_CollaborationJoin * dlg) +static void s_add_buddy_clicked(GtkWidget * /*wid*/, AP_UnixDialog_CollaborationJoin * dlg) { dlg->eventAddBuddy(); } -static void s_refresh_clicked(GtkWidget * wid, AP_UnixDialog_CollaborationJoin * dlg) +static void s_refresh_clicked(GtkWidget * /*wid*/, AP_UnixDialog_CollaborationJoin * dlg) { dlg->eventRefresh(); } +static void s_connect_clicked(GtkWidget * /*wid*/, AP_UnixDialog_CollaborationJoin * dlg) +{ + dlg->eventConnect(); +} + +static void s_disconnect_clicked(GtkWidget * /*wid*/, AP_UnixDialog_CollaborationJoin * dlg) +{ + dlg->eventDisconnect(); +} + +static void s_selection_changed(GtkTreeView *treeview, AP_UnixDialog_CollaborationJoin * dlg) +{ + UT_return_if_fail(treeview && dlg); + dlg->eventSelectionChanged(treeview); +} + +/* static void joined_toggled (GtkCellRendererToggle *cell, gchar *path_str, gpointer data) @@ -64,14 +81,14 @@ // get the toggled state gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, JOINED_COLUMN, &joined, -1); + gtk_tree_model_get (model, &iter, CONNECTED_COLUMN, &joined, -1); gtk_tree_model_get (model, &iter, DOCHANDLE_COLUMN, &doc_handle, -1); gtk_tree_model_get (model, &iter, BUDDY_COLUMN, &buddy, -1); // toggle the value joined = !joined; // set the new value - gtk_tree_store_set (GTK_TREE_STORE (model), &iter, JOINED_COLUMN, joined, -1); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter, CONNECTED_COLUMN, joined, -1); // handle the joining/closing of the selected document pDlg->eventJoin( @@ -82,6 +99,7 @@ // clean up gtk_tree_path_free (path); } +*/ XAP_Dialog * AP_UnixDialog_CollaborationJoin::static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id) { @@ -95,7 +113,9 @@ m_wAddBuddy(NULL), m_wDeleteBuddy(NULL), m_wModel(NULL), - m_wBuddyTree(NULL) + m_wBuddyTree(NULL), + m_wConnect(NULL), + m_wDisconnect(NULL) { } @@ -115,12 +135,18 @@ switch ( abiRunModalDialog ( GTK_DIALOG(m_wWindowMain), pFrame, this, GTK_RESPONSE_CLOSE, false ) ) { - /*case GTK_RESPONSE_CLOSE: - m_answer = AP_UnixDialog_CollaborationAccounts::a_CLOSE; + case GTK_RESPONSE_YES: // ugly stock response abuse + m_answer = AP_Dialog_CollaborationJoin::a_CONNECT; + break; + case GTK_RESPONSE_NO: // ugly stock response abuse + m_answer = AP_Dialog_CollaborationJoin::a_DISCONNECT; + break; + case GTK_RESPONSE_CLOSE: + m_answer = AP_Dialog_CollaborationJoin::a_CLOSE; break; default: - m_answer = AP_UnixDialog_CollaborationAccounts::a_CLOSE; - break;*/ + m_answer = AP_Dialog_CollaborationJoin::a_CLOSE; + break; } abiDestroyWidget(m_wWindowMain); @@ -148,12 +174,16 @@ m_wDeleteBuddy = glade_xml_get_widget(xml, "btDeleteBuddy"); m_wRefresh = glade_xml_get_widget(xml, "btRefresh"); m_wBuddyTree = glade_xml_get_widget(xml, "tvBuddies"); - + m_wConnect = glade_xml_get_widget(xml, "btConnect"); + m_wDisconnect = glade_xml_get_widget(xml, "btDisconnect"); + _refreshAccounts(); AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); gtk_widget_set_sensitive(m_wAddBuddy, pManager->getAccounts().getItemCount() != 0); // TODO: fix this gtk_widget_set_sensitive(m_wDeleteBuddy, false); // TODO: implement this gtk_widget_set_sensitive(m_wRefresh, true); + gtk_widget_set_sensitive(m_wConnect, false); + gtk_widget_set_sensitive(m_wDisconnect, false); // set the dialog title // TODO @@ -171,6 +201,21 @@ "clicked", G_CALLBACK(s_refresh_clicked), static_cast(this)); + + g_signal_connect(G_OBJECT(m_wConnect), + "clicked", + G_CALLBACK(s_connect_clicked), + static_cast(this)); + + g_signal_connect(G_OBJECT(m_wDisconnect), + "clicked", + G_CALLBACK(s_disconnect_clicked), + static_cast(this)); + + g_signal_connect_after(G_OBJECT(m_wBuddyTree), + "cursor-changed", + G_CALLBACK(s_selection_changed), + static_cast(this)); return window; } @@ -201,11 +246,11 @@ renderer = gtk_cell_renderer_toggle_new (); g_object_set (renderer, "xalign", 0.0, NULL); - g_signal_connect (renderer, "toggled", G_CALLBACK (joined_toggled), this); + //g_signal_connect (renderer, "toggled", G_CALLBACK (joined_toggled), this); col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (m_wBuddyTree), - -1, "Joined", + -1, "Connected", renderer, - "active", JOINED_COLUMN, + "active", CONNECTED_COLUMN, "visible", VISIBLE_COLUMN, (void*)NULL); column = gtk_tree_view_get_column (GTK_TREE_VIEW (m_wBuddyTree), col_offset - 1); @@ -235,11 +280,12 @@ for (UT_uint32 j = 0; j < accounts.getNthItem(i)->getBuddies().size(); j++) { const Buddy* pBuddy = accounts.getNthItem(i)->getBuddies()[j]; - + UT_continue_if_fail(pBuddy); + gtk_tree_store_append (model, &iter, NULL); gtk_tree_store_set (model, &iter, DESCRIPTION_COLUMN, pBuddy->getDescription().utf8_str(), - JOINED_COLUMN, false, /* joined */ + CONNECTED_COLUMN, false, /* joined */ DOCHANDLE_COLUMN, 0, /* dochandle */ BUDDY_COLUMN, 0, /* buddy */ VISIBLE_COLUMN, false, /* visibility */ @@ -249,22 +295,18 @@ GtkTreeIter child_iter; for (const DocTreeItem* item = pBuddy->getDocTreeItems(); item; item = item->m_next) { - if (item->m_docHandle) - { - UT_DEBUGMSG(("DocHandle document name: %s\n", item->m_docHandle->getName().utf8_str())); + UT_continue_if_fail(item->m_docHandle); + UT_DEBUGMSG(("DocHandle document name: %s\n", item->m_docHandle->getName().utf8_str())); - // TODO: handle the DocTreeItem type - gtk_tree_store_append (model, &child_iter, &iter); - gtk_tree_store_set (model, &child_iter, - DESCRIPTION_COLUMN, (item->m_docHandle ? item->m_docHandle->getName().utf8_str() : "null"), - JOINED_COLUMN, pManager->isActive(item->m_docHandle->getSessionId()), - DOCHANDLE_COLUMN, item->m_docHandle, - BUDDY_COLUMN, pBuddy, - VISIBLE_COLUMN, true, - -1); - } - else - UT_ASSERT(UT_SHOULD_NOT_HAPPEN); + // TODO: handle the DocTreeItem type + gtk_tree_store_append (model, &child_iter, &iter); + gtk_tree_store_set (model, &child_iter, + DESCRIPTION_COLUMN, (item->m_docHandle ? item->m_docHandle->getName().utf8_str() : "null"), + CONNECTED_COLUMN, pManager->isActive(item->m_docHandle->getSessionId()), + DOCHANDLE_COLUMN, item->m_docHandle, + BUDDY_COLUMN, pBuddy, + VISIBLE_COLUMN, true, + -1); } } } @@ -307,15 +349,121 @@ _refreshAllDocHandlesAsync(); } -void AP_UnixDialog_CollaborationJoin::eventJoin(Buddy* pBuddy, DocHandle* pDocHandle, bool joined) +// FIXME: share code with eventDisconnect() +void AP_UnixDialog_CollaborationJoin::eventConnect() +{ + UT_DEBUGMSG(("AP_UnixDialog_CollaborationJoin::eventConnect()\n")); + + GtkTreeSelection * selection; + GtkTreeIter iter; + GtkTreeModel * model; + + selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_wBuddyTree) ); + if (!selection || !gtk_tree_selection_get_selected (selection, &model, &iter)) + { + m_answer = AP_Dialog_CollaborationJoin::a_CLOSE; + return; + } + + // see if we selected a row that has a document that we can still join + + // get the row data + gboolean connected; + gpointer doc_handle; + gpointer buddy; + + gtk_tree_model_get (model, &iter, CONNECTED_COLUMN, &connected, -1); + gtk_tree_model_get (model, &iter, DOCHANDLE_COLUMN, &doc_handle, -1); + gtk_tree_model_get (model, &iter, BUDDY_COLUMN, &buddy, -1); + + if (!doc_handle || connected) + { + UT_DEBUGMSG(("Not a document we can join\n")); + m_answer = AP_Dialog_CollaborationJoin::a_CLOSE; + return; + } + + UT_DEBUGMSG(("Got a document we can connect to!\n")); + m_answer = AP_Dialog_CollaborationJoin::a_CONNECT; + m_pBuddy = reinterpret_cast(buddy); + m_pDocHandle = reinterpret_cast(doc_handle); +} + +// FIXME: share code with eventConnect() +void AP_UnixDialog_CollaborationJoin::eventDisconnect() { - UT_DEBUGMSG(("AP_UnixDialog_CollaborationJoin::eventJoin()\n")); - UT_return_if_fail(pBuddy); - UT_return_if_fail(pDocHandle); - - if (joined) - _join(pBuddy, pDocHandle); - else - _disjoin(pBuddy, pDocHandle); + UT_DEBUGMSG(("AP_UnixDialog_CollaborationJoin::eventDisconnect()\n")); + + GtkTreeSelection * selection; + GtkTreeIter iter; + GtkTreeModel * model; + + selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_wBuddyTree) ); + if (!selection || !gtk_tree_selection_get_selected (selection, &model, &iter)) + { + m_answer = AP_Dialog_CollaborationJoin::a_CLOSE; + return; + } + + // see if we selected a row that has a document that we can still join + + // get the row data + gboolean connected; + gpointer doc_handle; + gpointer buddy; + + gtk_tree_model_get (model, &iter, CONNECTED_COLUMN, &connected, -1); + gtk_tree_model_get (model, &iter, DOCHANDLE_COLUMN, &doc_handle, -1); + gtk_tree_model_get (model, &iter, BUDDY_COLUMN, &buddy, -1); + + if (!doc_handle || !connected) + { + UT_DEBUGMSG(("Not a document we can disconnect from\n")); + m_answer = AP_Dialog_CollaborationJoin::a_CLOSE; + return; + } + + UT_DEBUGMSG(("Got a document we can disconnect from!\n")); + m_answer = AP_Dialog_CollaborationJoin::a_DISCONNECT; + m_pBuddy = reinterpret_cast(buddy); + m_pDocHandle = reinterpret_cast(doc_handle); } +void AP_UnixDialog_CollaborationJoin::eventSelectionChanged(GtkTreeView *treeview) +{ + UT_DEBUGMSG(("AP_UnixDialog_CollaborationJoin::eventSelectionChanged()\n")); + + GtkTreeSelection * selection; + GtkTreeIter iter; + GtkTreeModel * model; + + selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(treeview) ); + if (!selection || !gtk_tree_selection_get_selected (selection, &model, &iter)) + { + gtk_widget_set_sensitive(m_wConnect, false); + gtk_widget_set_sensitive(m_wDisconnect, false); + return; + } + + // see if we selected a row that has a document that we can still join + + // get the row data + gboolean connected; + gpointer doc_handle; + gpointer buddy; + + gtk_tree_model_get (model, &iter, CONNECTED_COLUMN, &connected, -1); + gtk_tree_model_get (model, &iter, DOCHANDLE_COLUMN, &doc_handle, -1); + gtk_tree_model_get (model, &iter, BUDDY_COLUMN, &buddy, -1); + + if (!doc_handle) + { + UT_DEBUGMSG(("Not a document\n")); + gtk_widget_set_sensitive(m_wConnect, false); + gtk_widget_set_sensitive(m_wDisconnect, false); + return; + } + + gtk_widget_set_sensitive(m_wConnect, !connected); + gtk_widget_set_sensitive(m_wDisconnect, connected); +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.glade /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.glade --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.glade 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.glade 2009-07-15 16:56:23.000000000 +0100 @@ -6,8 +6,8 @@ 5 - 460 - 300 + 550 + 350 Join collaboration GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER @@ -35,6 +35,33 @@ GTK_BUTTONBOX_END + + True + True + True + True + gtk-disconnect + True + GTK_RELIEF_NORMAL + True + -9 + + + + + + True + True + True + gtk-connect + True + GTK_RELIEF_NORMAL + True + -8 + + + + True True diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.h 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/ap_UnixDialog_CollaborationJoin.h 2009-07-15 16:56:23.000000000 +0100 @@ -34,7 +34,9 @@ void eventAddBuddy(); void eventRefresh(); - void eventJoin(Buddy* pBuddy, DocHandle* pDocHandle, bool joined); + void eventConnect(); + void eventDisconnect(); + void eventSelectionChanged(GtkTreeView *treeview); GtkTreeStore* getModel() @@ -54,6 +56,8 @@ GtkWidget* m_wRefresh; GtkTreeStore* m_wModel; GtkWidget * m_wBuddyTree; + GtkWidget* m_wConnect; + GtkWidget* m_wDisconnect; }; #endif /* AP_UNIXDIALOG_COLLABORATIONJOIN_H */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/unix/GNUmakefile.in 2008-04-06 22:37:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -102,6 +102,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -174,14 +176,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -198,6 +200,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_XMPP_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -214,6 +219,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -224,7 +232,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -290,7 +303,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -321,6 +334,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -334,6 +348,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -369,8 +384,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -466,8 +481,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -479,8 +494,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -490,13 +505,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.cpp 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -29,31 +29,35 @@ #include "ap_Win32Dialog_CollaborationAccounts.h" -static BOOL CALLBACK AP_Win32Dialog_CollaborationAccounts::s_dlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +BOOL CALLBACK AP_Win32Dialog_CollaborationAccounts::s_dlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - AP_Win32Dialog_CollaborationAccounts * pThis; switch (msg) { - case WM_INITDIALOG: - pThis = (AP_Win32Dialog_CollaborationAccounts *)lParam; - UT_return_val_if_fail(pThis, 0); - SetWindowLong(hWnd,DWL_USER,lParam); - return pThis->_onInitDialog(hWnd,wParam,lParam); - - case WM_COMMAND: - pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLong(hWnd,DWL_USER); - UT_return_val_if_fail(pThis, 0); - return pThis->_onCommand(hWnd,wParam,lParam); - - case WM_DESTROY: - pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLong(hWnd,DWL_USER); - DELETEP(pThis->p_win32Dialog); - return true; - - default: - // Message not processed - Windows should take care of it - return false; - } + case WM_INITDIALOG: + { + AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)lParam; + UT_return_val_if_fail(pThis, false); + SetWindowLong(hWnd,DWL_USER,lParam); + return pThis->_onInitDialog(hWnd,wParam,lParam); + } + case WM_COMMAND: + { + AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLong(hWnd,DWL_USER); + UT_return_val_if_fail(pThis, false); + return pThis->_onCommand(hWnd,wParam,lParam); + } + case WM_DESTROY: + { + UT_DEBUGMSG(("Got WM_DESTROY\n")); + AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLong(hWnd,DWL_USER); + UT_return_val_if_fail(pThis, false); + DELETEP(pThis->m_pWin32Dialog); + return true; + } + default: + // Message not processed - Windows should take care of it + return false; + } } XAP_Dialog * AP_Win32Dialog_CollaborationAccounts::static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id) @@ -64,7 +68,7 @@ AP_Win32Dialog_CollaborationAccounts::AP_Win32Dialog_CollaborationAccounts(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id) : AP_Dialog_CollaborationAccounts(pDlgFactory, id), - p_win32Dialog(NULL), + m_pWin32Dialog(NULL), m_hInstance(NULL) { AbiCollabSessionManager * pSessionManager= AbiCollabSessionManager::getManager(); @@ -76,31 +80,25 @@ void AP_Win32Dialog_CollaborationAccounts::runModal(XAP_Frame * pFrame) { - UT_return_if_fail(pFrame); UT_return_if_fail(m_hInstance); - XAP_Win32App* pWin32App = static_cast(XAP_App::getApp()); - // create the dialog LPCTSTR lpTemplate = MAKEINTRESOURCE(AP_RID_DIALOG_COLLABORATIONACCOUNTS); int result = DialogBoxParam( m_hInstance, lpTemplate, static_cast(pFrame->getFrameImpl())->getTopLevelWindow(), (DLGPROC)s_dlgProc, (LPARAM)this ); - switch (result) { - case 0: - // MSDN: If the function fails because the hWndParent parameter is invalid, the return value is zero. - break; - case -1: - UT_DEBUGMSG(("Win32 error: %d. lpTemplate: %d, RID:%d\n", GetLastError(), lpTemplate, AP_RID_DIALOG_COLLABORATIONACCOUNTS)); - - break; - default: - break; - // ok! + switch (result) + { + case 0: + // MSDN: If the function fails because the hWndParent parameter is invalid, the return value is zero. + break; + case -1: + UT_DEBUGMSG(("Win32 error: %d. lpTemplate: %d, RID:%d\n", GetLastError(), lpTemplate, AP_RID_DIALOG_COLLABORATIONACCOUNTS)); + break; + default: + break; }; - - } /*****************************************************************/ @@ -143,12 +141,12 @@ int index=0; std::map::iterator iter=model.begin(); std::map::iterator end=model.end(); - p_win32Dialog->resetContent(AP_RID_DIALOG_COLLABORATIONACCOUNTS_ACCOUNT_LIST); + m_pWin32Dialog->resetContent(AP_RID_DIALOG_COLLABORATIONACCOUNTS_ACCOUNT_LIST); m_mIndices.clear(); while (iter!=end) { - p_win32Dialog->addItemToList(AP_RID_DIALOG_COLLABORATIONACCOUNTS_ACCOUNT_LIST, AP_Win32App::s_fromUTF8ToWinLocale((iter->first).utf8_str()).c_str()); + m_pWin32Dialog->addItemToList(AP_RID_DIALOG_COLLABORATIONACCOUNTS_ACCOUNT_LIST, AP_Win32App::s_fromUTF8ToWinLocale((iter->first).utf8_str()).c_str()); m_mIndices[index]=(iter->second); iter++; index++; @@ -203,8 +201,8 @@ // hDlg is stored in the DialogHelper - use that! // Get ourselves a custom DialogHelper - DELETEP(p_win32Dialog); - p_win32Dialog = new XAP_Win32DialogHelper(hWnd); + DELETEP(m_pWin32Dialog); + m_pWin32Dialog = new XAP_Win32DialogHelper(hWnd); // Set up dialog initial state _setModel(_constructModel()); @@ -213,7 +211,7 @@ _updateSelection(); // Center Window - p_win32Dialog->centerDialog(); + m_pWin32Dialog->centerDialog(); return true; } @@ -223,9 +221,8 @@ { WORD wNotifyCode = HIWORD(wParam); WORD wId = LOWORD(wParam); - HWND hWndCtrl = (HWND)lParam; - int selItem; AccountHandler* pHandler; + switch (wId) { case AP_RID_DIALOG_COLLABORATIONACCOUNTS_CLOSE_BUTTON: @@ -282,8 +279,6 @@ createNewAccount(); // TODO: only refresh if it actually changed. _setModel(_constructModel()); - - // WM_COMMAND message processed return true; case AP_RID_DIALOG_COLLABORATIONACCOUNTS_DELETE_BUTTON: @@ -310,8 +305,7 @@ _setModel(_constructModel()); } } - - // WM_COMMAND message processed + return true; case AP_RID_DIALOG_COLLABORATIONACCOUNTS_PROPERTIES_BUTTON: @@ -322,28 +316,25 @@ // TODO: do something like open a dialog. } - // we didn't really handle anything - return false; + return true; default: // WM_COMMAND message NOT processed return false; - } - - + } } void AP_Win32Dialog_CollaborationAccounts::_updateSelection() { - int selItem = p_win32Dialog->getListSelectedIndex(AP_RID_DIALOG_COLLABORATIONACCOUNTS_ACCOUNT_LIST); + int selItem = m_pWin32Dialog->getListSelectedIndex(AP_RID_DIALOG_COLLABORATIONACCOUNTS_ACCOUNT_LIST); if (selItem != LB_ERR) { m_bHasSelection = true; m_iSelected = selItem; // TODO: Uncomment this line when Preferences does something. - //p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_PROPERTIES_BUTTON, true); + //m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_PROPERTIES_BUTTON, true); - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DELETE_BUTTON, true); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DELETE_BUTTON, true); // Choose which of the Connect/Disconnect buttons is available AccountHandler* pHandler; pHandler=m_mIndices[m_iSelected]; @@ -352,30 +343,30 @@ if (pHandler->isOnline()) { // We're online with this account - allow disconnect. - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_CONNECT_BUTTON, false); - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DISCONNECT_BUTTON, true); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_CONNECT_BUTTON, false); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DISCONNECT_BUTTON, true); } else { // We're offline - allow connect - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_CONNECT_BUTTON, true); - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DISCONNECT_BUTTON, false); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_CONNECT_BUTTON, true); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DISCONNECT_BUTTON, false); } } else { // pHandler no good - don't allow connect or disconnect - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_CONNECT_BUTTON, false); - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DISCONNECT_BUTTON, false); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_CONNECT_BUTTON, false); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DISCONNECT_BUTTON, false); } } else { m_bHasSelection = false; - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_PROPERTIES_BUTTON, false); - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DELETE_BUTTON, false); - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_CONNECT_BUTTON, false); - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DISCONNECT_BUTTON, false); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_PROPERTIES_BUTTON, false); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DELETE_BUTTON, false); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_CONNECT_BUTTON, false); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONACCOUNTS_DISCONNECT_BUTTON, false); } } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.h 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.h 2009-07-15 16:56:23.000000000 +0100 @@ -44,14 +44,12 @@ virtual void signal(const Event& event, const Buddy* pSource); private: - XAP_Win32DialogHelper * p_win32Dialog; - std::map _constructModel(); void _setModel(std::map model); void setOnline(AccountHandler* pHandler, bool online); void _updateSelection(); - // Handles + XAP_Win32DialogHelper * m_pWin32Dialog; HINSTANCE m_hInstance; // Internal states diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.cpp 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -1,6 +1,6 @@ /* AbiCollab - Code to enable the modification of remote documents. * Copyright (C) 2007 by Ryan Pavlik - * Copyright (C) 2006 by Marc Maurer + * Copyright (C) 2006,2008 by Marc Maurer * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -30,54 +30,37 @@ #include "ap_Win32Dialog_CollaborationAddAccount.h" -static BOOL CALLBACK AP_Win32Dialog_CollaborationAddAccount::s_dlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +BOOL CALLBACK AP_Win32Dialog_CollaborationAddAccount::s_dlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - AP_Win32Dialog_CollaborationAddAccount * pThis; switch (msg) { - case WM_INITDIALOG: - pThis = (AP_Win32Dialog_CollaborationAddAccount *)lParam; - UT_return_val_if_fail(pThis, 0); - SetWindowLong(hWnd,DWL_USER,lParam); - return pThis->_onInitDialog(hWnd,wParam,lParam); - - case WM_COMMAND: - pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLong(hWnd,DWL_USER); - UT_return_val_if_fail(pThis, 0); - return pThis->_onCommand(hWnd,wParam,lParam); - - case WM_DESTROY: - pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLong(hWnd,DWL_USER); - if (pThis->p_win32Dialog) + case WM_INITDIALOG: { - DELETEP(pThis->p_win32Dialog); + AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)lParam; + UT_return_val_if_fail(pThis, false); + SetWindowLong(hWnd,DWL_USER,lParam); + return pThis->_onInitDialog(hWnd,wParam,lParam); } - return 0; - - case WM_NOTIFY: - pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLong(hWnd,DWL_USER); - UT_return_val_if_fail(pThis, 0); - UT_return_val_if_fail(lParam, 0); - switch (((LPNMHDR)lParam)->code) + case WM_COMMAND: { - //case UDN_DELTAPOS: return pThis->_onDeltaPos((NM_UPDOWN *)lParam); - default: return 0; + AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLong(hWnd,DWL_USER); + UT_return_val_if_fail(pThis, false); + return pThis->_onCommand(hWnd,wParam,lParam); } - - case WM_PARENTNOTIFY: - // do something here - messages for the backend gui might come in here - UT_DEBUGMSG(("WM_PARENTNOTIFY!\n")); - return false; - - return false; - - - default: - // Windows handles all unhandled messages - pass false - return false; - + case WM_DESTROY: + { + UT_DEBUGMSG(("Got WM_DESTROY\n")); + AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLong(hWnd,DWL_USER); + UT_return_val_if_fail(pThis, false); + DELETEP(pThis->m_pWin32Dialog); + return true; + } + default: + // Message not processed - Windows should take care of it + return false; } } + XAP_Dialog * AP_Win32Dialog_CollaborationAddAccount::static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id) { return static_cast(new AP_Win32Dialog_CollaborationAddAccount(pFactory, id)); @@ -86,10 +69,10 @@ AP_Win32Dialog_CollaborationAddAccount::AP_Win32Dialog_CollaborationAddAccount(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id) : AP_Dialog_CollaborationAddAccount(pDlgFactory, id), - p_win32Dialog(NULL), + m_pWin32Dialog(NULL), + m_hInstance(NULL), m_hOk(NULL), - m_hDetails(NULL), - m_hInstance(NULL) + m_hDetails(NULL) { AbiCollabSessionManager * pSessionManager = AbiCollabSessionManager::getManager(); if (pSessionManager) @@ -101,28 +84,25 @@ void AP_Win32Dialog_CollaborationAddAccount::runModal(XAP_Frame * pFrame) { - UT_return_if_fail(pFrame); UT_return_if_fail(m_hInstance); - XAP_Win32App* pWin32App = static_cast(XAP_App::getApp()); - + // create the dialog LPCTSTR lpTemplate = MAKEINTRESOURCE(AP_RID_DIALOG_COLLABORATIONADDACCOUNT); int result = DialogBoxParam( m_hInstance, lpTemplate, static_cast(pFrame->getFrameImpl())->getTopLevelWindow(), (DLGPROC)s_dlgProc, (LPARAM)this ); - switch (result) { - case 0: - // MSDN: If the function fails because the hWndParent parameter is invalid, the return value is zero. - break; - case -1: - UT_DEBUGMSG(("Win32 error: %d. lpTemplate: %d, RID:%d\n", GetLastError(), lpTemplate, AP_RID_DIALOG_COLLABORATIONADDACCOUNT)); - break; - default: - break; - // ok! + switch (result) + { + case 0: + // MSDN: If the function fails because the hWndParent parameter is invalid, the return value is zero. + break; + case -1: + UT_DEBUGMSG(("Win32 error: %d. lpTemplate: %d, RID:%d\n", GetLastError(), lpTemplate, AP_RID_DIALOG_COLLABORATIONADDACCOUNT)); + break; + default: + break; }; - //*/ } /*****************************************************************/ @@ -143,28 +123,28 @@ ////// // Get ourselves a custom DialogHelper - if (p_win32Dialog) + if (m_pWin32Dialog) { - DELETEP(p_win32Dialog); + DELETEP(m_pWin32Dialog); } - p_win32Dialog = new XAP_Win32DialogHelper(hWnd); + m_pWin32Dialog = new XAP_Win32DialogHelper(hWnd); ////// // Set up dialog initial state _populateWindowData(); // Center Window - p_win32Dialog->centerDialog(); + m_pWin32Dialog->centerDialog(); // Return 1 to proceed with dialog initialization return 1; } +// return true if we process the command, false otherwise BOOL AP_Win32Dialog_CollaborationAddAccount::_onCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { WORD wNotifyCode = HIWORD(wParam); WORD wId = LOWORD(wParam); - HWND hWndCtrl = (HWND)lParam; AccountHandler* pHandler; switch (wId) @@ -184,14 +164,9 @@ else UT_DEBUGMSG(("No account handler types to select; this makes abicollab kinda pointless...\n")); - // WM_COMMAND message processed - return 0 - return 0; - } - else - { - // return unhandled - return 1; + return true; } + return false; case AP_RID_DIALOG_COLLABORATIONADDACCOUNT_OK_BUTTON: UT_DEBUGMSG(("Add Account - OK button clicked\n")); @@ -201,65 +176,58 @@ pHandler->storeProperties(); m_answer=AP_Dialog_CollaborationAddAccount::a_OK; EndDialog(hWnd,0); - - // WM_COMMAND message processed - return 0 - return 0; + return true; + case AP_RID_DIALOG_COLLABORATIONADDACCOUNT_CANCEL_BUTTON: // Close without applying changes EndDialog(hWnd,0); m_answer=AP_Dialog_CollaborationAddAccount::a_CANCEL; - - // WM_COMMAND message processed - return 0 - return 0; + return true; + default: - - AccountHandler* pAccountHandler=_getActiveAccountHandler(); + AccountHandler* pAccountHandler = _getActiveAccountHandler(); if (pAccountHandler) //if we have an account handler { return pAccountHandler->_onCommand(hWnd, wParam, lParam); } - // return unhandled - return 1; + // WM_COMMAND message NOT processed + return false; } - - } void AP_Win32Dialog_CollaborationAddAccount::_populateWindowData() { - // populate the account type combobox + UT_DEBUGMSG(("AP_Win32Dialog_CollaborationAddAccount::_populateWindowData()\n")); + AbiCollabSessionManager* pSessionManager = AbiCollabSessionManager::getManager(); UT_return_if_fail(pSessionManager); - UT_sint32 index; - for (UT_sint32 i = 0; i < pSessionManager->getRegisteredAccountHandlers().size(); i++) + + UT_return_if_fail(m_pWin32Dialog); + + for (UT_uint32 i = 0; i < pSessionManager->getRegisteredAccountHandlers().size(); i++) { AccountHandlerConstructor pConstructor = pSessionManager->getRegisteredAccountHandlers().getNthItem(i); - if (pConstructor) + UT_continue_if_fail(pConstructor); + + // TODO: we need to free these somewhere + AccountHandler* pHandler = pConstructor(); + UT_continue_if_fail(pHandler); + + UT_sint32 index = m_pWin32Dialog->addItemToCombo(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO, (LPCSTR) AP_Win32App::s_fromUTF8ToWinLocale(pHandler->getDisplayType().utf8_str()).c_str()); + if (index >= 0) { - // TODO: we need to free these somewhere - AccountHandler* pHandler = pConstructor(); - if (pHandler) - { - index=p_win32Dialog->addItemToCombo(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO, (LPCSTR) AP_Win32App::s_fromUTF8ToWinLocale(pHandler->getDisplayType().utf8_str()).c_str()); - if (index>=0) - { - // remember for later - m_mAccountTypeCombo[index]=pHandler; - } - else - { - // windows threw an error - // TODO - handle? - } - } + UT_DEBUGMSG(("Added handler to index %d\n", index)); + m_vAccountTypeCombo.insert(m_vAccountTypeCombo.begin()+index, pHandler); } + else + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); } // if we have at least one account handler, then make sure the first one is selected if (pSessionManager->getRegisteredAccountHandlers().size() > 0) { - p_win32Dialog->selectComboItem(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO, 0); + m_pWin32Dialog->selectComboItem(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO, 0); // Note, this requires that the backends be alright with having their widgets destroyed before being created. // TCP does this, but I didn't add such code to any other backends yet. --RP 22 July 2007 UT_DEBUGMSG(("Add Account - New handler type selected\n")); @@ -277,20 +245,23 @@ { // nope, we don't have any account handler :'-( // Add a sample item to show that we can. Then, disable the box and the ok button - index=p_win32Dialog->addItemToCombo(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO, (LPCSTR) "No Handlers!"); - p_win32Dialog->selectComboItem(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO, 0); - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO, false); - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_OK_BUTTON, false); + m_pWin32Dialog->addItemToCombo(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO, (LPCSTR) "No Handlers!"); + m_pWin32Dialog->selectComboItem(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO, 0); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO, false); + m_pWin32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_OK_BUTTON, false); } } AccountHandler* AP_Win32Dialog_CollaborationAddAccount::_getActiveAccountHandler() { - int index; - index=p_win32Dialog->getComboSelectedIndex(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO); - UT_return_val_if_fail(index >= 0, 0); - // check the return value of this function! If it's a null pointer, don't follow it! - return m_mAccountTypeCombo[index]; + UT_DEBUGMSG(("AP_Win32Dialog_CollaborationAddAccount::_getActiveAccountHandler()\n")); + UT_return_val_if_fail(m_pWin32Dialog, NULL); + + int index = m_pWin32Dialog->getComboSelectedIndex(AP_RID_DIALOG_COLLABORATIONADDACCOUNT_TYPECOMBO); + UT_return_val_if_fail(index >= 0 && index < static_cast(m_vAccountTypeCombo.size()), NULL); + + // check the return value of this function! + return m_vAccountTypeCombo[index]; } void AP_Win32Dialog_CollaborationAddAccount::setBackendValidity(bool valid) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.h 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.h 2009-07-15 16:56:23.000000000 +0100 @@ -21,7 +21,7 @@ #ifndef AP_WIN32DIALOG_COLLABORATIONADDACCOUNT_H #define AP_WIN32DIALOG_COLLABORATIONADDACCOUNT_H -#include +#include #include "xap_Win32DialogHelper.h" #include "ut_assert.h" @@ -44,7 +44,7 @@ void setBackendValidity(bool valid); protected: - XAP_Win32DialogHelper * p_win32Dialog; + XAP_Win32DialogHelper * m_pWin32Dialog; /* virtual void* _getEmbeddingParent() { return m_hDlg; } @@ -61,7 +61,7 @@ HWND m_hDetails; // Data - std::map m_mAccountTypeCombo; + std::vector m_vAccountTypeCombo; private: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.cpp 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ #include "ap_Win32Dialog_CollaborationJoin.h" -static BOOL CALLBACK AP_Win32Dialog_CollaborationJoin::s_dlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +BOOL CALLBACK AP_Win32Dialog_CollaborationJoin::s_dlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { AP_Win32Dialog_CollaborationJoin * pThis; switch (msg) @@ -95,8 +95,6 @@ UT_return_if_fail(pFrame); UT_return_if_fail(m_hInstance); - XAP_Win32App* pWin32App = static_cast(XAP_App::getApp()); - LPCTSTR lpTemplate = MAKEINTRESOURCE(AP_RID_DIALOG_COLLABORATIONJOIN); int result = DialogBoxParam( m_hInstance, lpTemplate, @@ -135,12 +133,8 @@ // If we can't init common controls, bail out UT_return_val_if_fail(InitCommonControlsEx(&icc), false); - ////// // Get ourselves a custom DialogHelper - if (p_win32Dialog) - { - DELETEP(p_win32Dialog); - } + DELETEP(p_win32Dialog); p_win32Dialog = new XAP_Win32DialogHelper(hWnd); ////// @@ -155,36 +149,35 @@ // Center Window p_win32Dialog->centerDialog(); - // WM_INITDIALOG wants True returned in order to continue processing return true; } BOOL AP_Win32Dialog_CollaborationJoin::_onCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { - WORD wNotifyCode = HIWORD(wParam); WORD wId = LOWORD(wParam); - HWND hWndCtrl = (HWND)lParam; - switch (wId) { - case AP_RID_DIALOG_COLLABORATIONJOIN_JOIN_BUTTON: + case AP_RID_DIALOG_COLLABORATIONJOIN_DISCONNECT_BUTTON: + // join and close + // Formerly/secretly the OK button + _setJoin(m_hSelected, false); + EndDialog(hWnd, 0); + return true; + + case AP_RID_DIALOG_COLLABORATIONJOIN_CONNECT_BUTTON: // join and close // Formerly/secretly the OK button _setJoin(m_hSelected, true); - EndDialog(hWnd,0); - - // WM_COMMAND message processed - return 0 - return 0; + EndDialog(hWnd, 0); + return true; case AP_RID_DIALOG_COLLABORATIONJOIN_CLOSE_BUTTON: // Close without necessarily joining // formerly/secretly the Cancel button EndDialog(hWnd,0); - - // WM_COMMAND message processed - return 0 - return 0; + return true; case AP_RID_DIALOG_COLLABORATIONJOIN_ADDBUDDY_BUTTON: // open the Add Buddy dialog @@ -198,16 +191,12 @@ // Refresh documents _refreshAllDocHandlesAsync(); _setModel(); - - // WM_COMMAND message processed - return 0 - return 0; + return true; case AP_RID_DIALOG_COLLABORATIONJOIN_DELETE_BUTTON: - // right now, do nothing // TODO: Implement! - // didn't actually handle this - return 1; + return false; case AP_RID_DIALOG_COLLABORATIONJOIN_REFRESH_BUTTON: // TODO: we really should refresh the buddies here as well, @@ -215,13 +204,10 @@ // avahi backend) _refreshAllDocHandlesAsync(); _setModel(); - - // WM_COMMAND message processed - return 0 - return 0; + return true; default: - // WM_COMMAND message not handled - return 1 to require Windows to process it. - return 1; + return false; } } @@ -232,7 +218,9 @@ //UT_DEBUGMSG(("Notify: Code=0x%x\n", ((LPNMHDR)lParam)->code)); case NM_DBLCLK: - // A double-click will toggle join status + return false; // need to think this through, just toggling the state sounds wrong to me, UI-wise - MARCM + +/* // A double-click will toggle join status // TODO: This is probably awful GUI-wise _updateSelection(); // join stuff! @@ -252,7 +240,7 @@ _refreshAllDocHandlesAsync(); _setModel(); } - return 1; + return 1;*/ case TVN_SELCHANGED: _updateSelection(); @@ -277,10 +265,10 @@ SetWindowLong(m_hDocumentTreeview, GWL_STYLE, styles); // Loop through accounts - for (UT_sint32 i = 0; i < accounts.getItemCount(); i++) + for (UT_uint32 i = 0; i < accounts.getItemCount(); i++) { // Loop through buddies in accounts - for (UT_sint32 j = 0; j < accounts.getNthItem(i)->getBuddies().size(); j++) + for (UT_uint32 j = 0; j < accounts.getNthItem(i)->getBuddies().size(); j++) { const Buddy* pBuddy = accounts.getNthItem(i)->getBuddies()[j]; UT_UTF8String buddyDesc = pBuddy->getDescription(); @@ -292,8 +280,8 @@ tviBuddy.item.stateMask = TVIS_BOLD|TVIS_EXPANDED; tviBuddy.hInsertAfter = TVI_LAST; // only insert at the end tviBuddy.hParent = NULL; // top most level Item - tviBuddy.item.state = NULL; - tviBuddy.item.pszText = sBuddyText.c_str(); + tviBuddy.item.state = 0; + tviBuddy.item.pszText = const_cast(sBuddyText.c_str()); HTREEITEM htiBuddy = (HTREEITEM)SendMessage(m_hDocumentTreeview, TVM_INSERTITEM,0,(LPARAM)&tviBuddy); m_mTreeItemHandles.insert(std::pair(htiBuddy, ShareListItem(pBuddy, NULL))); @@ -311,10 +299,10 @@ tviDocument.hInsertAfter = TVI_LAST; // only insert at the end tviDocument.hParent = htiBuddy; tviDocument.hInsertAfter = TVI_LAST; - tviDocument.item.pszText = sDocText.c_str(); + tviDocument.item.pszText = const_cast(sDocText.c_str()); // if we are connected to this document, bold it. Eventually checkboxes would be cooler, that's a TODO tviDocument.item.state = pManager->isActive(item->m_docHandle->getSessionId()) ? TVIS_BOLD : TVIS_EXPANDED; - HTREEITEM htiDoc = SendMessage(m_hDocumentTreeview, TVM_INSERTITEM,0,(LPARAM)&tviDocument); + HTREEITEM htiDoc = (HTREEITEM)SendMessage(m_hDocumentTreeview, TVM_INSERTITEM, 0, (LPARAM)&tviDocument); m_mTreeItemHandles.insert(std::pair(htiDoc, ShareListItem(pBuddy, item->m_docHandle))); } } @@ -343,10 +331,12 @@ void AP_Win32Dialog_CollaborationJoin::_updateSelection() { + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_if_fail(pManager); + HTREEITEM hSelItem = TreeView_GetSelection(m_hDocumentTreeview); if (hSelItem) { - m_bHasSelection = true; m_hSelected = hSelItem; std::map< HTREEITEM, ShareListItem >::const_iterator cit = m_mTreeItemHandles.find(hSelItem); @@ -354,60 +344,59 @@ if (cit->second.pDocHandle) { UT_DEBUGMSG(("Document selected\n")); - // If the doc handle isn't null then this is a document - m_bShareSelected=true; - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_JOIN_BUTTON, true); + bool bIsConnected = pManager->isActive(cit->second.pDocHandle->getSessionId()); + p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_DISCONNECT_BUTTON, bIsConnected ); + p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_CONNECT_BUTTON, !bIsConnected ); p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_DELETE_BUTTON, false); } else { UT_DEBUGMSG(("Buddy selected\n")); - // This is just a buddy. - m_bShareSelected=false; - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_JOIN_BUTTON, false); + p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_DISCONNECT_BUTTON, false); + p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_CONNECT_BUTTON, false); p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_DELETE_BUTTON, true); } } else { - m_bHasSelection = false; - m_bShareSelected = false; - p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_JOIN_BUTTON, false); + p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_DISCONNECT_BUTTON, false); + p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_CONNECT_BUTTON, false); p_win32Dialog->enableControl(AP_RID_DIALOG_COLLABORATIONJOIN_DELETE_BUTTON, false); } - } -// Return value: true if the join status was updated -// false if the desired status was already the current status -bool AP_Win32Dialog_CollaborationJoin::_setJoin(HTREEITEM hItem, bool joinStatus) +void AP_Win32Dialog_CollaborationJoin::_setJoin(HTREEITEM hItem, bool joinStatus) { AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); - UT_return_val_if_fail(pManager, false); + UT_return_if_fail(pManager); std::map< HTREEITEM, ShareListItem >::const_iterator cit = m_mTreeItemHandles.find(hItem); - UT_return_val_if_fail(cit != m_mTreeItemHandles.end(), false); - - Buddy* pBuddy = cit->second.pBuddy; + UT_return_if_fail(cit != m_mTreeItemHandles.end()); + + const Buddy* pBuddy = cit->second.pBuddy; UT_return_if_fail(pBuddy); DocHandle* pDocHandle = cit->second.pDocHandle; UT_return_if_fail(pDocHandle); - + bool currentlyJoined = pManager->isActive(pDocHandle->getSessionId()); + UT_return_if_fail(joinStatus != currentlyJoined); - if (joinStatus && !currentlyJoined) + if (joinStatus) { - _join(pBuddy, pDocHandle); - return true; + UT_DEBUGMSG(("Got a document we can connect to!\n")); + m_answer = AP_Dialog_CollaborationJoin::a_CONNECT; + m_pBuddy = pBuddy; + m_pDocHandle = pDocHandle; + return; } - if (!joinStatus && currentlyJoined) + if (!joinStatus) { - _disjoin(pBuddy, pDocHandle); - return true; + UT_DEBUGMSG(("Got a document we can disconnect from!\n")); + m_answer = AP_Dialog_CollaborationJoin::a_DISCONNECT; + m_pBuddy = pBuddy; + m_pDocHandle = pDocHandle; + return; } - - // We did not have to change the status - return false; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.h 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.h 2009-07-15 16:56:23.000000000 +0100 @@ -34,8 +34,8 @@ struct ShareListItem { - ShareListItem(Buddy* pBuddy_, DocHandle* pDocHandle_) : pBuddy(pBuddy_), pDocHandle(pDocHandle_) {}; - Buddy* pBuddy; + ShareListItem(const Buddy* pBuddy_, DocHandle* pDocHandle_) : pBuddy(pBuddy_), pDocHandle(pDocHandle_) {}; + const Buddy* pBuddy; DocHandle* pDocHandle; }; @@ -58,16 +58,13 @@ void _refreshWindow(); void _enableBuddyAddition(bool bEnabled); void _updateSelection(); - bool _setJoin(HTREEITEM hItem, bool joinStatus); + void _setJoin(HTREEITEM hItem, bool joinStatus); // Handles HINSTANCE m_hInstance; HWND m_hDocumentTreeview; // Internal states - BOOL m_bHasSelection; - BOOL m_bBuddySelected; - BOOL m_bShareSelected; HTREEITEM m_hSelected; // Model diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Res_CollaborationDialogs.rc /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Res_CollaborationDialogs.rc --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Res_CollaborationDialogs.rc 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Res_CollaborationDialogs.rc 2009-07-15 16:56:23.000000000 +0100 @@ -21,10 +21,13 @@ ////////////////////////////////////////////////////////////////// // Include all the dialogs for AbiCollab since the resource compiler only likes compiling -// one RCSRCS file per directory +// one RCSRCS file per executable #include "ap_Win32Res_DlgCollaborationAccounts.rc2" #include "ap_Win32Res_DlgCollaborationAddAccount.rc2" #include "ap_Win32Res_DlgCollaborationAddBuddy.rc2" #include "ap_Win32Res_DlgCollaborationJoin.rc2" +#ifdef ABICOLLAB_HANDLER_SERVICE +#include "../../../backends/service/win/ap_Win32Res_ServiceDialogs.rc" +#endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Res_DlgCollaborationJoin.rc2 /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Res_DlgCollaborationJoin.rc2 --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Res_DlgCollaborationJoin.rc2 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/ap_Win32Res_DlgCollaborationJoin.rc2 2009-07-15 16:56:23.000000000 +0100 @@ -21,12 +21,13 @@ #define AP_RID_DIALOG_COLLABORATIONJOIN 604 -#define AP_RID_DIALOG_COLLABORATIONJOIN_JOIN_BUTTON IDOK +#define AP_RID_DIALOG_COLLABORATIONJOIN_DISCONNECT_BUTTON 1000 +#define AP_RID_DIALOG_COLLABORATIONJOIN_CONNECT_BUTTON 1001 #define AP_RID_DIALOG_COLLABORATIONJOIN_CLOSE_BUTTON IDCANCEL -#define AP_RID_DIALOG_COLLABORATIONJOIN_DOCUMENT_TREE 1000 -#define AP_RID_DIALOG_COLLABORATIONJOIN_ADDBUDDY_BUTTON 1001 -#define AP_RID_DIALOG_COLLABORATIONJOIN_DELETE_BUTTON 1002 -#define AP_RID_DIALOG_COLLABORATIONJOIN_REFRESH_BUTTON 1003 +#define AP_RID_DIALOG_COLLABORATIONJOIN_DOCUMENT_TREE 1002 +#define AP_RID_DIALOG_COLLABORATIONJOIN_ADDBUDDY_BUTTON 1003 +#define AP_RID_DIALOG_COLLABORATIONJOIN_DELETE_BUTTON 1004 +#define AP_RID_DIALOG_COLLABORATIONJOIN_REFRESH_BUTTON 1005 #ifdef RC_INVOKED // NOTE -- these placeholder strings get overridden at runtime @@ -37,7 +38,8 @@ CAPTION "Join Collaboration" FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "Join",AP_RID_DIALOG_COLLABORATIONJOIN_JOIN_BUTTON,125,154,50,14, WS_TABSTOP + DEFPUSHBUTTON "Disconnect",AP_RID_DIALOG_COLLABORATIONJOIN_DISCONNECT_BUTTON,67,154,50,14, WS_TABSTOP + DEFPUSHBUTTON "Connect",AP_RID_DIALOG_COLLABORATIONJOIN_CONNECT_BUTTON,125,154,50,14, WS_TABSTOP PUSHBUTTON "Close",AP_RID_DIALOG_COLLABORATIONJOIN_CLOSE_BUTTON,183,154,50,14, WS_TABSTOP CONTROL "", AP_RID_DIALOG_COLLABORATIONJOIN_DOCUMENT_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT| TVS_DISABLEDRAGDROP | WS_TABSTOP | WS_BORDER | WS_VSCROLL, 7, 16, 168, 124 PUSHBUTTON "Add Buddy", AP_RID_DIALOG_COLLABORATIONJOIN_ADDBUDDY_BUTTON, 181, 18, 55, 14, WS_TABSTOP diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/GNUmakefile.in 2008-04-06 22:37:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -92,6 +92,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -164,14 +166,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -188,6 +190,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABICOLLAB_XMPP_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -204,6 +209,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -214,7 +222,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -280,7 +293,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -311,6 +324,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -324,6 +338,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libAbiCollabWin32Dialogs.la @@ -355,8 +370,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -448,8 +463,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -459,13 +474,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/win/Makefile 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/win/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -21,6 +21,7 @@ ABI_ROOT:=$(shell pwd)/../../../../../../abi include $(ABI_ROOT)/src/config/abi_defs.mk +include $(shell pwd)/../../../abicollab_config.mk TARGETS= $(OBJS) CPPSRCS= ap_Win32Dialog_CollaborationAccounts.cpp \ @@ -38,13 +39,14 @@ -I$(ABI_ROOT)/../libs/boost -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers # compiler (MinGW, MSVC, etc) specific ifeq ($(OS_NAME),MINGW32) + INCLUDES += $(BACKEND_INCLUDES) else OS_CFLAGS+=-GX endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationAccounts.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationAccounts.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationAccounts.cpp 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationAccounts.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -40,8 +40,28 @@ bool AP_Dialog_CollaborationAccounts::_addAccount(AccountHandler* pAccount) { + UT_return_val_if_fail(pAccount, false); + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); - return pManager->addAccount(pAccount); + UT_return_val_if_fail(pManager, false); + + bool success = pManager->addAccount(pAccount); + if (success) + pManager->storeProfile(); + return success; +} + +bool AP_Dialog_CollaborationAccounts::_deleteAccount(AccountHandler* pAccount) +{ + UT_return_val_if_fail(pAccount, false); + + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_val_if_fail(pManager, false); + + bool success = pManager->destroyAccount(pAccount); + if (success) + pManager->storeProfile(); + return success; } void AP_Dialog_CollaborationAccounts::createNewAccount() diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationAccounts.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationAccounts.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationAccounts.h 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationAccounts.h 2009-07-15 16:56:23.000000000 +0100 @@ -47,7 +47,8 @@ protected: bool _addAccount(AccountHandler* pHandler); - + bool _deleteAccount(AccountHandler* pAccount); + AP_Dialog_CollaborationAccounts::tAnswer m_answer; }; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationJoin.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationJoin.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationJoin.cpp 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationJoin.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -34,7 +34,9 @@ #include AP_Dialog_CollaborationJoin::AP_Dialog_CollaborationJoin(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id) - : XAP_Dialog_NonPersistent(pDlgFactory, id, "interface/dialogcollaborationjoin") + : XAP_Dialog_NonPersistent(pDlgFactory, id, "interface/dialogcollaborationjoin"), + m_pBuddy(NULL), + m_pDocHandle(NULL) { AbiCollabSessionManager::getManager()->registerEventListener(this); } @@ -121,28 +123,7 @@ _enableBuddyAddition(bEnableAddition); } -void AP_Dialog_CollaborationJoin::_join(Buddy* pBuddy, DocHandle* pDocHandle) -{ - UT_DEBUGMSG(("AP_Dialog_CollaborationJoin::_join()\n")); - UT_return_if_fail(pBuddy); - UT_return_if_fail(pDocHandle); - AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); - pManager->joinSessionInitiate(pBuddy, pDocHandle); -} - -void AP_Dialog_CollaborationJoin::_disjoin(Buddy* pBuddy, DocHandle* pDocHandle) -{ - UT_DEBUGMSG(("AP_Dialog_CollaborationJoin::_disjoin()\n")); - UT_return_if_fail(pBuddy); - UT_return_if_fail(pDocHandle); - - UT_DEBUGMSG(("Disjoining from session |%s| which was shared by |%s|\n", pDocHandle->getSessionId().utf8_str(), pBuddy->getDescription().utf8_str())); - AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); - UT_return_if_fail(pManager); - pManager->disjoinSession(pDocHandle->getSessionId()); -} - -void AP_Dialog_CollaborationJoin::signal(const Event& event, const Buddy* pSource) +void AP_Dialog_CollaborationJoin::signal(const Event& event, const Buddy* /*pSource*/) { UT_DEBUGMSG(("AP_Dialog_CollaborationJoin::signal()\n")); switch (event.getClassType()) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationJoin.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationJoin.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationJoin.h 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/ap_Dialog_CollaborationJoin.h 2009-07-15 16:56:23.000000000 +0100 @@ -40,11 +40,23 @@ void signal(const Event& event, const Buddy* pSource); + typedef enum { a_CLOSE, a_CONNECT, a_DISCONNECT } tAnswer; + + AP_Dialog_CollaborationJoin::tAnswer getAnswer(void) const + { return m_answer; } + + const Buddy* getBuddy() + { return m_pBuddy; }; + + DocHandle* getDocHandle() + { return m_pDocHandle; }; + protected: - void _eventAddBuddy(); - void _join(Buddy* pBuddy, DocHandle* pDocHandle); - void _disjoin(Buddy* pBuddy, DocHandle* pDocHandle); + AP_Dialog_CollaborationJoin::tAnswer m_answer; + const Buddy* m_pBuddy; + DocHandle* m_pDocHandle; + void _eventAddBuddy(); void _addBuddy(AccountHandler* pHandler, Buddy* pBuddy); void _refreshAllDocHandlesAsync(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/GNUmakefile.in 2008-04-06 22:37:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -91,6 +91,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -162,14 +164,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -186,6 +188,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -202,6 +207,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -212,7 +220,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -278,7 +291,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -309,6 +322,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -322,6 +336,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -352,8 +367,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -432,8 +447,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -445,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -456,13 +471,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/dialogs/xp/Makefile 2008-04-06 22:36:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/dialogs/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -20,6 +20,7 @@ ABI_ROOT:=$(shell pwd)/../../../../../../abi include $(ABI_ROOT)/src/config/abi_defs.mk +include $(shell pwd)/../../../abicollab_config.mk TARGETS= $(OBJS) CPPSRCS= ap_Dialog_CollaborationAccounts.cpp \ @@ -34,13 +35,14 @@ -I$(ABI_ROOT)/../libs/boost -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers # compiler (MinGW, MSVC, etc) specific ifeq ($(OS_NAME),MINGW32) + INCLUDES += $(BACKEND_INCLUDES) else OS_CFLAGS+=-GX endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/GNUmakefile.in 2008-04-06 22:37:38.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = dialogs packet session @@ -303,8 +318,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -410,8 +425,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -436,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -447,13 +462,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/Makefile 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ TARGETS= $(OBJS) -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/GNUmakefile.in 2008-04-06 22:37:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/Makefile 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/AbiCollab_Packet.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/AbiCollab_Packet.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/AbiCollab_Packet.cpp 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/AbiCollab_Packet.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -69,6 +69,8 @@ PT_IMAGE_DATAID, PT_IMAGE_TITLE, PT_IMAGE_DESCRIPTION, + PT_DATA_PREVIEW, + PT_HYPERLINK_TARGET_NAME }; UT_sint16 getPacket_PTName_Index( const gchar* name ) @@ -225,40 +227,33 @@ static const std::string& getPXTypeStr( PX_ChangeRecord::PXType t ) { - bool safeGuard; - UT_ASSERT( safeGuard = (t>=PX_ChangeRecord::PXT_GlobMarker && t<=PX_ChangeRecord::PXT_ChangeDocProp) ); - if (safeGuard) { - static std::string pxTypeStrs[] = { - "PXT_GlobMarker", - "PXT_InsertSpan", - "PXT_DeleteSpan", - "PXT_ChangeSpan", - "PXT_InsertStrux", - "PXT_DeleteStrux", - "PXT_ChangeStrux", - "PXT_InsertObject", - "PXT_DeleteObject", - "PXT_ChangeObject", - "PXT_InsertFmtMark", - "PXT_DeleteFmtMark", - "PXT_ChangeFmtMark", - "PXT_ChangePoint", - "PXT_ListUpdate", - "PXT_StopList", - "PXT_UpdateField", - "PXT_RemoveList", - "PXT_UpdateLayout", - "PXT_AddStyle", - "PXT_RemoveStyle", - "PXT_CreateDataItem", - "PXT_ChangeDocProp", - }; - return pxTypeStrs[ int(t)+1 ]; - } else { - static std::string invalidValue; - invalidValue = str(boost::format( "" ) % int(t) ); - return invalidValue; - } + UT_return_val_if_fail(t >= PX_ChangeRecord::PXT_GlobMarker && t <= PX_ChangeRecord::PXT_ChangeDocProp, str(boost::format( "" ) % int(t) )); + static std::string pxTypeStrs[] = { + "PXT_GlobMarker", + "PXT_InsertSpan", + "PXT_DeleteSpan", + "PXT_ChangeSpan", + "PXT_InsertStrux", + "PXT_DeleteStrux", + "PXT_ChangeStrux", + "PXT_InsertObject", + "PXT_DeleteObject", + "PXT_ChangeObject", + "PXT_InsertFmtMark", + "PXT_DeleteFmtMark", + "PXT_ChangeFmtMark", + "PXT_ChangePoint", + "PXT_ListUpdate", + "PXT_StopList", + "PXT_UpdateField", + "PXT_RemoveList", + "PXT_UpdateLayout", + "PXT_AddStyle", + "PXT_RemoveStyle", + "PXT_CreateDataItem", + "PXT_ChangeDocProp", + }; + return pxTypeStrs[ int(t)+1 ]; } std::string ChangeRecordSessionPacket::toStr() const @@ -337,6 +332,7 @@ i += 2; } m_szProps[i] = NULL; + UT_DEBUGMSG(("Props of packet %s \n",m_szProps)); } void Props_ChangeRecordSessionPacket::_fillAtts() @@ -409,37 +405,30 @@ static const std::string& getPTStruxTypeStr( PTStruxType p ) { - bool safeGuard; - UT_ASSERT( safeGuard = (p>=PTX_Section && p<=PTX_StruxDummy) ); - if (safeGuard) { - static std::string PacketSessionTypeStrs[] = { - "PTX_Section", - "PTX_Block", - "PTX_SectionHdrFtr", - "PTX_SectionEndnote", - "PTX_SectionTable", - "PTX_SectionCell", - "PTX_SectionFootnote", - "PTX_SectionMarginnote", - "PTX_SectionAnnotation", - "PTX_SectionFrame", - "PTX_SectionTOC", - "PTX_EndCell", - "PTX_EndTable", - "PTX_EndFootnote", - "PTX_EndMarginnote", - "PTX_EndEndnote", - "PTX_EndAnnotation", - "PTX_EndFrame", - "PTX_EndTOC", - "PTX_StruxDummy", - }; - return PacketSessionTypeStrs[ int(p) ]; - } else { - static std::string invalidValue; - invalidValue = str(boost::format( "" ) % int(p) ); - return invalidValue; - } + UT_return_val_if_fail(p >= PTX_Section && p <= PTX_StruxDummy, str(boost::format( "" ) % int(p) )); + static std::string PacketSessionTypeStrs[] = { + "PTX_Section", + "PTX_Block", + "PTX_SectionHdrFtr", + "PTX_SectionEndnote", + "PTX_SectionTable", + "PTX_SectionCell", + "PTX_SectionFootnote", + "PTX_SectionMarginnote", + "PTX_SectionAnnotation", + "PTX_SectionFrame", + "PTX_SectionTOC", + "PTX_EndCell", + "PTX_EndTable", + "PTX_EndFootnote", + "PTX_EndMarginnote", + "PTX_EndEndnote", + "PTX_EndAnnotation", + "PTX_EndFrame", + "PTX_EndTOC", + "PTX_StruxDummy", + }; + return PacketSessionTypeStrs[ int(p) ]; } void InsertSpan_ChangeRecordSessionPacket::serialize( Archive& ar ) @@ -489,23 +478,16 @@ static const std::string& getPTObjectTypeStr( PTObjectType p ) { - bool safeGuard; - UT_ASSERT( safeGuard = (p>=PTO_Image && p<=PTO_Embed) ); - if (safeGuard) { - static std::string PTObjectTypeStrs[] = { - "PTO_Image", - "PTO_Field", - "PTO_Bookmark", - "PTO_Hyperlink", - "PTO_Math", - "PTO_Embed" - }; - return PTObjectTypeStrs[ int(p) ]; - } else { - static std::string invalidValue; - invalidValue = str(boost::format( "" ) % int(p) ); - return invalidValue; - } + UT_return_val_if_fail(p >= PTO_Image && p <= PTO_Embed, str(boost::format( "" ) % int(p) )); + static std::string PTObjectTypeStrs[] = { + "PTO_Image", + "PTO_Field", + "PTO_Bookmark", + "PTO_Hyperlink", + "PTO_Math", + "PTO_Embed" + }; + return PTObjectTypeStrs[ int(p) ]; } std::string Object_ChangeRecordSessionPacket::toStr() const diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/AbiCollab_Packet.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/AbiCollab_Packet.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/AbiCollab_Packet.h 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/AbiCollab_Packet.h 2009-07-15 16:56:23.000000000 +0100 @@ -155,7 +155,7 @@ }; \ static PacketRegister##Class _PacketRegister##Class; -class ABI_EXPORT Packet +class Packet { public: DECLARE_ABSTRACT_PACKET(Packet); @@ -199,7 +199,7 @@ * SessionPackets * *************************************************************/ -class ABI_EXPORT SessionPacket : public Packet +class SessionPacket : public Packet { public: DECLARE_SERIALIZABLE_PACKET @@ -230,7 +230,7 @@ UT_UTF8String m_sDocUUID; }; -class ABI_EXPORT AbstractChangeRecordSessionPacket : public SessionPacket +class AbstractChangeRecordSessionPacket : public SessionPacket { public: AbstractChangeRecordSessionPacket() @@ -250,7 +250,7 @@ virtual UT_sint32 getRemoteRev(void) const = 0; }; -class ABI_EXPORT ChangeRecordSessionPacket : public AbstractChangeRecordSessionPacket +class ChangeRecordSessionPacket : public AbstractChangeRecordSessionPacket { public: DECLARE_PACKET(ChangeRecordSessionPacket); @@ -296,7 +296,7 @@ UT_sint32 m_iRemoteRev; }; -class ABI_EXPORT Props_ChangeRecordSessionPacket : public ChangeRecordSessionPacket { +class Props_ChangeRecordSessionPacket : public ChangeRecordSessionPacket { public: DECLARE_PACKET(Props_ChangeRecordSessionPacket); Props_ChangeRecordSessionPacket() : m_szAtts(NULL), m_szProps(NULL) {} @@ -341,7 +341,7 @@ void _fillAtts(); // uses m_sAtts to make m_szAtts }; -class ABI_EXPORT InsertSpan_ChangeRecordSessionPacket : public Props_ChangeRecordSessionPacket { +class InsertSpan_ChangeRecordSessionPacket : public Props_ChangeRecordSessionPacket { public: DECLARE_PACKET(InsertSpan_ChangeRecordSessionPacket); InsertSpan_ChangeRecordSessionPacket() : m_sText("") {} @@ -362,7 +362,7 @@ UT_UTF8String m_sText; }; -class ABI_EXPORT ChangeStrux_ChangeRecordSessionPacket : public Props_ChangeRecordSessionPacket { +class ChangeStrux_ChangeRecordSessionPacket : public Props_ChangeRecordSessionPacket { public: DECLARE_PACKET(ChangeStrux_ChangeRecordSessionPacket); ChangeStrux_ChangeRecordSessionPacket() : m_eStruxType(PTStruxType(0)) {} @@ -382,7 +382,7 @@ PTStruxType m_eStruxType; }; -class ABI_EXPORT DeleteStrux_ChangeRecordSessionPacket : public ChangeRecordSessionPacket { +class DeleteStrux_ChangeRecordSessionPacket : public ChangeRecordSessionPacket { public: DECLARE_PACKET(DeleteStrux_ChangeRecordSessionPacket); DeleteStrux_ChangeRecordSessionPacket() {} @@ -402,7 +402,7 @@ PTStruxType m_eStruxType; }; -class ABI_EXPORT Object_ChangeRecordSessionPacket : public Props_ChangeRecordSessionPacket { +class Object_ChangeRecordSessionPacket : public Props_ChangeRecordSessionPacket { public: DECLARE_PACKET(Object_ChangeRecordSessionPacket); Object_ChangeRecordSessionPacket() {} @@ -422,7 +422,7 @@ PTObjectType m_eObjectType; }; -class ABI_EXPORT Data_ChangeRecordSessionPacket : public Props_ChangeRecordSessionPacket { +class Data_ChangeRecordSessionPacket : public Props_ChangeRecordSessionPacket { public: DECLARE_PACKET(Data_ChangeRecordSessionPacket); Data_ChangeRecordSessionPacket() @@ -447,7 +447,7 @@ std::string m_sToken; }; -class ABI_EXPORT Glob_ChangeRecordSessionPacket : public ChangeRecordSessionPacket +class Glob_ChangeRecordSessionPacket : public ChangeRecordSessionPacket { public: DECLARE_PACKET(Glob_ChangeRecordSessionPacket); @@ -468,7 +468,7 @@ UT_Byte m_iGLOBType; }; -class ABI_EXPORT GlobSessionPacket : public AbstractChangeRecordSessionPacket +class GlobSessionPacket : public AbstractChangeRecordSessionPacket { public: DECLARE_PACKET(GlobSessionPacket); @@ -495,7 +495,7 @@ std::vector m_pPackets; }; -class ABI_EXPORT SignalSessionPacket : public SessionPacket +class SignalSessionPacket : public SessionPacket { public: DECLARE_PACKET(SignalSessionPacket); @@ -511,7 +511,7 @@ UT_uint32 m_iSignal; }; -class ABI_EXPORT RevertSessionPacket : public SessionPacket +class RevertSessionPacket : public SessionPacket { public: DECLARE_PACKET(RevertSessionPacket); @@ -527,7 +527,7 @@ UT_sint32 m_iRev; }; -class ABI_EXPORT RevertAckSessionPacket : public SessionPacket +class RevertAckSessionPacket : public SessionPacket { public: DECLARE_PACKET(RevertAckSessionPacket); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/EventPacket.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/EventPacket.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/EventPacket.h 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/EventPacket.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ #include "ut_string_class.h" #include "AbiCollab_Packet.h" -class ABI_EXPORT EventPacket : public Packet +class EventPacket : public Packet { public: DECLARE_ABSTRACT_PACKET(EventPacket); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/GNUmakefile.in 2008-04-06 22:37:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -87,6 +87,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -157,14 +159,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -181,6 +183,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -197,6 +202,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -207,7 +215,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -273,7 +286,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -304,6 +317,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -317,6 +331,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -342,8 +357,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -421,8 +436,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -434,8 +449,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -445,13 +460,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/Makefile 2008-04-06 22:36:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ -I$(ABI_ROOT)/../libs/boost -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/Serialization.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/Serialization.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/packet/xp/Serialization.h 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/packet/xp/Serialization.h 2009-07-15 16:56:23.000000000 +0100 @@ -65,7 +65,7 @@ * ar << COMPACT_INT(m_iRev); */ #define COMPACT_INT(v) (*(CompactInt*)&v) -struct ABI_EXPORT CompactInt { +struct CompactInt { public: friend Archive& operator<<( Archive& ar, CompactInt& c ); protected: @@ -73,7 +73,7 @@ }; /** Base archive */ -class ABI_EXPORT Archive +class Archive { public: virtual ~Archive() {} @@ -194,7 +194,7 @@ }; /** String based archive */ -class ABI_EXPORT StrArchive : public Archive +class StrArchive : public Archive { public: unsigned int Size() const { return m_sSource.size(); } @@ -211,7 +211,7 @@ }; /** Input (loading) archive */ -class ABI_EXPORT IStrArchive : public StrArchive +class IStrArchive : public StrArchive { public: IStrArchive( const std::string& sSource ) @@ -242,7 +242,7 @@ }; /** Output (saving) archive */ -class ABI_EXPORT OStrArchive : public StrArchive +class OStrArchive : public StrArchive { public: OStrArchive() @@ -254,7 +254,7 @@ m_sSource.resize( pos + Count ); memcpy( &m_sSource[pos], Buffer, Count ); } - virtual void Skip( unsigned int Count ) + virtual void Skip( unsigned int /*Count*/ ) { #if !defined(SERIALIZATION_TEST) UT_ASSERT(UT_SHOULD_NOT_HAPPEN); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/GNUmakefile.in 2008-04-06 22:37:40.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/Makefile 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ TARGETS= $(OBJS) -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Command.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Command.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Command.h 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Command.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ class FakeAccountHandler; #endif -class ABI_EXPORT AbiCollab_Command +class AbiCollab_Command { public: AbiCollab_Command(const UT_UTF8String& argv); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab.cpp 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -72,9 +72,10 @@ } // Use this constructor to host a collaboration session -AbiCollab::AbiCollab(PD_Document* pDoc, const UT_UTF8String& sSessionId) +AbiCollab::AbiCollab(PD_Document* pDoc, const UT_UTF8String& sSessionId, XAP_Frame* pFrame) : EV_MouseListener(), m_pDoc(pDoc), + m_pFrame(pFrame), m_Import(this, pDoc), m_Export(this, pDoc), m_iDocListenerId(0), @@ -91,7 +92,7 @@ // TODO: this can be made a lil' more efficient, as setDocument // will create import and export listeners, which is kinda useless // when there is no single collaborator yet - _setDocument(pDoc); + _setDocument(pDoc, pFrame); #ifdef ABICOLLAB_RECORD_ALWAYS startRecording( new DiskSessionRecorder( this ) ); @@ -104,9 +105,10 @@ const UT_UTF8String& docUUID, UT_sint32 iRev, Buddy* pController, - bool bReuseCurrentFrame) + XAP_Frame* pFrame) : EV_MouseListener(), m_pDoc(pDoc), + m_pFrame(pFrame), m_Import(this, pDoc), m_Export(this, pDoc), m_iDocListenerId(0), @@ -122,7 +124,7 @@ // TODO: this can be made a lil' more efficient, as setDocument // will create import and export listeners, which is kinda useless // when there is no single collaborator yet - _setDocument(pDoc, bReuseCurrentFrame); + _setDocument(pDoc, pFrame); m_Import.setInitialRemoteRev(pController->getName(), iRev); m_Export.addFakeImportAdjust(docUUID, iRev); @@ -163,7 +165,7 @@ DELETEP(m_pRecorder); } -void AbiCollab::removeCollaborator(Buddy* pCollaborator) +void AbiCollab::removeCollaborator(const Buddy* pCollaborator) { UT_return_if_fail(pCollaborator); @@ -231,10 +233,11 @@ } } -void AbiCollab::_setDocument(PD_Document* pDoc, bool bReuseCurrentFrame) +void AbiCollab::_setDocument(PD_Document* pDoc, XAP_Frame* pFrame) { UT_DEBUGMSG(("AbiCollab::setDocument()\n")); UT_return_if_fail(pDoc); + UT_return_if_fail(pFrame); AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); UT_return_if_fail(pManager); @@ -244,39 +247,14 @@ // update the frame m_pDoc = pDoc; - - // if the document doesn't belong to a frame already, then create a - // new frame for this session (except when the document in the current - // frame is not dirty, doesn't have a filename yet (which means it - // is a brand new empty document), and isn't being shared at the moment) - XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame(); - if (pFrame) - { - PD_Document * pFrameDoc = static_cast(pFrame->getCurrentDoc()); - if (pFrameDoc != pDoc) - { - if (bReuseCurrentFrame || - (!pFrameDoc || !pFrameDoc->getFilename() && !pFrameDoc->isDirty() && !pManager->isInSession(pFrameDoc))) - { - // we can replace the document in this frame safely, as it is - // brand new, and doesn't have any contents yet - } - else - { - // the current frame has already a document loaded, let's create - // a new frame - pFrame = XAP_App::getApp()->newFrame(); - } - pFrame->loadDocument(m_pDoc); // this will also delete the old document (or at least, it should) - // TODO: the frame shouldn't be raised - } - // register ourselves as a mouse listener - // FIXME: we should do this for all frames that display this document! - EV_Mouse* pMouse = pFrame->getMouse(); - if (pMouse) - m_iMouseLID = pMouse->registerListener(this); - } + // register ourselves as a mouse listener + // FIXME: we should do this for all frames that display this document! + EV_Mouse* pMouse = pFrame->getMouse(); + if (pMouse) + m_iMouseLID = pMouse->registerListener(this); + else + UT_DEBUGMSG(("No current frame!\n")); // add the new export listeners UT_uint32 lid = 0; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Export.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Export.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Export.cpp 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Export.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -527,7 +527,7 @@ */ bool ABI_Collab_Export::signal(UT_uint32 iSignal) { - UT_DEBUGMSG(("FIXME FIXME FIXME, DON'T SEND SIGNALS DIRECTLY FROM ABI_Collab_Export::signal()!\n")); + UT_DEBUGMSG(("ABI_Collab_Export::signal()!\n")); SignalSessionPacket* ssp = new SignalSessionPacket(m_pAbiCollab->getSessionId(), m_pDoc->getOrigDocUUIDString(), iSignal); if(m_pGlobPacket) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Export.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Export.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Export.h 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Export.h 2009-07-15 16:56:23.000000000 +0100 @@ -38,7 +38,7 @@ class ChangeAdjust; class AbiCollab; -class ABI_EXPORT ABI_Collab_Export : public PL_DocChangeListener +class ABI_Collab_Export : public PL_DocChangeListener { friend class AbiCollab; @@ -47,12 +47,12 @@ ABI_Collab_Export(AbiCollab* pAbiCollab, PD_Document* pDoc); virtual ~ABI_Collab_Export(); - virtual bool populate(PL_StruxFmtHandle sfh, - const PX_ChangeRecord* pcr) { return true; } + virtual bool populate(PL_StruxFmtHandle /*sfh*/, + const PX_ChangeRecord* /*pcr*/) { return true; } - virtual bool populateStrux(PL_StruxDocHandle sdh, - const PX_ChangeRecord* pcr, - PL_StruxFmtHandle* psfh) { return true; } + virtual bool populateStrux(PL_StruxDocHandle /*sdh*/, + const PX_ChangeRecord* /*pcr*/, + PL_StruxFmtHandle* /*psfh*/) { return true; } virtual bool change(PL_StruxFmtHandle sfh, const PX_ChangeRecord* pcr); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab.h 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab.h 2009-07-15 16:56:23.000000000 +0100 @@ -46,7 +46,7 @@ class Buddy; class AccountHandler; -class ABI_EXPORT ChangeAdjust +class ChangeAdjust { friend class AbiCollab_ImportRuleSet; @@ -74,7 +74,7 @@ }; class AbiCollab; -class ABI_EXPORT SessionRecorderInterface +class SessionRecorderInterface { public: SessionRecorderInterface( AbiCollab* Session ) : m_pAbiCollab(Session) {} @@ -86,26 +86,28 @@ AbiCollab* m_pAbiCollab; }; -class ABI_EXPORT AbiCollab : public EV_MouseListener +class AbiCollab : public EV_MouseListener { friend class ABI_Collab_Export; public: - AbiCollab(PD_Document* pDoc, const UT_UTF8String& sSessionId); + AbiCollab(PD_Document* pDoc, const UT_UTF8String& sSessionId, XAP_Frame* pFrame); AbiCollab(const UT_UTF8String& sSessionId, PD_Document* pDoc, const UT_UTF8String& docUUID, UT_sint32 iRev, Buddy* pControler, - bool bReuseCurrentFrame = false); + XAP_Frame* pFrame); virtual ~AbiCollab(); // collaborator management void addCollaborator(Buddy* pCollaborator); - void removeCollaborator(Buddy* pCollaborator); + void removeCollaborator(const Buddy* pCollaborator); void removeCollaboratorsForAccount(AccountHandler* pHandler); const std::vector& getCollaborators() const { return m_vecCollaborators; } + bool isController(const Buddy* pCollaborator) const + { return m_pController == pCollaborator; } // import/export management ABI_Collab_Import* getImport(void) @@ -126,8 +128,10 @@ // document management PD_Document* getDocument(void) const { return m_pDoc; } + XAP_Frame* getFrame(void) const + { return m_pFrame; } - const UT_UTF8String& getSessionId() const + const UT_UTF8String getSessionId() const { return m_sId; } bool isLocallyControlled() const { return m_pController == NULL; } @@ -149,14 +153,14 @@ void _removeCollaborator(UT_sint32 index); // document management - void _setDocument(PD_Document* pDoc, bool bReuseCurrentFrame = false); + void _setDocument(PD_Document* pDoc, XAP_Frame* pFrame); void _setDocListenerId(UT_uint32 iDocListenerId) { m_iDocListenerId = iDocListenerId; } - XAP_Frame* _constructFrame(); void _fillRemoteRev( Packet* pPacket, const Buddy& ); PD_Document * m_pDoc; + XAP_Frame* m_pFrame; ABI_Collab_Import m_Import; ABI_Collab_Export m_Export; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Import.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Import.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Import.h 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Import.h 2009-07-15 16:56:23.000000000 +0100 @@ -43,7 +43,7 @@ class ABI_xmpp; class ChangeAdjust; -class ABI_EXPORT ABI_Collab_Import +class ABI_Collab_Import { friend class FakeAccountHandler; @@ -75,13 +75,6 @@ void _enableUpdates(UT_GenericVector& vecViews, bool bIsGlob); bool _import(const SessionPacket& packet, UT_sint32 iImportAdjustment, const Buddy& collaborator, bool inGlob = false); - bool getStruxType(UT_UTF8String& sInPacket, PTStruxType& struxType, - UT_UTF8String& sAttributes, UT_UTF8String& sOutpacket) - { return true; } - bool getObjectType(UT_UTF8String& sInPacket,PTObjectType& objectType, - UT_UTF8String& sAttributes, UT_UTF8String& sOutpacket) - { return true; } - PD_Document* m_pDoc; AbiCollab * m_pAbiCollab; std::map m_remoteRevs; // maintained by the importer, used by the exporter diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_ImportRuleSet.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_ImportRuleSet.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_ImportRuleSet.h 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_ImportRuleSet.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ class ChangeAdjust; class AbstractChangeRecordSessionPacket; -class ABI_EXPORT AbiCollab_ImportRuleSet +class AbiCollab_ImportRuleSet { public: static bool isOverlapAllowed(const ChangeAdjust& ca, const AbstractChangeRecordSessionPacket& acrsp, UT_sint32 iRemotePosAdjust); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Plugin.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Plugin.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Plugin.cpp 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Plugin.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -55,7 +55,9 @@ // forward declarations static void s_abicollab_add_menus(); static void s_abicollab_remove_menus(); +#if defined(ABICOLLAB_RECORD_ALWAYS) && defined(DEBUG) static void s_cleanup_old_sessions(); +#endif // ----------------------------------------------------------------------- // @@ -531,13 +533,16 @@ else { UT_UTF8String sSessionId(""); - pManager->startSession(pDoc, sSessionId); + pManager->startSession(pDoc, sSessionId, NULL); } return true; } bool s_abicollab_join(AV_View* v, EV_EditMethodCallData *d) { + AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager(); + UT_return_val_if_fail(pManager, false); + // Get the current view that the user is in. XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame(); // Get an Accounts dialog instance @@ -548,7 +553,33 @@ ); // Run the dialog pDialog->runModal(pFrame); + // Handle the dialog outcome + AP_Dialog_CollaborationJoin::tAnswer answer = pDialog->getAnswer(); + Buddy* pBuddy = const_cast(pDialog->getBuddy()); // FIXME: bad const cast (it should probably stay const) + DocHandle* pDocHandle = pDialog->getDocHandle(); pFactory->releaseDialog(pDialog); + + switch (answer) + { + case AP_Dialog_CollaborationJoin::a_CONNECT: + UT_return_val_if_fail(pBuddy && pDocHandle, false); + pManager->joinSessionInitiate(pBuddy, pDocHandle); + break; + case AP_Dialog_CollaborationJoin::a_DISCONNECT: + { + UT_return_val_if_fail(pBuddy && pDocHandle, false); + AbiCollab* pSession = pManager->getSessionFromSessionId(pDocHandle->getSessionId()); + UT_return_val_if_fail(pSession, false); + if (pSession->isLocallyControlled()) + pManager->closeSession(pSession, true); + else + pManager->disjoinSession(pDocHandle->getSessionId()); + } + break; + case AP_Dialog_CollaborationJoin::a_CLOSE: + break; + } + return true; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -32,6 +32,7 @@ for (std::vector::const_iterator cit = files.begin(); cit != files.end(); cit++) { } + return true; } #ifndef WIN32 diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Regression.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Regression.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Regression.h 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollab_Regression.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ #include "ut_types.h" -class ABI_EXPORT AbiCollab_Regression +class AbiCollab_Regression { public: bool execute(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollabSessionManager.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollabSessionManager.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollabSessionManager.cpp 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollabSessionManager.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -40,8 +40,6 @@ #ifdef WIN32 #include -// hacky but it works. it's what we get for not having autotools. -#define ABICOLLAB_HANDLER_TCP 1 #else #include #include "ut_files.h" @@ -73,6 +71,7 @@ #endif #ifdef ABICOLLAB_HANDLER_SERVICE #include +#include #endif // event includes @@ -147,10 +146,12 @@ return result; } -UT_Error AbiCollabSessionManager::deserializeDocument(PD_Document** pDoc, std::string& document, bool isEncodedBase64) +UT_Error AbiCollabSessionManager::deserializeDocument(PD_Document** pDoc, const std::string& document, bool isEncodedBase64) { + UT_return_val_if_fail(pDoc, UT_ERROR); + UT_Error res = UT_ERROR; - + // really bad abuse of std::string's below, but more efficient than copying // the whole buffer (which could be massive) into a temporary buffer GsfInput *source; @@ -172,13 +173,17 @@ GsfInput *gzabwBuf = gsf_input_gzip_new (source, NULL); // todo: don't pass null here, but check for errors if (gzabwBuf) { - // TODO: if there are unsaved changes to the current document, - // then open this document in a new frame! - (*pDoc) = new PD_Document(XAP_App::getApp()); - (*pDoc)->createRawDocument(); + bool create = (*pDoc == NULL); + if (create) + { + UT_DEBUGMSG(("Creating a new document in AbiCollabSessionManager::deserializeDocument()\n")); + (*pDoc) = new PD_Document(XAP_App::getApp()); + (*pDoc)->createRawDocument(); + } IE_Imp* imp = (IE_Imp*)new IE_Imp_AbiWord_1(*pDoc); imp->importFile(gzabwBuf); // todo: check for errors - (*pDoc)->finishRawCreation(); + if (create) + (*pDoc)->finishRawCreation(); DELETEP(imp); g_object_unref(G_OBJECT(gzabwBuf)); res = UT_OK; @@ -240,7 +245,8 @@ addAccount(pSugarHandler); #endif #ifdef ABICOLLAB_HANDLER_SERVICE - m_regAccountHandlers.push_back(ServiceAccountHandlerConstructor); + if (tls_tunnel::Proxy::tls_tunnel_init()) + m_regAccountHandlers.push_back(ServiceAccountHandlerConstructor); #endif return true; } @@ -248,7 +254,10 @@ bool AbiCollabSessionManager::unregisterAccountHandlers(void) { // no need to "free/delete" items, as they are just function pointers (ie. basic types) - m_regAccountHandlers.clear(); + m_regAccountHandlers.clear(); +#ifdef ABICOLLAB_HANDLER_SERVICE + tls_tunnel::Proxy::tls_tunnel_deinit(); +#endif return true; } @@ -370,7 +379,7 @@ pHandler->connect(); break; } - DELETEP(pHandler); + _deleteAccount(pHandler); } } } @@ -481,20 +490,20 @@ bool AbiCollabSessionManager::destroySession(PD_Document * pDoc) { - AbiCollab * pCollab = NULL; + UT_DEBUGMSG(("AbiCollabSessionManager::destroySession(PD_Document * pDoc)\n")); + UT_uint32 i = 0; for (i = 0; i < m_vecSessions.getItemCount(); i++) { - pCollab = m_vecSessions.getNthItem(i); - if (pCollab) + AbiCollab* pSession = m_vecSessions.getNthItem(i); + UT_continue_if_fail(pSession); + + PD_Document* pSessionDoc = pSession->getDocument(); + if (pSessionDoc == pDoc) { - PD_Document* pSessionDoc = pCollab->getDocument(); - if (pSessionDoc == pDoc) - { - DELETEP(pCollab); - m_vecSessions.deleteNthItem(i); - return true; - } + m_vecSessions.deleteNthItem(i); + _deleteSession(pSession); + return true; } } return false; @@ -502,16 +511,18 @@ bool AbiCollabSessionManager::destroySession(AbiCollab* pSession) { - UT_DEBUGMSG(("AbiCollabSessionManager::destroySession()\n")); + UT_DEBUGMSG(("AbiCollabSessionManager::destroySession(AbiCollab* pSession)\n")); UT_uint32 i = 0; for (i = 0; i < m_vecSessions.getItemCount(); i++) { AbiCollab* pActiveSession = m_vecSessions.getNthItem(i); + UT_continue_if_fail(pActiveSession); + if (pActiveSession == pSession) { - DELETEP(pSession); m_vecSessions.deleteNthItem(i); + _deleteSession(pSession); return true; } } @@ -538,12 +549,8 @@ for(UT_uint32 i = 0; i < m_vecSessions.getItemCount(); i++) { AbiCollab* pSession = m_vecSessions.getNthItem(i); - if (pSession) - { - disconnectSession(pSession); - DELETEP(pSession); - } - m_vecSessions.deleteNthItem(i); + UT_continue_if_fail(pSession); + disconnectSession(pSession); } } @@ -605,7 +612,7 @@ return NULL; } -AbiCollab* AbiCollabSessionManager::startSession(PD_Document* pDoc, UT_UTF8String& sSessionId) +AbiCollab* AbiCollabSessionManager::startSession(PD_Document* pDoc, UT_UTF8String& sSessionId, XAP_Frame* pFrame) { UT_DEBUGMSG(("Starting collaboration session for document with id %s\n", pDoc->getDocUUIDString())); @@ -617,7 +624,9 @@ } UT_DEBUGMSG(("Creating a new collaboration session with UUID: %s\n", sSessionId.utf8_str())); - AbiCollab* pAbiCollab = new AbiCollab(pDoc, sSessionId); + + UT_return_val_if_fail(_setupFrame(&pFrame, pDoc), NULL); + AbiCollab* pAbiCollab = new AbiCollab(pDoc, sSessionId, pFrame); m_vecSessions.push_back(pAbiCollab); // notify all people we are sharing a new document @@ -685,19 +694,24 @@ // TODO: do some accounting here, so we know we send an auth request in ::joinSession() } -void AbiCollabSessionManager::joinSession(const UT_UTF8String& sSessionId, PD_Document* pDoc, const UT_UTF8String& docUUID, UT_sint32 iRev, Buddy* pCollaborator) +void AbiCollabSessionManager::joinSession(const UT_UTF8String& sSessionId, PD_Document* pDoc, + const UT_UTF8String& docUUID, UT_sint32 iRev, Buddy* pCollaborator, + XAP_Frame *pFrame) { UT_DEBUGMSG(("AbiCollabSessionManager::joinSession()\n")); UT_return_if_fail(pCollaborator); UT_return_if_fail(pDoc); - AbiCollab* pSession = #ifdef ABICOLLAB_HANDLER_SUGAR - new AbiCollab(sSessionId, pDoc, docUUID, iRev, pCollaborator, true); + // HACK, remove this some day: the sugar backend should just pass us a frame to use + pFrame = XAP_App::getApp()->getLastFocussedFrame(); + pFrame->loadDocument(pDoc); #else - new AbiCollab(sSessionId, pDoc, docUUID, iRev, pCollaborator); -#endif + UT_return_if_fail(_setupFrame(&pFrame, pDoc)); +#endif + + AbiCollab* pSession = new AbiCollab(sSessionId, pDoc, docUUID, iRev, pCollaborator, pFrame); m_vecSessions.push_back(pSession); // signal everyone that we have joined this session @@ -809,6 +823,49 @@ return false; } +void AbiCollabSessionManager::removeBuddy(const Buddy* pBuddy, bool graceful) +{ + UT_return_if_fail(pBuddy); + + UT_DEBUGMSG(("Dropping buddy '%s' from all sessions\n", pBuddy->getName().utf8_str())); + // TODO: should we send out events for every buddy we drop, or session + // we delete? + + for (UT_sint32 i = m_vecSessions.getItemCount() - 1; i >= 0; i--) + { + AbiCollab* pSession = m_vecSessions.getNthItem(i); + UT_continue_if_fail(pSession); + + if (pSession->isLocallyControlled()) + { + pSession->removeCollaborator(pBuddy); + } + else + { + // we don't control this session, meaning we can drop it completely + // if this buddy controlled it + // TODO: when we allow more than 1 buddy in a non-locally controlled, + // then remove it from that list here + if (pSession->isController(pBuddy)) + { + UT_DEBUGMSG(("This buddy controlled a session, destroying the session...\n")); + UT_UTF8String docName = pSession->getDocument()->getFilename(); + if (docName == "") + docName = "Untitled"; // TODO: fetch the title from the frame somehow (which frame?) - MARCM + destroySession(pSession); + if (!graceful) + { + XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame(); + UT_continue_if_fail(pFrame); + // TODO: make this localizable + UT_UTF8String msg; + UT_UTF8String_sprintf(msg, "You've been disconnected from buddy %s. The collaboration session for document %s has been stopped.", pBuddy->getDescription().utf8_str(), docName.utf8_str()); + pFrame->showMessageBox(msg.utf8_str(), XAP_Dialog_MessageBox::b_O, XAP_Dialog_MessageBox::a_OK); + } + } + } + } +} bool AbiCollabSessionManager::addAccount(AccountHandler* pHandler) { @@ -832,7 +889,7 @@ } else { - DELETEP(pHandler); + _deleteAccount(pHandler); UT_DEBUGMSG(("User attempted to add duplicate account - request ignored.\n")); } @@ -844,14 +901,14 @@ for (UT_uint32 i = 0; i < m_vecAccounts.getItemCount(); i++) { AccountHandler * pHandler = m_vecAccounts.getNthItem(i); - DELETEP(pHandler); + _deleteAccount(pHandler); } m_vecAccounts.clear(); } -void AbiCollabSessionManager::destroyAccount(AccountHandler* pHandler) +bool AbiCollabSessionManager::destroyAccount(AccountHandler* pHandler) { - UT_return_if_fail(pHandler); + UT_return_val_if_fail(pHandler, false); for (UT_uint32 i = 0; i < m_vecAccounts.getItemCount(); i++) { @@ -883,10 +940,11 @@ } m_vecAccounts.deleteNthItem(i); - DELETEP(pHandler); - break; + _deleteAccount(pHandler); + return true; } } + return false; } void AbiCollabSessionManager::setDocumentHandles(Buddy& buddy, const UT_GenericVector& vDocHandles) @@ -982,13 +1040,10 @@ } } -bool AbiCollabSessionManager::processPacket(AccountHandler& handler, Packet* packet, const UT_UTF8String& sBuddyName) +bool AbiCollabSessionManager::processPacket(AccountHandler& handler, Packet* packet, Buddy* buddy) { UT_DEBUGMSG(("AbiCollabSessionManager::processPacket()\n")); UT_return_val_if_fail(packet, false); - - // TODO: it is rather inefficient to request a buddy for every packet - Buddy* buddy = handler.getBuddy(sBuddyName); UT_return_val_if_fail(buddy, false); // check if this is a simple import-meh-now-packet @@ -1085,6 +1140,10 @@ { if (!isLocallyControlled(pSession->getDocument())) { + UT_UTF8String docName = pSession->getDocument()->getFilename(); + if (docName == "") + docName = "Untitled"; // TODO: fetch the title from the frame somehow (which frame?) - MARCM + // the server hosting this session is gone, so let's disconnect as well if (!destroySession(pSession)) UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); @@ -1098,7 +1157,7 @@ UT_return_val_if_fail(pFrame, true); UT_UTF8String msg; // TODO: make this localizable - UT_UTF8String_sprintf(msg, "This document is not being shared anymore by %s. You are disconnected from the collaboration session.", buddy->getName().utf8_str()); + UT_UTF8String_sprintf(msg, "Document %s is not being shared anymore by buddy %s. You are disconnected from the collaboration session.", docName.utf8_str(), buddy->getName().utf8_str()); pFrame->showMessageBox(msg.utf8_str(), XAP_Dialog_MessageBox::b_O, XAP_Dialog_MessageBox::a_OK); } else @@ -1115,14 +1174,11 @@ case PCT_AccountAddBuddyRequestEvent: { - // TODO: it is rather inefficient to request a buddy for every packet - Buddy* pBuddy = handler.getBuddy(sBuddyName); - if (!pBuddy) + if (buddy != handler.getBuddy(buddy->getName())) { PropertyMap vBuddyProps; - vBuddyProps.insert(PropertyMap::value_type("name", sBuddyName.utf8_str())); + vBuddyProps.insert(PropertyMap::value_type("name", buddy->getName().utf8_str())); Buddy* pBuddy = handler.constructBuddy(vBuddyProps); - if (pBuddy) { // TODO: we don't handle request authorization yet. For now, just @@ -1190,3 +1246,126 @@ pListener->signal(event, pSource); } } + +void AbiCollabSessionManager::beginAsyncOperation(AbiCollab* pSession) +{ + UT_DEBUGMSG(("AbiCollabSessionManager::beginAsyncOperation(AbiCollab*)\n")); + UT_return_if_fail(pSession); + m_asyncSessionOps[pSession]++; +} + +void AbiCollabSessionManager::endAsyncOperation(AbiCollab* pSession) +{ + UT_DEBUGMSG(("AbiCollabSessionManager::endAsyncOperation(AbiCollab*)\n")); + UT_return_if_fail(pSession); + UT_return_if_fail(m_asyncSessionOps[pSession] > 0); + m_asyncSessionOps[pSession]--; +} + +void AbiCollabSessionManager::beginAsyncOperation(AccountHandler* pAccount) +{ + UT_DEBUGMSG(("AbiCollabSessionManager::beginAsyncOperation(AccountHandler*)\n")); + UT_return_if_fail(pAccount); + m_asyncAccountOps[pAccount]++; +} + +void AbiCollabSessionManager::endAsyncOperation(AccountHandler* pAccount) +{ + UT_DEBUGMSG(("AbiCollabSessionManager::endAsyncOperation(AccountHandler*)\n")); + UT_return_if_fail(pAccount); + UT_return_if_fail(m_asyncAccountOps[pAccount] > 0); + m_asyncAccountOps[pAccount]--; +} + +bool AbiCollabSessionManager::_setupFrame(XAP_Frame** pFrame, PD_Document* pDoc) +{ + UT_return_val_if_fail(pFrame, false); + + if (*pFrame) + { + UT_DEBUGMSG(("Frame is non-NULL, NOT loading document in the frame\n")); + return true; + } + + // if the document doesn't belong to a frame already, then create a + // new frame for this session (except when the document in the current + // frame is not dirty, doesn't have a filename yet (which means it + // is a brand new empty document), and isn't being shared at the moment) + XAP_Frame* pCurFrame = XAP_App::getApp()->getLastFocussedFrame(); + UT_return_val_if_fail(pCurFrame, false); + + bool isNewFrame = false; + PD_Document * pFrameDoc = static_cast(pCurFrame->getCurrentDoc()); + if (pFrameDoc != pDoc) + { + if (!pFrameDoc || (!pFrameDoc->getFilename() && !pFrameDoc->isDirty() && !isInSession(pFrameDoc))) + { + // we can replace the document in this frame safely, as it is + // brand new, and doesn't have any contents yet + } + else + { + // the current frame has already a document loaded, let's create + // a new frame + pCurFrame = XAP_App::getApp()->newFrame(); + isNewFrame = true; + } + + } + else + UT_DEBUGMSG(("This document is already in the current frame; using this frame\n")); + + UT_return_val_if_fail(pCurFrame, false); + *pFrame = pCurFrame; + + // load the document in the frame; this will also delete the old document (or at least, it should) + if (static_cast((*pFrame)->getCurrentDoc()) != pDoc) + { + UT_DEBUGMSG(("Loading the document in the frame\n")); + (*pFrame)->loadDocument(pDoc); + } + else + UT_DEBUGMSG(("Not loading the document in the frame, as the frame already has it\n")); + + if (isNewFrame) + (*pFrame)->show(); + + return true; +} + +void AbiCollabSessionManager::_deleteSession(AbiCollab* pSession) +{ + UT_DEBUGMSG(("Waiting for all async actions to complete...\n")); + UT_return_if_fail(pSession); + // wait for all async actions to complete + // TODO: some sort of feedback to the user would be nice + while (m_asyncSessionOps[pSession] > 0) + _nullUpdate(); + DELETEP(pSession); +} + +void AbiCollabSessionManager::_deleteAccount(AccountHandler* pHandler) +{ + UT_DEBUGMSG(("Waiting for all async actions to complete...\n")); + UT_return_if_fail(pHandler); + // wait for all async actions to complete + // TODO: some sort of feedback to the user would be nice + while (m_asyncAccountOps[pHandler] > 0) + _nullUpdate(); + DELETEP(pHandler); +} + +void AbiCollabSessionManager::_nullUpdate() +{ +#ifdef WIN32 + MSG msg; + for (UT_sint32 i = 0 ; i < 10 ; i++ ) + if (PeekMessage(&msg, (HWND) NULL, 0, 0, PM_REMOVE)) + DispatchMessage(&msg); + Sleep(10); +#else + for (UT_sint32 i = 0; (i < 10) && gtk_events_pending(); i++) + gtk_main_iteration (); + usleep(1000*10); +#endif +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollabSessionManager.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollabSessionManager.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollabSessionManager.h 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/AbiCollabSessionManager.h 2009-07-15 16:56:23.000000000 +0100 @@ -21,6 +21,7 @@ #ifndef ABICOLLABSESSIONMANAGER_H #define ABICOLLABSESSIONMANAGER_H +#include #include #include #include "ut_types.h" @@ -42,7 +43,7 @@ class Event; class EventListener; -class ABI_EXPORT AbiCollabSessionManager +class AbiCollabSessionManager { public: static AbiCollabSessionManager* getManager(); @@ -51,7 +52,7 @@ // helper functions static UT_Error serializeDocument(const PD_Document* pDoc, std::string& document, bool encodeBase64=true ); - static UT_Error deserializeDocument(PD_Document** pDoc, std::string& document, bool isEncodedBase64=true); + static UT_Error deserializeDocument(PD_Document** pDoc, const std::string& document, bool isEncodedBase64=true); // dialog code bool registerDialogs(void); @@ -87,16 +88,19 @@ AbiCollab* getSessionFromSessionId(const UT_UTF8String& sSessionId); const UT_GenericVector& getSessions(void) const { return m_vecSessions;} - AbiCollab* startSession(PD_Document* pDoc, UT_UTF8String& sNewSessionId); + AbiCollab* startSession(PD_Document* pDoc, UT_UTF8String& sNewSessionId, XAP_Frame* pFrame); void closeSession(AbiCollab* pSession, bool canConfirm); void closeSessions(); void joinSessionInitiate(Buddy* pBuddy, DocHandle* pDocHandle); - void joinSession(const UT_UTF8String& sSessionId, PD_Document* pDoc, const UT_UTF8String& docUUID, UT_sint32 iRev, Buddy* pCollaborator); + void joinSession(const UT_UTF8String& sSessionId, PD_Document* pDoc, + const UT_UTF8String& docUUID, UT_sint32 iRev, Buddy* pCollaborator, + XAP_Frame *pFrame); void joinSession(AbiCollab* pSession, Buddy* pCollaborator); void disjoinSession(const UT_UTF8String& sSessionId); bool isLocallyControlled(PD_Document* pDoc); bool isInSession(PD_Document* pDoc); bool isActive(const UT_UTF8String& sSessionId); + void removeBuddy(const Buddy* pBuddy, bool graceful = true); // account code bool registerAccountHandlers(void); @@ -108,22 +112,34 @@ const UT_GenericVector& getAccounts() const { return m_vecAccounts; } void destroyAccounts(); - void destroyAccount(AccountHandler* pHandler); + bool destroyAccount(AccountHandler* pHandler); void setDocumentHandles(Buddy& buddy, const UT_GenericVector& vDocHandle); // packet handling - bool processPacket(AccountHandler& handler, Packet* pPacket, const UT_UTF8String& sBuddyName); + bool processPacket(AccountHandler& handler, Packet* pPacket, Buddy* buddy); // signalling code void registerEventListener(EventListener* pListener); void unregisterEventListener(EventListener* pListener); void signal(const Event& event, const Buddy* pSource = 0); + // asynchronous operation handling + void beginAsyncOperation(AbiCollab* pSession); + void endAsyncOperation(AbiCollab* pSession); + void beginAsyncOperation(AccountHandler* pSession); + void endAsyncOperation(AccountHandler* pSession); AbiCollabSessionManager(void); // TODO: this constructor shouldn't be public private: - static AbiCollabSessionManager* m_pManager; + bool _setupFrame(XAP_Frame** pFrame, PD_Document* pDoc); + + // asynchronous operation handling + void _deleteSession(AbiCollab* pSession); + void _deleteAccount(AccountHandler* pHandler); + void _nullUpdate(); + + static AbiCollabSessionManager* m_pManager; // dialog code XAP_Dialog_Id m_iDialogJoin; @@ -142,6 +158,10 @@ UT_GenericVector m_regAccountHandlers; UT_GenericVector m_vecAccounts; UT_GenericVector m_vecEventListeners; + + // asynchronous opertation registration + std::map m_asyncSessionOps; + std::map m_asyncAccountOps; }; #endif /* ABICOLLABSESSIONMANAGER_H */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/DiskSessionRecorder.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/DiskSessionRecorder.cpp --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/DiskSessionRecorder.cpp 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/DiskSessionRecorder.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -204,6 +204,7 @@ DELETEP(rp); } } + return true; } void DiskSessionRecorder::destroy() diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/DiskSessionRecorder.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/DiskSessionRecorder.h --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/DiskSessionRecorder.h 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/DiskSessionRecorder.h 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ #include -class ABI_EXPORT RecordedPacket +class RecordedPacket { public: RecordedPacket(bool bIncoming,bool bHasBuddy, const UT_UTF8String& buddyName, UT_uint64 timestamp, Packet* pPacket) @@ -58,7 +58,7 @@ bool m_bDeleteAtDestroy; }; -class ABI_EXPORT DiskSessionRecorder : public SessionRecorderInterface +class DiskSessionRecorder : public SessionRecorderInterface { public: DiskSessionRecorder(AbiCollab* pSession); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/GNUmakefile.in 2008-04-06 22:37:40.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -119,6 +119,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -189,14 +191,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -213,6 +215,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ $(am__append_2) $(am__append_4) \ $(am__append_6) $(am__append_8) $(am__append_10) LEX = @LEX@ @@ -230,6 +235,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -240,7 +248,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -306,7 +319,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -337,6 +350,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -350,6 +364,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -394,8 +409,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -425,8 +440,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -434,8 +449,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -560,8 +575,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -573,8 +588,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -584,13 +599,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/core/session/xp/Makefile 2008-04-06 22:36:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/core/session/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -2,6 +2,7 @@ ## AbiWord ## Copyright (C) 1998 AbiSource, Inc. +## Copyright (C) 2008 by Marc Maurer ## ## This program is free software; you can redistribute it and/or ## modify it under the terms of the GNU General Public License @@ -20,6 +21,7 @@ ABI_ROOT:=$(shell pwd)/../../../../../../abi include $(ABI_ROOT)/src/config/abi_defs.mk +include $(shell pwd)/../../../abicollab_config.mk TARGETS= $(OBJS) CPPSRCS= AbiCollab.cpp \ @@ -40,13 +42,14 @@ -I$(ABI_ROOT)/../libs/boost \ -I$(ABI_ROOT)/../libs/asio/include -#CFLAGS += -DABI_DLL +CFLAGS += -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers # compiler (MinGW, MSVC, etc) specific ifeq ($(OS_NAME),MINGW32) + INCLUDES += $(BACKEND_INCLUDES) else OS_CFLAGS+=-GX endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/tools/abicollab/GNUmakefile.am 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -2,4 +2,5 @@ EXTRA_DIST = \ plugin.m4 \ - Makefile + Makefile \ + abicollab_config.mk diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicollab/GNUmakefile.in 2008-04-06 22:37:35.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,12 +306,14 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = backends core EXTRA_DIST = \ plugin.m4 \ - Makefile + Makefile \ + abicollab_config.mk all: all-recursive @@ -306,8 +322,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +429,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +455,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +466,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/Makefile --- abiword-2.6.2/abiword-plugins/tools/abicollab/Makefile 2008-04-06 22:36:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -2,6 +2,7 @@ ## AbiWord ## Copyright (C) 1998 AbiSource, Inc. +## Copyright (C) 2008 AbiSource Corporation B.V. ## ## This program is free software; you can redistribute it and/or ## modify it under the terms of the GNU General Public License @@ -20,6 +21,7 @@ ABI_ROOT:=$(shell pwd)/../../../abi include $(ABI_ROOT)/src/config/abi_defs.mk +include $(shell pwd)/abicollab_config.mk DIRS= core backends @@ -52,15 +54,36 @@ $(OBJDIR)/Buddy.$(OBJ_SUFFIX) \ $(OBJDIR)/Serialization.$(OBJ_SUFFIX) \ $(OBJDIR)/AbiCollab_Command.$(OBJ_SUFFIX) \ - $(OBJDIR)/TCPAccountHandler.$(OBJ_SUFFIX) \ - $(OBJDIR)/TCPWin32AccountHandler.$(OBJ_SUFFIX)\ - $(OBJDIR)/Synchronizer.$(OBJ_SUFFIX)\ + $(OBJDIR)/Synchronizer.$(OBJ_SUFFIX) \ $(OBJDIR)/ap_Win32Res_CollaborationDialogsrc.$(OBJ_SUFFIX) +ifeq ($(BUILD_TCP_BACKEND),1) +OBJS+= $(OBJDIR)/TCPAccountHandler.$(OBJ_SUFFIX) \ + $(OBJDIR)/TCPWin32AccountHandler.$(OBJ_SUFFIX) +endif + +ifeq ($(BUILD_SERVICE_BACKEND),1) +OBJS+= $(OBJDIR)/ServiceAccountHandler.$(OBJ_SUFFIX) \ + $(OBJDIR)/AbiCollabImport.$(OBJ_SUFFIX) \ + $(OBJDIR)/AbiCollabSaveInterceptor.$(OBJ_SUFFIX) \ + $(OBJDIR)/AbiCollabService_Export.$(OBJ_SUFFIX) \ + $(OBJDIR)/RealmConnection.$(OBJ_SUFFIX) \ + $(OBJDIR)/RealmProtocol.$(OBJ_SUFFIX) \ + $(OBJDIR)/ap_Dialog_GenericInput.$(OBJ_SUFFIX) \ + $(OBJDIR)/ap_Dialog_GenericProgress.$(OBJ_SUFFIX) \ + $(OBJDIR)/ap_Win32Dialog_GenericInput.$(OBJ_SUFFIX) \ + $(OBJDIR)/ap_Win32Dialog_GenericProgress.$(OBJ_SUFFIX) \ + $(OBJDIR)/ServiceWin32AccountHandler.$(OBJ_SUFFIX) \ + $(OBJDIR)/tls_tunnel.$(OBJ_SUFFIX) +endif + +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe EXTRA_LIBS+= $(shell pkg-config --libs libxml-2.0) + EXTRA_LIBS+= $(BACKEND_LIBS) EXTRA_LIBS+= -lws2_32 EXTRA_LIBS+= -lwsock32 EXTRA_LIBS+= -lgdi32 diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicollab/plugin.m4 /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicollab/plugin.m4 --- abiword-2.6.2/abiword-plugins/tools/abicollab/plugin.m4 2008-04-06 22:36:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicollab/plugin.m4 2009-07-15 16:56:23.000000000 +0100 @@ -178,21 +178,36 @@ # -# Checks for the collaborate.abisource.com service backend +# Checks for the abicollab.net service backend # -AC_ARG_WITH(abicollab-service-backend,[ --with-abicollab-service-backend enable the collaborate.abisource.com service backend for abicollab],[ +AC_ARG_WITH(abicollab-service-backend,[ --with-abicollab-service-backend enable the abicollab.net service backend for abicollab; NOTE to packagers: do NOT enable this, the service is not publically available yet],[ AC_CHECK_HEADERS(asio.hpp,[ - ABI_PLUGIN_REPORT([abicollab collaborate.abisource.com support: yes]) abicollab_handler_service=yes - ],[ ABI_PLUGIN_REPORT([abicollab collaborate.abisource.com support: no, asio >= 0.3.8rc1 required]) + ],[ ABI_PLUGIN_REPORT([abicollab abicollab.net support: no, asio >= 0.3.8rc1 required]) ]) + + if test "x$abicollab_handler_service" = "xyes" ; then + PKG_CHECK_MODULES(ABICOLLAB_SOUP, [libsoup-2.2 >= 2.2.100],[ + ABI_PLUGIN_REPORT([abicollab abicollab.net support: yes]) + abicollab_handler_service=yes + ],[ PKG_CHECK_MODULES(ABICOLLAB_SOUP, [libsoup-2.4 >= 2.4.1],[ + ABICOLLAB_SOUP_CFLAGS+=-DSOUP24 + ABI_PLUGIN_REPORT([abicollab abicollab.net support: yes]) + abicollab_handler_service=yes + ],[ + ABI_PLUGIN_REPORT([abicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required]) + abicollab_handler_service=no + ]) + ]) + fi + ],[ - ABI_PLUGIN_REPORT([abicollab collaborate.abisource.com support: no]) + ABI_PLUGIN_REPORT([abicollab abicollab.net support: no]) abicollab_handler_service=no ]) if test "x$abicollab_handler_service" = "xyes" ; then - ABICOLLAB_SERVICE_CPPFLAGS="-DABICOLLAB_HANDLER_SERVICE $ABICOLLAB_ASIO_CPPFLAGS" - ABICOLLAB_SERVICE_LIBS="-lpthread" + ABICOLLAB_SERVICE_CPPFLAGS="-DABICOLLAB_HANDLER_SERVICE $ABICOLLAB_ASIO_CPPFLAGS $ABICOLLAB_SOUP_CFLAGS" + ABICOLLAB_SERVICE_LIBS="-lpthread $ABICOLLAB_SOUP_LIBS" fi AC_SUBST(ABICOLLAB_SERVICE_CPPFLAGS) AC_SUBST(ABICOLLAB_SERVICE_LIBS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicommand/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicommand/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicommand/GNUmakefile.in 2008-04-06 22:37:40.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicommand/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicommand/xp/AbiCommand.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicommand/xp/AbiCommand.h --- abiword-2.6.2/abiword-plugins/tools/abicommand/xp/AbiCommand.h 2008-04-06 22:36:38.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicommand/xp/AbiCommand.h 2009-07-15 16:56:23.000000000 +0100 @@ -29,7 +29,7 @@ class XAP_App; class UT_UTF8String; -class ABI_EXPORT AbiCommand +class AbiCommand { public: AbiCommand(void); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abicommand/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abicommand/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abicommand/xp/GNUmakefile.in 2008-04-06 22:37:40.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abicommand/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_COMMAND_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -342,8 +357,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -373,8 +388,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -382,8 +397,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -437,8 +452,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -450,8 +465,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -461,13 +476,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abidash/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abidash/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/tools/abidash/GNUmakefile.am 2008-04-06 22:36:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abidash/GNUmakefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -SUBDIRS = xp - -EXTRA_DIST = \ - plugin.m4 diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abidash/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abidash/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abidash/GNUmakefile.in 2008-04-06 22:37:40.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abidash/GNUmakefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,616 +0,0 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = tools/abidash -DIST_COMMON = $(srcdir)/GNUmakefile.am $(srcdir)/GNUmakefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/ac-helpers/abi-libpng.m4 \ - $(top_srcdir)/ac-helpers/abi-plugin-init.m4 \ - $(top_srcdir)/ac-helpers/abi-plugin-platform.m4 \ - $(top_srcdir)/ac-helpers/abi-plugin-report.m4 \ - $(top_srcdir)/ac-helpers/abi-plugin-setup.m4 \ - $(top_srcdir)/ac-helpers/ax_boost_base.m4 \ - $(top_srcdir)/ac-helpers/dyld.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABICOLLAB_FAKE_CPPFLAGS = @ABICOLLAB_FAKE_CPPFLAGS@ -ABICOLLAB_FAKE_LIBS = @ABICOLLAB_FAKE_LIBS@ -ABICOLLAB_LIBXML2_CPPFLAGS = @ABICOLLAB_LIBXML2_CPPFLAGS@ -ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ -ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ -ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ -ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ -ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ -ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ -ABICOLLAB_TCP_LIBS = @ABICOLLAB_TCP_LIBS@ -ABICOLLAB_XMPP_CPPFLAGS = @ABICOLLAB_XMPP_CPPFLAGS@ -ABICOLLAB_XMPP_LIBS = @ABICOLLAB_XMPP_LIBS@ -ABI_AIKSAURUS_CPPFLAGS = @ABI_AIKSAURUS_CPPFLAGS@ -ABI_AIKSAURUS_LDFLAGS = @ABI_AIKSAURUS_LDFLAGS@ -ABI_BMP_CPPFLAGS = @ABI_BMP_CPPFLAGS@ -ABI_BMP_LDFLAGS = @ABI_BMP_LDFLAGS@ -ABI_CFLAGS = @ABI_CFLAGS@ -ABI_COMMAND_CPPFLAGS = @ABI_COMMAND_CPPFLAGS@ -ABI_COMMAND_LDFLAGS = @ABI_COMMAND_LDFLAGS@ -ABI_CPPFLAGS = @ABI_CPPFLAGS@ -ABI_DOCBOOK_CPPFLAGS = @ABI_DOCBOOK_CPPFLAGS@ -ABI_DOCBOOK_LDFLAGS = @ABI_DOCBOOK_LDFLAGS@ -ABI_GDA_CPPFLAGS = @ABI_GDA_CPPFLAGS@ -ABI_GDA_LDFLAGS = @ABI_GDA_LDFLAGS@ -ABI_GDICT_CPPFLAGS = @ABI_GDICT_CPPFLAGS@ -ABI_GDICT_LDFLAGS = @ABI_GDICT_LDFLAGS@ -ABI_GRAMMAR_CPPFLAGS = @ABI_GRAMMAR_CPPFLAGS@ -ABI_GRAMMAR_LDFLAGS = @ABI_GRAMMAR_LDFLAGS@ -ABI_HANCOM_CPPFLAGS = @ABI_HANCOM_CPPFLAGS@ -ABI_HANCOM_LDFLAGS = @ABI_HANCOM_LDFLAGS@ -ABI_JPEG_CPPFLAGS = @ABI_JPEG_CPPFLAGS@ -ABI_JPEG_LDFLAGS = @ABI_JPEG_LDFLAGS@ -ABI_LIBS = @ABI_LIBS@ -ABI_OPENDOCUMENT_CPPFLAGS = @ABI_OPENDOCUMENT_CPPFLAGS@ -ABI_OPENDOCUMENT_LDFLAGS = @ABI_OPENDOCUMENT_LDFLAGS@ -ABI_OPENWRITER_CPPFLAGS = @ABI_OPENWRITER_CPPFLAGS@ -ABI_OPENWRITER_LDFLAGS = @ABI_OPENWRITER_LDFLAGS@ -ABI_OPENXML_CPPFLAGS = @ABI_OPENXML_CPPFLAGS@ -ABI_OPENXML_LDFLAGS = @ABI_OPENXML_LDFLAGS@ -ABI_OTS_CPPFLAGS = @ABI_OTS_CPPFLAGS@ -ABI_OTS_LDFLAGS = @ABI_OTS_LDFLAGS@ -ABI_PLUGIN_DIR = @ABI_PLUGIN_DIR@ -ABI_PSION_CPPFLAGS = @ABI_PSION_CPPFLAGS@ -ABI_PSION_LDFLAGS = @ABI_PSION_LDFLAGS@ -ABI_SDW_CPPFLAGS = @ABI_SDW_CPPFLAGS@ -ABI_SDW_LDFLAGS = @ABI_SDW_LDFLAGS@ -ABI_WMF_CPPFLAGS = @ABI_WMF_CPPFLAGS@ -ABI_WMF_LDFLAGS = @ABI_WMF_LDFLAGS@ -ABI_XHTML_CPPFLAGS = @ABI_XHTML_CPPFLAGS@ -ABI_XHTML_LDFLAGS = @ABI_XHTML_LDFLAGS@ -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ -BOOST_LDFLAGS = @BOOST_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ -GNOMESCAN_LIBS = @GNOMESCAN_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ -GOFFICE_LIBS = @GOFFICE_LIBS@ -GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ -LIBPNG_LIBS = @LIBPNG_LIBS@ -LIBPNG_PEERDIR = @LIBPNG_PEERDIR@ -LIBRSVG_CPPFLAGS = @LIBRSVG_CPPFLAGS@ -LIBRSVG_LDFLAGS = @LIBRSVG_LDFLAGS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWPG_CPPFLAGS = @LIBWPG_CPPFLAGS@ -LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ -LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ -LIBXML2_LIBS = @LIBXML2_LIBS@ -LN_S = @LN_S@ -LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ -LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MATHVIEW_CFLAGS = @MATHVIEW_CFLAGS@ -MATHVIEW_LIBS = @MATHVIEW_LIBS@ -MKDIR_P = @MKDIR_P@ -NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ -NAUTILUS_LIBS = @NAUTILUS_LIBS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGAIKSAURUS_CFLAGS = @PKGAIKSAURUS_CFLAGS@ -PKGAIKSAURUS_LIBS = @PKGAIKSAURUS_LIBS@ -PKGGAIKSAURUS_CFLAGS = @PKGGAIKSAURUS_CFLAGS@ -PKGGAIKSAURUS_LIBS = @PKGGAIKSAURUS_LIBS@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_CPPFLAGS = @PLATFORM_CPPFLAGS@ -PLATFORM_LDFLAGS = @PLATFORM_LDFLAGS@ -PRESENTATION_CPPFLAGS = @PRESENTATION_CPPFLAGS@ -PRESENTATION_LDFLAGS = @PRESENTATION_LDFLAGS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WORDPERFECT_CPPFLAGS = @WORDPERFECT_CPPFLAGS@ -WORDPERFECT_LDFLAGS = @WORDPERFECT_LDFLAGS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -_abi_dbus_CFLAGS = @_abi_dbus_CFLAGS@ -_abi_dbus_LIBS = @_abi_dbus_LIBS@ -_abi_dbus_glib_CFLAGS = @_abi_dbus_glib_CFLAGS@ -_abi_dbus_glib_LIBS = @_abi_dbus_glib_LIBS@ -_abi_gda_CFLAGS = @_abi_gda_CFLAGS@ -_abi_gda_LIBS = @_abi_gda_LIBS@ -_abi_glib_CFLAGS = @_abi_glib_CFLAGS@ -_abi_glib_LIBS = @_abi_glib_LIBS@ -_abi_grammar_CFLAGS = @_abi_grammar_CFLAGS@ -_abi_grammar_LIBS = @_abi_grammar_LIBS@ -_abi_gtk_CFLAGS = @_abi_gtk_CFLAGS@ -_abi_gtk_LIBS = @_abi_gtk_LIBS@ -_abi_librsvg_CFLAGS = @_abi_librsvg_CFLAGS@ -_abi_librsvg_LIBS = @_abi_librsvg_LIBS@ -_abi_libwpg_CFLAGS = @_abi_libwpg_CFLAGS@ -_abi_libwpg_LIBS = @_abi_libwpg_LIBS@ -_abi_libxml2_CFLAGS = @_abi_libxml2_CFLAGS@ -_abi_libxml2_LIBS = @_abi_libxml2_LIBS@ -_abi_loudmouth_CFLAGS = @_abi_loudmouth_CFLAGS@ -_abi_loudmouth_LIBS = @_abi_loudmouth_LIBS@ -_abi_msworks_CFLAGS = @_abi_msworks_CFLAGS@ -_abi_msworks_LIBS = @_abi_msworks_LIBS@ -_abi_openxml_CFLAGS = @_abi_openxml_CFLAGS@ -_abi_openxml_LIBS = @_abi_openxml_LIBS@ -_abi_ots_CFLAGS = @_abi_ots_CFLAGS@ -_abi_ots_LIBS = @_abi_ots_LIBS@ -_abi_wordperfect_CFLAGS = @_abi_wordperfect_CFLAGS@ -_abi_wordperfect_LIBS = @_abi_wordperfect_LIBS@ -abi_libwmf_config = @abi_libwmf_config@ -abi_tools = @abi_tools@ -abi_wp_impexp = @abi_wp_impexp@ -abi_wp_impexp_graphics = @abi_wp_impexp_graphics@ -abi_wp_scripts = @abi_wp_scripts@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -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@ -psiconvconfig = @psiconvconfig@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = xp -EXTRA_DIST = \ - plugin.m4 - -all: all-recursive - -.SUFFIXES: -$(srcdir)/GNUmakefile.in: $(srcdir)/GNUmakefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/abidash/GNUmakefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/abidash/GNUmakefile -.PRECIOUS: GNUmakefile -GNUmakefile: $(srcdir)/GNUmakefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: GNUmakefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f GNUmakefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f GNUmakefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abidash/plugin.m4 /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abidash/plugin.m4 --- abiword-2.6.2/abiword-plugins/tools/abidash/plugin.m4 2008-04-06 22:36:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abidash/plugin.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -dnl= ########################################################################## -dnl= # abiword-plugins: autogen.sh header -dnl= # this file is executed as a shell script -dnl= -dnl= # 1. abi_plugin_macro is the name of the main macro defined here: -dnl= abi_plugin_macro="ABIPGN_ABIDASH" -dnl= -dnl= # 2. abi_plugin_files is the list of files that configure must generate: -dnl= abi_plugin_files="GNUmakefile xp/GNUmakefile" -dnl= -dnl= # 3. abi_plugin_desc is a short description of the plugin -dnl= abi_plugin_desc="Interface with dashboard" -dnl= -dnl= # 4. abi_plugin_enable - whether plugin should be enabled by default -dnl= abi_plugin_enable="no" -dnl= -dnl= return -dnl= ########################################################################## - - -AC_DEFUN([ABIPGN_ABIDASH],[ - - abi_plugin_disable=yes - -if test $abi_plugin_disable = no; then - ABI_PLUGIN_REPORT([abidash: okay]) -else - ABI_PLUGIN_REPORT([abidash: disabled]) -fi - -]) - diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abidash/xp/AbiDash.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abidash/xp/AbiDash.cpp --- abiword-2.6.2/abiword-plugins/tools/abidash/xp/AbiDash.cpp 2008-04-06 22:36:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abidash/xp/AbiDash.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,234 +0,0 @@ -/* - * AbiDash - Abiword framework for the notification based notification based - * plugins. Designed in particular as a framework for Dashboard. - * Copyright (C) 2004 by Martin Sevior - * Copyright (C) 2004 QinetiQ Plc. - * Author Julian Satchell - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#ifdef ABI_PLUGIN_BUILTIN -#define abi_plugin_register abipgn_abidash_register -#define abi_plugin_unregister abipgn_abidash_unregister -#define abi_plugin_supports_version abipgn_abidash_supports_version -#endif - -#include "ut_assert.h" -#include "ut_debugmsg.h" -#include "xap_Module.h" -#include "xap_App.h" -#include "xap_Frame.h" -#include "fv_View.h" -#include "xav_View.h" -#include "xav_Listener.h" -#include "fl_BlockLayout.h" -#include "pd_Document.h" - -#include "dashboard-frontend.c" - -#include "ut_types.h" -#include "ut_misc.h" -#include "ut_units.h" - -#include "ut_sleep.h" -#include -#include -#ifdef WIN32 -#include -#else -#include -#include -#include -#include "ut_files.h" -#endif - - -// ----------------------------------------------------------------------- -// -// AbiDash code -// -// ----------------------------------------------------------------------- - -class AbiDash : public AV_Listener -{ -public: -AbiDash(XAP_App * pApp): - m_pApp(pApp), - m_pCurView(NULL), - m_pCurDoc(NULL), - m_pCurBlock(NULL), - m_iCurPoint(0) - { - } - -virtual ~AbiDash(void) - { - } -void setID(AV_ListenerId id) - { - m_lid = id; - } - -virtual AV_ListenerType getType(void) { return AV_LISTENER_PLUGIN;} - -AV_ListenerId getID(void) - { - return m_lid; - } -virtual bool notify(AV_View * pAView, const AV_ChangeMask mask) - { - PD_Document * arg_pCurDoc; - fl_BlockLayout * arg_pCurBlock; - char *cluepkt, context[16], *time_txt=NULL; - UT_UTF8String aText = "",bText="",cText="",sText=""; - const char *title_txt = NULL; - const char *para_txt = NULL; - const char *creator_txt = NULL; - const char *coverage_txt = NULL; - struct tm *tbork; - time_t doc_time; - //printf("I've been notified!! View = %x hint mask %d \n",pAView,mask); - FV_View * pView = static_cast(pAView); - - m_pCurView = pView; - arg_pCurDoc = pView->getDocument(); - if (arg_pCurDoc != m_pCurDoc) - { - m_pCurDoc = arg_pCurDoc; - } - /*last opened time*/ - doc_time = m_pCurDoc->getLastOpenedTime() ; - tbork = gmtime(&doc_time) ; - time_txt = g_strdup_printf("%04d-%02d-%02d", - tbork->tm_year+1900, - tbork->tm_mon+1, - tbork->tm_mday); - /* Gather various metadat items (if set)) - /*title*/ - m_pCurDoc->getMetaDataProp (PD_META_KEY_TITLE, aText); - if (aText.byteLength()>0) { - title_txt = aText.utf8_str(); - } - /*creator*/ - m_pCurDoc->getMetaDataProp (PD_META_KEY_CREATOR , bText); - if (bText.byteLength()>0) { - creator_txt = bText.utf8_str(); - } - /*coverage*/ - m_pCurDoc->getMetaDataProp (PD_META_KEY_COVERAGE , cText); - if (cText.byteLength()>0) { - coverage_txt = cText.utf8_str(); - } - - /*Use address of CurDoc as context id*/ - g_snprintf(context,16,"%p",m_pCurDoc); - m_iCurPoint = pView->getPoint(); - - arg_pCurBlock= pView->getCurrentBlock(); - if (m_pCurBlock != arg_pCurBlock ) - { - m_pCurBlock = arg_pCurBlock; - if (m_pCurBlock!=NULL) - { - /*Now get block text*/ - m_pCurBlock->appendUTF8String(sText); - if (sText.byteLength()>0) { - para_txt = sText.utf8_str(); - } - } - } - cluepkt = dashboard_build_cluepacket_then_free_clues - ("Abiword", - true, - context, - dashboard_build_clue (title_txt, "textblock", 10), - dashboard_build_clue (time_txt, "date", 10), - dashboard_build_clue (para_txt, "textblock", 10), - dashboard_build_clue (creator_txt, "name", 10), - dashboard_build_clue (coverage_txt, "latlong", 10), - NULL); - dashboard_send_raw_cluepacket(cluepkt); - //printf("%s\n",cluepkt); - g_free(time_txt); - g_free(cluepkt); - return true; - } - -private: - XAP_App * m_pApp; - FV_View * m_pCurView; - PD_Document * m_pCurDoc; - fl_BlockLayout * m_pCurBlock; - PT_DocPosition m_iCurPoint; - AV_ListenerId m_lid; -}; - - -static AbiDash * pAbiDash = NULL; - -ABI_PLUGIN_DECLARE(AbiDash) - -// ----------------------------------------------------------------------- -// -// Abiword Plugin Interface -// -// ----------------------------------------------------------------------- - - -ABI_FAR_CALL -int abi_plugin_register (XAP_ModuleInfo * mi) -{ - mi->name = "AbiDash"; - mi->desc = "The plugin allows AbiWord to send notifications to Dashboard"; - mi->version = ABI_VERSION_STRING; - mi->author = "Martin Sevior "; - mi->usage = "No Usage"; - - // Add to AbiWord's plugin listeners - XAP_App * pApp = XAP_App::getApp(); - pAbiDash = new AbiDash(pApp); - AV_ListenerId listenerID = 0; - pApp->addListener(pAbiDash, &listenerID); - pAbiDash->setID(listenerID); - UT_DEBUGMSG(("Class AbiDash %x created! Listener Id %d \n",pAbiDash,listenerID)); - - return 1; -} - - -ABI_FAR_CALL -int abi_plugin_unregister (XAP_ModuleInfo * mi) -{ - mi->name = 0; - mi->desc = 0; - mi->version = 0; - mi->author = 0; - mi->usage = 0; - - XAP_App * pApp = XAP_App::getApp(); - UT_DEBUGMSG(("Removing AbiDash %x ! Listener Id %d \n",pAbiDash,pAbiDash->getID())); - pApp->removeListener(pAbiDash->getID()); - - return 1; -} - - -ABI_FAR_CALL -int abi_plugin_supports_version (UT_uint32 major, UT_uint32 minor, UT_uint32 release) -{ - return 1; -} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abidash/xp/dashboard-frontend.c /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abidash/xp/dashboard-frontend.c --- abiword-2.6.2/abiword-plugins/tools/abidash/xp/dashboard-frontend.c 2008-04-06 22:36:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abidash/xp/dashboard-frontend.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,444 +0,0 @@ -#ifndef __DASHBOARD_FRONTEND_H__ -#define __DASHBOARD_FRONTEND_H__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if GLIB_CHECK_VERSION (2,0,0) -#include -#endif - -#define DASHBOARD_PORT 5913 -#define NATMIN(a,b) ((a) < (b) ? (a) : (b)) - -/* - * Open a connection to the dashboard. We never block and at - * the first sign of a problem we bail. - */ -static int -dashboard_connect_with_timeout (int *fd, - long timeout_usecs) -{ - struct sockaddr_in sock; - struct timeval timeout; - fd_set write_fds; - - *fd = socket (PF_INET, SOCK_STREAM, 0); - if (*fd < 0) { - UT_DEBUGMSG (("Dashboard: socket\n")); - return 0; - } - - /* - * Set the socket to be non-blocking so that connect () - * doesn't block. - */ - if (fcntl (*fd, F_SETFL, O_NONBLOCK) < 0) { - UT_DEBUGMSG (("Dashboard: setting O_NONBLOCK\n")); - - if (close(*fd) < 0) - UT_DEBUGMSG (("Dashboard: closing socket (1)\n")); - - return 0; - } - - memset ((char *) &sock, 0, sizeof (sock)); - sock.sin_family = AF_INET; - sock.sin_port = htons (DASHBOARD_PORT); - sock.sin_addr.s_addr = inet_addr ("127.0.0.1"); - - timeout.tv_sec = 0; - timeout.tv_usec = timeout_usecs; - - while (1) { - - /* - * Try to connect. - */ - if (connect (*fd, (struct sockaddr *) &sock, - sizeof (struct sockaddr_in)) < 0) { - - if (errno != EAGAIN && - errno != EINPROGRESS) { - UT_DEBUGMSG (("Dashboard: connect\n")); - - if (close(*fd) < 0) - UT_DEBUGMSG (("Dashboard: closing socket (2)\n")); - - return 0; - } - - } else - return 1; - - /* - * We couldn't connect, so we select on the fd and - * wait for the timer to run out, or for the fd to be - * ready. - */ - FD_ZERO (&write_fds); - FD_SET (*fd, &write_fds); - - while (select (getdtablesize (), NULL, &write_fds, NULL, &timeout) < 0) { - if (errno != EINTR) { - xxx_UT_DEBUGMSG (("Dashboard: select\n")); - - if (close(*fd) < 0) - UT_DEBUGMSG (("Dashboard: closing socket (3)\n")); - - return 0; - } - } - - if (timeout.tv_sec == 0 && timeout.tv_usec == 0) { - UT_DEBUGMSG (("Dashboard: Connection timed out.\n")); - - if (close(*fd) < 0) - UT_DEBUGMSG (("Dashboard: closing socket (4)\n")); - - return 0; - } - - } - - return 1; -} - -typedef struct { - char *rawcluepacket; - int bytes_written; -} CluepacketInfo; - -#if GLIB_CHECK_VERSION(2,0,0) - -static gboolean -cluepacket_write_cb (GIOChannel *channel, - GIOCondition cond, - gpointer user_data) -{ - CluepacketInfo *info = (CluepacketInfo *)user_data; - GIOError err; - gsize total_bytes; - - total_bytes = strlen (info->rawcluepacket); - - do { - gsize b; - - err = g_io_channel_write (channel, - info->rawcluepacket + info->bytes_written, - total_bytes - info->bytes_written, - &b); - info->bytes_written += b; - } while (info->bytes_written < total_bytes && err == G_IO_ERROR_NONE); - - if (err == G_IO_ERROR_NONE) { - /* We're all done sending */ - UT_DEBUGMSG (("Dashboard: Sent.\n")); - goto cleanup; - } - - if (err == G_IO_ERROR_AGAIN) { - /* Hand control back to the main loop */ - return TRUE; - } - - /* Otherwise... */ - UT_DEBUGMSG (("Dashboard: Error trying to send cluepacket.\n")); - -cleanup: - g_io_channel_close (channel); - g_free (info->rawcluepacket); - g_free (info); - - return FALSE; -} - -static void -dashboard_send_raw_cluepacket (const char *rawcluepacket) -{ - int fd; - GIOChannel *channel; - CluepacketInfo *info; - - // UT_DEBUGMSG (("Dashboard: Sending cluepacket...\n")); - - /* Connect. */ - if (! dashboard_connect_with_timeout (&fd, 200000)) - return; - - channel = g_io_channel_unix_new (fd); - - info = g_new0 (CluepacketInfo, 1); - info->rawcluepacket = g_strdup (rawcluepacket); - - g_io_add_watch (channel, - (GIOCondition)(G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL), - cluepacket_write_cb, - info); - - g_io_channel_unref (channel); -} - -#endif /* GLIB_CHECK_VERSION (2,0,0) */ - - -/* - * Sends a raw cluepacket to the dashboard. - */ -static void -dashboard_send_raw_cluepacket_sync (const char *rawcluepacket) -{ - int fd; - int total_bytes; - int bytes_written; - const char *p; - int eagain_count; - - UT_DEBUGMSG (("Dashboard: Sending cluepacket...\n")); - UT_DEBUGMSG (("Cluepacket: %s\n", rawcluepacket)); - - /* Connect. */ - if (! dashboard_connect_with_timeout (&fd, 200000)) - return; - - /* Write out the cluepacket */ - total_bytes = strlen (rawcluepacket); - bytes_written = 0; - p = rawcluepacket; - eagain_count = 0; - while (bytes_written < total_bytes) { - int b; - - b = write (fd, p, total_bytes - bytes_written); - if (b < 0) { - UT_DEBUGMSG (("Dashboard: Error writing: %s\n", strerror (errno))); - - if (errno != EAGAIN && errno != EWOULDBLOCK) { - close (fd); - return; - } - - eagain_count ++; - - if (eagain_count > 10) { - close (fd); - return; - } - } - - bytes_written += b; - p += b; - } - - close (fd); - - UT_DEBUGMSG (("Dashboard: Sent.\n")); -} - -#if !GLIB_CHECK_VERSION (2,0,0) -static char * -lame_xml_quote (const char *str) -{ - char *retval; - const char *p; - char *q; - - if (str == NULL || strlen (str) == 0) - return g_strdup (""); - - retval = g_new (char, strlen (str) * 3); - - q = retval; - for (p = str; *p != '\0'; p ++) { - switch (*p) { - - case '<': - *q ++ = '&'; - *q ++ = 'l'; - *q ++ = 't'; - *q ++ = ';'; - break; - - case '>': - *q ++ = '&'; - *q ++ = 'g'; - *q ++ = 't'; - *q ++ = ';'; - break; - - case '&': - *q ++ = '&'; - *q ++ = 'a'; - *q ++ = 'm'; - *q ++ = 'p'; - *q ++ = ';'; - break; - default: - *q ++ = *p; - break; - } - } - - *q = '\0'; - - return retval; -} -#endif - -static char * -dashboard_xml_quote (const char *str) -{ -#if GLIB_CHECK_VERSION (2,0,0) - return g_markup_escape_text (str, strlen (str)); -#else - return lame_xml_quote (str); -#endif -} - -static char * -dashboard_build_clue (const char *text, - const char *type, - int relevance) -{ - char *text_xml; - char *clue; - - if (text == NULL || strlen (text) == 0) - return g_strdup (""); - - text_xml = dashboard_xml_quote (text); - - clue = g_strdup_printf (" %s\n", - type, relevance, text_xml); - - g_free (text_xml); - - return clue; -} - -static char * -dashboard_build_cluepacket_from_cluelist (const char *frontend, - gboolean focused, - const char *context, - GList *clues) -{ - char *cluepacket; - char *new_cluepacket; - GList *l; - - g_return_val_if_fail (frontend != NULL, NULL); - g_return_val_if_fail (clues != NULL, NULL); - - cluepacket = g_strdup_printf ( - "\n" - " %s\n" - " %s\n" - " %s\n", - frontend, - context, - focused ? "true" : "false"); - - for (l = clues; l != NULL; l = l->next) { - const char *clue = (const char *) l->data; - - new_cluepacket = g_strconcat (cluepacket, clue, NULL); - g_free (cluepacket); - - cluepacket = new_cluepacket; - } - - new_cluepacket = g_strconcat (cluepacket, "\n", NULL); - g_free (cluepacket); - - cluepacket = new_cluepacket; - - return cluepacket; -} - -static char * -dashboard_build_cluepacket_v (const char *frontend, - gboolean focused, - const char *context, - va_list args) -{ - char *cluep; - GList *clue_list; - char *retval; - - g_return_val_if_fail (frontend != NULL, NULL); - - cluep = va_arg (args, char *); - clue_list = NULL; - while (cluep) { - clue_list = g_list_append (clue_list, cluep); - cluep = va_arg (args, char *); - } - - retval = dashboard_build_cluepacket_from_cluelist (frontend, focused, context, clue_list); - - g_list_free (clue_list); - - return retval; -} - -static char * -dashboard_build_cluepacket (const char *frontend, - gboolean focused, - const char *context, - ...) -{ - char *retval; - va_list args; - - g_return_val_if_fail (frontend != NULL, NULL); - - va_start (args, context); - - retval = dashboard_build_cluepacket_v (frontend, focused, context, args); - - va_end (args); - - return retval; -} - - -static char * -dashboard_build_cluepacket_then_free_clues (const char *frontend, - gboolean focused, - const char *context, - ...) -{ - char *retval; - char *cluep; - va_list args; - - g_return_val_if_fail (frontend != NULL, NULL); - - /* Build the cluepacket */ - va_start (args, context); - retval = dashboard_build_cluepacket_v (frontend, focused, context, args); - va_end (args); - - /* Free the clues */ - va_start (args, context); - cluep = va_arg (args, char *); - while (cluep) { - g_free (cluep); - cluep = va_arg (args, char *); - } - - va_end (args); - - return retval; -} - -#endif /* ! __DASHBOARD_FRONTEND_H__ */ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abidash/xp/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abidash/xp/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/tools/abidash/xp/GNUmakefile.am 2008-04-06 22:36:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abidash/xp/GNUmakefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -plugindir = @ABI_PLUGIN_DIR@ - -CPPFLAGS = @ABI_CPPFLAGS@ @CPPFLAGS@ @PLATFORM_CPPFLAGS@ - -LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ - -plugin_LTLIBRARIES = libAbiDash.la - -libAbiDash_la_SOURCES = AbiDash.cpp - -libAbiDash_la_LIBADD = @ABI_LIBS@ - -libAbiDash_la_LDFLAGS = -no-undefined -module -avoid-version - -# eek -EXTRA_DIST = \ - dashboard-frontend.c diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abidash/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abidash/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abidash/xp/GNUmakefile.in 2008-04-06 22:37:41.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abidash/xp/GNUmakefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,605 +0,0 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = tools/abidash/xp -DIST_COMMON = $(srcdir)/GNUmakefile.am $(srcdir)/GNUmakefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/ac-helpers/abi-libpng.m4 \ - $(top_srcdir)/ac-helpers/abi-plugin-init.m4 \ - $(top_srcdir)/ac-helpers/abi-plugin-platform.m4 \ - $(top_srcdir)/ac-helpers/abi-plugin-report.m4 \ - $(top_srcdir)/ac-helpers/abi-plugin-setup.m4 \ - $(top_srcdir)/ac-helpers/ax_boost_base.m4 \ - $(top_srcdir)/ac-helpers/dyld.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(plugindir)" -pluginLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(plugin_LTLIBRARIES) -libAbiDash_la_DEPENDENCIES = -am_libAbiDash_la_OBJECTS = AbiDash.lo -libAbiDash_la_OBJECTS = $(am_libAbiDash_la_OBJECTS) -libAbiDash_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libAbiDash_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libAbiDash_la_SOURCES) -DIST_SOURCES = $(libAbiDash_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABICOLLAB_FAKE_CPPFLAGS = @ABICOLLAB_FAKE_CPPFLAGS@ -ABICOLLAB_FAKE_LIBS = @ABICOLLAB_FAKE_LIBS@ -ABICOLLAB_LIBXML2_CPPFLAGS = @ABICOLLAB_LIBXML2_CPPFLAGS@ -ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ -ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ -ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ -ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ -ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ -ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ -ABICOLLAB_TCP_LIBS = @ABICOLLAB_TCP_LIBS@ -ABICOLLAB_XMPP_CPPFLAGS = @ABICOLLAB_XMPP_CPPFLAGS@ -ABICOLLAB_XMPP_LIBS = @ABICOLLAB_XMPP_LIBS@ -ABI_AIKSAURUS_CPPFLAGS = @ABI_AIKSAURUS_CPPFLAGS@ -ABI_AIKSAURUS_LDFLAGS = @ABI_AIKSAURUS_LDFLAGS@ -ABI_BMP_CPPFLAGS = @ABI_BMP_CPPFLAGS@ -ABI_BMP_LDFLAGS = @ABI_BMP_LDFLAGS@ -ABI_CFLAGS = @ABI_CFLAGS@ -ABI_COMMAND_CPPFLAGS = @ABI_COMMAND_CPPFLAGS@ -ABI_COMMAND_LDFLAGS = @ABI_COMMAND_LDFLAGS@ -ABI_CPPFLAGS = @ABI_CPPFLAGS@ -ABI_DOCBOOK_CPPFLAGS = @ABI_DOCBOOK_CPPFLAGS@ -ABI_DOCBOOK_LDFLAGS = @ABI_DOCBOOK_LDFLAGS@ -ABI_GDA_CPPFLAGS = @ABI_GDA_CPPFLAGS@ -ABI_GDA_LDFLAGS = @ABI_GDA_LDFLAGS@ -ABI_GDICT_CPPFLAGS = @ABI_GDICT_CPPFLAGS@ -ABI_GDICT_LDFLAGS = @ABI_GDICT_LDFLAGS@ -ABI_GRAMMAR_CPPFLAGS = @ABI_GRAMMAR_CPPFLAGS@ -ABI_GRAMMAR_LDFLAGS = @ABI_GRAMMAR_LDFLAGS@ -ABI_HANCOM_CPPFLAGS = @ABI_HANCOM_CPPFLAGS@ -ABI_HANCOM_LDFLAGS = @ABI_HANCOM_LDFLAGS@ -ABI_JPEG_CPPFLAGS = @ABI_JPEG_CPPFLAGS@ -ABI_JPEG_LDFLAGS = @ABI_JPEG_LDFLAGS@ -ABI_LIBS = @ABI_LIBS@ -ABI_OPENDOCUMENT_CPPFLAGS = @ABI_OPENDOCUMENT_CPPFLAGS@ -ABI_OPENDOCUMENT_LDFLAGS = @ABI_OPENDOCUMENT_LDFLAGS@ -ABI_OPENWRITER_CPPFLAGS = @ABI_OPENWRITER_CPPFLAGS@ -ABI_OPENWRITER_LDFLAGS = @ABI_OPENWRITER_LDFLAGS@ -ABI_OPENXML_CPPFLAGS = @ABI_OPENXML_CPPFLAGS@ -ABI_OPENXML_LDFLAGS = @ABI_OPENXML_LDFLAGS@ -ABI_OTS_CPPFLAGS = @ABI_OTS_CPPFLAGS@ -ABI_OTS_LDFLAGS = @ABI_OTS_LDFLAGS@ -ABI_PLUGIN_DIR = @ABI_PLUGIN_DIR@ -ABI_PSION_CPPFLAGS = @ABI_PSION_CPPFLAGS@ -ABI_PSION_LDFLAGS = @ABI_PSION_LDFLAGS@ -ABI_SDW_CPPFLAGS = @ABI_SDW_CPPFLAGS@ -ABI_SDW_LDFLAGS = @ABI_SDW_LDFLAGS@ -ABI_WMF_CPPFLAGS = @ABI_WMF_CPPFLAGS@ -ABI_WMF_LDFLAGS = @ABI_WMF_LDFLAGS@ -ABI_XHTML_CPPFLAGS = @ABI_XHTML_CPPFLAGS@ -ABI_XHTML_LDFLAGS = @ABI_XHTML_LDFLAGS@ -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ -BOOST_LDFLAGS = @BOOST_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @ABI_CPPFLAGS@ @CPPFLAGS@ @PLATFORM_CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ -GNOMESCAN_LIBS = @GNOMESCAN_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ -GOFFICE_LIBS = @GOFFICE_LIBS@ -GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ -LIBPNG_LIBS = @LIBPNG_LIBS@ -LIBPNG_PEERDIR = @LIBPNG_PEERDIR@ -LIBRSVG_CPPFLAGS = @LIBRSVG_CPPFLAGS@ -LIBRSVG_LDFLAGS = @LIBRSVG_LDFLAGS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWPG_CPPFLAGS = @LIBWPG_CPPFLAGS@ -LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ -LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ -LIBXML2_LIBS = @LIBXML2_LIBS@ -LN_S = @LN_S@ -LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ -LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MATHVIEW_CFLAGS = @MATHVIEW_CFLAGS@ -MATHVIEW_LIBS = @MATHVIEW_LIBS@ -MKDIR_P = @MKDIR_P@ -NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ -NAUTILUS_LIBS = @NAUTILUS_LIBS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGAIKSAURUS_CFLAGS = @PKGAIKSAURUS_CFLAGS@ -PKGAIKSAURUS_LIBS = @PKGAIKSAURUS_LIBS@ -PKGGAIKSAURUS_CFLAGS = @PKGGAIKSAURUS_CFLAGS@ -PKGGAIKSAURUS_LIBS = @PKGGAIKSAURUS_LIBS@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_CPPFLAGS = @PLATFORM_CPPFLAGS@ -PLATFORM_LDFLAGS = @PLATFORM_LDFLAGS@ -PRESENTATION_CPPFLAGS = @PRESENTATION_CPPFLAGS@ -PRESENTATION_LDFLAGS = @PRESENTATION_LDFLAGS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WORDPERFECT_CPPFLAGS = @WORDPERFECT_CPPFLAGS@ -WORDPERFECT_LDFLAGS = @WORDPERFECT_LDFLAGS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -_abi_dbus_CFLAGS = @_abi_dbus_CFLAGS@ -_abi_dbus_LIBS = @_abi_dbus_LIBS@ -_abi_dbus_glib_CFLAGS = @_abi_dbus_glib_CFLAGS@ -_abi_dbus_glib_LIBS = @_abi_dbus_glib_LIBS@ -_abi_gda_CFLAGS = @_abi_gda_CFLAGS@ -_abi_gda_LIBS = @_abi_gda_LIBS@ -_abi_glib_CFLAGS = @_abi_glib_CFLAGS@ -_abi_glib_LIBS = @_abi_glib_LIBS@ -_abi_grammar_CFLAGS = @_abi_grammar_CFLAGS@ -_abi_grammar_LIBS = @_abi_grammar_LIBS@ -_abi_gtk_CFLAGS = @_abi_gtk_CFLAGS@ -_abi_gtk_LIBS = @_abi_gtk_LIBS@ -_abi_librsvg_CFLAGS = @_abi_librsvg_CFLAGS@ -_abi_librsvg_LIBS = @_abi_librsvg_LIBS@ -_abi_libwpg_CFLAGS = @_abi_libwpg_CFLAGS@ -_abi_libwpg_LIBS = @_abi_libwpg_LIBS@ -_abi_libxml2_CFLAGS = @_abi_libxml2_CFLAGS@ -_abi_libxml2_LIBS = @_abi_libxml2_LIBS@ -_abi_loudmouth_CFLAGS = @_abi_loudmouth_CFLAGS@ -_abi_loudmouth_LIBS = @_abi_loudmouth_LIBS@ -_abi_msworks_CFLAGS = @_abi_msworks_CFLAGS@ -_abi_msworks_LIBS = @_abi_msworks_LIBS@ -_abi_openxml_CFLAGS = @_abi_openxml_CFLAGS@ -_abi_openxml_LIBS = @_abi_openxml_LIBS@ -_abi_ots_CFLAGS = @_abi_ots_CFLAGS@ -_abi_ots_LIBS = @_abi_ots_LIBS@ -_abi_wordperfect_CFLAGS = @_abi_wordperfect_CFLAGS@ -_abi_wordperfect_LIBS = @_abi_wordperfect_LIBS@ -abi_libwmf_config = @abi_libwmf_config@ -abi_tools = @abi_tools@ -abi_wp_impexp = @abi_wp_impexp@ -abi_wp_impexp_graphics = @abi_wp_impexp_graphics@ -abi_wp_scripts = @abi_wp_scripts@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -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@ -psiconvconfig = @psiconvconfig@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -plugindir = @ABI_PLUGIN_DIR@ -plugin_LTLIBRARIES = libAbiDash.la -libAbiDash_la_SOURCES = AbiDash.cpp -libAbiDash_la_LIBADD = @ABI_LIBS@ -libAbiDash_la_LDFLAGS = -no-undefined -module -avoid-version - -# eek -EXTRA_DIST = \ - dashboard-frontend.c - -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/GNUmakefile.in: $(srcdir)/GNUmakefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/abidash/xp/GNUmakefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/abidash/xp/GNUmakefile -.PRECIOUS: GNUmakefile -GNUmakefile: $(srcdir)/GNUmakefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - -clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libAbiDash.la: $(libAbiDash_la_OBJECTS) $(libAbiDash_la_DEPENDENCIES) - $(libAbiDash_la_LINK) -rpath $(plugindir) $(libAbiDash_la_OBJECTS) $(libAbiDash_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AbiDash.Plo@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: GNUmakefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(plugindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f GNUmakefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-pluginLTLIBRARIES - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f GNUmakefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pluginLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pluginLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pluginLTLIBRARIES - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigimp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigimp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abigimp/GNUmakefile.in 2008-04-06 22:37:41.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigimp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigimp/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigimp/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abigimp/xp/GNUmakefile.in 2008-04-06 22:37:41.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigimp/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -328,8 +343,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -359,8 +374,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -368,8 +383,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -423,8 +438,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -436,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -447,13 +462,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigoffice/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abigoffice/GNUmakefile.in 2008-04-06 22:37:41.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = unix @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/AbiGOChart.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/AbiGOChart.cpp --- abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/AbiGOChart.cpp 2008-04-06 22:36:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/AbiGOChart.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -158,7 +158,6 @@ data = go_data_scalar_val_new (val); else data = go_data_scalar_str_new (g_strdup (str), TRUE); - g_object_unref (data); break; case GOG_DATA_VECTOR: { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/AbiGOChart.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/AbiGOChart.h --- abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/AbiGOChart.h 2008-04-06 22:36:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/AbiGOChart.h 2009-07-15 16:56:23.000000000 +0100 @@ -36,7 +36,7 @@ class GOChartView; class GR_AbiGOChartItems; -class ABI_EXPORT GR_AbiGOChartItems +class GR_AbiGOChartItems { public: GR_AbiGOChartItems(); @@ -45,7 +45,7 @@ bool m_bHasSnapshot; }; -class ABI_EXPORT GR_GOChartManager : public GR_EmbedManager +class GR_GOChartManager : public GR_EmbedManager { public: GR_GOChartManager(GR_Graphics * pG); @@ -94,7 +94,7 @@ }; // FIXME wrapper for libGNOMEOFFICEChart object -class ABI_EXPORT GOChartView +class GOChartView { public: GOChartView(GR_GOChartManager * pGOMan); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/AbiGOComponent.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/AbiGOComponent.h --- abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/AbiGOComponent.h 2008-04-06 22:36:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/AbiGOComponent.h 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ class GOComponentView; class GR_AbiGOComponentItems; -class ABI_EXPORT GR_AbiGOComponentItems +class GR_AbiGOComponentItems { public: GR_AbiGOComponentItems(); @@ -41,7 +41,7 @@ bool m_bHasSnapshot; }; -class ABI_EXPORT GR_GOComponentManager : public GR_EmbedManager +class GR_GOComponentManager : public GR_EmbedManager { public: GR_GOComponentManager(GR_Graphics * pG, char const *mime_type); @@ -87,7 +87,7 @@ }; // FIXME wrapper for libGNOMEOFFICEComponent object -class ABI_EXPORT GOComponentView +class GOComponentView { friend class GR_GOComponentManager; public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/GNUmakefile.in 2008-04-06 22:37:41.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @GOFFICE_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -346,8 +361,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -377,8 +392,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -386,8 +401,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -445,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -458,8 +473,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -469,13 +484,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/ie_imp_GOChart.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/ie_imp_GOChart.h --- abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/ie_imp_GOChart.h 2008-04-06 22:36:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/ie_imp_GOChart.h 2009-07-15 16:56:23.000000000 +0100 @@ -28,12 +28,12 @@ #include "ie_imp.h" #include "ut_mbtowc.h" #include "pd_Document.h" -class UT_ByteBuf; -class ImportStream; +class UT_ByteBuf; +class ImportStream; // The importer/reader for Embedable Objects. -class ABI_EXPORT IE_Imp_Object_Sniffer : public IE_ImpSniffer +class IE_Imp_Object_Sniffer : public IE_ImpSniffer { friend class IE_Imp; friend class IE_Imp_Object; @@ -68,7 +68,7 @@ // The importer/reader for GNOME-Office charts. -class ABI_EXPORT IE_Imp_Object : public IE_Imp +class IE_Imp_Object : public IE_Imp { public: IE_Imp_Object(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/ie_imp_GOComponent.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/ie_imp_GOComponent.h --- abiword-2.6.2/abiword-plugins/tools/abigoffice/unix/ie_imp_GOComponent.h 2008-04-06 22:36:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigoffice/unix/ie_imp_GOComponent.h 2009-07-15 16:56:23.000000000 +0100 @@ -29,14 +29,14 @@ #include "ut_mbtowc.h" #include "pd_Document.h" #include -class UT_ByteBuf; -class ImportStream; +class UT_ByteBuf; +class ImportStream; extern GSList *mime_types; // The importer/reader for Embedable Components. -class ABI_EXPORT IE_Imp_Component_Sniffer : public IE_ImpSniffer +class IE_Imp_Component_Sniffer : public IE_ImpSniffer { friend class IE_Imp; friend class IE_Imp_Component; @@ -69,7 +69,7 @@ // The importer/reader for GNOME-Office charts. -class ABI_EXPORT IE_Imp_Component : public IE_Imp +class IE_Imp_Component : public IE_Imp { public: IE_Imp_Component(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigrammar/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abigrammar/GNUmakefile.in 2008-04-06 22:37:42.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = linkgrammarwrap xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigrammar/linkgrammarwrap/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/linkgrammarwrap/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abigrammar/linkgrammarwrap/GNUmakefile.in 2008-04-06 22:37:42.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/linkgrammarwrap/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -86,6 +86,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -151,14 +153,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -175,6 +177,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_GRAMMAR_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -191,6 +196,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -201,7 +209,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -267,7 +280,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -298,6 +311,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -311,6 +325,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = liblinkgrammarwrap.la @@ -328,8 +343,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -405,8 +420,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -418,8 +433,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -429,13 +444,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h --- abiword-2.6.2/abiword-plugins/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2008-04-06 22:36:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2009-07-15 16:56:23.000000000 +0100 @@ -26,7 +26,7 @@ class PieceOfText; -class ABI_EXPORT LinkGrammarWrap +class LinkGrammarWrap { public: LinkGrammarWrap(void); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigrammar/linkgrammarwrap/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/linkgrammarwrap/Makefile --- abiword-2.6.2/abiword-plugins/tools/abigrammar/linkgrammarwrap/Makefile 2008-04-06 22:36:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/linkgrammarwrap/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= LinkGrammarWrap.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) INCLUDES+= $(shell pkg-config --cflags link-grammar) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigrammar/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/Makefile --- abiword-2.6.2/abiword-plugins/tools/abigrammar/Makefile 2008-04-06 22:36:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -32,6 +32,8 @@ $(OBJDIR)/AbiGrammarUtil.$(OBJ_SUFFIX) \ $(OBJDIR)/LinkGrammarWrap.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= $(shell pkg-config --libs link-grammar) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigrammar/xp/AbiGrammarCheck.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/xp/AbiGrammarCheck.h --- abiword-2.6.2/abiword-plugins/tools/abigrammar/xp/AbiGrammarCheck.h 2008-04-06 22:36:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/xp/AbiGrammarCheck.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ class LinkGrammarWrap; class PieceOfText; -class ABI_EXPORT Abi_GrammarCheck +class Abi_GrammarCheck { public: Abi_GrammarCheck(void); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigrammar/xp/AbiGrammarUtil.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/xp/AbiGrammarUtil.h --- abiword-2.6.2/abiword-plugins/tools/abigrammar/xp/AbiGrammarUtil.h 2008-04-06 22:36:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/xp/AbiGrammarUtil.h 2009-07-15 16:56:23.000000000 +0100 @@ -23,7 +23,7 @@ #include "ut_types.h" #include "ut_vector.h" -class ABI_EXPORT AbiGrammarError +class AbiGrammarError { public: AbiGrammarError(void); @@ -34,7 +34,7 @@ UT_UTF8String m_sErrorDesc; }; -class ABI_EXPORT PieceOfText +class PieceOfText { public: PieceOfText(void); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigrammar/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abigrammar/xp/GNUmakefile.in 2008-04-06 22:37:42.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -96,6 +96,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -161,14 +163,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -185,6 +187,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -201,6 +206,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -211,7 +219,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -277,7 +290,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -308,6 +321,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -321,6 +335,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -339,8 +354,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -370,8 +385,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -379,8 +394,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -436,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -449,8 +464,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -460,13 +475,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abigrammar/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/xp/Makefile --- abiword-2.6.2/abiword-plugins/tools/abigrammar/xp/Makefile 2008-04-06 22:36:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abigrammar/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,6 +26,8 @@ AbiGrammarCheck.cpp \ AbiGrammarUtil.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) INCLUDES+= $(shell pkg-config --cflags link-grammar) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abimathview/GNUmakefile.in 2008-04-06 22:37:42.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = itex2MML xp @@ -307,8 +322,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -414,8 +429,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -440,8 +455,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -451,13 +466,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/itex2MML/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/itex2MML/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abimathview/itex2MML/GNUmakefile.in 2008-04-06 22:37:42.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/itex2MML/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -77,6 +77,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -142,14 +144,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -166,6 +168,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -182,6 +187,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -192,7 +200,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -258,7 +271,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -289,6 +302,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -302,6 +316,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libitex2MML.la @@ -327,8 +342,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -405,8 +420,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -418,8 +433,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -429,13 +444,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.h --- abiword-2.6.2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.h 2008-04-06 22:36:42.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.h 2009-07-15 16:56:23.000000000 +0100 @@ -1,10 +1,12 @@ -/* itex2MML 1.1.8 - * itex2MML.h last modified 9/14/2005 +/* itex2MML 1.3.5 + * itex2MML.h last modified 2/29/2008 */ #ifndef ITEX2MML_H #define ITEX2MML_H +#define ITEX2MML_VERSION "1.3.5" + #ifdef __cplusplus extern "C" { #endif @@ -23,6 +25,7 @@ extern int itex2MML_filter (const char * buffer, unsigned long length); extern int itex2MML_html_filter (const char * buffer, unsigned long length); + extern int itex2MML_strict_html_filter (const char * buffer, unsigned long length); /* To change output methods: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.l /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.l --- abiword-2.6.2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.l 2008-04-06 22:36:42.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.l 2009-07-15 16:56:23.000000000 +0100 @@ -1,11 +1,11 @@ -/* itex2MML 1.2 - * itex2MML.l last modified 4/4/2007 +/* itex2MML 1.3.5 + * itex2MML.l last modified 2/29/2008 */ %{ %} %option noyywrap -%x MATH ATTRIBUTELIST BBOLD FRAKTUR CALLIGRAPHIC ROMAN PLAINTEXT INT1 INT2 INT3 MATHENV +%x MATH ATTRIBUTELIST BBOLD FRAKTUR CALLIGRAPHIC ROMAN PLAINTEXT INT1 INT2 INT3 MATHENV SVGENV %{ #include @@ -47,6 +47,7 @@ "$"{1,2} | "\\]" {BEGIN(INITIAL); return ENDMATH;} + "^" return SUP; "_" return SUB; "{"[\t\r\n ]*"}" return EMPTYMROW; @@ -134,6 +135,8 @@ "+" {if (itex2MML_rowposn==1) return UNARYPLUS; else {yylval=itex2MML_copy_string("+"); return MO;}} +"\\#" {yylval=itex2MML_copy_string("#"); return MOL;} + "," | ":" | "!" | @@ -145,9 +148,11 @@ "`" | "*" {yylval=itex2MML_copy_string(yytext); return MOL;} +"\\prime" {yylval=itex2MML_copy_string("′"); return MOLL;} "'" {yylval=itex2MML_copy_string("′"); return MOL;} "''" {yylval=itex2MML_copy_string("″"); return MOL;} "'''" {yylval=itex2MML_copy_string("‴"); return MOL;} +"''''" {yylval=itex2MML_copy_string("⁗"); return MOL;} "\\alpha" | "\\beta" | @@ -326,7 +331,7 @@ "\\curvearrowleft" {yylval=itex2MML_copy_string("⤺"); return MOL;} "\\curvearrowbotright" {yylval=itex2MML_copy_string("⤻"); return MOL;} "\\downdownarrows" {yylval=itex2MML_copy_string("⇊"); return MOL;} -"\\leftleftarrows" {yylval=itex2MML_copy_string("&leftleftarrow;"); return MOL;} +"\\leftleftarrows" {yylval=itex2MML_copy_string("⇇"); return MOL;} "\\leftrightarrows" {yylval=itex2MML_copy_string("⇆"); return MOL;} "\\righttoleftarrow" {yylval=itex2MML_copy_string("⟲"); return MOL;} "\\lefttorightarrow" {yylval=itex2MML_copy_string("⟳"); return MOL;} @@ -458,6 +463,7 @@ "\\nsupseteq" | "\\propto" | "\\equiv" | +"\\nequiv" | "\\frown" | "\\triangleright" | "\\ncong" | @@ -494,7 +500,6 @@ "\\div" | "\\rtimes" | "\\bot" | -"\\prime" | "\\therefore" | "\\thickapprox" | "\\thicksim" | @@ -554,6 +559,8 @@ "\\wp" | "\\Re" {yylval=itex2MML_copy2(yytext, ";"); if (yylval != itex2MML_empty_string) yylval[0]='&'; return MI;} +"\\Perp" | +"\\Vbar" {yylval=itex2MML_copy_string("⫫"); return MOL;} "\\Box" | "\\square" {yylval=itex2MML_copy_string("□"); return MOL;} "\\emptyset" | @@ -636,7 +643,7 @@ "\\bigodot" {yylval=itex2MML_copy_string("⨀"); return MOB;} "\\bigsqcup" {yylval=itex2MML_copy_string("⨆"); return MOB;} -"\\bigsuplus" {yylval=itex2MML_copy_string("⨄"); return MOB;} +"\\biguplus" {yylval=itex2MML_copy_string("⨄"); return MOB;} "\\wedge" {yylval=itex2MML_copy_string("∧"); return MOL;} "\\Wedge" | @@ -687,6 +694,7 @@ "\\overset" {return OVER;} "\\over" {return TEXOVER;} +"\\atop" {return TEXATOP;} "\\underoverset" {return UNDEROVER;} @@ -733,6 +741,8 @@ "\\mathfrak" | "\\mathfr" {BEGIN(FRAKTUR); return FRAK;} +"\\slash" {return SLASHED;} + "\\mathcal" {BEGIN(CALLIGRAPHIC); return CAL;} "\\begin" {BEGIN(MATHENV); return BEGINENV;} @@ -792,9 +802,11 @@ "\\href" {BEGIN(PLAINTEXT); return HREF;} - +"\\operatorname" | "\\mathop" {BEGIN(PLAINTEXT); return MATHOP;} +"\\includegraphics"(\[[^\]]*\])?\{[^}]*\} ; + "\\"[a-zA-Z]+ {yylval=itex2MML_copy_string(yytext+1); return MOP;} "\&"[a-zA-Z_][a-zA-Z0-9_]*";" | @@ -822,6 +834,12 @@ "\{aligned\}" {BEGIN(MATH); return ALIGNED;} "\{gathered\}" {BEGIN(MATH); return GATHERED;} "\{split\}" {BEGIN(MATH); return ALIGNED;} +"\{svg\}" {BEGIN(SVGENV); return SVG;} +} + +{ +"\\end\{svg\}" {BEGIN(MATH); return ENDSVG;} +[^\\]* {yylval=itex2MML_copy_string(yytext); BEGIN(SVGENV); return XMLSTRING;} } { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.y /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.y --- abiword-2.6.2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.y 2008-04-06 22:36:42.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/itex2MML/itex2MML.y 2009-07-15 16:56:23.000000000 +0100 @@ -1,5 +1,5 @@ -/* itex2MML 1.1.9 - * itex2MML.y last modified 1/28/2007 +/* itex2MML 1.3.2 + * itex2MML.y last modified 11/10/2007 */ %{ @@ -266,8 +266,8 @@ %} -%left TEXOVER -%token CHAR STARTMATH STARTDMATH ENDMATH MI MIB MN MO SUP SUB MROWOPEN MROWCLOSE LEFT RIGHT BIG BBIG BIGG BBIGG BIGL BBIGL BIGGL BBIGGL FRAC TFRAC MATHOP MOP MOL MOF PERIODDELIM OTHERDELIM LEFTDELIM RIGHTDELIM MOS MOB SQRT ROOT BINOM UNDER OVER OVERBRACE UNDERBRACE UNDEROVER TENSOR MULTI ARRAY COLSEP ROWSEP ARRAYOPTS COLLAYOUT COLALIGN ROWALIGN ALIGN EQROWS EQCOLS ROWLINES COLLINES FRAME PADDING ATTRLIST ITALICS BOLD RM BB ST END BBLOWERCHAR BBUPPERCHAR CALCHAR FRAKCHAR CAL FRAK ROWOPTS TEXTSIZE SCSIZE SCSCSIZE DISPLAY TEXTSTY TEXTBOX TEXTSTRING CELLOPTS ROWSPAN COLSPAN THINSPACE MEDSPACE THICKSPACE QUAD QQUAD NEGSPACE PHANTOM HREF UNKNOWNCHAR EMPTYMROW STATLINE TOGGLE FGHIGHLIGHT BGHIGHLIGHT SPACE INTONE INTTWO INTTHREE BAR WIDEBAR VEC WIDEVEC HAT WIDEHAT CHECK WIDECHECK TILDE WIDETILDE DOT DDOT UNARYMINUS UNARYPLUS BEGINENV ENDENV MATRIX PMATRIX BMATRIX BBMATRIX VMATRIX VVMATRIX SMALLMATRIX CASES ALIGNED GATHERED SUBSTACK PMOD RMCHAR COLOR BGCOLOR +%left TEXOVER TEXATOP +%token CHAR STARTMATH STARTDMATH ENDMATH MI MIB MN MO SUP SUB MROWOPEN MROWCLOSE LEFT RIGHT BIG BBIG BIGG BBIGG BIGL BBIGL BIGGL BBIGGL FRAC TFRAC MATHOP MOP MOL MOLL MOF PERIODDELIM OTHERDELIM LEFTDELIM RIGHTDELIM MOS MOB SQRT ROOT BINOM UNDER OVER OVERBRACE UNDERBRACE UNDEROVER TENSOR MULTI ARRAY COLSEP ROWSEP ARRAYOPTS COLLAYOUT COLALIGN ROWALIGN ALIGN EQROWS EQCOLS ROWLINES COLLINES FRAME PADDING ATTRLIST ITALICS BOLD SLASHED RM BB ST END BBLOWERCHAR BBUPPERCHAR CALCHAR FRAKCHAR CAL FRAK ROWOPTS TEXTSIZE SCSIZE SCSCSIZE DISPLAY TEXTSTY TEXTBOX TEXTSTRING XMLSTRING CELLOPTS ROWSPAN COLSPAN THINSPACE MEDSPACE THICKSPACE QUAD QQUAD NEGSPACE PHANTOM HREF UNKNOWNCHAR EMPTYMROW STATLINE TOGGLE FGHIGHLIGHT BGHIGHLIGHT SPACE INTONE INTTWO INTTHREE BAR WIDEBAR VEC WIDEVEC HAT WIDEHAT CHECK WIDECHECK TILDE WIDETILDE DOT DDOT UNARYMINUS UNARYPLUS BEGINENV ENDENV MATRIX PMATRIX BMATRIX BBMATRIX VMATRIX VVMATRIX SVG ENDSVG SMALLMATRIX CASES ALIGNED GATHERED SUBSTACK PMOD RMCHAR COLOR BGCOLOR %% @@ -543,6 +543,7 @@ | rmchars | bbold | frak +| slashed | cal | space | textstring @@ -560,6 +561,7 @@ | bghighlight | color | texover +| texatop | MROWOPEN closedTerm MROWCLOSE { $$ = itex2MML_copy_string($2); itex2MML_free_string($2); @@ -662,7 +664,7 @@ $$ = itex2MML_copy3("", $2, ""); itex2MML_free_string($2); } -BIGL LEFTDELIM { +|BIGL LEFTDELIM { itex2MML_rowposn = 2; $$ = itex2MML_copy3("", $2, ""); itex2MML_free_string($2); @@ -743,6 +745,11 @@ $$ = itex2MML_copy3("", $1, ""); itex2MML_free_string($1); } +| MOLL { + itex2MML_rowposn = 2; + $$ = itex2MML_copy3("", $1, ""); + itex2MML_free_string($1); +} | RIGHTDELIM { $$ = itex2MML_copy3("", $1, ""); itex2MML_free_string($1); @@ -877,6 +884,11 @@ itex2MML_free_string($2); }; +slashed: SLASHED closedTerm { + $$ = itex2MML_copy3("", $2, ""); + itex2MML_free_string($2); +}; + bold: BOLD closedTerm { $$ = itex2MML_copy3("", $2, ""); itex2MML_free_string($2); @@ -913,7 +925,7 @@ }; bbletter: BBLOWERCHAR { - $$ = itex2MML_copy_string($1); + $$ = itex2MML_copy3("&", $1, "opf;"); itex2MML_free_string($1); } | BBUPPERCHAR { @@ -1109,9 +1121,30 @@ itex2MML_free_string($5); }; +texatop: MROWOPEN compoundTermList TEXATOP compoundTermList MROWCLOSE { + char * s1 = itex2MML_copy3("", $2, ""); + $$ = itex2MML_copy3(s1, $4, ""); + itex2MML_free_string(s1); + itex2MML_free_string($2); + itex2MML_free_string($4); +} +| left compoundTermList TEXATOP compoundTermList right { + char * s1 = itex2MML_copy3("", $1, ""); + char * s2 = itex2MML_copy3($2, "", $4); + char * s3 = itex2MML_copy3("", $5, ""); + $$ = itex2MML_copy3(s1, s2, s3); + itex2MML_free_string(s1); + itex2MML_free_string(s2); + itex2MML_free_string(s3); + itex2MML_free_string($1); + itex2MML_free_string($2); + itex2MML_free_string($4); + itex2MML_free_string($5); +}; + binom: BINOM closedTerm closedTerm { - char * s1 = itex2MML_copy3("", $2, $3); - $$ = itex2MML_copy2(s1, ""); + char * s1 = itex2MML_copy3("(", $2, $3); + $$ = itex2MML_copy2(s1, ")"); itex2MML_free_string(s1); itex2MML_free_string($2); itex2MML_free_string($3); @@ -1165,11 +1198,11 @@ }; check: CHECK closedTerm { - $$ = itex2MML_copy3("", $2, "¯"); + $$ = itex2MML_copy3("", $2, "ˇ"); itex2MML_free_string($2); } | WIDECHECK closedTerm { - $$ = itex2MML_copy3("", $2, "¯"); + $$ = itex2MML_copy3("", $2, "ˇ"); itex2MML_free_string($2); }; @@ -1259,6 +1292,13 @@ | BEGINENV ALIGNED tableRowList ENDENV ALIGNED { $$ = itex2MML_copy3("", $3, ""); itex2MML_free_string($3); +} +| BEGINENV SVG XMLSTRING ENDSVG { + $$ = itex2MML_copy3("", $3, ""); + itex2MML_free_string($3); +} +| BEGINENV SVG ENDSVG { + $$ = itex2MML_copy_string(" "); }; substack: SUBSTACK MROWOPEN tableRowList MROWCLOSE { @@ -1536,6 +1576,16 @@ int itex2MML_html_filter (const char * buffer, unsigned long length) { + itex2MML_do_html_filter (buffer, length, 0); +} + +int itex2MML_strict_html_filter (const char * buffer, unsigned long length) +{ + itex2MML_do_html_filter (buffer, length, 1); +} + +int itex2MML_do_html_filter (const char * buffer, unsigned long length, const int forbid_markup) +{ int result = 0; int type = 0; @@ -1602,7 +1652,7 @@ { case '<': case '>': - skip = 1; + if (forbid_markup == 1) skip = 1; break; case '\\': diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/itex2MML/README.itex2MML /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/itex2MML/README.itex2MML --- abiword-2.6.2/abiword-plugins/tools/abimathview/itex2MML/README.itex2MML 2008-04-06 22:36:42.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/itex2MML/README.itex2MML 2009-07-15 16:56:23.000000000 +0100 @@ -7,7 +7,7 @@ it). Our changes were accepted 'upstream', followed by a new release dubbed itex2MLL 1.0 [3]. -Currently, we include itex2MML 1.2, without any modifications. +Currently, we include itex2MML 1.3.5, without any modifications. Some documentation can be found here [4]. diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/Makefile --- abiword-2.6.2/abiword-plugins/tools/abimathview/Makefile 2008-04-06 22:36:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -40,6 +40,8 @@ $(OBJDIR)/y.tab.$(OBJ_SUFFIX) \ $(OBJDIR)/lex.yy.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= $(shell pkg-config --libs mathview-core mathview-frontend-libxml2) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/xp/AbiMathView.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/AbiMathView.h --- abiword-2.6.2/abiword-plugins/tools/abimathview/xp/AbiMathView.h 2008-04-06 22:36:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/AbiMathView.h 2009-07-15 16:56:23.000000000 +0100 @@ -35,7 +35,7 @@ class AD_Document; typedef SmartPtr GR_AbiMathView; -class ABI_EXPORT GR_AbiMathItems +class GR_AbiMathItems { public: GR_AbiMathItems(); @@ -44,7 +44,7 @@ bool m_bHasSnapshot; }; -class ABI_EXPORT GR_MathManager : public GR_EmbedManager +class GR_MathManager : public GR_EmbedManager { public: GR_MathManager(GR_Graphics * pG); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abimathview/xp/GNUmakefile.in 2008-04-06 22:37:42.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -98,6 +98,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -163,14 +165,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -187,6 +189,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @MATHVIEW_LIBS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -203,6 +208,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -213,7 +221,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -279,7 +292,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -310,6 +323,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -323,6 +337,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -364,8 +379,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -395,8 +410,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -404,8 +419,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -468,8 +483,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -481,8 +496,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -492,13 +507,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/xp/gr_Abi_ComputerModernShaper.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/gr_Abi_ComputerModernShaper.cpp --- abiword-2.6.2/abiword-plugins/tools/abimathview/xp/gr_Abi_ComputerModernShaper.cpp 2008-04-06 22:36:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/gr_Abi_ComputerModernShaper.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -51,7 +51,7 @@ static char fontFamily[128]; sprintf(fontFamily, "%s", getFamily()->nameOfFont(fontName, designSize).c_str()); - GR_Font* font = m_pGraphics->findFont(fontFamily, "normal", NULL, "normal", NULL, fontSize,NULL); + GR_Font* font = m_pGraphics->findFont(fontFamily, "normal", "", "normal", "", fontSize, ""); UT_ASSERT(font); return GR_Abi_CharArea::create(getGraphics(), font, size, toTTFGlyphIndex(getFamily()->encIdOfFontNameId(fontName), index)); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/xp/gr_Abi_DefaultShaper.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/gr_Abi_DefaultShaper.cpp --- abiword-2.6.2/abiword-plugins/tools/abimathview/xp/gr_Abi_DefaultShaper.cpp 2008-04-06 22:36:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/gr_Abi_DefaultShaper.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -111,7 +111,7 @@ sprintf(fontSize, "%dpt", static_cast(context.getSize().toFloat() + 0.5f)); const AbiTextProperties& props = getTextProperties(variant); - GR_Font* font = m_pGraphics->findFont(props.family, props.style, NULL, props.weight, NULL, fontSize,NULL); + GR_Font* font = m_pGraphics->findFont(props.family, props.style, "", props.weight, "", fontSize, ""); UT_ASSERT(font); SmartPtr factory = smart_cast(context.getFactory()); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/xp/gr_Abi_RenderingContext.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/gr_Abi_RenderingContext.cpp --- abiword-2.6.2/abiword-plugins/tools/abimathview/xp/gr_Abi_RenderingContext.cpp 2008-04-06 22:36:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/gr_Abi_RenderingContext.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -49,27 +49,11 @@ UT_sint32 GR_Abi_RenderingContext::toAbiLayoutUnits(const scaled& s) const { - if(!m_pGraphics) - return round((s * UT_LAYOUT_RESOLUTION) / 72.0).toInt(); - if( fabs(1.0 - m_pGraphics->getResolutionRatio()) > 0.01) - { - return round((s * (UT_LAYOUT_RESOLUTION * m_pGraphics->getResolutionRatio())) / 72.0).toInt(); - } - return round((s * UT_LAYOUT_RESOLUTION) / 72.0).toInt(); + return round((s * UT_LAYOUT_RESOLUTION) / 72.0).toInt(); } scaled GR_Abi_RenderingContext::fromAbiLayoutUnits(UT_sint32 s) const { - - if(!m_pGraphics) - { - return scaled((s * 72.0) / UT_LAYOUT_RESOLUTION); - } - - if( fabs(1.0 - m_pGraphics->getResolutionRatio()) > 0.01) - { - return scaled((s * 72.0) / (UT_LAYOUT_RESOLUTION * m_pGraphics->getResolutionRatio())); - } return scaled((s * 72.0) / UT_LAYOUT_RESOLUTION); } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/xp/gr_Abi_StandardSymbolsShaper.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/gr_Abi_StandardSymbolsShaper.cpp --- abiword-2.6.2/abiword-plugins/tools/abimathview/xp/gr_Abi_StandardSymbolsShaper.cpp 2008-04-06 22:36:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/gr_Abi_StandardSymbolsShaper.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -45,7 +45,7 @@ static char fontSize[128]; sprintf(fontSize, "%dpt", static_cast(size.toFloat() + 0.5f)); - GR_Font* font = m_pGraphics->findFont("Symbol", "normal", NULL, "normal", NULL, fontSize,NULL); + GR_Font* font = m_pGraphics->findFont("Symbol", "normal", "", "normal", "", fontSize, ""); UT_ASSERT(font); UT_UCS4Char ch = static_cast(static_cast(index)); return factory->charArea(getGraphics(), font, size, ch); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/xp/ie_imp_MathML.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/ie_imp_MathML.h --- abiword-2.6.2/abiword-plugins/tools/abimathview/xp/ie_imp_MathML.h 2008-04-06 22:36:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/ie_imp_MathML.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,15 +30,15 @@ #include "ut_vector.h" #include "pd_Document.h" -class UT_ByteBuf; -class ImportStream; +class UT_ByteBuf; +class ImportStream; typedef struct { - char * szEntity; - char * szVal; + const char * szEntity; + const char * szVal; } AbiMathViewEntityMapItem; -class ABI_EXPORT IE_Imp_MathML_EntityTable +class IE_Imp_MathML_EntityTable { public: IE_Imp_MathML_EntityTable (); @@ -53,7 +53,7 @@ // The importer/reader for MathML Files. -class ABI_EXPORT IE_Imp_MathML_Sniffer : public IE_ImpSniffer +class IE_Imp_MathML_Sniffer : public IE_ImpSniffer { friend class IE_Imp; friend class IE_Imp_MathML; @@ -88,7 +88,7 @@ // The importer/reader for MathML Files. -class ABI_EXPORT IE_Imp_MathML : public IE_Imp +class IE_Imp_MathML : public IE_Imp { public: IE_Imp_MathML(PD_Document * pDocument, const IE_Imp_MathML_EntityTable & EntityTable); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abimathview/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/Makefile --- abiword-2.6.2/abiword-plugins/tools/abimathview/xp/Makefile 2008-04-06 22:36:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abimathview/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -33,6 +33,8 @@ gr_Abi_StandardSymbolsShaper.cpp \ ie_imp_MathML.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) INCLUDES+= $(shell pkg-config --cflags glib-2.0 mathview-core mathview-frontend-libxml2) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abiscan/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abiscan/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abiscan/GNUmakefile.in 2008-04-06 22:37:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abiscan/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = unix @@ -302,8 +317,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -409,8 +424,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -446,13 +461,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/abiscan/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/abiscan/unix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/abiscan/unix/GNUmakefile.in 2008-04-06 22:37:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/abiscan/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -340,8 +355,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -371,8 +386,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -380,8 +395,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -450,8 +465,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -463,8 +478,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -474,13 +489,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/aiksaurus/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/aiksaurus/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/aiksaurus/GNUmakefile.in 2008-04-06 22:37:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/aiksaurus/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/aiksaurus/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/aiksaurus/Makefile --- abiword-2.6.2/abiword-plugins/tools/aiksaurus/Makefile 2008-04-06 22:36:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/aiksaurus/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,7 @@ OBJS= $(OBJDIR)/AiksaurusABI.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/aiksaurus/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/aiksaurus/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/aiksaurus/xp/GNUmakefile.in 2008-04-06 22:37:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/aiksaurus/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_AIKSAURUS_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -328,8 +343,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -359,8 +374,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -368,8 +383,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -423,8 +438,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -436,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -447,13 +462,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/babelfish/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/babelfish/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/babelfish/GNUmakefile.in 2008-04-06 22:37:43.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/babelfish/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/babelfish/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/babelfish/Makefile --- abiword-2.6.2/abiword-plugins/tools/babelfish/Makefile 2008-04-06 22:36:37.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/babelfish/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,7 @@ OBJS= $(OBJDIR)/AbiBabelfish.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/babelfish/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/babelfish/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/babelfish/xp/GNUmakefile.in 2008-04-06 22:37:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/babelfish/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -328,8 +343,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -359,8 +374,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -368,8 +383,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -423,8 +438,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -436,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -447,13 +462,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/develop/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/develop/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/develop/GNUmakefile.in 2008-04-06 22:37:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/develop/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ DIST_SUBDIRS = gnu-regex xp @@ -308,8 +323,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -415,8 +430,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -441,8 +456,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -452,13 +467,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/develop/gnu-regex/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/develop/gnu-regex/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/develop/gnu-regex/GNUmakefile.in 2008-04-06 22:37:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/develop/gnu-regex/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -76,6 +76,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -141,14 +143,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -165,6 +167,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -181,6 +186,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -191,7 +199,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -257,7 +270,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -288,6 +301,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -301,6 +315,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @BUILD_GNU_REGEX_TRUE@noinst_LTLIBRARIES = libgnuregex.la @@ -320,8 +335,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -397,8 +412,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -410,8 +425,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -421,13 +436,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/develop/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/develop/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/develop/xp/GNUmakefile.in 2008-04-06 22:37:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/develop/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -166,14 +168,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -190,6 +192,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -206,6 +211,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -216,7 +224,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -282,7 +295,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -313,6 +326,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -326,6 +340,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -352,8 +367,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -383,8 +398,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -392,8 +407,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -451,8 +466,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -464,8 +479,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -475,13 +490,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/freetranslation/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/freetranslation/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/freetranslation/GNUmakefile.in 2008-04-06 22:37:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/freetranslation/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/freetranslation/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/freetranslation/Makefile --- abiword-2.6.2/abiword-plugins/tools/freetranslation/Makefile 2008-04-06 22:36:42.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/freetranslation/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,7 @@ OBJS= $(OBJDIR)/AbiFreeTranslation.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/freetranslation/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/freetranslation/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/freetranslation/xp/GNUmakefile.in 2008-04-06 22:37:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/freetranslation/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -87,6 +87,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -152,14 +154,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -176,6 +178,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -192,6 +197,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -202,7 +210,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -268,7 +281,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -299,6 +312,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -312,6 +326,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -330,8 +345,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -361,8 +376,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -370,8 +385,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -425,8 +440,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/gda/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/gda/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/gda/GNUmakefile.in 2008-04-06 22:37:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/gda/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = unix @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/gda/unix/AbiGDA.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/gda/unix/AbiGDA.cpp --- abiword-2.6.2/abiword-plugins/tools/gda/unix/AbiGDA.cpp 2008-04-06 22:36:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/gda/unix/AbiGDA.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -70,7 +70,7 @@ * we'll open up a new window. If not, we'll act like the data * set got pasted in place */ -class ABI_EXPORT IE_Imp_GDA : public IE_Imp +class IE_Imp_GDA : public IE_Imp { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/gda/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/gda/unix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/gda/unix/GNUmakefile.in 2008-04-06 22:37:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/gda/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_GDA_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -325,8 +340,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -356,8 +371,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -365,8 +380,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -420,8 +435,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -433,8 +448,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -444,13 +459,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/gdict/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/gdict/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/gdict/GNUmakefile.in 2008-04-06 22:37:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/gdict/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = unix @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/gdict/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/gdict/unix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/gdict/unix/GNUmakefile.in 2008-04-06 22:37:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/gdict/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_GDICT_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -328,8 +343,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -359,8 +374,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -368,8 +383,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -423,8 +438,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -436,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -447,13 +462,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/tools/GNUmakefile.am 2008-04-06 22:37:20.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -1,5 +1,5 @@ # autogenerated by nextgen.sh SUBDIRS = @abi_tools@ -DIST_SUBDIRS = abicollab abicommand abidash abigimp abigoffice abigrammar abimathview abiscan aiksaurus babelfish develop freetranslation gda gdict google loadbindings ots presentation urldict wikipedia +DIST_SUBDIRS = abicollab abicommand abigimp abigoffice abigrammar abimathview abiscan aiksaurus babelfish develop freetranslation gda gdict google loadbindings ots presentation urldict wikipedia DISTCLEANFILES = plugin.status EXTRA_DIST = Makefile diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/GNUmakefile.in 2008-04-06 22:37:35.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,6 +66,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -131,14 +133,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -155,6 +157,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -171,6 +176,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -181,7 +189,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -247,7 +260,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -278,6 +291,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -291,12 +305,13 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # autogenerated by nextgen.sh SUBDIRS = @abi_tools@ -DIST_SUBDIRS = abicollab abicommand abidash abigimp abigoffice abigrammar abimathview abiscan aiksaurus babelfish develop freetranslation gda gdict google loadbindings ots presentation urldict wikipedia +DIST_SUBDIRS = abicollab abicommand abigimp abigoffice abigrammar abimathview abiscan aiksaurus babelfish develop freetranslation gda gdict google loadbindings ots presentation urldict wikipedia DISTCLEANFILES = plugin.status EXTRA_DIST = Makefile all: all-recursive @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/google/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/google/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/google/GNUmakefile.in 2008-04-06 22:37:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/google/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/google/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/google/Makefile --- abiword-2.6.2/abiword-plugins/tools/google/Makefile 2008-04-06 22:36:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/google/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,7 @@ OBJS= $(OBJDIR)/AbiGoogle.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/google/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/google/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/google/xp/GNUmakefile.in 2008-04-06 22:37:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/google/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -328,8 +343,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -359,8 +374,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -368,8 +383,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -423,8 +438,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -436,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -447,13 +462,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/loadbindings/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/loadbindings/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/loadbindings/GNUmakefile.in 2008-04-06 22:37:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/loadbindings/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/loadbindings/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/loadbindings/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/loadbindings/xp/GNUmakefile.in 2008-04-06 22:37:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/loadbindings/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @LOADBINDINGS_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -337,8 +352,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -368,8 +383,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -377,8 +392,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -432,8 +447,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -445,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -456,13 +471,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/loadbindings/xp/LoadBindings.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/loadbindings/xp/LoadBindings.cpp --- abiword-2.6.2/abiword-plugins/tools/loadbindings/xp/LoadBindings.cpp 2008-04-06 22:36:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/loadbindings/xp/LoadBindings.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -83,8 +83,11 @@ static XAP_Menu_Id dumpEditMethodsID; static XAP_Menu_Id saveBindingID; static const char * szLoadBinding = "Load keybindings"; +static const char * szLoadBindingStatus = "Load keybindings from a file"; static const char * szDumpEditMethods = "Dump edit methods"; +static const char * szDumpEditMethodsStatus = "Dump edit methods to your console"; static const char * szSaveBinding = "Save keybindings"; +static const char * szSaveBindingStatus = "Save keybindings to your profile directory"; static void LoadBindings_registerMethod () { @@ -113,7 +116,7 @@ #if defined(DEBUG) // add menu item loadBindingID = pFact->addNewMenuAfter("Main",NULL,AP_MENU_ID_FMT_STYLIST,EV_MLF_Normal); // named _FMT_, but actually in tools menu - pFact->addNewLabel(NULL,loadBindingID,szLoadBinding, NULL); + pFact->addNewLabel(NULL,loadBindingID,szLoadBinding,szLoadBindingStatus); EV_Menu_Action* myLoadBindingAction = new EV_Menu_Action( loadBindingID, // id that the layout said we could use 0, // no, we don't have a sub menu. @@ -128,7 +131,7 @@ // add menu item dumpEditMethodsID = pFact->addNewMenuAfter("Main",NULL,loadBindingID,EV_MLF_Normal); - pFact->addNewLabel(NULL,dumpEditMethodsID,szDumpEditMethods, NULL); + pFact->addNewLabel(NULL,dumpEditMethodsID,szDumpEditMethods,szDumpEditMethodsStatus); EV_Menu_Action* myDumpEditMethodsAction = new EV_Menu_Action( dumpEditMethodsID, // id that the layout said we could use 0, // no, we don't have a sub menu. @@ -143,7 +146,7 @@ // add menu item saveBindingID = pFact->addNewMenuAfter("Main",NULL,dumpEditMethodsID,EV_MLF_Normal); - pFact->addNewLabel(NULL,saveBindingID,szSaveBinding, NULL); + pFact->addNewLabel(NULL,saveBindingID,szSaveBinding,szSaveBindingStatus); EV_Menu_Action* mySaveBindingAction = new EV_Menu_Action( saveBindingID, // id that the layout said we could use 0, // no, we don't have a sub menu. @@ -337,7 +340,9 @@ // print them printf("%u bindable edit methods (don't require data)\n", list.size()); - for (size_t i=0; igetName()); + for (size_t i=0; igetName()); + return true; } static bool SaveBindings_invoke(AV_View * v, EV_EditMethodCallData* d) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/loadbindings/xp/LoadBindings.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/loadbindings/xp/LoadBindings.h --- abiword-2.6.2/abiword-plugins/tools/loadbindings/xp/LoadBindings.h 2008-04-06 22:36:39.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/loadbindings/xp/LoadBindings.h 2009-07-15 16:56:23.000000000 +0100 @@ -34,7 +34,7 @@ DONT_UNBIND_MOUSECONTEXTS = 0x01, DONT_UNBIND_KEYSTROKES = 0x02, - DONT_UNBIND_ANYTHING = 0x03, + DONT_UNBIND_ANYTHING = 0x03 }; enum _FROM_URI { FROM_URI }; @@ -43,7 +43,7 @@ typedef std::map UnbindMap; typedef std::map BindingMap; -class ABI_EXPORT LoadBindings +class LoadBindings { public: LoadBindings(EV_EditMethodCallData * d, _FROM_URI); @@ -90,7 +90,7 @@ void ReportWarning( const char* format, ... ) const; }; -class ABI_EXPORT EV_NamedVirtualKey +class EV_NamedVirtualKey { public: static const char * getName(EV_EditBits eb); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/ots/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/ots/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/ots/GNUmakefile.in 2008-04-06 22:37:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/ots/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/ots/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/ots/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/ots/xp/GNUmakefile.in 2008-04-06 22:37:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/ots/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -88,6 +88,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -153,14 +155,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -177,6 +179,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_OTS_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -193,6 +198,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -203,7 +211,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -269,7 +282,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -300,6 +313,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -313,6 +327,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -333,8 +348,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -364,8 +379,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -373,8 +388,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -445,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -458,8 +473,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -469,13 +484,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/presentation/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/presentation/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/presentation/GNUmakefile.in 2008-04-06 22:37:46.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/presentation/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/presentation/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/presentation/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/presentation/xp/GNUmakefile.in 2008-04-06 22:37:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/presentation/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -97,6 +97,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -162,14 +164,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -186,6 +188,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PRESENTATION_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -202,6 +207,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -212,7 +220,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -278,7 +291,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -309,6 +322,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -322,6 +336,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -347,8 +362,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -378,8 +393,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -387,8 +402,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -459,8 +474,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -472,8 +487,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -483,13 +498,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/presentation/xp/Presentation.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/presentation/xp/Presentation.cpp --- abiword-2.6.2/abiword-plugins/tools/presentation/xp/Presentation.cpp 2008-04-06 22:36:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/presentation/xp/Presentation.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -79,6 +79,7 @@ EV_EditMouseContext PresentationContextID = EV_EMC_EMBED; static XAP_Menu_Id presentationID; static const char * szPresentation = "Presentation"; +static const char * szPresentationStatus = "View the document in presentation mode"; static const char * szNextSlide = "Next Slide"; static const char * szPrevSlide = "Previous Slide"; static XAP_Menu_Id nextSlideID; @@ -156,7 +157,7 @@ UT_DEBUGMSG(("presentationID %d \n",presentationID)); - pFact->addNewLabel(NULL,presentationID,szPresentation, NULL); + pFact->addNewLabel(NULL,presentationID,szPresentation,szPresentationStatus); // Create the Action that will be called. EV_Menu_Action* myPresentationAction = new EV_Menu_Action( @@ -415,14 +416,12 @@ { return true; } - // get the path where our app data is located + // get the path where our app data is located XAP_App * pApp = static_cast(XAP_App::getApp()); UT_String data_path( pApp->getAbiSuiteLibDir() ); -#if defined(WIN32) - data_path += "\\Presentation.xml"; -#else - data_path += "/Presentation.xml"; -#endif + data_path += G_DIR_SEPARATOR; + data_path += "Presentation.xml"; + EV_EditMethod * pLoadB = pEMC->findEditMethodByName ("com.abisource.abiword.loadbindings.fromURI"); g_return_val_if_fail (pLoadB != 0, false); EV_EditMethodCallData calldata(data_path.c_str(),data_path.size()); @@ -573,7 +572,7 @@ #endif bool Presentation::showNext(void) { - showNextPage(); + return showNextPage(); } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/presentation/xp/Presentation.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/presentation/xp/Presentation.h --- abiword-2.6.2/abiword-plugins/tools/presentation/xp/Presentation.h 2008-04-06 22:36:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/presentation/xp/Presentation.h 2009-07-15 16:56:23.000000000 +0100 @@ -31,7 +31,7 @@ class XAP_Frame; class GR_Image; -class ABI_EXPORT Presentation +class Presentation { public: Presentation(void); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/urldict/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/urldict/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/urldict/GNUmakefile.in 2008-04-06 22:37:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/urldict/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/urldict/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/urldict/Makefile --- abiword-2.6.2/abiword-plugins/tools/urldict/Makefile 2008-04-06 22:36:44.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/urldict/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,7 @@ OBJS= $(OBJDIR)/AbiURLDict.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/urldict/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/urldict/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/urldict/xp/GNUmakefile.in 2008-04-06 22:37:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/urldict/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -328,8 +343,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -359,8 +374,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -368,8 +383,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -423,8 +438,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -436,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -447,13 +462,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/wikipedia/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/wikipedia/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/wikipedia/GNUmakefile.in 2008-04-06 22:37:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/wikipedia/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/wikipedia/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/wikipedia/Makefile --- abiword-2.6.2/abiword-plugins/tools/wikipedia/Makefile 2008-04-06 22:36:45.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/wikipedia/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/AbiWikipedia.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/tools/wikipedia/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/tools/wikipedia/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/tools/wikipedia/xp/GNUmakefile.in 2008-04-06 22:37:47.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/tools/wikipedia/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -328,8 +343,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -359,8 +374,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -368,8 +383,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -423,8 +438,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -436,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -447,13 +462,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/GNUmakefile.in 2008-04-06 22:37:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,6 +66,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -131,14 +133,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -155,6 +157,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -171,6 +176,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -181,7 +189,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -247,7 +260,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -278,6 +291,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -291,6 +305,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/applix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/applix/GNUmakefile.in 2008-04-06 22:37:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/applix/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/applix/Makefile 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/ie_imp_Applix.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_impexp_Applix.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/applix/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/applix/xp/GNUmakefile.in 2008-04-06 22:37:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -338,8 +353,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -369,8 +384,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -378,8 +393,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -448,8 +463,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -459,13 +474,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/applix/xp/ie_exp_Applix.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/xp/ie_exp_Applix.h --- abiword-2.6.2/abiword-plugins/wp/impexp/applix/xp/ie_exp_Applix.h 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/xp/ie_exp_Applix.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,7 +30,7 @@ // the exporter/writer for Applix -class ABI_EXPORT IE_Exp_Applix_Sniffer : public IE_ExpSniffer +class IE_Exp_Applix_Sniffer : public IE_ExpSniffer { friend class IE_Exp; @@ -48,7 +48,7 @@ IE_Exp ** ppie); }; -class ABI_EXPORT IE_Exp_Applix : public IE_Exp +class IE_Exp_Applix : public IE_Exp { public: IE_Exp_Applix(PD_Document *pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/applix/xp/ie_imp_Applix.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/xp/ie_imp_Applix.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/applix/xp/ie_imp_Applix.cpp 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/xp/ie_imp_Applix.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -79,11 +79,33 @@ UT_Confidence_t IE_Imp_Applix_Sniffer::recognizeContents(const char * szBuf, UT_uint32 iNumbytes) { - // this should be suffecient, at least for my liking - const char * magic = ""; + UT_uint32 iLinesToRead = 2; // Only examine the first few lines of the file + UT_uint32 iBytesScanned = 0; + const char *p = szBuf; + const char *magic; - if (!AX_STRN_CMP(szBuf, magic, strlen(magic))) - return UT_CONFIDENCE_PERFECT; + while( iLinesToRead-- ) + { + magic = ""; + if ( (iNumbytes - iBytesScanned) < strlen(magic) ) return(UT_CONFIDENCE_ZILCH); + if ( strncmp(p, magic, strlen(magic)) == 0 ) return(UT_CONFIDENCE_PERFECT); + + /* Seek to the next newline: */ + while ( *p != '\n' && *p != '\r' ) + { + iBytesScanned++; p++; + if( iBytesScanned+2 >= iNumbytes ) return(UT_CONFIDENCE_ZILCH); + } + /* Seek past the next newline: */ + if ( *p == '\n' || *p == '\r' ) + { + iBytesScanned++; p++; + if ( *p == '\n' || *p == '\r' ) + { + iBytesScanned++; p++; + } + } + } return UT_CONFIDENCE_ZILCH; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/applix/xp/ie_imp_Applix.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/xp/ie_imp_Applix.h --- abiword-2.6.2/abiword-plugins/wp/impexp/applix/xp/ie_imp_Applix.h 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/xp/ie_imp_Applix.h 2009-07-15 16:56:23.000000000 +0100 @@ -34,7 +34,7 @@ // The importer/reader for Applix Word files -class ABI_EXPORT IE_Imp_Applix_Sniffer : public IE_ImpSniffer +class IE_Imp_Applix_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -54,7 +54,7 @@ }; -class ABI_EXPORT IE_Imp_Applix : public IE_Imp +class IE_Imp_Applix : public IE_Imp { public: IE_Imp_Applix(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/applix/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/applix/xp/Makefile 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/applix/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,6 +26,8 @@ ie_imp_Applix.cpp \ ie_impexp_Applix.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/clarisworks/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/clarisworks/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/clarisworks/GNUmakefile.in 2008-04-06 22:37:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/clarisworks/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/clarisworks/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/clarisworks/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/clarisworks/Makefile 2008-04-06 22:37:07.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/clarisworks/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/ie_imp_ClarisWorks.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/clarisworks/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/clarisworks/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/clarisworks/xp/GNUmakefile.in 2008-04-06 22:37:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/clarisworks/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -337,8 +352,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -368,8 +383,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -377,8 +392,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -432,8 +447,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -445,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -456,13 +471,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/clarisworks/xp/ie_imp_ClarisWorks.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/clarisworks/xp/ie_imp_ClarisWorks.h --- abiword-2.6.2/abiword-plugins/wp/impexp/clarisworks/xp/ie_imp_ClarisWorks.h 2008-04-06 22:37:07.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/clarisworks/xp/ie_imp_ClarisWorks.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,7 +30,7 @@ // The importer/reader for ClarisWorks/AppleWorks Files -class ABI_EXPORT IE_Imp_ClarisWorks_Sniffer : public IE_ImpSniffer +class IE_Imp_ClarisWorks_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -50,7 +50,7 @@ }; -class ABI_EXPORT IE_Imp_ClarisWorks : public IE_Imp +class IE_Imp_ClarisWorks : public IE_Imp { public: IE_Imp_ClarisWorks(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/clarisworks/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/clarisworks/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/clarisworks/xp/Makefile 2008-04-06 22:37:07.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/clarisworks/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= ie_imp_ClarisWorks.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/docbook/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/docbook/GNUmakefile.in 2008-04-06 22:37:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/docbook/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/docbook/Makefile 2008-04-06 22:36:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -35,7 +35,7 @@ # it is not exported (stripped during build), so until it is used # we must link with object file [ut_png] for it. - +CFLAGS+= -DABI_DLL ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/docbook/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/docbook/xp/GNUmakefile.in 2008-04-06 22:37:51.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_DOCBOOK_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -345,8 +360,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -376,8 +391,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -385,8 +400,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -442,8 +457,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -455,8 +470,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -466,13 +481,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/docbook/xp/ie_exp_DocBook.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/xp/ie_exp_DocBook.h --- abiword-2.6.2/abiword-plugins/wp/impexp/docbook/xp/ie_exp_DocBook.h 2008-04-06 22:36:53.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/xp/ie_exp_DocBook.h 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ // The exporter/writer for DocBook -class ABI_EXPORT IE_Exp_DocBook_Sniffer : public IE_ExpSniffer +class IE_Exp_DocBook_Sniffer : public IE_ExpSniffer { friend class IE_Exp; @@ -49,7 +49,7 @@ }; -class ABI_EXPORT IE_Exp_DocBook : public IE_Exp +class IE_Exp_DocBook : public IE_Exp { public: IE_Exp_DocBook(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/docbook/xp/ie_imp_DocBook.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/xp/ie_imp_DocBook.h --- abiword-2.6.2/abiword-plugins/wp/impexp/docbook/xp/ie_imp_DocBook.h 2008-04-06 22:36:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/xp/ie_imp_DocBook.h 2009-07-15 16:56:23.000000000 +0100 @@ -29,7 +29,7 @@ class PD_Document; -class ABI_EXPORT IE_Imp_DocBook_Sniffer : public IE_ImpSniffer +class IE_Imp_DocBook_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -51,7 +51,7 @@ // The importer/reader for DocBook files. -class ABI_EXPORT IE_Imp_DocBook : public IE_Imp_XML +class IE_Imp_DocBook : public IE_Imp_XML { public: IE_Imp_DocBook(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/docbook/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/docbook/xp/Makefile 2008-04-06 22:36:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/docbook/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -27,6 +27,7 @@ ie_imp_DocBook.cpp \ ie_impexp_DocBook.cpp +CFLAGS+= -DABI_DLL include $(ABI_ROOT)/src/config/abi_rules.mk diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/eml/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/eml/GNUmakefile.in 2008-04-06 22:37:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/eml/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/eml/Makefile 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/ie_exp_EML.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/eml/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/eml/xp/GNUmakefile.in 2008-04-06 22:37:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -340,8 +355,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -371,8 +386,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -380,8 +395,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -448,8 +463,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -459,13 +474,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/eml/xp/ie_exp_EML.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/xp/ie_exp_EML.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/eml/xp/ie_exp_EML.cpp 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/xp/ie_exp_EML.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ #include "ut_string.h" #include "ut_assert.h" -//extern ABI_EXPORT IE_Exp_Text::; +//extern IE_Exp_Text::; /*****************************************************************/ /*****************************************************************/ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/eml/xp/ie_exp_EML.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/xp/ie_exp_EML.h --- abiword-2.6.2/abiword-plugins/wp/impexp/eml/xp/ie_exp_EML.h 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/xp/ie_exp_EML.h 2009-07-15 16:56:23.000000000 +0100 @@ -22,7 +22,7 @@ #include "ie_exp_Text.h" -class ABI_EXPORT IE_Exp_EML : public IE_Exp_Text +class IE_Exp_EML : public IE_Exp_Text { public: IE_Exp_EML(PD_Document * pDocument); @@ -31,7 +31,7 @@ virtual UT_Error _writeDocument(void); }; -class ABI_EXPORT IE_Exp_EML_Sniffer : public IE_ExpSniffer +class IE_Exp_EML_Sniffer : public IE_ExpSniffer { public: IE_Exp_EML_Sniffer (); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/eml/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/eml/xp/Makefile 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/eml/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= ie_exp_EML.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/GNUmakefile.in 2008-04-06 22:37:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,6 +66,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -131,14 +133,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -155,6 +157,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -171,6 +176,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -181,7 +189,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -247,7 +260,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -278,6 +291,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -291,6 +305,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/bmp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/bmp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/bmp/GNUmakefile.in 2008-04-06 22:37:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/bmp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/bmp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/bmp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/bmp/Makefile 2008-04-06 22:37:03.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/bmp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/ie_impGraphic_BMP.$(OBJ_SUFFIX) \ +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/bmp/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/bmp/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/bmp/xp/GNUmakefile.in 2008-04-06 22:37:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/bmp/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_BMP_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -337,8 +352,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -368,8 +383,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -377,8 +392,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -432,8 +447,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -445,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -456,13 +471,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/GNUmakefile.in 2008-04-06 22:37:52.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,6 +66,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -131,14 +133,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -155,6 +157,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -171,6 +176,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -181,7 +189,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -247,7 +260,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -278,6 +291,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -291,6 +305,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/jpeg/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/jpeg/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/jpeg/GNUmakefile.in 2008-04-06 22:37:53.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/jpeg/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/jpeg/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/jpeg/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/jpeg/Makefile 2008-04-06 22:37:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/jpeg/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/ie_impGraphic_JPEG.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/jpeg/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/jpeg/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/jpeg/xp/GNUmakefile.in 2008-04-06 22:37:53.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/jpeg/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_JPEG_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -337,8 +352,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -368,8 +383,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -377,8 +392,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -432,8 +447,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -445,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -456,13 +471,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/librsvg/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/librsvg/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/librsvg/GNUmakefile.in 2008-04-06 22:37:53.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/librsvg/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = unix @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/librsvg/unix/AbiRSVG.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/librsvg/unix/AbiRSVG.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/librsvg/unix/AbiRSVG.cpp 2008-04-06 22:37:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/librsvg/unix/AbiRSVG.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -58,7 +58,7 @@ //------------------------------------------------------------------------------------ -class ABI_EXPORT IE_RSVGGraphic : public IE_ImpGraphic +class IE_RSVGGraphic : public IE_ImpGraphic { public: @@ -269,7 +269,7 @@ { "", UT_CONFIDENCE_ZILCH } }; -class ABI_EXPORT IE_RSVGGraphic_Sniffer : public IE_ImpGraphicSniffer +class IE_RSVGGraphic_Sniffer : public IE_ImpGraphicSniffer { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/librsvg/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/librsvg/unix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/librsvg/unix/GNUmakefile.in 2008-04-06 22:37:53.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/librsvg/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @LIBRSVG_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -325,8 +340,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -356,8 +371,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -365,8 +380,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -420,8 +435,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -433,8 +448,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -444,13 +459,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/win32native/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/win32native/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/win32native/GNUmakefile.in 2008-04-06 22:37:53.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/win32native/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = unix @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/win32native/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/win32native/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/win32native/Makefile 2008-04-06 22:37:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/win32native/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -30,6 +30,8 @@ OBJS= $(OBJDIR)/ie_impGraphic_Win32Native.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_impGraphic_Win32GDIPlus.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/win32native/unix/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/win32native/unix/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/win32native/unix/GNUmakefile.in 2008-04-06 22:37:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/win32native/unix/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -55,6 +55,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -120,14 +122,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -144,6 +146,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -160,6 +165,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -170,7 +178,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -236,7 +249,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -267,6 +280,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -280,6 +294,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ all: all-am @@ -289,8 +304,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/wmf/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/wmf/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/wmf/GNUmakefile.in 2008-04-06 22:37:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/wmf/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/wmf/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/wmf/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/wmf/xp/GNUmakefile.in 2008-04-06 22:37:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/wmf/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_WMF_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -334,8 +349,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -365,8 +380,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -374,8 +389,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -429,8 +444,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -442,8 +457,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -453,13 +468,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/wpg/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/wpg/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/wpg/GNUmakefile.in 2008-04-06 22:37:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/wpg/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/wpg/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/wpg/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/wpg/xp/GNUmakefile.in 2008-04-06 22:37:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/wpg/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -162,14 +164,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -186,6 +188,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @LIBWPG_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -202,6 +207,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -212,7 +220,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -278,7 +291,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -309,6 +322,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -322,6 +336,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -340,8 +355,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -371,8 +386,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -380,8 +395,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -448,8 +463,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -459,13 +474,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/graphics/wpg/xp/ie_impGraphic_WPG.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/wpg/xp/ie_impGraphic_WPG.h --- abiword-2.6.2/abiword-plugins/wp/impexp/graphics/wpg/xp/ie_impGraphic_WPG.h 2008-04-06 22:37:03.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/graphics/wpg/xp/ie_impGraphic_WPG.h 2009-07-15 16:56:23.000000000 +0100 @@ -23,7 +23,7 @@ #include #include "ie_impGraphic_SVG.h" -class ABI_EXPORT IE_Imp_WordPerfectGraphics_Sniffer : public IE_ImpGraphicSniffer +class IE_Imp_WordPerfectGraphics_Sniffer : public IE_ImpGraphicSniffer { friend class IE_Imp; friend class IE_Imp_WordPerfectGraphics; @@ -41,7 +41,7 @@ virtual UT_Error constructImporter(IE_ImpGraphic **ppieg); }; -class ABI_EXPORT IE_Imp_WordPerfectGraphics : public IE_ImpGraphic +class IE_Imp_WordPerfectGraphics : public IE_ImpGraphic { public: virtual UT_Error importGraphic(GsfInput *input, FG_Graphic **ppfg); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/hancom/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/hancom/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/hancom/GNUmakefile.in 2008-04-06 22:37:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/hancom/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/hancom/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/hancom/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/hancom/Makefile 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/hancom/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/ie_imp_hancom.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/hancom/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/hancom/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/hancom/xp/GNUmakefile.in 2008-04-06 22:37:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/hancom/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_HANCOM_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -327,8 +342,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -358,8 +373,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -367,8 +382,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -422,8 +437,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -446,13 +461,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/hancom/xp/ie_imp_hancom.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/hancom/xp/ie_imp_hancom.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/hancom/xp/ie_imp_hancom.cpp 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/hancom/xp/ie_imp_hancom.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -42,7 +42,7 @@ // ------------------------------------------------------------------------------------- // The importer -class ABI_EXPORT IE_Imp_Hancom : public IE_Imp { +class IE_Imp_Hancom : public IE_Imp { public: IE_Imp_Hancom(PD_Document *pDoc); virtual ~IE_Imp_Hancom(); @@ -122,7 +122,7 @@ { "", UT_CONFIDENCE_ZILCH } }; -class ABI_EXPORT IE_Imp_Hancom_Sniffer : public IE_ImpSniffer { +class IE_Imp_Hancom_Sniffer : public IE_ImpSniffer { public: IE_Imp_Hancom_Sniffer() : IE_ImpSniffer("AbiHancom:HWP:") diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/hancom/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/hancom/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/hancom/xp/Makefile 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/hancom/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= ie_imp_hancom.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) INCLUDES+= $(ABI_GSF_INC) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/hrtext/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/hrtext/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/hrtext/GNUmakefile.in 2008-04-06 22:37:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/hrtext/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/hrtext/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/hrtext/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/hrtext/Makefile 2008-04-06 22:37:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/hrtext/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/ie_exp_HRText.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/hrtext/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/hrtext/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/hrtext/xp/GNUmakefile.in 2008-04-06 22:37:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/hrtext/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -337,8 +352,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -368,8 +383,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -377,8 +392,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -432,8 +447,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -445,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -456,13 +471,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/hrtext/xp/ie_exp_HRText.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/hrtext/xp/ie_exp_HRText.h --- abiword-2.6.2/abiword-plugins/wp/impexp/hrtext/xp/ie_exp_HRText.h 2008-04-06 22:37:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/hrtext/xp/ie_exp_HRText.h 2009-07-15 16:56:23.000000000 +0100 @@ -28,7 +28,7 @@ // The exporter/writer for human readable text -class ABI_EXPORT IE_Exp_HRText_Sniffer : public IE_ExpSniffer +class IE_Exp_HRText_Sniffer : public IE_ExpSniffer { friend class IE_Exp; @@ -45,7 +45,7 @@ }; -class ABI_EXPORT IE_Exp_HRText : public IE_Exp +class IE_Exp_HRText : public IE_Exp { public: IE_Exp_HRText(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/hrtext/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/hrtext/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/hrtext/xp/Makefile 2008-04-06 22:37:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/hrtext/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= ie_exp_HRText.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/GNUmakefile.in 2008-04-06 22:37:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/Makefile 2008-04-06 22:36:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/ie_imp_ISCII.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_impexp_ISCII.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/xp/GNUmakefile.in 2008-04-06 22:37:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -338,8 +353,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -369,8 +384,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -378,8 +393,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -448,8 +463,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -459,13 +474,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/xp/ie_exp_ISCII.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/xp/ie_exp_ISCII.h --- abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/xp/ie_exp_ISCII.h 2008-04-06 22:36:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/xp/ie_exp_ISCII.h 2009-07-15 16:56:23.000000000 +0100 @@ -24,7 +24,7 @@ // The exporter/writer for ISCII text files. -class ABI_EXPORT IE_Exp_ISCII_Sniffer : public IE_ExpSniffer +class IE_Exp_ISCII_Sniffer : public IE_ExpSniffer { friend class IE_Exp; @@ -40,7 +40,7 @@ IE_Exp ** ppie); }; -class ABI_EXPORT IE_Exp_ISCII : public IE_Exp_Text +class IE_Exp_ISCII : public IE_Exp_Text { public: IE_Exp_ISCII(PD_Document * pDocument) : IE_Exp_Text(pDocument) {} @@ -55,7 +55,7 @@ // into a text stream. ////////////////////////////////////////////////////////////////// -class ABI_EXPORT ISCII_Listener : public Text_Listener +class ISCII_Listener : public Text_Listener { public: ISCII_Listener(PD_Document * pDocument, IE_Exp_Text * pie) : Text_Listener(pDocument, pie) {} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/xp/ie_imp_ISCII.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/xp/ie_imp_ISCII.h --- abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/xp/ie_imp_ISCII.h 2008-04-06 22:36:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/xp/ie_imp_ISCII.h 2009-07-15 16:56:23.000000000 +0100 @@ -33,7 +33,7 @@ // ISCII file stream class -class ABI_EXPORT ImportISCIIStreamFile : public ImportStreamFile +class ImportISCIIStreamFile : public ImportStreamFile { public: ImportISCIIStreamFile(GsfInput *pFile); @@ -47,7 +47,7 @@ // The importer/reader for ISCII files. -class ABI_EXPORT IE_Imp_ISCII_Sniffer : public IE_ImpSniffer +class IE_Imp_ISCII_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -67,7 +67,7 @@ }; -class ABI_EXPORT IE_Imp_ISCII : public IE_Imp_Text +class IE_Imp_ISCII : public IE_Imp_Text { public: IE_Imp_ISCII(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/iscii-text/xp/Makefile 2008-04-06 22:36:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/iscii-text/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,6 +26,8 @@ ie_imp_ISCII.cpp \ ie_impexp_ISCII.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/kword/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/kword/GNUmakefile.in 2008-04-06 22:37:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/kword/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/kword/Makefile 2008-04-06 22:36:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/ie_imp_KWord_1.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_impexp_KWord_1.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/kword/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/kword/xp/GNUmakefile.in 2008-04-06 22:37:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -338,8 +353,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -369,8 +384,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -378,8 +393,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -448,8 +463,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -459,13 +474,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/kword/xp/ie_exp_KWord_1.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/xp/ie_exp_KWord_1.h --- abiword-2.6.2/abiword-plugins/wp/impexp/kword/xp/ie_exp_KWord_1.h 2008-04-06 22:36:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/xp/ie_exp_KWord_1.h 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ // The exporter/writer for the KWord 1 spec -class ABI_EXPORT IE_Exp_KWord_1_Sniffer : public IE_ExpSniffer +class IE_Exp_KWord_1_Sniffer : public IE_ExpSniffer { friend class IE_Exp; @@ -50,7 +50,7 @@ IE_Exp ** ppie); }; -class ABI_EXPORT IE_Exp_KWord_1 : public IE_Exp +class IE_Exp_KWord_1 : public IE_Exp { public: IE_Exp_KWord_1(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/kword/xp/ie_imp_KWord_1.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/xp/ie_imp_KWord_1.h --- abiword-2.6.2/abiword-plugins/wp/impexp/kword/xp/ie_imp_KWord_1.h 2008-04-06 22:36:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/xp/ie_imp_KWord_1.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,7 +30,7 @@ // The importer/reader for KWord 1.0 files. -class ABI_EXPORT IE_Imp_KWord_1_Sniffer : public IE_ImpSniffer +class IE_Imp_KWord_1_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -50,7 +50,7 @@ }; -class ABI_EXPORT IE_Imp_KWord_1 : public IE_Imp_XML +class IE_Imp_KWord_1 : public IE_Imp_XML { public: IE_Imp_KWord_1(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/kword/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/kword/xp/Makefile 2008-04-06 22:36:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/kword/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,6 +26,8 @@ ie_imp_KWord_1.cpp \ ie_impexp_KWord_1.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/GNUmakefile.am 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,8 @@ +if HAVE_LIBXSLT +SUBDIRS = xp xsltml +else SUBDIRS = xp +endif EXTRA_DIST = \ Makefile \ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/GNUmakefile.in 2008-04-06 22:37:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -59,7 +59,7 @@ distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = xp xsltml DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ABICOLLAB_FAKE_CPPFLAGS = @ABICOLLAB_FAKE_CPPFLAGS@ ABICOLLAB_FAKE_LIBS = @ABICOLLAB_FAKE_LIBS@ @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,9 +306,11 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = xp +@HAVE_LIBXSLT_FALSE@SUBDIRS = xp +@HAVE_LIBXSLT_TRUE@SUBDIRS = xp xsltml EXTRA_DIST = \ Makefile \ plugin.m4 @@ -306,8 +322,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +429,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +455,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +466,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/Makefile 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/ie_exp_LaTeX.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/plugin.m4 /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/plugin.m4 --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/plugin.m4 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/plugin.m4 2009-07-15 16:56:23.000000000 +0100 @@ -4,9 +4,10 @@ dnl= dnl= # 1. abi_plugin_macro is the name of the main macro defined here: dnl= abi_plugin_macro="ABIPGN_LATEX" +dnl= abi_plugin_macro_end="ABIPGN_LATEX_END" dnl= dnl= # 2. abi_plugin_files is the list of files that configure must generate: -dnl= abi_plugin_files="GNUmakefile xp/GNUmakefile" +dnl= abi_plugin_files="GNUmakefile xp/GNUmakefile xsltml/GNUmakefile" dnl= dnl= # 3. abi_plugin_desc is a short description of the plugin dnl= abi_plugin_desc="" @@ -21,5 +22,39 @@ ABI_PLUGIN_REPORT([latex: okay]) +libxslt_req='libxslt' + +# use libxslt if detected +PKG_CHECK_EXISTS([ $libxslt_req ], +[ + abi_cv_libxslt="yes" +], [ + abi_cv_libxslt="no" +]) + +if test "$abi_cv_libxslt" == "yes"; then + PKG_CHECK_MODULES(LIBXSLT,[$libxslt_req]) + LATEX_CFLAGS="$LATEX_CFLAGS "'${LIBXSLT_CFLAGS}'" -DHAVE_LIBXSLT" + LATEX_LIBS="$LATEX_LIBS "'${LIBXSLT_LIBS}' + ABI_PLUGIN_REPORT([latex: equation export enabled]) +else + ABI_PLUGIN_REPORT([latex: equation export disabled]) +fi + +LATEX_CFLAGS="$LATEX_CFLAGS "'${PLUGIN_CFLAGS}' +LATEX_LIBS="$LATEX_LIBS "'${PLUGIN_LIBS}' + +if test "$enable_latex_builtin" == "yes"; then + LATEX_CFLAGS="$LATEX_CFLAGS -DABI_PLUGIN_BUILTIN" +fi + +AC_SUBST([LATEX_CFLAGS]) +AC_SUBST([LATEX_LIBS]) + ]) +AC_DEFUN([ABIPGN_LATEX_END],[ + +AM_CONDITIONAL(HAVE_LIBXSLT, test "x$abi_cv_libxslt" = "xyes") + +]) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xp/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xp/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xp/GNUmakefile.am 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xp/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -CPPFLAGS = @ABI_CPPFLAGS@ @CPPFLAGS@ @PLATFORM_CPPFLAGS@ +CPPFLAGS = @ABI_CPPFLAGS@ @CPPFLAGS@ @PLATFORM_CPPFLAGS@ @LATEX_CFLAGS@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ @@ -8,7 +8,7 @@ libAbiLaTeX_la_SOURCES = ie_exp_LaTeX.cpp ie_exp_LaTeX.h -libAbiLaTeX_la_LIBADD = @ABI_LIBS@ +libAbiLaTeX_la_LIBADD = @ABI_LIBS@ @LATEX_LIBS@ libAbiLaTeX_la_LDFLAGS = -no-undefined -module -avoid-version diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xp/GNUmakefile.in 2008-04-06 22:37:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -151,7 +153,7 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ -CPPFLAGS = @ABI_CPPFLAGS@ @CPPFLAGS@ @PLATFORM_CPPFLAGS@ +CPPFLAGS = @ABI_CPPFLAGS@ @CPPFLAGS@ @PLATFORM_CPPFLAGS@ @LATEX_CFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,12 +333,13 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ plugin_LTLIBRARIES = libAbiLaTeX.la libAbiLaTeX_la_SOURCES = ie_exp_LaTeX.cpp ie_exp_LaTeX.h -libAbiLaTeX_la_LIBADD = @ABI_LIBS@ +libAbiLaTeX_la_LIBADD = @ABI_LIBS@ @LATEX_LIBS@ libAbiLaTeX_la_LDFLAGS = -no-undefined -module -avoid-version EXTRA_DIST = \ Makefile @@ -337,8 +352,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -368,8 +383,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -377,8 +392,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -432,8 +447,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -445,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -456,13 +471,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xp/ie_exp_LaTeX.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xp/ie_exp_LaTeX.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xp/ie_exp_LaTeX.cpp 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xp/ie_exp_LaTeX.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -3,6 +3,7 @@ /* AbiWord * Copyright (C) 1998 AbiSource, Inc. * Copyright (C) 2004 Marc Maurer (uwog@uwog.net) + * Copyright (C) 2008 Xun Sun (xun.sun.cn@gmail.com) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -28,28 +29,43 @@ #include #include +#include +#include -#include "ut_stack.h" +#ifdef HAVE_LIBXSLT +#include +#include +#include +#include +#include +#endif + +#include "fp_types.h" #include "ut_debugmsg.h" #include "ut_string.h" #include "ut_bytebuf.h" #include "ut_base64.h" +#include "ut_Language.h" #include "ut_units.h" +#include "ut_mbtowc.h" #include "ut_wctomb.h" #include "pt_Types.h" #include "ie_exp_LaTeX.h" #include "pd_Document.h" +#include "pd_Style.h" #include "pp_AttrProp.h" #include "px_ChangeRecord.h" #include "px_CR_Object.h" #include "px_CR_Span.h" #include "px_CR_Strux.h" +#include "xap_App.h" #include "xap_EncodingManager.h" #include "fd_Field.h" #include "ie_Table.h" #include "ut_locale.h" #include "ut_string_class.h" +#include "ut_misc.h" /*****************************************************************/ /*****************************************************************/ @@ -101,8 +117,8 @@ } ABI_FAR_CALL -int abi_plugin_supports_version (UT_uint32 major, UT_uint32 minor, - UT_uint32 release) +int abi_plugin_supports_version (UT_uint32 /*major*/, UT_uint32 /*minor*/, + UT_uint32 /*release*/) { return 1; } @@ -122,7 +138,7 @@ } UT_Error IE_Exp_LaTeX_Sniffer::constructExporter(PD_Document * pDocument, - IE_Exp ** ppie) + IE_Exp ** ppie) { IE_Exp_LaTeX * p = new IE_Exp_LaTeX(pDocument); *ppie = p; @@ -130,8 +146,8 @@ } bool IE_Exp_LaTeX_Sniffer::getDlgLabels(const char ** pszDesc, - const char ** pszSuffixList, - IEFileType * ft) + const char ** pszSuffixList, + IEFileType * ft) { *pszDesc = "LaTeX (.latex)"; *pszSuffixList = "*.tex; *.latex"; @@ -142,7 +158,7 @@ /*****************************************************************/ /*****************************************************************/ -#define DEFAULT_SIZE "12pt" +//#define DEFAULT_SIZE "12pt" #define EPSILON 0.1 enum JustificationTypes { @@ -176,66 +192,89 @@ #define BT_BLOCKTEXT 5 #define BT_PLAINTEXT 6 -#define BULLET_LIST 1 -#define NUMBERED_LIST 2 -typedef int LIST_TYPE; - class LaTeX_Analysis_Listener : public PL_Listener { +private: + ie_Table * m_pTableHelper; public: bool m_hasEndnotes; + bool m_hasTable; + bool m_hasMultiRow; LaTeX_Analysis_Listener(PD_Document * pDocument, - IE_Exp_LaTeX * pie) - : m_hasEndnotes(false) + IE_Exp_LaTeX * /*pie*/) + : m_hasEndnotes(false), + m_hasTable(false), + m_hasMultiRow(false) { + m_pTableHelper = new ie_Table(pDocument); } virtual ~LaTeX_Analysis_Listener() { + DELETEP(m_pTableHelper); } - virtual bool populate(PL_StruxFmtHandle sfh, - const PX_ChangeRecord * pcr) + virtual bool populate(PL_StruxFmtHandle /*sfh*/, + const PX_ChangeRecord * /*pcr*/) { return true; } virtual bool populateStrux(PL_StruxDocHandle sdh, - const PX_ChangeRecord * pcr, - PL_StruxFmtHandle * psfh) + const PX_ChangeRecord * pcr, + PL_StruxFmtHandle * psfh) { UT_ASSERT(pcr->getType() == PX_ChangeRecord::PXT_InsertStrux); const PX_ChangeRecord_Strux * pcrx = static_cast (pcr); *psfh = 0; // we don't need it. switch (pcrx->getStruxType()) - { - case PTX_SectionEndnote: - case PTX_EndEndnote: - m_hasEndnotes = true; - break; - default: - break; - } + { + case PTX_SectionEndnote: + case PTX_EndEndnote: + m_hasEndnotes = true; + break; + case PTX_SectionTable: + { + m_pTableHelper->OpenTable(sdh, pcr->getIndexAP()); + m_hasTable = true; + break; + } + case PTX_EndTable: + { + m_pTableHelper->CloseTable(); + break; + } + case PTX_SectionCell: + m_pTableHelper->OpenCell(pcr->getIndexAP()); + if(m_pTableHelper->getBot() - m_pTableHelper->getTop() >1) + this->m_hasMultiRow = true; + break; + case PTX_EndCell: + m_pTableHelper->CloseCell(); + break; + default: + break; + } return true; } - virtual bool change(PL_StruxFmtHandle sfh, - const PX_ChangeRecord * pcr) + virtual bool change(PL_StruxFmtHandle /*sfh*/, + const PX_ChangeRecord * /*pcr*/) { UT_ASSERT(UT_SHOULD_NOT_HAPPEN); return false; } - virtual bool insertStrux(PL_StruxFmtHandle sfh, - const PX_ChangeRecord * pcr, - PL_StruxDocHandle sdh, + virtual bool insertStrux(PL_StruxFmtHandle /*sfh*/, + const PX_ChangeRecord * /*pcr*/, + PL_StruxDocHandle /*sdh*/, + PL_ListenerId /*lid*/, + void (* /*pfnBindHandles*/)(PL_StruxDocHandle sdhNew, PL_ListenerId lid, - void (* pfnBindHandles)(PL_StruxDocHandle sdhNew, - PL_ListenerId lid, - PL_StruxFmtHandle sfhNew)) + PL_StruxFmtHandle sfhNew)) { UT_ASSERT(UT_SHOULD_NOT_HAPPEN); return false; @@ -252,30 +291,33 @@ { public: s_LaTeX_Listener(PD_Document * pDocument, - IE_Exp_LaTeX * pie, - LaTeX_Analysis_Listener& analysis); + IE_Exp_LaTeX * pie, + const LaTeX_Analysis_Listener& analysis); virtual ~s_LaTeX_Listener(); virtual bool populate(PL_StruxFmtHandle sfh, - const PX_ChangeRecord * pcr); + const PX_ChangeRecord * pcr); virtual bool populateStrux(PL_StruxDocHandle sdh, - const PX_ChangeRecord * pcr, - PL_StruxFmtHandle * psfh); + const PX_ChangeRecord * pcr, + PL_StruxFmtHandle * psfh); virtual bool change(PL_StruxFmtHandle sfh, - const PX_ChangeRecord * pcr); + const PX_ChangeRecord * pcr); virtual bool insertStrux(PL_StruxFmtHandle sfh, - const PX_ChangeRecord * pcr, - PL_StruxDocHandle sdh, - PL_ListenerId lid, - void (* pfnBindHandles)(PL_StruxDocHandle sdhNew, - PL_ListenerId lid, - PL_StruxFmtHandle sfhNew)); + const PX_ChangeRecord * pcr, + PL_StruxDocHandle sdh, + PL_ListenerId lid, + void (* pfnBindHandles)(PL_StruxDocHandle sdhNew, + PL_ListenerId lid, + PL_StruxFmtHandle sfhNew)); virtual bool signal(UT_uint32 iSignal); - +#ifdef HAVE_LIBXSLT + static bool convertMathMLtoLaTeX(const UT_UTF8String & sMathML, + UT_UTF8String & sLaTeX); +#endif protected: void _closeBlock(void); void _closeCell(void); @@ -290,10 +332,15 @@ void _openSection(PT_AttrPropIndex api); void _openSpan(PT_AttrPropIndex api); void _openTable(PT_AttrPropIndex api); + void _outputBabelPackage(void); void _outputData(const UT_UCSChar * p, UT_uint32 length); void _handleDataItems(void); void _convertFontSize(UT_String& szDest, const char* pszFontSize); void _convertColor(UT_String& szDest, const char* pszColor); + void _writeImage (const UT_ByteBuf * pByteBuf, + const UT_UTF8String & imagedir, + const UT_UTF8String & filename); + void _handleImage(const PP_AttrProp * pAP); PD_Document * m_pDocument; IE_Exp_LaTeX * m_pie; @@ -308,21 +355,31 @@ bool m_bBetweenQuotes; const PP_AttrProp* m_pAP_Span; bool m_bMultiCols; - bool m_bInSymbol; - bool m_bInCourier; - bool m_bInSansSerif; + bool m_bInSymbol; bool m_bInEndnote; bool m_bHaveEndnote; + bool m_bOverline; JustificationTypes m_eJustification; bool m_bLineHeight; - bool m_bFirstSection; int ChapterNumber; + + /* default font size for the current document, in pt, + * as defined by the Normal style + */ + int m_DefaultFontSize; + int m_Indent; + int m_NumCloseBrackets; // accessed by _openSpan() and _closeSpan() + int m_TableWidth; + int m_CellLeft; + int m_CellRight; + int m_CellTop; + int m_CellBot; // Type for the last-processed list - LIST_TYPE list_type; - + FL_ListType list_type; + std::stack list_stack; // Need to look up proper type, and place to stick #defines... UT_uint16 m_iBlockType; // BT_* @@ -332,10 +389,27 @@ ie_Table * m_pTableHelper; -// std::stack list_stack; - UT_NumberStack list_stack; + int m_RowNuminTable; // the current row being handled, starting from 1 + int m_ExpectedLeft; // expected left-attach value for the next cell, + // to deal with cells spanning multiple columns; + // starting from 0 + + std::deque *m_pqRect; // pointer to a UT_Rect (de)queque. each UT_Rect + // instance in this queue has a 1:1 correspondence + // to a cell spanning multiple rows. The queue is + // examined when a table row ends, to output a \hline + // or several \cline as appropriate + unsigned int m_index; // (dynamic, increase only) index into m_pqRect; it is safe + // to skip anything before m_index +#ifdef HAVE_LIBXSLT + static xsltStylesheet *cur; +#endif }; +#ifdef HAVE_LIBXSLT + xsltStylesheet * s_LaTeX_Listener::cur = NULL; +#endif + void s_LaTeX_Listener::_closeParagraph(void) { if ((!m_bInCell) && (!m_bInFootnote) && (!m_bInEndnote)) m_pie->write("\n"); @@ -349,25 +423,30 @@ case NUMBERED_LIST: m_pie->write("\\end{enumerate}\n"); break; - case BULLET_LIST: + case BULLETED_LIST: m_pie->write("\\end{itemize}\n"); break; default: ; } list_stack.pop(); + if (!list_stack.empty()) + { + list_type = list_stack.top(); + } } void s_LaTeX_Listener::_closeLists() { do{ _closeList(); - } while(list_stack.getDepth()); + } while(!list_stack.empty()); m_bInList = false; } void s_LaTeX_Listener::_closeSection(void) { + _closeBlock(); if (!m_bInSection) { return; @@ -390,6 +469,7 @@ void s_LaTeX_Listener::_closeBlock(void) { + _closeSpan(); if(m_bInFootnote || m_bInEndnote) return; if (!m_bInBlock) @@ -440,30 +520,93 @@ void s_LaTeX_Listener::_openCell(PT_AttrPropIndex api) { - const PP_AttrProp * pAP = NULL; - bool bHaveProp = m_pDocument->getAttrProp(api,&pAP); - const gchar * szValue; - + this->m_pTableHelper->OpenCell(api); + m_CellLeft = this->m_pTableHelper->getLeft(); + m_CellTop = this->m_pTableHelper->getTop(); + m_CellRight = this->m_pTableHelper->getRight(); + m_CellBot = this->m_pTableHelper->getBot(); m_bInCell = true; - if (bHaveProp && pAP) + + if (this->m_pTableHelper->isNewRow()) { - pAP->getProperty("left-attach", szValue); - if (!strcmp("0",szValue)) - { - pAP->getProperty("top-attach", szValue); - if (!strcmp("0",szValue)) - m_pie->write("\n\\hline\n"); - else - m_pie->write("\\\\\n\\hline\n"); - } - else + m_ExpectedLeft = 0; + if(m_CellTop != 0) + m_pie->write("\\\\"); + m_pie->write("\n"); + if(!m_pqRect || m_pqRect->empty()) + m_pie->write("\\hline"); + else + { + UT_Rect* p; + int left=1; + while(m_index < m_pqRect->size()) + { + p = m_pqRect->at(m_index); + if(p->top + p->height -1 > m_RowNuminTable) + break; + m_index++; + } + for(unsigned int i=m_index; i< m_pqRect->size(); i++) + { + p = m_pqRect->at(i); + if(m_RowNuminTable < p->top) + break; + if(left < p->left) + { + UT_String str; + UT_String_sprintf(str, "\\cline{%d-%d}", left, p->left-1); + m_pie->write(str); + } + + left = p->left + p->width; + if(left > this->m_TableWidth) + break; + } + xxx_UT_DEBUGMSG(("left = %d \n", left)); + if(left <= m_TableWidth) + { + if(1 == left) + m_pie->write("\\hline"); + else + { + UT_String str; + UT_String_sprintf(str, "\\cline{%d-%d}", left, m_TableWidth); + m_pie->write(str); + } + } + } + m_pie->write("\n"); + m_RowNuminTable = m_CellTop + 1; + } + if (m_CellLeft != 0) + { + int i = m_CellLeft - m_ExpectedLeft; + for(; i>0; i--) m_pie->write("&"); } + if(m_CellRight - m_CellLeft >1) + { + UT_String str; + UT_String_sprintf(str, "\\multicolumn{%d}{|l|}{", m_CellRight - m_CellLeft); + m_pie->write(str); + } + if(m_CellBot - m_CellTop >1) + { + UT_String str; + UT_String_sprintf(str, "\\multirow{%d}{*}{", m_CellBot - m_CellTop); + m_pie->write(str); + if(m_pqRect) + { + UT_Rect * p = new UT_Rect(m_CellLeft+1, m_CellTop+1, + m_CellRight - m_CellLeft, m_CellBot - m_CellTop); + if(p) + m_pqRect->push_back(p); + } + } } void s_LaTeX_Listener::_openParagraph(PT_AttrPropIndex api) { - m_eJustification = JUSTIFIED; m_bLineHeight = false; if (!m_bInSection) @@ -473,6 +616,7 @@ const PP_AttrProp * pAP = NULL; bool bHaveProp = m_pDocument->getAttrProp(api,&pAP); + m_iBlockType = BT_NORMAL; if (bHaveProp && pAP) { @@ -484,16 +628,29 @@ { int indent = 0; bool bNewList = false; - const gchar * szIndent, * szLeft, * szListStyle; - + const gchar * szIndent, * szLeft, * szListStyle = NULL; + FL_ListType this_list_type = NOT_A_LIST; pAP->getProperty("list-style", szListStyle); + if(szListStyle) + { + if (0 == strcmp(szListStyle, "Numbered List") ) + this_list_type = NUMBERED_LIST; + else if (0 == strcmp(szListStyle, "Bullet List") ) + this_list_type = BULLETED_LIST; + } + + if (this_list_type == NOT_A_LIST) + { + this_list_type = list_type; + } + if (pAP->getProperty("text-indent", szIndent) && pAP->getProperty("margin-left", szLeft)) { indent = UT_convertToDimension(szIndent, DIM_MM) + UT_convertToDimension(szLeft, DIM_MM); if (m_bInList) { - UT_DEBUGMSG((" indent = %d, m_Indent = %d\n", indent, m_Indent)); + xxx_UT_DEBUGMSG((" indent = %d, m_Indent = %d\n", indent, m_Indent)); if(indent > this->m_Indent) //nested list bNewList = true; else if (indent < this->m_Indent) @@ -501,22 +658,16 @@ this->_closeList(); } else - /* - * now we have indent == this->m_Indent, - * but it is possible that the current list item is - * of different style with the last one. - */ + /* + * now we have indent == this->m_Indent, + * but it is possible that the current list item is + * of different style with the last one. + */ { - if(szListStyle) + if (this_list_type != list_type) { - LIST_TYPE temp = BULLET_LIST; - if (0 == strcmp(szListStyle, "Numbered List") ) - temp = NUMBERED_LIST; - if (temp != list_type) - { - this->_closeList(); - bNewList = true; - } + this->_closeList(); + bNewList = true; } } } @@ -525,23 +676,18 @@ if (bNewList || !m_bInList) //necessary to build a new (possibly nested) list { - if (pAP->getProperty("list-style", szValue)) - { - //if(NULL == list_stack) - // this->list_stack = new std::stack(); - if (0 == strcmp(szValue, "Numbered List")) - { - list_type = NUMBERED_LIST; - m_pie->write("\\begin{enumerate}\n"); - } - else if (0 == strcmp(szValue, "Bullet List")) - { - list_type = BULLET_LIST; - m_pie->write("\\begin{itemize}\n"); - } - list_stack.push(list_type); - } - m_bInList = true; + list_type = this_list_type; + if (list_type == NUMBERED_LIST) + { + m_pie->write("\\begin{enumerate}\n"); + } + else if (list_type == BULLETED_LIST) + { + m_pie->write("\\begin{itemize}\n"); + } + + list_stack.push(list_type); + m_bInList = true; } if (szIndent && szLeft) @@ -551,6 +697,7 @@ } else if (m_bInList) { this->_closeLists(); } + if (pAP->getAttribute(PT_STYLE_ATTRIBUTE_NAME, szValue)) { if (strstr(szValue, "Heading")) @@ -593,16 +740,7 @@ m_pie->write ("\n\\newpage \\section*{\\LARGE\\chaptername\\ "); m_pie->write(szChapterNumber); m_pie->write(" "); // \\newline"); - } - else if (0 == strcmp(szValue, "Chapter Heading")) { - // TODO: Clean this... - char szChapterNumber[6]; - m_iBlockType = BT_HEADING1; - sprintf(szChapterNumber, "%d", ChapterNumber++); - m_pie->write ("\n\\newpage \\section*{\\LARGE\\chaptername\\ "); - m_pie->write(szChapterNumber); - m_pie->write(" "); // \\newline"); - } + } else if(0 == strcmp(szValue, "Block Text")) { m_iBlockType = BT_BLOCKTEXT; @@ -613,20 +751,17 @@ m_iBlockType = BT_PLAINTEXT; m_pie->write("\\texttt{"); } - else - { - m_iBlockType = BT_NORMAL; - } - } - else - { - m_iBlockType = BT_NORMAL; } /* Assumption: never get property set with h1-h3, block text, plain text. Probably true. */ - // TODO: Split this function in several ones - if (m_iBlockType == BT_NORMAL) + + /* In LaTeX, a footnote is enclosed within a parapgraph, so we need to + * preserve values of the previous block, in particular m_iBlockType and + * m_eJustification, as they affect the behavior of _closeBlock() + */ + if (m_iBlockType == BT_NORMAL && !m_bInFootnote) { + m_eJustification = JUSTIFIED; if (pAP->getProperty("text-align", szValue)) { if (0 == strcmp(szValue, "center")) @@ -652,23 +787,22 @@ if (height < 0.9 || height > 1.1) { + char strH[8]; + + /* Assume $baselineskip/fontsize \approx 1.2$, reasonable in most cases */ + snprintf(strH, 8, "%.2f", height / 1.2); + strH[7] = '\0'; + m_pie->write("\\begin{spacing}{"); - UT_DEBUGMSG(("m_bLineHeight = true\n")); + xxx_UT_DEBUGMSG(("m_bLineHeight = true\n")); m_bLineHeight = true; + + m_pie->write(strH); + m_pie->write("}\n"); } - if (height > 1.4 && height < 1.6) - m_pie->write("1.24}\n"); - else if (height > 1.9 && height < 2.1) - m_pie->write("1.66}\n"); - else if (m_bLineHeight) // glup. TODO: calculate the spacing :) - m_pie->write("1.0} % Sorry. I know that you don't expect the 1.0... feel free to fix it! :)\n"); } } } - else - { - m_iBlockType = BT_NORMAL; - } m_bInBlock = true; } @@ -676,7 +810,6 @@ void s_LaTeX_Listener::_openSection(PT_AttrPropIndex api) { const PP_AttrProp* pAP = NULL; - bool bMustEmitMulticol = false; const gchar* pszNbCols = NULL; m_bBetweenQuotes = false; @@ -694,9 +827,8 @@ pAP->getProperty("page-margin-left", pszPageMarginRight); if (pszNbCols != NULL && ((0 == strcmp(pszNbCols, "2")) - || (0 == strcmp(pszNbCols, "3")))) + || (0 == strcmp(pszNbCols, "3")))) { - bMustEmitMulticol = true; m_bMultiCols = true; } if (pszPageMarginLeft != NULL) @@ -716,14 +848,7 @@ } } - if (m_bFirstSection) - { - // Document begins - m_pie->write ("\n\n\\begin{document}\n"); - m_bFirstSection = false; - } - - if (bMustEmitMulticol) + if (m_bMultiCols) { m_pie->write("\\begin{multicols}{"); m_pie->write(static_cast (pszNbCols)); @@ -746,47 +871,87 @@ strtol (&colors[2][0],NULL,16)/255.); } +struct LaTeX_Font_Size +{ + guint8 tiny; + guint8 scriptsize; + guint8 footnotesize; + guint8 small; + /* int normalsize; */ + guint8 large; + guint8 Large; + guint8 LARGE; + guint8 huge; + guint8 Huge; +}; + +/* + * These font sizes in the standard document classes are documented in + * "The (Not So) Short Introduction to LaTeX2e" and the following url: + * http://en.wikibooks.org/wiki/LaTeX/Formatting + */ +static const LaTeX_Font_Size fontsizes[]= +{ + {5, 7, 8, 9, /*10,*/ 12, 14, 17, 20, 25}, // normalsize == 10pt + {6, 8, 9, 10, /*11,*/ 12, 17, 17, 20, 25}, // normalsize == 11pt + {6, 8, 10, 11, /*12,*/ 14, 17, 20, 25, 25} // normalsize == 12pt +}; + void s_LaTeX_Listener::_convertFontSize(UT_String& szDest, const char* pszFontSize) { double fSizeInPoints = UT_convertToPoints(pszFontSize); + const LaTeX_Font_Size *fs = NULL; if(m_bInScript) { fSizeInPoints -= 4; } - - if (fSizeInPoints <= 6) + + if (m_DefaultFontSize == 10) + { + fs = &fontsizes[0]; + } + else if (m_DefaultFontSize == 11) + { + fs = &fontsizes[1]; + } + else // m_DefaultFontSize == 12 + { + fs = &fontsizes[2]; + } + + if (fSizeInPoints <= fs->tiny) { szDest = "tiny"; } - else if (fSizeInPoints <= 8) + else if (fSizeInPoints <= fs->scriptsize) { szDest = "scriptsize"; } - else if (fSizeInPoints <= 10) + else if (fSizeInPoints <= fs->footnotesize) { szDest = "footnotesize"; } - else if (fSizeInPoints <= 11) + else if (fSizeInPoints <= fs->small) { szDest = "small"; } - else if (fSizeInPoints <= 12) + else if (fSizeInPoints <= m_DefaultFontSize) { szDest = "normalsize"; } - else if (fSizeInPoints <= 14) + else if (fSizeInPoints <= fs->large) { szDest = "large"; } - else if (fSizeInPoints <= 17) + else if (fSizeInPoints <= fs->Large) { szDest = "Large"; } - else if (fSizeInPoints <= 20) + else if (fSizeInPoints <= fs->LARGE) { szDest = "LARGE"; } - else if (fSizeInPoints <= 25) + else if (fSizeInPoints <= fs->huge) { szDest = "huge"; } @@ -805,98 +970,60 @@ const PP_AttrProp * pAP = NULL; bool bHaveProp = m_pDocument->getAttrProp(api,&pAP); + m_bOverline = false; + m_NumCloseBrackets = 0; if (bHaveProp && pAP) { const gchar * szValue; - if ( - (pAP->getProperty("font-weight", szValue) && !m_bInHeading) + if (pAP->getProperty("font-weight", szValue) && !strcmp(szValue, "bold") ) { m_pie->write("\\textbf{"); + m_NumCloseBrackets++; } - if ( - (pAP->getProperty("font-style", szValue) && !m_bInHeading) + if (pAP->getProperty("font-style", szValue) && !strcmp(szValue, "italic") ) { m_pie->write("\\emph{"); + m_NumCloseBrackets++; } - if (pAP->getProperty("text-decoration", szValue)) - { - const gchar* pszDecor = szValue; - - gchar* p; - if (!(p = g_strdup(pszDecor))) - { - // TODO outofmem - } - - UT_ASSERT(p || !pszDecor); - gchar* q = strtok(p, " "); - - // See the ulem.sty documentation (available at www.ctan.org) - // if you wish to include other kinds of underlines, such as - // double underlines or wavy underlines - while (q) - { - if (0 == strcmp(q, "underline")) // TODO: \def\undertext#1{$\underline{\vphantom{y}\smash{\hbox{#1}}}$} - { - m_pie->write("\\uline{"); - } - - if (0 == strcmp(q, "overline")) - { - m_pie->write("$\\overline{\\textrm{"); - } - - if (0 == strcmp(q, "line-through")) - { - m_pie->write("\\sout{"); - } - - q = strtok(NULL, " "); - } - - free(p); - } - if (pAP->getProperty("text-position", szValue)) { if (!strcmp("superscript", szValue)) { m_bInScript = true; - //m_pie->write("$^{\\mathrm{"); m_pie->write("\\textsuperscript{"); + m_NumCloseBrackets++; } else if (!strcmp("subscript", szValue)) { m_bInScript = true; - //m_pie->write("$_{\\mathrm{"); m_pie->write("\\textsubscript{"); + m_NumCloseBrackets++; } } const gchar* pszColor = NULL; pAP->getProperty("color", pszColor); if (pszColor) - { + { if ((0 != strcmp("000000", pszColor)) && - (0 != strcmp("000000", pszColor))) - { - UT_String szColor; - _convertColor(szColor,(const char*)pszColor); - m_pie->write("\\textcolor[rgb]{"); - m_pie->write(szColor); - m_pie->write("}{"); - } - else - m_pie->write("{"); - } + (0 != strcmp("transparent", pszColor))) + { + UT_String szColor; + _convertColor(szColor,(const char*)pszColor); + m_pie->write("\\textcolor[rgb]{"); + m_pie->write(szColor); + m_pie->write("}{"); + m_NumCloseBrackets++; + } + } const gchar* pszBgColor = NULL; pAP->getProperty("bgcolor", pszBgColor); @@ -911,44 +1038,79 @@ m_pie->write("\\colorbox[rgb]{"); m_pie->write(szColor); m_pie->write("}{"); + m_NumCloseBrackets++; } - else - m_pie->write("{"); } if (pAP->getProperty("font-size", szValue) && !m_bInHeading) { - if (strcmp (DEFAULT_SIZE, szValue) != 0) + if (int(0.5 + UT_convertToPoints(szValue)) != m_DefaultFontSize) { m_pie->write("{\\"); UT_String szSize; _convertFontSize(szSize, static_cast(szValue)); m_pie->write(szSize); m_pie->write(" "); + m_NumCloseBrackets++; } } - if (pAP->getProperty("font-family", szValue) && !m_bInHeading) + if (pAP->getProperty("font-family", szValue)) { // TODO: Use a dynamic substitution table - if (!strcmp("Symbol", szValue) || - !strcmp("Standard Symbols", szValue)) + if (strstr(szValue, "Symbol") && !m_bInHeading) m_bInSymbol = true; - if (!strcmp("Courier", szValue) || - !strcmp("Courier New", szValue) || + if (strstr(szValue, "Courier") || !strcmp("Luxi Mono",szValue)) { - m_bInCourier = true; m_pie->write("\\texttt{"); + m_NumCloseBrackets++; } if (!strcmp("Arial", szValue) || !strcmp("Helvetic", szValue) || !strcmp("Luxi Sans",szValue)) { - m_bInSansSerif = true; m_pie->write("\\textsf{"); + m_NumCloseBrackets++; } UT_DEBUGMSG (("Latex export: TODO: 'font-family' property\n")); } + if (pAP->getProperty("text-decoration", szValue) && szValue && !m_bInHeading) + { + gchar* p = g_strdup(szValue); + + UT_return_if_fail(p); + gchar* q = strtok(p, " "); + + // See the ulem.sty documentation (available at www.ctan.org) + // if you wish to include other kinds of underlines, such as + // double underlines or wavy underlines + while (q) + { + if (0 == strcmp(q, "underline")) + { + m_pie->write("\\uline{"); + m_NumCloseBrackets++; + } + else if(0 == strcmp(q, "overline")) + { + m_bOverline = true; + } + else if(0 == strcmp(q, "line-through")) + { + m_pie->write("\\sout{"); + m_NumCloseBrackets++; + } + q = strtok(NULL, " "); + } + + /* This should be at the very last, in order to match + * the close brackets in _closeSpan(). + */ + if (m_bOverline) + m_pie->write("$\\overline{\\textrm{"); + g_free(p); + } + m_bInSpan = true; m_pAP_Span = pAP; } @@ -964,11 +1126,30 @@ m_pie->write("\n\\begin{table}[h]\\begin{tabular}{|"); for(i = 0; i < m_pTableHelper->getNumCols(); i++) m_pie->write("l|"); m_pie->write("}"); +// m_pie->write("\n\\hline\n"); + + m_RowNuminTable = 1; + m_ExpectedLeft = 0; + m_index = 0; } void s_LaTeX_Listener::_closeCell(void) { + if (m_CellBot - m_CellTop >1) + m_pie->write("}"); + if (m_CellRight - m_CellLeft >1) + m_pie->write("}"); m_bInCell = false; + this->m_pTableHelper->CloseCell(); + if(m_CellRight == m_TableWidth) + { + m_ExpectedLeft = 0; + } + else + { + m_ExpectedLeft = m_CellRight; + m_pie->write("&"); + } } void s_LaTeX_Listener::_closeSpan(void) @@ -976,142 +1157,16 @@ if (!m_bInSpan) return; - const PP_AttrProp * pAP = m_pAP_Span; + if (m_bOverline) + m_pie->write("}}$"); - if (pAP) + if (m_pAP_Span) { - const gchar * szValue; - - if (pAP->getProperty("color", szValue)) - { - m_pie->write("}"); - } - - if (pAP->getProperty("bgcolor", szValue)) - { - m_pie->write("}"); - } - - if ((pAP->getProperty("font-size", szValue) && !m_bInHeading) -// || (pAP->getProperty("font-family", szValue)) // TODO - ) - { - if (strcmp (szValue, DEFAULT_SIZE) != 0) - m_pie->write("}"); - } - - if (pAP->getProperty("text-position", szValue)) - { - if (!strcmp("superscript", szValue)) - { - m_bInScript = false; - //m_pie->write("}}$"); - m_pie->write("}\n"); - } - else if (!strcmp("subscript", szValue)) - { - m_bInScript = false; - //m_pie->write("}}$"); - m_pie->write("}\n"); - } - } - - if ( - (pAP->getProperty("text-decoration", szValue)) - ) - { - const gchar* pszDecor = szValue; - - gchar* p; - if (!(p = g_strdup(pszDecor))) - { - // TODO outofmem - } - - UT_ASSERT(p || !pszDecor); - gchar* q = strtok(p, " "); - - while (q) - { - if (0 == strcmp(q, "line-through")) - { - m_pie->write("}"); - } - - q = strtok(NULL, " "); - } - - free(p); - } - - if ( - (pAP->getProperty("text-decoration", szValue)) - ) - { - const gchar* pszDecor = szValue; - - gchar* p; - if (!(p = g_strdup(pszDecor))) - { - // TODO outofmem - } - - UT_ASSERT(p || !pszDecor); - gchar* q = strtok(p, " "); - - while (q) - { - if (0 == strcmp(q, "underline")) - { - m_pie->write("}"); - } - - if (0 == strcmp(q, "overline")) - { - m_pie->write("}}$"); - } - - q = strtok(NULL, " "); - } - - free(p); - } - - if ( - (pAP->getProperty("font-style", szValue) && !m_bInHeading) - && !strcmp(szValue, "italic") - ) - { - m_pie->write("}"); - } - - if ( - (pAP->getProperty("font-weight", szValue) && !m_bInHeading) - && !strcmp(szValue, "bold") - ) - { + m_bInScript = false; + if (m_bInSymbol) + m_bInSymbol = false; + for(; m_NumCloseBrackets>0; m_NumCloseBrackets--) m_pie->write("}"); - } - - if (pAP->getProperty("font-family", szValue) && !m_bInHeading) - { - if (!strcmp ("Symbol", szValue) || - !strcmp("Standard Symbols", szValue)) - m_bInSymbol = false; - if (!strcmp("Courier", szValue) || - !strcmp("Courier New", szValue)) - { - m_pie->write("}"); - m_bInCourier = false; - } - if (!strcmp("Helvetic", szValue) || - !strcmp("Arial", szValue) || - !strcmp("Luxi Sans", szValue)) - { - m_pie->write("}"); - m_bInSansSerif = false; - } - } m_pAP_Span = NULL; } @@ -1122,7 +1177,17 @@ void s_LaTeX_Listener::_closeTable(void) { - m_pie->write("\\\\\n\\hline\n\\end{tabular}\n\\end{table}\n"); + if(m_pqRect) + { + for(unsigned int i=0; isize(); i++) + { + delete m_pqRect->at(i); + m_pqRect->at(i) = NULL; + } + m_pqRect->clear(); + } + m_pie->write("\\\\\n\\hline\n"); + m_pie->write("\\end{tabular}\n\\end{table}\n"); } void s_LaTeX_Listener::_outputData(const UT_UCSChar * data, UT_uint32 length) @@ -1290,7 +1355,6 @@ { // only-if-amssymb // SUB('\\', "therefore"); - // todo: $ and ^ don't actually work right. SUB('\"', "forall"); SUB('$', "exists"); SUB('\'', "ni"); SUB('@', "cong"); @@ -1326,20 +1390,72 @@ } } -s_LaTeX_Listener::s_LaTeX_Listener(PD_Document * pDocument, IE_Exp_LaTeX * pie, LaTeX_Analysis_Listener& analysis) +// _outputBabelPackage should be called only by the constructer, and only once +void s_LaTeX_Listener::_outputBabelPackage(void) +{ + // Language appears in as property "lang", + // es-ES, en-US, and so forth... + + const gchar * szLangCode = NULL; + m_pDocument->getAttrProp()->getProperty("lang", szLangCode); // language code + if(szLangCode && *szLangCode) + { + UT_Language lang; + UT_uint32 indx = lang.getIndxFromCode(szLangCode); + if (indx > 0) + { + char *strLangName = g_strdup(lang.getNthLangName(indx)); // language name + if (strLangName) + { + m_pie->write("%% Please revise the following command, if your babel\n"); + m_pie->write("%% package does not support "); + m_pie->write(strLangName); + m_pie->write("\n"); + + *strLangName = tolower(*strLangName); + + const char *q = strtok(strLangName, " ("); // retrieve the "significant" part + if (strcmp(q, "french") == 0) + q="frenchb"; // frenchb.ldf + else if (strcmp(q, "german") == 0) + q="germanb"; // germanb.ldf + else if (strcmp(q, "portuguese") == 0) + q="portuges"; // portuges.ldf + else if (strcmp(q, "russian") == 0) + q="russianb"; // russianb.ldf + else if (strcmp(q, "slovenian") == 0) + q="slovene"; // slovene.ldf + else if (strcmp(q, "ukrainian") == 0) + q="ukraineb"; // ukraineb.ldf + + m_pie->write("\\usepackage["); + m_pie->write(q); + m_pie->write("]{babel}\n"); + + g_free(strLangName); + } + } + + } +} +s_LaTeX_Listener::s_LaTeX_Listener(PD_Document * pDocument, IE_Exp_LaTeX * pie, + const LaTeX_Analysis_Listener& analysis) : m_pDocument(pDocument), m_pie(pie), m_bInBlock(false), m_bInCell(false), m_bInSection(false), m_bInSpan(false), + m_bInScript(false), m_bInFootnote(false), m_bInSymbol(0), - m_bInCourier(0), - m_bInSansSerif(0), - m_bFirstSection(true), m_bInEndnote(false), - m_bHaveEndnote(analysis.m_hasEndnotes) + m_bHaveEndnote(analysis.m_hasEndnotes), + m_bOverline(false), + m_DefaultFontSize(12), + m_NumCloseBrackets(0), + list_type(BULLETED_LIST), + m_pqRect(NULL) { m_pie->write("%% ================================================================================\n"); m_pie->write("%% This LaTeX file was created by AbiWord. \n"); @@ -1351,27 +1467,84 @@ // If (documentclass == book), numbered headings begin with x.y. // If (documentclass == article), there are no chapter headings. // We redefine a "chapter" as a section*. - // TODO: Use correct paper settings from .abw. - // Page size appears in before first
- m_pie->write("\\documentclass[12pt,a4paper]{article}\n"); + + m_pie->write("\\documentclass["); + + fp_PageSize::Predefined ps = pDocument->m_docPageSize.NameToPredefined(pDocument->m_docPageSize.getPredefinedName()); + switch(ps) + { + case fp_PageSize::psA4: + m_pie->write("a4paper"); + break; + case fp_PageSize::psA5: + m_pie->write("a5paper"); + break; + case fp_PageSize::psB5: + m_pie->write("b5paper"); + break; + case fp_PageSize::psLegal: + m_pie->write("legalpaper"); + break; + case fp_PageSize::psLetter: + default: + m_pie->write("letterpaper"); + break; + } + + if(pDocument->m_docPageSize.isPortrait()) + m_pie->write(",portrait"); + else + m_pie->write(",landscape"); + + //retrieve the actual font size + PD_Style * pStyle = NULL; + pDocument->getStyle ("Normal", &pStyle); + if(pStyle) + { + const gchar * szValue = 0; + pStyle->getProperty("font-size", szValue); + if (szValue) + { + // rounding + m_DefaultFontSize = int(0.5 + UT_convertToPoints(szValue)); + if (m_DefaultFontSize <= 10) + { + m_DefaultFontSize = 10; + m_pie->write(",10pt"); + } + else if (m_DefaultFontSize <= 11) + { + m_DefaultFontSize = 11; + m_pie->write(",11pt"); + } + } + } + if (m_DefaultFontSize == 12) + m_pie->write(",12pt"); + + m_pie->write("]{article}\n"); // Better for ISO-8859-1 than previous: [T1] doesn't work very well // TODO: Use inputenc from .abw. m_pie->write("\\usepackage[latin1]{inputenc}\n"); m_pie->write("\\usepackage{calc}\n"); m_pie->write("\\usepackage{setspace}\n"); + m_pie->write("\\usepackage{fixltx2e}\n"); // for \textsubscript m_pie->write("\\usepackage{graphicx}\n"); m_pie->write("\\usepackage{multicol}\n"); m_pie->write("\\usepackage[normalem]{ulem}\n"); - // TODO: Use correct language from .abw. - // Language appears in as property "lang", - // es-ES, en-US, and so forth... - m_pie->write("%% Please set your language here\n"); - m_pie->write("\\usepackage[english]{babel}\n"); + + _outputBabelPackage(); + m_pie->write("\\usepackage{color}\n"); if (m_bHaveEndnote) m_pie->write("\\usepackage{endnotes}\n"); + if (analysis.m_hasTable && analysis.m_hasMultiRow) + { + m_pie->write("\\usepackage{multirow}\n"); + m_pqRect = new std::deque; + } // Must be as late as possible. m_pie->write("\\usepackage{hyperref}\n"); @@ -1382,9 +1555,7 @@ } m_pie->write("\n"); ChapterNumber = 1; - m_bInScript = false; - // m_pie->write("\\begin{document}\n"); // I've to leave this step to the openSection, and that implies - // m_pie->write("\n"); // future problems when we will support several sections in the same doc... + m_pie->write("\\begin{document}\n\n"); m_pTableHelper = new ie_Table(pDocument); } @@ -1392,16 +1563,84 @@ s_LaTeX_Listener::~s_LaTeX_Listener() { //if (!m_bInFootnote) return; - _closeSpan(); - _closeBlock(); +#ifdef HAVE_LIBXSLT + if(cur) + { + xsltFreeStylesheet(cur); + cur = NULL; + } +#endif _closeSection(); _handleDataItems(); DELETEP(m_pTableHelper); + if(m_pqRect) + { + for(unsigned int i=0; isize(); i++) + { + delete m_pqRect->at(i); + m_pqRect->at(i) = NULL; + } + delete m_pqRect; + } if (m_bHaveEndnote) m_pie->write("\n\\theendnotes"); m_pie->write("\n\\end{document}\n"); } +#ifdef HAVE_LIBXSLT +bool s_LaTeX_Listener::convertMathMLtoLaTeX(const UT_UTF8String & sMathML, + UT_UTF8String & sLaTeX) +{ + //static xsltStylesheet *cur = NULL; + xmlDocPtr doc, res; + xmlChar * pLatex = NULL; + int len; + + if (sMathML.empty()) + // Nothing has failed, but we have nothing to do anyway + return false; + if (!cur) + { + UT_UTF8String path(XAP_App::getApp()->getAbiSuiteLibDir()); + path += "/xsltml/mmltex.xsl"; + + cur = xsltParseStylesheetFile((const xmlChar *)(path.utf8_str())); + if (!cur) + { + UT_DEBUGMSG(("convertMathMLtoLaTeX: Parsing stylesheet failed\n")); + return false; + } + } + doc = xmlParseDoc((const xmlChar*)(sMathML.utf8_str())); + if (!doc) + { + xxx_UT_DEBUGMSG(("convertMathMLtoLaTeX: Parsing MathML document failed\n")); + return false; + } + + res = xsltApplyStylesheet(cur, doc, NULL); + if (!res) + { + xxx_UT_DEBUGMSG(("convertMathMLtoLaTeX: Applying stylesheet failed\n")); + xmlFreeDoc(doc); + return false; + } + + if (xsltSaveResultToString(&pLatex, &len, res, cur) != 0) + { + xmlFreeDoc(res); + xmlFreeDoc(doc); + return false; + } + sLaTeX.assign((const char*)pLatex, len); + + g_free(pLatex); + xmlFreeDoc(res); + xmlFreeDoc(doc); + return true; +} +#endif + bool s_LaTeX_Listener::populate(PL_StruxFmtHandle /*sfh*/, const PX_ChangeRecord * pcr) { @@ -1442,27 +1681,19 @@ switch (pcro->getObjectType()) { case PTO_Image: - // TODO we *will* create separate image files. - // (we will borrow the code from HTML export) // LaTeX assumes images are EPS. // PDFLaTeX assumes images are PNG. - m_pie->write("\\includegraphics[height="); - pAP->getProperty("height", szValue); - m_pie->write(szValue); - pAP->getProperty("width", szValue); - m_pie->write(",width="); - m_pie->write(szValue); - m_pie->write("]{"); - pAP->getAttribute("dataid", szValue); - m_pie->write(szValue); - m_pie->write("}"); - + // Currently we can create PNG images only + // TODO: is it possible to create EPS images after the cairo integration? + if(bHaveProp) + _handleImage(pAP); return true; case PTO_Field: field = pcro->getField(); - m_pie->write(field->getValue()); + if(field->getValue()) + m_pie->write(field->getValue()); // we do nothing with computed fields. return true; @@ -1502,6 +1733,58 @@ m_pie->write("}"); } return true; + + case PTO_Math: + _closeSpan () ; + if(bHaveProp && pAP) + { + UT_UTF8String sLatex; + const UT_ByteBuf * pByteBuf = NULL; + UT_UCS4_mbtowc myWC; + + if(pAP->getAttribute("latexid", szValue) && szValue + && *szValue) + { + bool bFoundLatex = m_pDocument->getDataItemDataByName(szValue, + &pByteBuf, + NULL, NULL); + if(!bFoundLatex) + { + UT_DEBUGMSG(("Equation %s not found in document \n", szValue)); + return true; + } + sLatex.appendBuf(*pByteBuf, myWC); + + m_pie->write("$"); + m_pie->write(sLatex.utf8_str()); + m_pie->write("$"); + } +#ifdef HAVE_LIBXSLT + else if(pAP->getAttribute("dataid", szValue) && szValue + && *szValue) + { + UT_UTF8String sMathML; + bool bFoundMathML = m_pDocument->getDataItemDataByName(szValue, + &pByteBuf, + NULL, NULL); + if(!bFoundMathML) + { + UT_DEBUGMSG(("Equation %s not found in document \n", szValue)); + return true; + } + + sMathML.appendBuf(*pByteBuf, myWC); + + if(!convertMathMLtoLaTeX(sMathML, sLatex)) + return true; + /*The converted sLatex already contains $s*/ + m_pie->write(sLatex.utf8_str()); + } +#endif + else + return true; + } + return true; default: UT_ASSERT_HARMLESS(0); @@ -1530,8 +1813,6 @@ { case PTX_Section: { - _closeSpan(); - _closeBlock(); _closeSection(); PT_AttrPropIndex indexAP = pcr->getIndexAP(); @@ -1563,8 +1844,6 @@ case PTX_SectionHdrFtr: { - _closeSpan(); - _closeBlock(); _closeSection(); PT_AttrPropIndex indexAP = pcr->getIndexAP(); @@ -1596,7 +1875,6 @@ case PTX_Block: { - _closeSpan(); _closeBlock(); _closeParagraph(); _openParagraph(pcr->getIndexAP()); @@ -1606,6 +1884,7 @@ case PTX_SectionTable: { m_pTableHelper->OpenTable(sdh, pcr->getIndexAP()); + m_TableWidth = m_pTableHelper->getNumCols(); _openTable(pcr->getIndexAP()); return true; } @@ -1649,7 +1928,6 @@ case PTX_SectionTOC: { - _closeSpan(); _closeBlock(); /* _closeSection(); @@ -1732,6 +2010,77 @@ } +/* Code taken from the HTML exporter + * + * imagedir is the name of the directory in which we'll write the image + * filename is the name of the file to which we'll write the image + */ +void s_LaTeX_Listener::_writeImage (const UT_ByteBuf * pByteBuf, + const UT_UTF8String & imagedir, + const UT_UTF8String & filename) +{ + UT_go_directory_create(imagedir.utf8_str(), 0750, NULL); + + UT_UTF8String path(imagedir); + path += "/"; + path += filename; + + GsfOutput * out = UT_go_file_create (path.utf8_str (), NULL); + if (out) + { + gsf_output_write (out, pByteBuf->getLength (), (const guint8*)pByteBuf->getPointer (0)); + gsf_output_close (out); + g_object_unref (G_OBJECT (out)); + } +} + +void s_LaTeX_Listener::_handleImage(const PP_AttrProp * pAP) +{ + /* Part of code taken from the HTML exporter */ + const UT_ByteBuf * pByteBuf; + UT_ByteBuf decodedByteBuf; + const gchar *szHeight = NULL, *szWidth = NULL, *szDataID = NULL, *szMimeType = NULL; + + if (! pAP) + return; + if (! pAP->getAttribute("dataid", szDataID)) + return; + + if (! m_pDocument->getDataItemDataByName(szDataID, &pByteBuf, reinterpret_cast(&szMimeType), NULL)) + return; + if ((pByteBuf == 0) || (szMimeType == 0)) return; // ?? + + if (strcmp (szMimeType, "image/png") != 0) + { + UT_DEBUGMSG(("Object not of MIME type image/png - ignoring...\n")); + return; + } + + gchar *imagedir = UT_go_dirname_from_uri(m_pie->getFileName(), true); + + UT_UTF8String filename(szDataID); + filename += ".png"; + + /* save the image as imagedir/filename */ + _writeImage (pByteBuf, imagedir, filename); + FREEP(imagedir); + + m_pie->write("\\includegraphics"); + if (pAP->getProperty("height", szHeight) && pAP->getProperty("width", szWidth)) + { + m_pie->write("[height="); + m_pie->write(szHeight); + m_pie->write(",width="); + m_pie->write(szWidth); + m_pie->write("]"); + } + + m_pie->write("{"); + m_pie->write(szDataID); + m_pie->write("}\n"); + + return; +} /* This is a copy from wv. Returns 1 if was translated, 0 if wasn't. It can convert to empty string. diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xp/ie_exp_LaTeX.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xp/ie_exp_LaTeX.h --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xp/ie_exp_LaTeX.h 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xp/ie_exp_LaTeX.h 2009-07-15 16:56:23.000000000 +0100 @@ -28,7 +28,7 @@ // The exporter/writer for LaTeX -class ABI_EXPORT IE_Exp_LaTeX_Sniffer : public IE_ExpSniffer +class IE_Exp_LaTeX_Sniffer : public IE_ExpSniffer { friend class IE_Exp; @@ -44,7 +44,7 @@ IE_Exp ** ppie); }; -class ABI_EXPORT IE_Exp_LaTeX : public IE_Exp +class IE_Exp_LaTeX : public IE_Exp { public: IE_Exp_LaTeX(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xp/Makefile 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= ie_exp_LaTeX.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/cmarkup.xsl /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/cmarkup.xsl --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/cmarkup.xsl 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/cmarkup.xsl 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,1113 @@ + + + + + + + + + + + + + + + + i + + + + + / + + + + + + _{} + + + + + e^{i + + } + + + + + E + + + + + + + + \mathrm{} + + + + + + + + + + + + + ( + + + , + + ) + + + + + () + + + + + + + \left( + + \left[ + + + , + + + + \right) + + \right] + + + + + \left\{\right\} + + + + + ^{(-1)} + + + + + + + + + \mapsto + + + + + + + + + + + \circ + + + + +\mathrm{id} + + + + \mathop{\mathrm{ + + }} + + + + + + + + \begin{cases} + + + \end{cases} + + + + + & \text{if $ + + $} + \\ + + + + + & \text{otherwise} + + + + + \left\lfloor\frac{ + + }{ + + }\right\rfloor + + + + + + + + ! + + + + + + + \left( + \frac{ + + + }{ + + + } + \right) + + + + + \ + + \{ + + + + \mid + + + + + + , + + + + \} + + + + + - + + + + + + + + + - + + + + + + + + + + + ( + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + ) + + + + + + + + + ^{ + + + + } + + + + + + + \mod + + + + + + + + + + ( + + + + \times + + + + + + + + + + ) + + + + + \sqrt + + [ + + ] + + { + + } + + + +\gcd + + + + + + + + \land + + + + + + + + + + \lor + + + + + + + + + + \mathop{\mathrm{xor}} + + + + + + \neg + + + + + + + + + + \implies + + + + + + + + \ + + + + + , + + + \colon + + + + + + + \left| + + \right| + + + + + \overline{} + + + +\Re + + +\Im + + + + \lfloor + + \rfloor + + + + + \lceil + + \rceil + + + + + + + + + = + + + + + + + + + + \neq + + + + + + + + + + > + + + + + + + + + + < + + + + + + + + + + \ge + + + + + + + + + + \le + + + + + + + + + + \equiv + + + + + + + + + + \approx + + + + + + + + | + + + + + + + + \int + + _{ + + } + + + ^{ + + } + + + + \,d + + + + + + + ^\prime + + + + \frac{ + + + d^{ + + } + + }{d + + ^{ + + } + + + d + + }{d + + + + } + + + + + D_{ + + + , + + } + + + + + \frac{\partial + + + ^{ + + } + + + ^{ + + + + + + + + + + + } + + + ^{ + + } + + + + + }{ + + \partial + + + ^{ + + } + + + } + + + + + + + + + , + + + +\mathop{\mathrm{div}} + + +\nabla^2 + + + + \{\} + + + + + \left[\right] + + + + + + + \colon + + + + + + , + + + + + + + + + + + + \cup + + + + + + + + + + \cap + + + + + + + + \in + + + + + + + + + + \notin + + + + + + + + + + + + \subseteq + + + + + + + + + + \subset + + + + + + + + + + \nsubseteq + + + + + + + + + + \not\subset + + + + + + + + + + \setminus + + + + + + | + + | + + + + + + + + + \times + + + + + + + + ^{ + + } + + + + + \sum + + + + + \prod + + + + + _{ + + + = + + + } + + + ^{ + + } + + + + + + + + \lim_{ + + } + + + + + + \to + + + + + + + + + + + + \searrow + \nearrow + \rightarrow + \to + + + + + + + + \ + + + + + + + + + \ + + + + + + \mathrm{ + + \,} + + + + + + + \mathrm{ + + } + + + + + e^{} + + + + + \lg + + + + + + + \log_{ + + } + + + + + + + + \langle + + + , + + \rangle + + + +\sigma + + + + \sigma( + + )^2 + + + + + \langle + + ^{ + + }\rangle + + _{ + + } + + + + + + + \left(\begin{array}{c} + + + \\ + + \end{array}\right) + + + + + \begin{pmatrix} + + \end{pmatrix} + + + + + + + & + + \\ + + + + + \det + + + + + + + \begin{vmatrix} + + \end{vmatrix} + + + + + + + + ^T + + + + + + + + _{ + + + , + + } + + + + + + + + + \cdot + + + + + + + + + + \otimes + + + + + + + + + + + +\mathbb{Z} + + +\mathbb{R} + + +\mathbb{Q} + + +\mathbb{N} + + +\mathbb{C} + + +\mathbb{P} + + +e + + +i + + +NaN + + +\mbox{true} + + +\mbox{false} + + +\emptyset + + +\pi + + +\gamma + + +\infty + + + + + + + ( + + + + + + + + + ) + + + + + + + ( + + + + + + + + ) + + + \ No newline at end of file diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/entities.xsl /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/entities.xsl --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/entities.xsl 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/entities.xsl 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,909 @@ + + + + + + +' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/glayout.xsl /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/glayout.xsl --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/glayout.xsl 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/glayout.xsl 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,228 @@ + + + + + + + + + + + + \genfrac{}{}{ + + + + ex + + + 0ex + + + .05ex + + + + .2ex + + + + + + }{}{ + + + \frac{ + + + + \hfill + + + + \hfill + + }{ + + \hfill + + + + \hfill + + } + + + + \raisebox{1ex}{$ + + $}\!\left/ \!\raisebox{-1ex}{$ + + $}\right. + + + + + + + \sqrt[ + + ]{ + + } + + + + exception 25: + \text{exception 25:} + + + + + + \sqrt{ + + } + + + + + + + \left + + + \ + + + \left. + + + + \left( + + + + + + + , + + + + + + + + + + + + + + + + + + + \right + + + \ + + + \right. + + + + \right) + + + + + \phantom{ + + } + + + + + + \overline{ + + \hspace{.2em}|} + + + \sqrt{ + + } + + + \overline{) + + } + + + + + + + + + + + {\displaystyle + + + { + + \textstyle + \scriptstyle + \scriptscriptstyle + + + + \colorbox[rgb]{ + + + + }{$ + + + + + + + + + \textcolor[rgb]{ + + + + }{ + + + + } + + + $} + + + } + + + } + + + + + + + + \ No newline at end of file diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/GNUmakefile.am 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,14 @@ +EXTRA_DIST = \ + cmarkup.xsl \ + entities.xsl \ + glayout.xsl \ + mmltex.xsl \ + scripts.xsl \ + tables.xsl \ + tokens.xsl \ + README + +if HAVE_LIBXSLT +xslt_DATA = $(EXTRA_DIST) +xsltdir = $(datadir)/abiword-2.6/xsltml +endif diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/GNUmakefile.in 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,511 @@ +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = wp/impexp/latex/xsltml +DIST_COMMON = README $(srcdir)/GNUmakefile.am $(srcdir)/GNUmakefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/ac-helpers/abi-libpng.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-init.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-platform.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-report.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-setup.m4 \ + $(top_srcdir)/ac-helpers/ax_boost_base.m4 \ + $(top_srcdir)/ac-helpers/dyld.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(xsltdir)" +xsltDATA_INSTALL = $(INSTALL_DATA) +DATA = $(xslt_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ABICOLLAB_FAKE_CPPFLAGS = @ABICOLLAB_FAKE_CPPFLAGS@ +ABICOLLAB_FAKE_LIBS = @ABICOLLAB_FAKE_LIBS@ +ABICOLLAB_LIBXML2_CPPFLAGS = @ABICOLLAB_LIBXML2_CPPFLAGS@ +ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ +ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ +ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ +ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ +ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ +ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ +ABICOLLAB_TCP_LIBS = @ABICOLLAB_TCP_LIBS@ +ABICOLLAB_XMPP_CPPFLAGS = @ABICOLLAB_XMPP_CPPFLAGS@ +ABICOLLAB_XMPP_LIBS = @ABICOLLAB_XMPP_LIBS@ +ABI_AIKSAURUS_CPPFLAGS = @ABI_AIKSAURUS_CPPFLAGS@ +ABI_AIKSAURUS_LDFLAGS = @ABI_AIKSAURUS_LDFLAGS@ +ABI_BMP_CPPFLAGS = @ABI_BMP_CPPFLAGS@ +ABI_BMP_LDFLAGS = @ABI_BMP_LDFLAGS@ +ABI_CFLAGS = @ABI_CFLAGS@ +ABI_COMMAND_CPPFLAGS = @ABI_COMMAND_CPPFLAGS@ +ABI_COMMAND_LDFLAGS = @ABI_COMMAND_LDFLAGS@ +ABI_CPPFLAGS = @ABI_CPPFLAGS@ +ABI_DOCBOOK_CPPFLAGS = @ABI_DOCBOOK_CPPFLAGS@ +ABI_DOCBOOK_LDFLAGS = @ABI_DOCBOOK_LDFLAGS@ +ABI_GDA_CPPFLAGS = @ABI_GDA_CPPFLAGS@ +ABI_GDA_LDFLAGS = @ABI_GDA_LDFLAGS@ +ABI_GDICT_CPPFLAGS = @ABI_GDICT_CPPFLAGS@ +ABI_GDICT_LDFLAGS = @ABI_GDICT_LDFLAGS@ +ABI_GRAMMAR_CPPFLAGS = @ABI_GRAMMAR_CPPFLAGS@ +ABI_GRAMMAR_LDFLAGS = @ABI_GRAMMAR_LDFLAGS@ +ABI_HANCOM_CPPFLAGS = @ABI_HANCOM_CPPFLAGS@ +ABI_HANCOM_LDFLAGS = @ABI_HANCOM_LDFLAGS@ +ABI_JPEG_CPPFLAGS = @ABI_JPEG_CPPFLAGS@ +ABI_JPEG_LDFLAGS = @ABI_JPEG_LDFLAGS@ +ABI_LIBS = @ABI_LIBS@ +ABI_OPENDOCUMENT_CPPFLAGS = @ABI_OPENDOCUMENT_CPPFLAGS@ +ABI_OPENDOCUMENT_LDFLAGS = @ABI_OPENDOCUMENT_LDFLAGS@ +ABI_OPENWRITER_CPPFLAGS = @ABI_OPENWRITER_CPPFLAGS@ +ABI_OPENWRITER_LDFLAGS = @ABI_OPENWRITER_LDFLAGS@ +ABI_OPENXML_CPPFLAGS = @ABI_OPENXML_CPPFLAGS@ +ABI_OPENXML_LDFLAGS = @ABI_OPENXML_LDFLAGS@ +ABI_OTS_CPPFLAGS = @ABI_OTS_CPPFLAGS@ +ABI_OTS_LDFLAGS = @ABI_OTS_LDFLAGS@ +ABI_PLUGIN_DIR = @ABI_PLUGIN_DIR@ +ABI_PSION_CPPFLAGS = @ABI_PSION_CPPFLAGS@ +ABI_PSION_LDFLAGS = @ABI_PSION_LDFLAGS@ +ABI_SDW_CPPFLAGS = @ABI_SDW_CPPFLAGS@ +ABI_SDW_LDFLAGS = @ABI_SDW_LDFLAGS@ +ABI_WMF_CPPFLAGS = @ABI_WMF_CPPFLAGS@ +ABI_WMF_LDFLAGS = @ABI_WMF_LDFLAGS@ +ABI_XHTML_CPPFLAGS = @ABI_XHTML_CPPFLAGS@ +ABI_XHTML_LDFLAGS = @ABI_XHTML_LDFLAGS@ +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ +GNOMESCAN_LIBS = @GNOMESCAN_LIBS@ +GNOME_CFLAGS = @GNOME_CFLAGS@ +GNOME_LIBS = @GNOME_LIBS@ +GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ +GOFFICE_LIBS = @GOFFICE_LIBS@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ +LIBPNG_PEERDIR = @LIBPNG_PEERDIR@ +LIBRSVG_CPPFLAGS = @LIBRSVG_CPPFLAGS@ +LIBRSVG_LDFLAGS = @LIBRSVG_LDFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBWPG_CPPFLAGS = @LIBWPG_CPPFLAGS@ +LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ +LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ +LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ +LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MATHVIEW_CFLAGS = @MATHVIEW_CFLAGS@ +MATHVIEW_LIBS = @MATHVIEW_LIBS@ +MKDIR_P = @MKDIR_P@ +NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ +NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGAIKSAURUS_CFLAGS = @PKGAIKSAURUS_CFLAGS@ +PKGAIKSAURUS_LIBS = @PKGAIKSAURUS_LIBS@ +PKGGAIKSAURUS_CFLAGS = @PKGGAIKSAURUS_CFLAGS@ +PKGGAIKSAURUS_LIBS = @PKGGAIKSAURUS_LIBS@ +PKG_CONFIG = @PKG_CONFIG@ +PLATFORM_CPPFLAGS = @PLATFORM_CPPFLAGS@ +PLATFORM_LDFLAGS = @PLATFORM_LDFLAGS@ +PRESENTATION_CPPFLAGS = @PRESENTATION_CPPFLAGS@ +PRESENTATION_LDFLAGS = @PRESENTATION_LDFLAGS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +WORDPERFECT_CPPFLAGS = @WORDPERFECT_CPPFLAGS@ +WORDPERFECT_LDFLAGS = @WORDPERFECT_LDFLAGS@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +_abi_dbus_CFLAGS = @_abi_dbus_CFLAGS@ +_abi_dbus_LIBS = @_abi_dbus_LIBS@ +_abi_dbus_glib_CFLAGS = @_abi_dbus_glib_CFLAGS@ +_abi_dbus_glib_LIBS = @_abi_dbus_glib_LIBS@ +_abi_gda_CFLAGS = @_abi_gda_CFLAGS@ +_abi_gda_LIBS = @_abi_gda_LIBS@ +_abi_glib_CFLAGS = @_abi_glib_CFLAGS@ +_abi_glib_LIBS = @_abi_glib_LIBS@ +_abi_grammar_CFLAGS = @_abi_grammar_CFLAGS@ +_abi_grammar_LIBS = @_abi_grammar_LIBS@ +_abi_gtk_CFLAGS = @_abi_gtk_CFLAGS@ +_abi_gtk_LIBS = @_abi_gtk_LIBS@ +_abi_librsvg_CFLAGS = @_abi_librsvg_CFLAGS@ +_abi_librsvg_LIBS = @_abi_librsvg_LIBS@ +_abi_libwpg_CFLAGS = @_abi_libwpg_CFLAGS@ +_abi_libwpg_LIBS = @_abi_libwpg_LIBS@ +_abi_libxml2_CFLAGS = @_abi_libxml2_CFLAGS@ +_abi_libxml2_LIBS = @_abi_libxml2_LIBS@ +_abi_loudmouth_CFLAGS = @_abi_loudmouth_CFLAGS@ +_abi_loudmouth_LIBS = @_abi_loudmouth_LIBS@ +_abi_msworks_CFLAGS = @_abi_msworks_CFLAGS@ +_abi_msworks_LIBS = @_abi_msworks_LIBS@ +_abi_openxml_CFLAGS = @_abi_openxml_CFLAGS@ +_abi_openxml_LIBS = @_abi_openxml_LIBS@ +_abi_ots_CFLAGS = @_abi_ots_CFLAGS@ +_abi_ots_LIBS = @_abi_ots_LIBS@ +_abi_wordperfect_CFLAGS = @_abi_wordperfect_CFLAGS@ +_abi_wordperfect_LIBS = @_abi_wordperfect_LIBS@ +abi_libwmf_config = @abi_libwmf_config@ +abi_tools = @abi_tools@ +abi_wp_impexp = @abi_wp_impexp@ +abi_wp_impexp_graphics = @abi_wp_impexp_graphics@ +abi_wp_scripts = @abi_wp_scripts@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +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@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +psiconvconfig = @psiconvconfig@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = \ + cmarkup.xsl \ + entities.xsl \ + glayout.xsl \ + mmltex.xsl \ + scripts.xsl \ + tables.xsl \ + tokens.xsl \ + README + +@HAVE_LIBXSLT_TRUE@xslt_DATA = $(EXTRA_DIST) +@HAVE_LIBXSLT_TRUE@xsltdir = $(datadir)/abiword-2.6/xsltml +all: all-am + +.SUFFIXES: +$(srcdir)/GNUmakefile.in: $(srcdir)/GNUmakefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign wp/impexp/latex/xsltml/GNUmakefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign wp/impexp/latex/xsltml/GNUmakefile +.PRECIOUS: GNUmakefile +GNUmakefile: $(srcdir)/GNUmakefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-xsltDATA: $(xslt_DATA) + @$(NORMAL_INSTALL) + test -z "$(xsltdir)" || $(MKDIR_P) "$(DESTDIR)$(xsltdir)" + @list='$(xslt_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(xsltDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xsltdir)/$$f'"; \ + $(xsltDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xsltdir)/$$f"; \ + done + +uninstall-xsltDATA: + @$(NORMAL_UNINSTALL) + @list='$(xslt_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(xsltdir)/$$f'"; \ + rm -f "$(DESTDIR)$(xsltdir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: GNUmakefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(xsltdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f GNUmakefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-xsltDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f GNUmakefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-xsltDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-xsltDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-xsltDATA + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/mmltex.xsl /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/mmltex.xsl --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/mmltex.xsl 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/mmltex.xsl 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + $ + + $ + + + + \[ + + \] + + + \ No newline at end of file diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/README /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/README --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/README 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/README 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,104 @@ + + + +README for the XSLT MathML Library 2.1.4 + + +XSLT MathML Library is a set of XSLT stylesheets to transform +MathML 2.0 to LaTeX. + +Currently, we include the cvs HEAD version of this library, as obtained on July +18 2008. + +For more information, see +http://xsltml.sf.net + +Manifest +-------- + +README this file +mmltex.xsl +tokens.xsl +glayout.xsl +scripts.xsl +tables.xsl +entities.xsl +cmarkup.xsl + +Use +--- + +There are two ways of using the library: + + * Use a local copy of the library. + + 1. Download the distribution (see below). + + 2. Unpack the distribution, using unzip. + + 3. In your stylesheet import or include either the main + stylesheet, mmltex.xsl, or the stylesheet module you + wish to use, such as tokens.xsl. This example assumes + that the distribution has been extracted into the same + directory as your own stylesheet: + + + + * Import or include either the main stylesheet, or the + stylesheet module you wish to use, directly from the library + website; http://www.raleigh.ru/MathML/mmltex/. For example: + + + +Obtaining The Library +--------------------- + +The XSLT MathML Library is available for download as: + + * Zip file: http://www.raleigh.ru/MathML/mmltex/xsltml_2.1.2.zip + +Copyright +--------- + +Copyright (C) 2001-2003 Vasil Yaroshevich + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the ``Software''), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +Except as contained in this notice, the names of individuals +credited with contribution to this software shall not be used in +advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization +from the individuals in question. + +Any stylesheet derived from this Software that is publically +distributed will be identified with a different name and the +version strings in any derived Software will be changed so that +no possibility of confusion between the derived package and this +Software will exist. + +Warranty +-------- + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER +CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Contacting the Author +--------------------- + +These stylesheets are maintained by Vasil Yaroshevich, . diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/scripts.xsl /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/scripts.xsl --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/scripts.xsl 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/scripts.xsl 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,375 @@ + + + + + + + + + + + + + + \overline{ + + + + + } + + + \overbrace{ + + + + + } + + + \overleftarrow{ + + + + + } + + + \overrightarrow{ + + + + + } + + + \overleftrightarrow{ + + + + + } + + + \underline{ + + + + + + } + + + \underbrace{ + + + + + + } + + + \underleftarrow{ + + + + + + } + + + \underrightarrow{ + + + + + + } + + + \underleftrightarrow{ + + + + + + } + + + + + _{ + + }^{ + + } + + + \underset{ + + }{\overset{ + + }{ + + }} + + + + + + + + + + + + + + + + + + + + + + + + + \overline{ + + } + + + \overbrace{ + + } + + + \overleftarrow{ + + } + + + \overrightarrow{ + + } + + + \overleftrightarrow{ + + } + + + \tilde{ + + } + + + \check{ + + } + + + \dot{ + + } + + + \ddot{ + + } + + + + + \widehat{ + + + \hat{ + + + } + + + + + ^{ + + } + + + \stackrel{ + + }{ + + } + + + + + + + + + + + \underline{ + + } + + + \underbrace{ + + } + + + \underleftarrow{ + + } + + + \underrightarrow{ + + } + + + \underleftrightarrow{ + + } + + + + + _{ + + } + + + \underset{ + + }{ + + } + + + + + + { + + }_{ + + }^{ + + } + + + + { + + }^{ + + } + + + + { + + }_{ + + } + + + + + + {}_{ + + } + + + {}^{ + + } + + + + + + {} + + + _{ + + } + + + ^{ + + } + + + + + + + + + + + + + + {} + + + _{ + + } + + + ^{ + + } + + + + + + + \ No newline at end of file diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/tables.xsl /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/tables.xsl --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/tables.xsl 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/tables.xsl 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,218 @@ + + + + + + + + + \multicolumn{ + + }{c}{ + + } + + & + + + + + + + \hfill + + + + \hfill + + + + + + + + & + + + + \\ + + + + + + + + + \hline + + + + + + + \begin{array}{ + + | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | + + } + + \hline + + + + \\ \hline + + \end{array} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + center + + + + + + + + + + + + + + + + + + + | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/tokens.xsl /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/tokens.xsl --- abiword-2.6.2/abiword-plugins/wp/impexp/latex/xsltml/tokens.xsl 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/latex/xsltml/tokens.xsl 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,342 @@ + + + + + + + + + + + + + + \textcolor{red}{ + + } + + + + + + + + + \ + + + + + \mathrm{ + + } + + + + + + + + + + + \mathrm{ + + } + + + + + + + + + + + + + \left + + + \right + + + + + + + + + + + + + \text{ + + } + + + + \phantom{\rule + + [- + + ] + + { + + 0ex + + + }{ + + 0ex + + + }} + + + + + + '' + + + '' + + + + + + \colorbox[rgb]{ + + + + }{$ + + + + + + + + + \textcolor[rgb]{ + + + + }{ + + + + + \mathrm{ + + + \mathbf{ + + + \mathit{ + + + \mathit{ + The value bold-italic for mathvariant is not supported + + + \mathbb{ + + + \mathfrak{ + The value bold-fraktur for mathvariant is not supported + + + \mathcal{ + + + \mathcal{ + The value bold-script for mathvariant is not supported + + + \mathfrak{ + + + \mathsf{ + + + \mathsf{ + The value bold-sans-serif for mathvariant is not supported + + + \mathsf{ + The value sans-serif-italic for mathvariant is not supported + + + \mathsf{ + The value sans-serif-bold-italic for mathvariant is not supported + + + \mathtt{ + + + { + Error at mathvariant attribute + + + + + + } + + + } + + + $} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + , + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + , + + + + + + + + + + + + + + 0,1,1 + 0,0,0 + 0,0,1 + 1,0,1 + .5,.5,.5 + 0,.5,0 + 0,1,0 + .5,0,0 + 0,0,.5 + .5,.5,0 + .5,0,.5 + 1,0,0 + .75,.75,.75 + 0,.5,.5 + 1,1,1 + 1,1,0 + + Exception at color template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Exception at Hex2Decimal template + + + + + + + + + + + \ No newline at end of file diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mif/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/mif/GNUmakefile.in 2008-04-06 22:37:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mif/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/mif/Makefile 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/ie_imp_MIF.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_impexp_MIF.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mif/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/mif/xp/GNUmakefile.in 2008-04-06 22:37:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -337,8 +352,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -368,8 +383,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -377,8 +392,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -434,8 +449,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -447,8 +462,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -458,13 +473,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mif/xp/ie_exp_MIF.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/xp/ie_exp_MIF.h --- abiword-2.6.2/abiword-plugins/wp/impexp/mif/xp/ie_exp_MIF.h 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/xp/ie_exp_MIF.h 2009-07-15 16:56:23.000000000 +0100 @@ -28,7 +28,7 @@ // the exporter/writer for MIF -class ABI_EXPORT IE_Exp_MIF_Sniffer : public IE_ExpSniffer +class IE_Exp_MIF_Sniffer : public IE_ExpSniffer { friend class IE_Exp; @@ -44,7 +44,7 @@ IE_Exp ** ppie); }; -class ABI_EXPORT IE_Exp_MIF : public IE_Exp +class IE_Exp_MIF : public IE_Exp { public: IE_Exp_MIF(PD_Document *pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mif/xp/ie_imp_MIF.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/xp/ie_imp_MIF.h --- abiword-2.6.2/abiword-plugins/wp/impexp/mif/xp/ie_imp_MIF.h 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/xp/ie_imp_MIF.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,7 +30,7 @@ // The importer/reader for MIF files -class ABI_EXPORT IE_Imp_MIF_Sniffer : public IE_ImpSniffer +class IE_Imp_MIF_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -50,7 +50,7 @@ }; -class ABI_EXPORT IE_Imp_MIF : public IE_Imp +class IE_Imp_MIF : public IE_Imp { public: IE_Imp_MIF(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mif/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/mif/xp/Makefile 2008-04-06 22:37:10.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mif/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,6 +26,8 @@ ie_imp_MIF.cpp \ ie_impexp_MIF.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/GNUmakefile.in 2008-04-06 22:37:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/Makefile 2008-04-06 22:36:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -30,6 +30,8 @@ OBJS= $(OBJDIR)/ie_imp_MSWrite.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_impexp_MSWrite.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/xp/GNUmakefile.in 2008-04-06 22:37:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -337,8 +352,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -368,8 +383,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -377,8 +392,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -433,8 +448,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -446,8 +461,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -457,13 +472,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/xp/ie_imp_MSWrite.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/xp/ie_imp_MSWrite.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/xp/ie_imp_MSWrite.cpp 2008-04-06 22:36:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/xp/ie_imp_MSWrite.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -312,7 +312,7 @@ tab_count = 0; dxaLeft = dxaRight = dxaLeft1 = 0; - if (bfProp != 0xffff) { + if ((bfProp != 0xffff) && (bfProp + 13 < 0x80)) { cch = pap_page[bfProp + 4]; if (cch >= 2) { jc = pap_page[bfProp + 6] & 3; @@ -363,7 +363,6 @@ UT_LocaleTransactor lt (LC_NUMERIC, "C"); UT_String_sprintf (propBuffer, "text-align:%s; line-height:%.1f", text_align[jc], static_cast(dyaLine) / 240.0); - propBuffer += tempBuffer; /* tabs */ if (tab_count) { @@ -454,7 +453,7 @@ hps = 24; bold = italic = underline = hpsPos = 0; - if (bfProp != 0xffff) { + if ((bfProp != 0xffff) && (bfProp + 10 < 0x80)) { cch = char_page[bfProp + 4]; if (cch >= 2) @@ -500,7 +499,8 @@ } while (fcFirst2 >= fcFirst) { - if ((fcFirst2 >= fcLim) || (fcFirst2 >= fcLim2)) { + if ((fcFirst2 >= fcLim) || (fcFirst2 >= fcLim2) || + (fcFirst2 - 0x80 >= static_cast(mTextBuf.getLength()))) { break; } translate_char (*(mTextBuf.getPointer(fcFirst2 - 0x80)), mCharBuf); @@ -518,7 +518,7 @@ appendSpan (reinterpret_cast(mCharBuf.ucs4_str()), mCharBuf.size()); } else { - UT_DEBUGMSG (("Hub: Ingore 0 length span")); + UT_DEBUGMSG (("Hub: Ignoring 0 length span\n")); } } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/xp/ie_imp_MSWrite.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/xp/ie_imp_MSWrite.h --- abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/xp/ie_imp_MSWrite.h 2008-04-06 22:36:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/xp/ie_imp_MSWrite.h 2009-07-15 16:56:23.000000000 +0100 @@ -46,7 +46,7 @@ // The importer/reader for MS Write Files. -class ABI_EXPORT IE_Imp_MSWrite_Sniffer : public IE_ImpSniffer +class IE_Imp_MSWrite_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -67,7 +67,7 @@ }; -class ABI_EXPORT IE_Imp_MSWrite : public IE_Imp +class IE_Imp_MSWrite : public IE_Imp { public: IE_Imp_MSWrite(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/mswrite/xp/Makefile 2008-04-06 22:36:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/mswrite/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -25,6 +25,8 @@ CPPSRCS= ie_imp_MSWrite.cpp \ ie_impexp_MSWrite.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/nroff/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/nroff/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/nroff/GNUmakefile.in 2008-04-06 22:37:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/nroff/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/nroff/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/nroff/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/nroff/Makefile 2008-04-06 22:37:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/nroff/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/ie_exp_Nroff.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/nroff/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/nroff/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/nroff/xp/GNUmakefile.in 2008-04-06 22:37:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/nroff/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -328,8 +343,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -359,8 +374,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -368,8 +383,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -423,8 +438,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -436,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -447,13 +462,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/nroff/xp/ie_exp_Nroff.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/nroff/xp/ie_exp_Nroff.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/nroff/xp/ie_exp_Nroff.cpp 2008-04-06 22:37:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/nroff/xp/ie_exp_Nroff.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -197,7 +197,7 @@ /* Exporter class */ /*********************************/ -class ABI_EXPORT IE_Exp_Nroff : public IE_Exp +class IE_Exp_Nroff : public IE_Exp { public: @@ -227,7 +227,7 @@ /* Export sniffer */ /*********************************/ -class ABI_EXPORT IE_Exp_Nroff_Sniffer +class IE_Exp_Nroff_Sniffer : public IE_ExpSniffer { friend class IE_Exp; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/nroff/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/nroff/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/nroff/xp/Makefile 2008-04-06 22:37:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/nroff/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= ie_exp_Nroff.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/common/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/common/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/common/GNUmakefile.in 2008-04-06 22:37:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/common/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/common/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/common/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/common/Makefile 2008-04-06 22:37:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/common/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -23,4 +23,6 @@ DIRS= xp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/common/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/common/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/common/xp/GNUmakefile.in 2008-04-06 22:37:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/common/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -79,6 +79,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -144,14 +146,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -168,6 +170,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_OPENDOCUMENT_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -184,6 +189,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -194,7 +202,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -260,7 +273,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -291,6 +304,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -304,6 +318,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libAbiOpenDocument_common.la @@ -321,8 +336,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -398,8 +413,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -411,8 +426,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -422,13 +437,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/common/xp/ie_impexp_OpenDocument.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/common/xp/ie_impexp_OpenDocument.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/common/xp/ie_impexp_OpenDocument.cpp 2008-04-06 22:37:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/common/xp/ie_impexp_OpenDocument.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -100,8 +100,8 @@ /** * */ -ABI_FAR_CALL int abi_plugin_supports_version (UT_uint32 major, UT_uint32 minor, - UT_uint32 release) +ABI_FAR_CALL int abi_plugin_supports_version (UT_uint32 /*major*/, UT_uint32 /*minor*/, + UT_uint32 /*release*/) { return 1; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/common/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/common/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/common/xp/Makefile 2008-04-06 22:37:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/common/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= ie_impexp_OpenDocument.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) INCLUDES+= $(shell pkg-config --cflags libgsf-1) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/GNUmakefile.in 2008-04-06 22:37:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/Makefile 2008-04-06 22:37:07.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -23,4 +23,6 @@ DIRS= xp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/GNUmakefile.in 2008-04-06 22:37:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -98,6 +98,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -163,14 +165,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -187,6 +189,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_OPENDOCUMENT_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -203,6 +208,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -213,7 +221,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -279,7 +292,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -310,6 +323,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -323,6 +337,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libAbiOpenDocument_exp.la @@ -392,8 +407,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -493,8 +508,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -506,8 +521,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -517,13 +532,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument.h 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument.h 2009-07-15 16:56:23.000000000 +0100 @@ -33,7 +33,7 @@ // AbiWord includes #include -class ABI_EXPORT IE_Exp_OpenDocument : public IE_Exp +class IE_Exp_OpenDocument : public IE_Exp { public: IE_Exp_OpenDocument(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.h 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,7 +30,7 @@ #include -class ABI_EXPORT IE_Exp_OpenDocument_Sniffer : public IE_ExpSniffer +class IE_Exp_OpenDocument_Sniffer : public IE_ExpSniffer { public: IE_Exp_OpenDocument_Sniffer(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/Makefile 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -48,6 +48,8 @@ ie_exp_OpenDocument.cpp \ ie_exp_OpenDocument_Sniffer.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) INCLUDES+= $(shell pkg-config --cflags libgsf-1) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListener.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListener.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListener.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListener.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -80,7 +80,7 @@ /** * */ -bool ODe_AbiDocListener::populate(PL_StruxFmtHandle sfh, +bool ODe_AbiDocListener::populate(PL_StruxFmtHandle /*sfh*/, const PX_ChangeRecord * pcr) { switch (pcr->getType()) { @@ -208,7 +208,7 @@ /** * */ -bool ODe_AbiDocListener::populateStrux(PL_StruxDocHandle sdh, +bool ODe_AbiDocListener::populateStrux(PL_StruxDocHandle /*sdh*/, const PX_ChangeRecord* pcr, PL_StruxFmtHandle* psfh) { @@ -414,7 +414,7 @@ /** * */ -bool ODe_AbiDocListener::change(PL_StruxFmtHandle sfh, const PX_ChangeRecord * pcr) +bool ODe_AbiDocListener::change(PL_StruxFmtHandle /*sfh*/, const PX_ChangeRecord * /*pcr*/) { UT_ASSERT_NOT_REACHED(); return true; @@ -424,13 +424,13 @@ /** * */ -bool ODe_AbiDocListener::insertStrux(PL_StruxFmtHandle sfh, - const PX_ChangeRecord * pcr, - PL_StruxDocHandle sdh, - PL_ListenerId lid, - void (* pfnBindHandles)(PL_StruxDocHandle sdhNew, - PL_ListenerId lid, - PL_StruxFmtHandle sfhNew)) +bool ODe_AbiDocListener::insertStrux(PL_StruxFmtHandle /*sfh*/, + const PX_ChangeRecord * /*pcr*/, + PL_StruxDocHandle /*sdh*/, + PL_ListenerId /*lid*/, + void (* /*pfnBindHandles*/)(PL_StruxDocHandle sdhNew, + PL_ListenerId lid, + PL_StruxFmtHandle sfhNew)) { UT_ASSERT_NOT_REACHED(); return true; @@ -440,7 +440,7 @@ /** * */ -bool ODe_AbiDocListener::signal(UT_uint32 iSignal) +bool ODe_AbiDocListener::signal(UT_uint32 /*iSignal*/) { UT_ASSERT_NOT_REACHED(); return true; @@ -1168,7 +1168,7 @@ return; } - for (int i = 0; i < buf.length(); i++) { + for (UT_uint32 i = 0; i < buf.length(); i++) { if (buf[i] == '<') { if (((i + 1) < buf.length()) && (buf[i+1] == '/')) { output += "insertTabChar(); + sBuf += ""; p++; break; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListener.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListener.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListener.h 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListener.h 2009-07-15 16:56:23.000000000 +0100 @@ -158,7 +158,11 @@ m_pListenerImpl = pListenerImpl; } // Work around the "return 0" issue of the UT_GenericVector::getNhItem() - StackCell(UT_uint32 i) {m_pListenerImpl=NULL; m_deleteWhenPop=false;} + StackCell(UT_uint32 /*i*/) + { + m_pListenerImpl=NULL; + m_deleteWhenPop=false; + } StackCell& operator=(const StackCell& sc) { this->m_deleteWhenPop = sc.m_deleteWhenPop; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListenerImpl.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListenerImpl.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListenerImpl.h 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListenerImpl.h 2009-07-15 16:56:23.000000000 +0100 @@ -46,52 +46,52 @@ virtual ~ODe_AbiDocListenerImpl() {} - virtual void insertText(const UT_UTF8String& rText) {} + virtual void insertText(const UT_UTF8String& /*rText*/) {} virtual void insertLineBreak() {} virtual void insertColumnBreak() {} virtual void insertPageBreak() {} virtual void insertTabChar() {} - virtual void openSpan(const PP_AttrProp* pAP) {} + virtual void openSpan(const PP_AttrProp* /*pAP*/) {} virtual void closeSpan() {} - virtual void openBlock(const PP_AttrProp* pAP, ODe_ListenerAction& rAction) {} + virtual void openBlock(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& /*rAction*/) {} virtual void closeBlock() {} - virtual void openSection(const PP_AttrProp* pAP, ODe_ListenerAction& rAction) {} - virtual void closeSection(ODe_ListenerAction& rAction) {} + virtual void openSection(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& /*rAction*/) {} + virtual void closeSection(ODe_ListenerAction& /*rAction*/) {} - virtual void openField(const fd_Field* field, const UT_UTF8String& fieldType, const UT_UTF8String& fieldValue) {} - virtual void closeField(const UT_UTF8String& fieldType) {} + virtual void openField(const fd_Field* /*field*/, const UT_UTF8String& /*fieldType*/, const UT_UTF8String& /*fieldValue*/) {} + virtual void closeField(const UT_UTF8String& /*fieldType*/) {} - virtual void openTable(const PP_AttrProp* pAP, ODe_ListenerAction& rAction) {} - virtual void closeTable(ODe_ListenerAction& rAction) {} + virtual void openTable(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& /*rAction*/) {} + virtual void closeTable(ODe_ListenerAction& /*rAction*/) {} - virtual void openCell(const PP_AttrProp* pAP, ODe_ListenerAction& rAction) {} - virtual void closeCell(ODe_ListenerAction& rAction) {} + virtual void openCell(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& /*rAction*/) {} + virtual void closeCell(ODe_ListenerAction& /*rAction*/) {} - virtual void openFootnote(const PP_AttrProp* pAP, ODe_ListenerAction& rAction) {} - virtual void closeFootnote(ODe_ListenerAction& rAction) {} + virtual void openFootnote(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& /*rAction*/) {} + virtual void closeFootnote(ODe_ListenerAction& /*rAction*/) {} - virtual void openEndnote(const PP_AttrProp* pAP, ODe_ListenerAction& rAction) {} - virtual void closeEndnote(ODe_ListenerAction& rAction) {} + virtual void openEndnote(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& /*rAction*/) {} + virtual void closeEndnote(ODe_ListenerAction& /*rAction*/) {} - virtual void openFrame(const PP_AttrProp* pAP, ODe_ListenerAction& rAction) {} - virtual void closeFrame(ODe_ListenerAction& rAction) {} + virtual void openFrame(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& /*rAction*/) {} + virtual void closeFrame(ODe_ListenerAction& /*rAction*/) {} - virtual void openTOC(const PP_AttrProp* pAP) {} + virtual void openTOC(const PP_AttrProp* /*pAP*/) {} virtual void closeTOC() {} - virtual void openBookmark(const PP_AttrProp* pAP) {} - virtual void closeBookmark(const PP_AttrProp* pAP) {} - virtual void closeBookmark(UT_UTF8String &sBookmarkName) {} + virtual void openBookmark(const PP_AttrProp* /*pAP*/) {} + virtual void closeBookmark(const PP_AttrProp* /*pAP*/) {} + virtual void closeBookmark(UT_UTF8String & /*sBookmarkName*/) {} - virtual void openHyperlink(const PP_AttrProp* pAP) {} + virtual void openHyperlink(const PP_AttrProp* /*pAP*/) {} virtual void closeHyperlink() {} - virtual void insertInlinedImage(const gchar* pImageName, - const PP_AttrProp* pAP) {} + virtual void insertInlinedImage(const gchar* /*pImageName*/, + const PP_AttrProp* /*pAP*/) {} protected: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Frame_Listener.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Frame_Listener.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Frame_Listener.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Frame_Listener.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -58,11 +58,10 @@ */ void ODe_Frame_Listener::openFrame(const PP_AttrProp* pAP, ODe_ListenerAction& rAction) { - bool ok; - const gchar* pValue; + bool ok = false; + const gchar* pValue = NULL; ok = pAP->getProperty("frame-type", pValue); - UT_ASSERT_HARMLESS(ok && pValue != NULL); if (pValue && !strcmp(pValue, "textbox")) { _openODTextbox(*pAP, rAction); @@ -93,7 +92,7 @@ /** * */ -void ODe_Frame_Listener::openTable(const PP_AttrProp* pAP, +void ODe_Frame_Listener::openTable(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& rAction) { ODe_Text_Listener* pTextListener; pTextListener = new ODe_Text_Listener(m_rAutomatiStyles, @@ -108,7 +107,7 @@ /** * */ -void ODe_Frame_Listener::openBlock(const PP_AttrProp* pAP, +void ODe_Frame_Listener::openBlock(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& rAction) { ODe_Text_Listener* pTextListener; pTextListener = new ODe_Text_Listener(m_rAutomatiStyles, @@ -124,11 +123,12 @@ * */ void ODe_Frame_Listener::_openODTextbox(const PP_AttrProp& rAP, - ODe_ListenerAction& rAction) { + ODe_ListenerAction& /*rAction*/) +{ UT_UTF8String output; UT_UTF8String str; bool ok; - const gchar* pValue; + const gchar* pValue = NULL; ODe_Style_Style* pStyle; pStyle = new ODe_Style_Style(); @@ -162,7 +162,6 @@ ok = rAP.getProperty("position-to", pValue); - UT_ASSERT (ok && pValue != NULL); if (pValue && !strcmp(pValue, "block-above-text")) { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ListenerAction.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ListenerAction.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ListenerAction.h 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ListenerAction.h 2009-07-15 16:56:23.000000000 +0100 @@ -42,10 +42,10 @@ ACTION_POP = 2 }; - void pushListenerImpl(ODe_AbiDocListenerImpl* pListenerImpl, bool deleteWhenPop) { + void pushListenerImpl(ODe_AbiDocListenerImpl* pListenerImpl, bool _deleteWhenPop) { m_action = ACTION_PUSH; m_pListenerImpl = pListenerImpl; - m_deleteWhenPop = deleteWhenPop; + m_deleteWhenPop = _deleteWhenPop; } void popListenerImpl() { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ListLevelStyle.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ListLevelStyle.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ListLevelStyle.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ListLevelStyle.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -135,18 +135,17 @@ // We first load the common attributes. ODe_ListLevelStyle::fetchAttributesFromAbiBlock(rAP); - const gchar* pValue; - bool ok; - UT_UCS4Char ucs4Char; + const gchar* pValue = NULL; + bool ok = false; + UT_UCS4Char ucs4Char = 0; // I'm hardcoding this font because it has all possible bullet characters and // it's a free font. m_fontName = "FreeSerif"; ok = rAP.getProperty("list-style", pValue); - UT_ASSERT(ok && pValue != NULL); - if (!strcmp(pValue, "Bullet List")) { + if (!pValue || !strcmp(pValue, "Bullet List")) { ucs4Char = 8226; // U+2022 BULLET } else if (!strcmp(pValue, "Dashed List")) { ucs4Char = 8211; // U+2013 EN DASH @@ -221,13 +220,12 @@ // We first load the common attributes. ODe_ListLevelStyle::fetchAttributesFromAbiBlock(rAP); - const gchar* pValue; - bool ok; + const gchar* pValue = NULL; + bool ok = false; ok = rAP.getProperty("list-style", pValue); - UT_ASSERT(ok && pValue != NULL); - if (!strcmp(pValue, "Numbered List")) { + if (!pValue || !strcmp(pValue, "Numbered List")) { m_numFormat = "1"; } else if (!strcmp(pValue, "Lower Case List")) { m_numFormat = "a"; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Main_Listener.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Main_Listener.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Main_Listener.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Main_Listener.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -176,7 +176,8 @@ /** * Override of ODe_AbiDocListenerImpl::closeSection */ -void ODe_Main_Listener::closeSection(ODe_ListenerAction& rAction) { +void ODe_Main_Listener::closeSection(ODe_ListenerAction& /*rAction*/) +{ if (m_openedODSection) { ODe_writeToFile(m_rDocumentData.m_pOfficeTextTemp, " \n"); @@ -213,12 +214,12 @@ const PP_AttrProp* pAP, ODe_ListenerAction& rAction) { const gchar* pValue; - const gchar* pId; + const gchar* pId = NULL; bool ok; UT_GenericVector* pMasterPageVector; UT_uint32 count, i; const ODe_Style_MasterPage* pMPageStyle; - GsfOutput* pTextOutput; + GsfOutput* pTextOutput = NULL; pMasterPageVector = m_rDocumentData.m_masterStyles.enumerate(); count = pMasterPageVector->getItemCount(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ManifestWriter.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ManifestWriter.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ManifestWriter.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_ManifestWriter.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -70,6 +70,7 @@ const char* szName; const char* szMimeType; + const char **pszMimeType = &szMimeType; const UT_ByteBuf* pByteBuf; bool wroteDirManifest = false; @@ -78,7 +79,7 @@ NULL, &szName, &pByteBuf, - reinterpret_cast(const_cast(&szMimeType)))); k++) { + reinterpret_cast(pszMimeType))); k++) { if (szMimeType && !strcmp(szMimeType, "image/png")) { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_MetaDataWriter.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_MetaDataWriter.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_MetaDataWriter.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_MetaDataWriter.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -86,7 +86,7 @@ UT_UTF8String buf = ""; UT_UCS4String keyword = keywords.utf8_str(); - for(int i = 0;i < keyword.length(); i++) + for(UT_uint32 i = 0;i < keyword.length(); i++) { if(keyword[i] != ' ') { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Note_Listener.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Note_Listener.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Note_Listener.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Note_Listener.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -54,13 +54,13 @@ void ODe_Note_Listener::openFootnote(const PP_AttrProp* pAP, ODe_ListenerAction& rAction) { bool ok; - const gchar* pValue; + const gchar* pValue = NULL; UT_UTF8String str; ok = pAP->getAttribute("footnote-id", pValue); - UT_ASSERT(ok && pValue != NULL); - - _openNote("footnote", pValue, rAction); + + if (ok && pValue) + _openNote("footnote", pValue, rAction); } @@ -78,13 +78,13 @@ void ODe_Note_Listener::openEndnote(const PP_AttrProp* pAP, ODe_ListenerAction& rAction) { bool ok; - const gchar* pValue; + const gchar* pValue = NULL; UT_UTF8String str; ok = pAP->getAttribute("endnote-id", pValue); - UT_ASSERT(ok && pValue != NULL); - - _openNote("endnote", pValue, rAction); + + if (ok && pValue) + _openNote("endnote", pValue, rAction); } @@ -99,7 +99,7 @@ /** * */ -void ODe_Note_Listener::openBlock(const PP_AttrProp* pAP, +void ODe_Note_Listener::openBlock(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& rAction) { ODe_Text_Listener* pTextListener; pTextListener = new ODe_Text_Listener(m_rAutomatiStyles, @@ -116,10 +116,12 @@ */ void ODe_Note_Listener::_openNote(const gchar* pNoteClass, const gchar* pNoteId, - ODe_ListenerAction& rAction) { + ODe_ListenerAction& /*rAction*/) { UT_uint32 noteCitation; UT_UTF8String str; UT_UTF8String output; + + UT_return_if_fail(pNoteId); // The note citation will be id+1 // So id=0 will have a citation "1", and so on. diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_PicturesWriter.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_PicturesWriter.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_PicturesWriter.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_PicturesWriter.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -40,6 +40,7 @@ bool ODe_PicturesWriter::writePictures(PD_Document* pDoc, GsfOutfile* pODT) { const char * szName; const char * szMimeType; + const char ** pszMimeType = &szMimeType; const UT_ByteBuf * pByteBuf; GsfOutput* pImg; UT_UTF8String name; @@ -50,8 +51,7 @@ NULL, &szName, &pByteBuf, - reinterpret_cast - (const_cast(&szMimeType)))); + reinterpret_cast(pszMimeType))); k++) { if (szMimeType && !strcmp(szMimeType, "image/png")) { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_SettingsWriter.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_SettingsWriter.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_SettingsWriter.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_SettingsWriter.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ #include -bool ODe_SettingsWriter::writeSettings(PD_Document* pDoc, GsfOutfile* oo) +bool ODe_SettingsWriter::writeSettings(PD_Document* /*pDoc*/, GsfOutfile* oo) { GsfOutput* pSettings = gsf_outfile_new_child (oo, "settings.xml", FALSE); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Style_PageLayout.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Style_PageLayout.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Style_PageLayout.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Style_PageLayout.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -85,8 +85,8 @@ bool ok; bool hasAbiHeaderMargin = false; bool hasAbiFooterMargin = false; - double abiHeaderMarginCM; - double abiFooterMarginCM; + double abiHeaderMarginCM = 0.0; + double abiFooterMarginCM = 0.0; double abiTopMarginCM; double abiBottomMarginCM; UT_LocaleTransactor t(LC_NUMERIC, "C"); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Style_Style.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Style_Style.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Style_Style.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Style_Style.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -331,101 +331,6 @@ /** - * - */ -bool ODe_Style_Style::hasTableCellStyleProps(const PP_AttrProp* pAP) { - const gchar* pValue; - bool ok; - - // Left border - - ok = pAP->getProperty("left-thickness", pValue); - if (ok && pValue != NULL) { - return true; - } - - ok = pAP->getProperty("left-color", pValue); - if (ok && pValue != NULL) { - return true; - } - - - // Right border - - ok = pAP->getProperty("right-thickness", pValue); - if (ok && pValue != NULL) { - return true; - } - - ok = pAP->getProperty("right-color", pValue); - if (ok && pValue != NULL) { - return true; - } - - - // Top border - - ok = pAP->getProperty("top-thickness", pValue); - if (ok && pValue != NULL) { - return true; - } - - ok = pAP->getProperty("top-color", pValue); - if (ok && pValue != NULL) { - return true; - } - - - // Bottom border - - ok = pAP->getProperty("bot-thickness", pValue); - if (ok && pValue != NULL) { - return true; - } - - ok = pAP->getProperty("bot-color", pValue); - if (ok && pValue != NULL) { - return true; - } - - - // Background color - - ok = pAP->getProperty("background-color", pValue); - if (ok && pValue != NULL) { - return true; - } - - // If we reached this point it's because there are no table cell props at all - // on this AbiWord element attributes and properties. - return false; -} - - -/** - * - */ -bool ODe_Style_Style::hasTableStyleProps(const PP_AttrProp* pAP) { - const gchar* pValue; - bool ok; - - ok = pAP->getProperty("background-color", pValue); - if (ok && pValue != NULL) { - return true; - } - - ok = pAP->getProperty("table-column-props", pValue); - if (ok && pValue != NULL) { - return true; - } - - // If we reached this point it's because there are no table props at all - // on this AbiWord element attributes and properties. - return false; -} - - -/** * It does not take style names into consideration. * Read it like: "is style "T1" equivalent to style "T2" * It is *NOT* like: "is style A equal to style B" @@ -714,12 +619,59 @@ /** * */ -void ODe_Style_Style::setTableCellBackgroundColor( - const UT_UTF8String& rBackgroundColor) { +void ODe_Style_Style::setMinRowHeight(const gchar* pMinRowHeight) { + if (m_pRowProps == NULL) { + m_pRowProps = new RowProps(); + } + m_pRowProps->m_minRowHeight = pMinRowHeight; +} + + +/** + * + */ +bool ODe_Style_Style::hasTableStyleProps(const PP_AttrProp* pAP) { + const gchar* pValue; + bool ok; + + ok = pAP->getProperty("background-color", pValue); + if (ok && pValue != NULL) { + return true; + } + + ok = pAP->getProperty("table-column-props", pValue); + if (ok && pValue != NULL) { + return true; + } + + // If we reached this point it's because there are no table props at all + // on this AbiWord element attributes and properties. + return false; +} + + +/** + * + */ +void ODe_Style_Style::inheritTableCellProperties(const ODe_Style_Style& tableStyle) { + UT_return_if_fail(tableStyle.m_pCellProps); if (m_pCellProps == NULL) { m_pCellProps = new CellProps(); } - m_pCellProps->m_backgroundColor = rBackgroundColor; + + // the following properties are always inherited by AbiWord cells + m_pCellProps->m_leftThickness = tableStyle.m_pCellProps->m_leftThickness; + m_pCellProps->m_leftColor = tableStyle.m_pCellProps->m_leftColor; + m_pCellProps->m_rightThickness = tableStyle.m_pCellProps->m_rightThickness; + m_pCellProps->m_rightColor = tableStyle.m_pCellProps->m_rightColor; + m_pCellProps->m_topThickness = tableStyle.m_pCellProps->m_topThickness; + m_pCellProps->m_topColor = tableStyle.m_pCellProps->m_topColor; + m_pCellProps->m_bottomThickness = tableStyle.m_pCellProps->m_bottomThickness; + m_pCellProps->m_bottomColor = tableStyle.m_pCellProps->m_bottomColor; + + // Table background colors are not inherited in AbiWord and an OpenDocument + // table can have its own background color as well, so we don't inherit + // this property } @@ -1125,44 +1077,12 @@ ok = rAP.getProperty("text-decoration", pValue); if (ok && pValue != NULL) { - gchar buffer[500]; - UT_uint32 i,j; - bool keepGoing = true; - bool finishedWord = false; - - buffer[0] = 0; - i = 0; - - j = 0; - while (keepGoing) { - buffer[i] = pValue[j]; - - if (pValue[j] == 0) { - keepGoing = false; - finishedWord = true; - } else if (isspace(pValue[j])) { - finishedWord = true; - buffer[i] = 0; // Make a null terminated string - } - - if (finishedWord) { - if (!strcmp(buffer, "underline")) { - m_underlineType = "single"; - - } else if (!strcmp(buffer, "line-through")) { - m_lineThroughType = "single"; - } - finishedWord = false; - i = 0; - buffer[0] = 0; - } else { - i++; - } - - j++; - } - - } // if (ok) + if (strstr(pValue, "underline")) + m_underlineType = "single"; + + if (strstr(pValue, "line-through")) + m_lineThroughType = "single"; + } ok = rAP.getProperty("text-position", pValue); @@ -1389,34 +1309,26 @@ ok = rAP.getProperty("table-column-props", pValue); if (ok && pValue != NULL) { - gchar buffer[100]; - UT_uint32 i; + std::string buffer; double tableWidth = 0.0; - UT_Dimension dimension; + UT_Dimension dimension = DIM_none; bool gotDimension = false; // The table width is the sum of all column widths. - buffer[0] = 0; - i = 0; while (*pValue != 0) { if (*pValue == '/') { // We've reached the end of a column width - - buffer[i] = 0; // NULL terminate the string - if (!gotDimension) { - dimension = UT_determineDimension(buffer, DIM_none); + dimension = UT_determineDimension(buffer.c_str(), DIM_none); gotDimension = true; } - tableWidth += UT_convertDimensionless(buffer); - - i = 0; // Restart the buffer + tableWidth += UT_convertDimensionless(buffer.c_str()); + buffer.clear(); } else { // Store the character in the buffer - buffer[i] = *pValue; - i++; + buffer += *pValue; } pValue++; } @@ -1547,7 +1459,8 @@ * */ bool ODe_Style_Style::RowProps::isEmpty() const { - return m_rowHeight.empty(); + return m_rowHeight.empty() && + m_minRowHeight.empty(); } @@ -1564,6 +1477,7 @@ rOutput += " columnStyleNames; - UT_GenericVector rowStyleNames; m_rAuxiliaryData.m_tableCount++; UT_UTF8String_sprintf(m_tableName, "Table%u", m_rAuxiliaryData.m_tableCount); @@ -96,108 +93,81 @@ // OBS: There's no need to delete it as it will be done // later by ODe_AutomaticStyles destructor. } + - if (ODe_Style_Style::hasTableCellStyleProps(pAP)) { - m_pTableWideCellStyle = new ODe_Style_Style(); - m_pTableWideCellStyle->fetchAttributesFromAbiCell(pAP); - - // An OpenDocument table can have a background color. - // So, there is no need to propagate it to its cells. - m_pTableWideCellStyle->setTableCellBackgroundColor(""); - - if (m_pTableWideCellStyle->isEmpty()) { - // It only had this background color attribute. Now that it's empty - // There's no reason to use it. - DELETEP(m_pTableWideCellStyle); - } - } - + // We don't have to check if there are any properties to export at all, + // because AbiWord has different default cell style properties than OpenDocument, + // which means we'll always have to export the styles. This will only result in + // writing out redundant properties when the user-selected style properties + // exactly match the default OpenDocument default properties; we will just ignore + // this case. + m_tableWideCellStyle.fetchAttributesFromAbiCell(pAP); + + // NOTE: Don't use the number of table-column-props values to determine + // the number of columns in the table. There can be more values than there + // are actual columns; see bug 11863 for an example. m_numColumns = 0; + UT_uint32 curColProp = 0; ok = pAP->getProperty("table-column-props", pValue); if (ok && pValue != NULL) { pVar = pValue; - i=0; while (*pVar != 0) { if (*pVar == '/') { - buffer[i] = 0; // NULL-terminate the string - - if (buffer[0] != 0 /* or i > 0 */) { - + if (!buffer.empty()) { + curColProp++; UT_UTF8String_sprintf(styleName, "%s.col%u", - m_tableName.utf8_str(), m_numColumns+1); + m_tableName.utf8_str(), curColProp); pStyle = m_rAutomatiStyles.addTableColumnStyle(styleName); - pStyle->setColumnWidth(buffer); + pStyle->setColumnWidth(buffer.c_str()); columnStyleNames.addItem(new UT_UTF8String(styleName)); - i=0; // Clear the buffer. + buffer.clear(); } else { columnStyleNames.addItem(new UT_UTF8String("")); } - - m_numColumns++; } else { - buffer[i] = *pVar; - i++; + buffer += *pVar; } pVar++; } } + buffer.clear(); + + // NOTE: Don't use the number of table-row-height values to determine + // the number of rows in the table. There can be more values than there + // are actual rows; see bug 11863 for an example. m_numRows = 0; + UT_uint32 curRowProp = 0; ok = pAP->getProperty("table-row-heights", pValue); if (ok && pValue != NULL) { pVar = pValue; - i=0; while (*pVar != 0) { if (*pVar == '/') { - buffer[i] = 0; // NULL-terminate the string - - if (buffer[0] != 0 /* or i > 0 */) { - + if (!buffer.empty()) { + curRowProp++; UT_UTF8String_sprintf(styleName, "%s.row%u", - m_tableName.utf8_str(), m_numRows+1); + m_tableName.utf8_str(), curRowProp); pStyle = m_rAutomatiStyles.addTableRowStyle(styleName); - pStyle->setRowHeight(buffer); + // Row heights values in AbiWord really are *minimum* row + // heights; the property name is unfortunate. + pStyle->setMinRowHeight(buffer.c_str()); rowStyleNames.addItem(new UT_UTF8String(styleName)); - i=0; // Clear the buffer. + buffer.clear(); // Clear the buffer. } else { rowStyleNames.addItem(new UT_UTF8String("")); } - - m_numRows++; } else { - buffer[i] = *pVar; - i++; + buffer += *pVar; } pVar++; } } - - - if (m_numColumns > 0) { - m_pColumns = new ODe_Table_Column[m_numColumns]; - - for (i=0; i 0) { - m_pRows = new ODe_Table_Row[m_numRows]; - - for (i=0; iloadAbiProps(pAP); //// @@ -280,22 +249,24 @@ //// // Define its style - if (ODe_Style_Style::hasTableCellStyleProps(pAP) || - m_pTableWideCellStyle != NULL) { - - UT_UTF8String_sprintf(pCell->m_styleName, "%s_col%u_row%u", - m_tableName.utf8_str(), - (pCell->m_leftAttach)+1, - (pCell->m_topAttach)+1); + UT_UTF8String_sprintf(pCell->m_styleName, "%s_col%u_row%u", + m_tableName.utf8_str(), + (pCell->m_leftAttach)+1, + (pCell->m_topAttach)+1); - pCellStyle = m_rAutomatiStyles.addTableCellStyle(pCell->m_styleName); - - if (m_pTableWideCellStyle != NULL) { - *pCellStyle = *m_pTableWideCellStyle; - } - - pCellStyle->fetchAttributesFromAbiCell(pAP); - } + pCellStyle = m_rAutomatiStyles.addTableCellStyle(pCell->m_styleName); + + // First inherit various the cell style properties from the table style. + pCellStyle->inheritTableCellProperties(m_tableWideCellStyle); + + // Then load the style properties that are specific for this cell. + // We don't have to check if there are any properties to export at all, + // because AbiWord has different default cell style properties than OpenDocument, + // which means we'll always have to export the styles. This will only result in + // writing out redundant properties when the user-selected style properties + // exactly match the default OpenDocument default properties; we will just ignore + // this case. + pCellStyle->fetchAttributesFromAbiCell(pAP); //// @@ -322,18 +293,29 @@ UT_uint32 i, j; ODe_Table_Cell* pCell; - UT_ASSERT(m_numRows > 0); - UT_ASSERT(m_numColumns > 0); + UT_return_if_fail(m_numRows > 0); + UT_return_if_fail(m_numColumns > 0); - // Create the columns, if not done already - if (m_pColumns == NULL) { - m_pColumns = new ODe_Table_Column[m_numColumns]; + // Create the columns + m_pColumns = new ODe_Table_Column[m_numColumns]; + + for (i=0; (im_topAttach < m_numRows); - UT_ASSERT(pCell->m_leftAttach < m_numColumns); + UT_continue_if_fail(pCell) + UT_continue_if_fail(pCell->m_topAttach < m_numRows); + UT_continue_if_fail(pCell->m_leftAttach < m_numColumns); m_pRows[pCell->m_topAttach].m_ppCells[pCell->m_leftAttach] = pCell; } @@ -361,38 +344,38 @@ * */ void ODe_Table_Cell::loadAbiProps(const PP_AttrProp* pAP) { - const gchar* pValue; - bool ok; + const gchar* pValue = NULL; + bool ok = false; ok = pAP->getProperty("left-attach", pValue); if (!ok || pValue == NULL) { - UT_ASSERT(UT_SHOULD_NOT_HAPPEN); + UT_DEBUGMSG(("ODe_Table_Cell::loadAbiProps(): missing left-attach property\n")); + return; } m_leftAttach = atoi(pValue); ok = pAP->getProperty("right-attach", pValue); if (!ok || pValue == NULL) { - UT_ASSERT(UT_SHOULD_NOT_HAPPEN); + UT_DEBUGMSG(("ODe_Table_Cell::loadAbiProps(): missing right-attach property\n")); + return; } m_rightAttach = atoi(pValue); ok = pAP->getProperty("top-attach", pValue); if (!ok || pValue == NULL) { - UT_ASSERT(UT_SHOULD_NOT_HAPPEN); + UT_DEBUGMSG(("ODe_Table_Cell::loadAbiProps(): missing top-attach property\n")); + return; } m_topAttach = atoi(pValue); ok = pAP->getProperty("bot-attach", pValue); if (!ok || pValue == NULL) { - UT_ASSERT(UT_SHOULD_NOT_HAPPEN); + UT_DEBUGMSG(("ODe_Table_Cell::loadAbiProps(): missing bot-attach property\n")); + return; } m_bottomAttach = atoi(pValue); // A few sanity checks - UT_ASSERT(m_leftAttach >= 0); - UT_ASSERT(m_rightAttach >= 0); - UT_ASSERT(m_topAttach >= 0); - UT_ASSERT(m_bottomAttach >= 0); UT_ASSERT(m_leftAttach < m_rightAttach); UT_ASSERT(m_topAttach < m_bottomAttach); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Table_Listener.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Table_Listener.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Table_Listener.h 2008-04-06 22:37:07.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Table_Listener.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,6 +25,7 @@ // Internal includes #include "ODe_AbiDocListenerImpl.h" #include "ODe_Common.h" +#include "ODe_Style_Style.h" // AbiWord includes #include @@ -37,7 +38,6 @@ class ODe_AutomaticStyles; class ODe_AuxiliaryData; class ODe_Styles; -class ODe_Style_Style; /** @@ -148,7 +148,9 @@ // Abiword has table-wide cell properties (i.e.: cell properties inside // element), but OpenDocument don't. // So I have to propagate this properties into every cell of this table. - ODe_Style_Style* m_pTableWideCellStyle; + ODe_Style_Style m_tableWideCellStyle; + UT_GenericVector columnStyleNames; + UT_GenericVector rowStyleNames; }; #endif /*ODE_TABLE_LISTENER_H_*/ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Text_Listener.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Text_Listener.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Text_Listener.cpp 2008-04-06 22:37:06.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_Text_Listener.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -126,7 +126,7 @@ /** * */ -void ODe_Text_Listener::openTable(const PP_AttrProp* pAP, +void ODe_Text_Listener::openTable(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& rAction) { _closeODParagraph(); _closeODList(); @@ -144,7 +144,7 @@ * Override of ODe_AbiDocListenerImpl::openBlock */ void ODe_Text_Listener::openBlock(const PP_AttrProp* pAP, - ODe_ListenerAction& rAction) { + ODe_ListenerAction& /*rAction*/) { _closeODParagraph(); @@ -228,11 +228,10 @@ */ void ODe_Text_Listener::openFrame(const PP_AttrProp* pAP, ODe_ListenerAction& rAction) { - bool ok; - const gchar* pValue; + bool ok = false; + const gchar* pValue = NULL; ok = pAP->getProperty("frame-type", pValue); - UT_ASSERT_HARMLESS(ok && pValue != NULL); if (pValue && !strcmp(pValue, "textbox")) { ODe_Frame_Listener* pFrameListener; @@ -365,7 +364,7 @@ */ -void ODe_Text_Listener::openFootnote(const PP_AttrProp* pAP, +void ODe_Text_Listener::openFootnote(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& rAction) { ODe_Note_Listener* pNoteListener; @@ -389,6 +388,7 @@ } else { // We were inside a footnote. _closeODParagraph(); + _closeODList(); rAction.popListenerImpl(); } } @@ -397,7 +397,7 @@ /** * */ -void ODe_Text_Listener::openEndnote(const PP_AttrProp* pAP, +void ODe_Text_Listener::openEndnote(const PP_AttrProp* /*pAP*/, ODe_ListenerAction& rAction) { ODe_Note_Listener* pNoteListener; @@ -421,6 +421,7 @@ } else { // We were inside an endnote. _closeODParagraph(); + _closeODList(); rAction.popListenerImpl(); } } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/GNUmakefile.in 2008-04-06 22:37:48.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -98,6 +98,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -163,14 +165,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -187,6 +189,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_OPENDOCUMENT_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -203,6 +208,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -213,7 +221,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -279,7 +292,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -310,6 +323,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -323,6 +337,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = common imp exp @@ -348,8 +363,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -379,8 +394,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -388,8 +403,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -513,8 +528,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -539,8 +554,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -550,13 +565,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/GNUmakefile.in 2008-04-06 22:37:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/Makefile 2008-04-06 22:37:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -23,4 +23,6 @@ DIRS= xp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/GNUmakefile.in 2008-04-06 22:37:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -101,6 +101,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -166,14 +168,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -190,6 +192,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_OPENDOCUMENT_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -206,6 +211,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -216,7 +224,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -282,7 +295,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -313,6 +326,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -326,6 +340,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libAbiOpenDocument_imp.la @@ -399,8 +414,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -501,8 +516,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -514,8 +529,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -525,13 +540,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -201,14 +201,18 @@ */ UT_Error IE_Imp_OpenDocument::_handleSettingsStream () { - UT_Error error; + if (gsf_infile_child_exists (m_pGsfInfile, "settings.xml")) { + UT_Error error; - error = m_pStreamListener->setState("SettingsStream"); - if (error != UT_OK) { - return error; - } + error = m_pStreamListener->setState("SettingsStream"); + if (error != UT_OK) { + return error; + } - return _handleStream (m_pGsfInfile, "settings.xml", *m_pStreamListener); + return _handleStream (m_pGsfInfile, "settings.xml", *m_pStreamListener); + } + + return UT_OK; } @@ -217,14 +221,18 @@ */ UT_Error IE_Imp_OpenDocument::_handleStylesStream () { - UT_Error error; + if (gsf_infile_child_exists (m_pGsfInfile, "styles.xml")) { + UT_Error error; - error = m_pStreamListener->setState("StylesStream"); - if (error != UT_OK) { - return error; - } + error = m_pStreamListener->setState("StylesStream"); + if (error != UT_OK) { + return error; + } - return _handleStream (m_pGsfInfile, "styles.xml", *m_pStreamListener); + return _handleStream (m_pGsfInfile, "styles.xml", *m_pStreamListener); + } + + return UT_OK; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument.h 2008-04-06 22:37:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument.h 2009-07-15 16:56:23.000000000 +0100 @@ -43,7 +43,7 @@ /** * Class used to import OpenDocument files */ -class ABI_EXPORT IE_Imp_OpenDocument : public IE_Imp +class IE_Imp_OpenDocument : public IE_Imp { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument_Sniffer.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument_Sniffer.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument_Sniffer.h 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ie_imp_OpenDocument_Sniffer.h 2009-07-15 16:56:23.000000000 +0100 @@ -28,7 +28,7 @@ #include -class ABI_EXPORT IE_Imp_OpenDocument_Sniffer : public IE_ImpSniffer +class IE_Imp_OpenDocument_Sniffer : public IE_ImpSniffer { public: IE_Imp_OpenDocument_Sniffer () ; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/Makefile 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -49,6 +49,8 @@ ODi_TextContent_ListenerState.cpp \ ODi_XMLRecorder.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) INCLUDES+= $(shell pkg-config --cflags libgsf-1) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ContentStream_ListenerState.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ContentStream_ListenerState.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ContentStream_ListenerState.cpp 2008-04-06 22:37:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ContentStream_ListenerState.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -122,7 +122,7 @@ /** * */ -void ODi_ContentStream_ListenerState::charData ( - const gchar* pBuffer, int length) +void ODi_ContentStream_ListenerState::charData (const gchar* /*pBuffer*/, + int /*length*/) { } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ElementStack.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ElementStack.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ElementStack.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ElementStack.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -56,7 +56,7 @@ void ODi_ElementStack::startElement (const gchar* pName, const gchar** ppAtts) { - ODi_StartTag* pStartTag; + ODi_StartTag* pStartTag = NULL; if (!m_pStartTags) { m_pStartTags = new UT_GenericVector (10, 10); @@ -85,7 +85,7 @@ * Must be the last command called by the endElement method of the listener * class. */ -void ODi_ElementStack::endElement (const gchar* pName) { +void ODi_ElementStack::endElement (const gchar* /*pName*/) { UT_ASSERT(m_pStartTags != NULL); UT_return_if_fail(m_stackSize > 0); m_stackSize--; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_FontFaceDecls.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_FontFaceDecls.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_FontFaceDecls.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_FontFaceDecls.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -43,8 +43,8 @@ */ void ODi_FontFaceDecls::startElement (const gchar* pName, const gchar** ppAtts, - ODi_ListenerStateAction& rAction) { - + ODi_ListenerStateAction& /*rAction*/) +{ if (!strcmp(pName, "style:font-face")) { const gchar* pStyleName; const gchar* pFontFamily; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_FontFaceDecls.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_FontFaceDecls.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_FontFaceDecls.h 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_FontFaceDecls.h 2009-07-15 16:56:23.000000000 +0100 @@ -47,7 +47,7 @@ void endElement (const gchar* pName, ODi_ListenerStateAction& rAction); - void charData (const gchar* pBuffer, int length) {} + void charData (const gchar* /*pBuffer*/, int /*length*/) {} const std::string & getFontFamily(const UT_UTF8String& rStyleName); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Frame_ListenerState.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Frame_ListenerState.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Frame_ListenerState.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Frame_ListenerState.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -33,6 +33,8 @@ // AbiWord includes #include #include +#include +#include /** @@ -48,7 +50,9 @@ m_pStyles(pStyles), m_parsedFrameStartTag(false), m_inlinedImage(false), - m_iFrameDepth(0) + m_iFrameDepth(0), + m_pMathBB(NULL), + m_bInMath(false) { if (m_rElementStack.hasElement("office:document-content")) { m_bOnContentStream = true; @@ -65,6 +69,20 @@ const gchar** ppAtts, ODi_ListenerStateAction& rAction) { + UT_return_if_fail(pName); + + if(m_bInMath && m_pMathBB && (strcmp(pName, "math:math") != 0)) + { + if (strncmp(pName, "math:", 5) != 0) { + return; + } + + m_pMathBB->append(reinterpret_cast("<"), 1); + m_pMathBB->append(reinterpret_cast(pName + 5), strlen(pName) - 5); //build the mathml + m_pMathBB->append(reinterpret_cast(">"), 1); + return; + } + if (!strcmp(pName, "draw:frame")) { if (m_parsedFrameStartTag) { // It's a nested frame. @@ -86,6 +104,14 @@ } } else if (!strcmp(pName, "draw:object")) { _drawObject(ppAtts, rAction); + + } else if (!strcmp(pName, "math:math")) { + + DELETEP(m_pMathBB); + m_pMathBB = new UT_ByteBuf; + m_pMathBB->append(reinterpret_cast(""), 65); + + m_bInMath = true; } } @@ -96,6 +122,20 @@ void ODi_Frame_ListenerState::endElement (const gchar* pName, ODi_ListenerStateAction& rAction) { + UT_return_if_fail(pName); + + if(m_bInMath && m_pMathBB && (strcmp(pName, "math:math") != 0)) + { + if (strncmp(pName, "math:", 5) != 0) { + return; + } + + m_pMathBB->append(reinterpret_cast("append(reinterpret_cast(pName + 5), strlen(pName) - 5); //build the mathml + m_pMathBB->append(reinterpret_cast(">"), 1); + return; + } + if (!strcmp(pName, "draw:frame")) { if (!m_inlinedImage && (m_iFrameDepth > 0)) { @@ -108,6 +148,26 @@ // We're done. rAction.popState(); + } else if (!strcmp(pName, "math:math")) { + + if (m_pMathBB) { + + m_pMathBB->append(reinterpret_cast(""), 7); + + // Create the data item + UT_uint32 id = m_pAbiDocument->getUID(UT_UniqueId::Math); + UT_UTF8String sID = UT_UTF8String_sprintf("MathLatex%d", id); + m_pAbiDocument->createDataItem(sID.utf8_str(), false, m_pMathBB, NULL, NULL); + + const gchar *atts[3] = { NULL, NULL, NULL }; + atts[0] = PT_IMAGE_DATAID; + atts[1] = sID.utf8_str(); + m_pAbiDocument->appendObject(PTO_Math, atts); + + DELETEP(m_pMathBB); + } + + m_bInMath = false; } } @@ -115,8 +175,12 @@ /** * */ -void ODi_Frame_ListenerState::charData (const gchar* pBuffer, int length) { - // Nothing yet... +void ODi_Frame_ListenerState::charData (const gchar* pBuffer, int length) +{ + if (m_bInMath && m_pMathBB) { + m_pMathBB->append(reinterpret_cast(pBuffer), length); + return; + } } @@ -150,45 +214,17 @@ // In-line wrapping. // No frames are used on AbiWord for in-line wrapping. // It uses a tag right in the paragraph text. - - m_inlinedImage = true; - - const gchar* pWidth; - const gchar* pHeight; - - if(!m_rAbiData.addImageDataItem(dataId, ppAtts)) { - UT_DEBUGMSG(("ODT import: no suitable image importer found\n")); - return; - } - - const gchar* attribs[5]; - UT_String propsBuffer; - - pWidth = m_rElementStack.getStartTag(0)->getAttributeValue("svg:width"); - UT_ASSERT(pWidth); - - pHeight = m_rElementStack.getStartTag(0)->getAttributeValue("svg:height"); - UT_ASSERT(pHeight); - - UT_String_sprintf(propsBuffer, "width:%s; height:%s", pWidth, pHeight); - - attribs[0] = "props"; - attribs[1] = propsBuffer.c_str(); - attribs[2] = "dataid"; - attribs[3] = dataId.c_str(); - attribs[4] = 0; - - if (!m_pAbiDocument->appendObject (PTO_Image, attribs)) { - UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); - } + + _drawInlineImage(ppAtts); } else { // We define a frame with the image in it. - + if (m_rElementStack.hasElement("draw:text-box")) { - // AbiWord can't have nested frames (a framed image inside a textbox). - // Abort mission! - rAction.ignoreElement(); + // AbiWord can't have nested frames (a framed image inside a textbox), + // so convert it to an inline image for now + + _drawInlineImage(ppAtts); return; } @@ -228,6 +264,41 @@ } +void ODi_Frame_ListenerState::_drawInlineImage (const gchar** ppAtts) +{ + const gchar* pWidth = NULL; + const gchar* pHeight = NULL; + UT_String dataId; + + m_inlinedImage = true; + + if(!m_rAbiData.addImageDataItem(dataId, ppAtts)) { + UT_DEBUGMSG(("ODT import: no suitable image importer found\n")); + return; + } + + const gchar* attribs[5]; + UT_String propsBuffer; + + pWidth = m_rElementStack.getStartTag(0)->getAttributeValue("svg:width"); + UT_ASSERT(pWidth); + + pHeight = m_rElementStack.getStartTag(0)->getAttributeValue("svg:height"); + UT_ASSERT(pHeight); + + UT_String_sprintf(propsBuffer, "width:%s; height:%s", pWidth, pHeight); + + attribs[0] = "props"; + attribs[1] = propsBuffer.c_str(); + attribs[2] = "dataid"; + attribs[3] = dataId.c_str(); + attribs[4] = 0; + + if (!m_pAbiDocument->appendObject (PTO_Image, attribs)) { + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); + } + +} /** * @@ -236,7 +307,7 @@ void ODi_Frame_ListenerState::_drawObject (const gchar** ppAtts, ODi_ListenerStateAction& rAction) { - const gchar* pChar; + const gchar* pChar = NULL; const ODi_Style_Style* pGraphicStyle; UT_String dataId; // id of the data item that contains the object. @@ -309,8 +380,6 @@ props = "frame-type:image"; if(!_getFrameProperties(props, ppAtts)) { - // Abort mission! - rAction.ignoreElement(); return; } @@ -340,6 +409,29 @@ } +static bool _convertBorderThickness(const char* szIncoming, UT_UTF8String& sConverted) +{ + UT_return_val_if_fail(szIncoming && *szIncoming, false); + + double d = 0.0f; + UT_Dimension units = UT_determineDimension (szIncoming, DIM_none); + + if (units == DIM_none) { + // no (valid) dimension specified, we'll assume inches + d = UT_convertToInches(szIncoming); + d = UT_convertInchesToDimension(d, DIM_PT); + + } else { + d = UT_convertToPoints(szIncoming); + } + + UT_LocaleTransactor t(LC_NUMERIC, "C"); + sConverted = UT_UTF8String_sprintf("%.2fpt", d); + + return true; +} + + /** * @param ppAtts The attributes of a element. * @param rAction Any action to be taken, regarding state change. @@ -351,6 +443,7 @@ const gchar* pStyleName = NULL; const ODi_Style_Style* pGraphicStyle = NULL; UT_UTF8String props; + UT_UTF8String sThickness; props = "frame-type:textbox"; @@ -369,8 +462,6 @@ props += "; "; } - // TODO: translate border thicknesses - if (m_rElementStack.getStartTag(0)) { pStyleName = m_rElementStack.getStartTag(0)->getAttributeValue("draw:style-name"); } @@ -420,6 +511,51 @@ } else { props += "; top-style:0"; } + + if(pGraphicStyle->getBorderBottom_thickness() && !pGraphicStyle->getBorderBottom_thickness()->empty()) { + + sThickness.clear(); + bool bRet = _convertBorderThickness(pGraphicStyle->getBorderBottom_thickness()->utf8_str(), sThickness); + + if(bRet) { + props += "; bot-thickness:"; + props += sThickness.utf8_str(); + } + } + + if(pGraphicStyle->getBorderLeft_thickness() && !pGraphicStyle->getBorderLeft_thickness()->empty()) { + + sThickness.clear(); + bool bRet = _convertBorderThickness(pGraphicStyle->getBorderLeft_thickness()->utf8_str(), sThickness); + + if(bRet) { + props += "; left-thickness:"; + props += sThickness.utf8_str(); + } + } + + if(pGraphicStyle->getBorderRight_thickness() && !pGraphicStyle->getBorderRight_thickness()->empty()) { + + sThickness.clear(); + bool bRet = _convertBorderThickness(pGraphicStyle->getBorderRight_thickness()->utf8_str(), sThickness); + + if(bRet) { + props += "; right-thickness:"; + props += sThickness.utf8_str(); + } + } + + if(pGraphicStyle->getBorderTop_thickness() && !pGraphicStyle->getBorderTop_thickness()->empty()) { + + sThickness.clear(); + bool bRet = _convertBorderThickness(pGraphicStyle->getBorderTop_thickness()->utf8_str(), sThickness); + + if(bRet) { + props += "; top-thickness:"; + props += sThickness.utf8_str(); + } + } + } else { //just hard-code some defaults props += "bot-style:1; left-style:1; right-style:1; top-style:1"; } @@ -449,7 +585,7 @@ const ODi_Style_Style* pGraphicStyle; const UT_UTF8String* pWrap; const UT_UTF8String* pBackgroundColor; - const gchar* pVal; + const gchar* pVal = NULL; pStyleName = m_rElementStack.getStartTag(0)->getAttributeValue("draw:style-name"); UT_ASSERT(pStyleName); @@ -487,7 +623,7 @@ pVal = m_rElementStack.getStartTag(0)->getAttributeValue("text:anchor-type"); - UT_ASSERT_HARMLESS(pVal); + if (pVal && !strcmp(pVal, "paragraph")) { rProps += "; position-to:block-above-text"; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Frame_ListenerState.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Frame_ListenerState.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Frame_ListenerState.h 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Frame_ListenerState.h 2009-07-15 16:56:23.000000000 +0100 @@ -62,6 +62,8 @@ */ void _drawImage (const gchar** ppAtts, ODi_ListenerStateAction& rAction); + void _drawInlineImage (const gchar** ppAtts); + /** * @param ppAtts The attributes of a element. */ @@ -86,6 +88,9 @@ // on the AbiWord document. bool m_inlinedImage; UT_sint32 m_iFrameDepth; + + UT_ByteBuf* m_pMathBB; + bool m_bInMath; }; #endif //_ODI_FRAME_LISTENERSTATE_H_ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -54,21 +54,25 @@ */ void ODi_ListLevelStyle::startElement (const gchar* pName, const gchar** ppAtts, - ODi_ListenerStateAction& rAction) { + ODi_ListenerStateAction& /*rAction*/) +{ const gchar* pVal = NULL; if (!strcmp("text:list-level-style-bullet", pName) || !strcmp("text:list-level-style-number", pName) || !strcmp("text:list-level-style-image", pName)) { - UT_uint32 result; + UT_uint32 result = 0; pVal = UT_getAttribute ("text:level", ppAtts); - UT_ASSERT(pVal); - result = sscanf(pVal, "%u", &m_levelNumber); - UT_ASSERT(result==1); - m_level = pVal; + if (pVal) { + result = sscanf(pVal, "%u", &m_levelNumber); + // TODO: check result? + m_level = pVal; + } else { + UT_DEBUGMSG(("ODi_ListLevelStyle::startElement: missing text:level attribute\n")); + } pVal = UT_getAttribute ("text:style-name", ppAtts); if (pVal) { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.h 2008-04-06 22:37:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.h 2009-07-15 16:56:23.000000000 +0100 @@ -47,7 +47,7 @@ virtual void endElement (const gchar* pName, ODi_ListenerStateAction& rAction); - virtual void charData (const gchar* pBuffer, int length) {} + virtual void charData (const gchar* /*pBuffer*/, int /*length*/) {} UT_uint32 getLevelNumber() const {return m_levelNumber;} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ManifestStream_ListenerState.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ManifestStream_ListenerState.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ManifestStream_ListenerState.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ManifestStream_ListenerState.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -46,8 +46,8 @@ * Called to signal that the start tag of an element has been reached. */ void ODi_ManifestStream_ListenerState::startElement (const gchar* pName, - const gchar** ppAtts, - ODi_ListenerStateAction& rAction) + const gchar** /*ppAtts*/, + ODi_ListenerStateAction& /*rAction*/) { if (!strcmp(pName, "manifest:encryption-data")) { m_isDocumentEncripted = true; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ManifestStream_ListenerState.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ManifestStream_ListenerState.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ManifestStream_ListenerState.h 2008-04-06 22:37:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ManifestStream_ListenerState.h 2009-07-15 16:56:23.000000000 +0100 @@ -45,7 +45,7 @@ void endElement (const gchar* pName, ODi_ListenerStateAction& rAction); - void charData (const gchar* pBuffer, int length) {} + void charData (const gchar* /*pBuffer*/, int /*length*/) {} bool isDocumentEncripted() const {return m_isDocumentEncripted;}; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_MetaStream_ListenerState.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_MetaStream_ListenerState.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_MetaStream_ListenerState.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_MetaStream_ListenerState.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -48,9 +48,9 @@ /** * Called to signal that the start tag of an element has been reached. */ -void ODi_MetaStream_ListenerState::startElement (const gchar* pName, - const gchar** ppAtts, - ODi_ListenerStateAction& rAction) +void ODi_MetaStream_ListenerState::startElement (const gchar* /*pName*/, + const gchar** /*ppAtts*/, + ODi_ListenerStateAction& /*rAction*/) { m_charData.clear (); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_NotesConfiguration.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_NotesConfiguration.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_NotesConfiguration.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_NotesConfiguration.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -33,8 +33,9 @@ * */ void ODi_NotesConfiguration::startElement(const gchar* pName, - const gchar** ppAtts, - ODi_ListenerStateAction& rAction) { + const gchar** ppAtts, + ODi_ListenerStateAction& /*rAction*/) +{ const gchar* pVal; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_NotesConfiguration.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_NotesConfiguration.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_NotesConfiguration.h 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_NotesConfiguration.h 2009-07-15 16:56:23.000000000 +0100 @@ -42,7 +42,7 @@ void endElement(const gchar* pName, ODi_ListenerStateAction& rAction); - void charData (const gchar* pBuffer, int length) {} + void charData (const gchar* /*pBuffer*/, int /*length*/) {} const UT_UTF8String* getCitationStyleName() const {return &m_citationStyleName;} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Office_Styles.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Office_Styles.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Office_Styles.cpp 2008-04-06 22:37:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Office_Styles.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -230,16 +230,15 @@ ODi_Style_Style* ODi_Office_Styles::addDefaultStyle(const gchar** ppAtts, ODi_ElementStack& rElementStack) { - const gchar* pAttr; + const gchar* pAttr = NULL; pAttr = UT_getAttribute("style:family", ppAtts); - UT_ASSERT(pAttr); - if (!strcmp("paragraph", pAttr)) { + if (pAttr && !strcmp("paragraph", pAttr)) { return m_paragraphStyleStyles.addDefaultStyle(rElementStack); - } else if (!strcmp("table", pAttr)) { + } else if (pAttr && !strcmp("table", pAttr)) { return m_tableStyleStyles.addDefaultStyle(rElementStack); @@ -280,7 +279,7 @@ ODi_Style_PageLayout* pLayout; pMasterStylesVec = m_masterPageStyles.enumerate(); - UT_ASSERT(pMasterStylesVec); + UT_return_if_fail(pMasterStylesVec); count = pMasterStylesVec->getItemCount(); for (i=0; igetItemCount(); for (i=0; igetLevelCount(); @@ -349,7 +348,7 @@ pListVec = m_listStyles.enumerate(); - UT_ASSERT(pListVec); + UT_return_if_fail(pListVec); count = pListVec->getItemCount(); for (i=0; igetItemCount(); for (i=0; i= -1); - UT_ASSERT(m_pElementStack->getStackSize() - + UT_ASSERT((int)m_pElementStack->getStackSize() - (m_stateAction.getElementLevel()+1) >= 0); m_elemenStackSize = m_pElementStack->getStackSize() - diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_StreamListener.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_StreamListener.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_StreamListener.h 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_StreamListener.h 2009-07-15 16:56:23.000000000 +0100 @@ -126,7 +126,7 @@ m_pState = pState; } // Work around the "return 0" issue of the UT_GenericVector::getNhItem() - StackCell(UT_uint32 i) {m_pState=NULL; m_deleteWhenPop=false;} + StackCell(UT_uint32 /*i*/) {m_pState=NULL; m_deleteWhenPop=false;} StackCell& operator=(const StackCell& sc) { this->m_deleteWhenPop = sc.m_deleteWhenPop; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_List.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_List.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_List.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_List.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -88,7 +88,8 @@ /** * */ -void ODi_Style_List::charData (const gchar* pBuffer, int length) { +void ODi_Style_List::charData (const gchar* /*pBuffer*/, int /*length*/) +{ } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_MasterPage.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_MasterPage.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_MasterPage.h 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_MasterPage.h 2009-07-15 16:56:23.000000000 +0100 @@ -48,7 +48,7 @@ void endElement(const gchar* pName, ODi_ListenerStateAction& rAction); - void charData (const gchar* pBuffer, int length) {} + void charData (const gchar* /*pBuffer*/, int /*length*/) {} inline const UT_UTF8String& getLayoutName() const {return m_layoutName;} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_PageLayout.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_PageLayout.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_PageLayout.cpp 2008-04-06 22:37:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_PageLayout.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -40,7 +40,8 @@ */ void ODi_Style_PageLayout::startElement(const gchar* pName, const gchar** ppAtts, - ODi_ListenerStateAction& rAction) { + ODi_ListenerStateAction& /*rAction*/) +{ const gchar* pVal; @@ -121,8 +122,8 @@ UT_uint32 propCtr = 0; static const int MAX_PAGE_ATTS = 13; // 2*(width height orientation pagetype units page-scale) 0 const gchar* pageAtts[MAX_PAGE_ATTS]; - double pageWidthMmNumeric; - double pageHeightMmNumeric; + double pageWidthMmNumeric = 0.0; + double pageHeightMmNumeric = 0.0; UT_UTF8String pageWidthMm; UT_UTF8String pageHeightMm; UT_LocaleTransactor lt(LC_NUMERIC, "C"); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_PageLayout.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_PageLayout.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_PageLayout.h 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_PageLayout.h 2009-07-15 16:56:23.000000000 +0100 @@ -52,7 +52,7 @@ void endElement(const gchar* pName, ODi_ListenerStateAction& rAction); - void charData (const gchar* pBuffer, int length) {} + void charData (const gchar* /*pBuffer*/, int /*length*/) {} void definePageSizeTag(PD_Document* pDocument) const; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_StylesStream_ListenerState.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_StylesStream_ListenerState.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_StylesStream_ListenerState.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_StylesStream_ListenerState.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -153,7 +153,7 @@ * e.g: char_data */ void ODi_StylesStream_ListenerState::charData ( - const gchar* pBuffer, int length) + const gchar* /*pBuffer*/, int /*length*/) { } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -64,7 +64,8 @@ */ void ODi_Style_Style::startElement(const gchar* pName, const gchar** ppAtts, - ODi_ListenerStateAction& rAction) { + ODi_ListenerStateAction& /*rAction*/) +{ if (!strcmp("style:style", pName)) { @@ -410,6 +411,10 @@ } pVal = UT_getAttribute("style:font-name", ppProps); + if(!pVal) { + pVal = UT_getAttribute("fo:font-family", ppProps); + } + if(pVal) { m_fontName.assign(pVal); } @@ -498,6 +503,11 @@ m_wrap = pVal; } + pVal = UT_getAttribute("style:parent-style-name", ppProps); + if (pVal && *pVal) { + m_parentStyleName = pVal; + } + pVal = UT_getAttribute("fo:border-top", ppProps); if (pVal) { _stripColorLength(m_borderTop_color, m_borderTop_thickness, m_haveTopBorder, pVal); @@ -857,6 +867,16 @@ } +const UT_UTF8String* ODi_Style_Style::getBackgroundColor() const +{ + if (m_backgroundColor.empty() && m_pParentStyle) { + return m_pParentStyle->getBackgroundColor(); + } + + return &m_backgroundColor; +} + + /** * If pString is "0.0556in solid #0000ff", rColor will receive "#0000ff", * rLength "0.0556in" and rHaveBorder "yes". diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style_Family.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style_Family.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style_Family.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style_Family.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -155,7 +155,7 @@ UT_uint32 i, count; UT_GenericVector* pStylesVec; - ODi_Style_Style* pStyle; + ODi_Style_Style* pStyle = NULL; bool noneFound; do { @@ -249,7 +249,6 @@ UT_GenericVector* pStylesVec; UT_UTF8String styleName; UT_UTF8String replacementName; - bool ok; _findSuitableReplacement(replacementName, pRemovedStyle, bOnContentStream); @@ -448,6 +447,9 @@ */ const ODi_Style_Style* ODi_Style_Style_Family::getStyle(const gchar* pStyleName, bool bOnContentStream) { + + UT_return_val_if_fail(pStyleName, NULL); + const ODi_Style_Style* pStyle = NULL; // Is it the default style? diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2009-07-15 16:56:23.000000000 +0100 @@ -59,7 +59,7 @@ void endElement(const gchar* pName, ODi_ListenerStateAction& rAction); - void charData (const gchar* pBuffer, int length) {} + void charData (const gchar* /*pBuffer*/, int /*length*/) {} const UT_UTF8String& getDisplayName() const {return m_displayName;} @@ -181,7 +181,7 @@ */ const UT_UTF8String* getWrap(bool local) const; - const UT_UTF8String* getBackgroundColor() const {return &m_backgroundColor;} + const UT_UTF8String* getBackgroundColor() const; const UT_UTF8String* getColumnWidth() const {return &m_columnWidth;} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Table_ListenerState.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Table_ListenerState.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Table_ListenerState.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Table_ListenerState.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -255,7 +255,7 @@ * Used to parse a start element. */ void ODi_Table_ListenerState::_parseColumnStart (const gchar** ppAtts, - ODi_ListenerStateAction& rAction) + ODi_ListenerStateAction& /*rAction*/) { if (m_onFirstPass) { const gchar* pStyleName; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Table_ListenerState.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Table_ListenerState.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Table_ListenerState.h 2008-04-06 22:37:05.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Table_ListenerState.h 2009-07-15 16:56:23.000000000 +0100 @@ -64,7 +64,7 @@ void endElement (const gchar* pName, ODi_ListenerStateAction& rAction); - void charData (const gchar* pBuffer, int length) {} + void charData (const gchar* /*pBuffer*/, int /*length*/) {} private: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_TableOfContent_ListenerState.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_TableOfContent_ListenerState.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_TableOfContent_ListenerState.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_TableOfContent_ListenerState.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -51,8 +51,9 @@ * */ void ODi_TableOfContent_ListenerState::startElement (const gchar* pName, - const gchar** ppAtts, - ODi_ListenerStateAction& rAction) { + const gchar** ppAtts, + ODi_ListenerStateAction& /*rAction*/) +{ if (!strcmp(pName, "text:index-title-template")) { const gchar* pVal; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_TextContent_ListenerState.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_TextContent_ListenerState.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_TextContent_ListenerState.cpp 2008-04-06 22:37:04.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_TextContent_ListenerState.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -135,12 +135,9 @@ } else if (!strcmp(pName, "text:h" )) { - const gchar* pStyleName; - const gchar* pOutlineLevel; - const ODi_Style_Style* pStyle; - - pStyleName = UT_getAttribute("text:style-name", ppAtts); - UT_ASSERT(pStyleName); + const gchar* pStyleName = NULL; + const gchar* pOutlineLevel = NULL; + const ODi_Style_Style* pStyle = NULL; pOutlineLevel = UT_getAttribute("text:outline-level", ppAtts); if (pOutlineLevel == NULL) { @@ -148,9 +145,11 @@ // be at level 1. pOutlineLevel = "1"; } - - pStyle = m_pStyles->getParagraphStyle(pStyleName, m_bOnContentStream); - UT_ASSERT_HARMLESS(pStyle); + + pStyleName = UT_getAttribute("text:style-name", ppAtts); + if (pStyleName) { + pStyle = m_pStyles->getParagraphStyle(pStyleName, m_bOnContentStream); + } if (pStyle && (pStyle->isAutomatic())) { @@ -179,13 +178,18 @@ const gchar* pSpaceCount; UT_uint32 spaceCount, i; + UT_sint32 tmpSpaceCount = 0; UT_UCS4String string; pSpaceCount = UT_getAttribute("text:c", ppAtts); - if (pSpaceCount) { - i = sscanf(pSpaceCount, "%d", &spaceCount); - UT_ASSERT(i==1); + if (pSpaceCount && *pSpaceCount) { + i = sscanf(pSpaceCount, "%d", &tmpSpaceCount); + if ((i != 1) || (tmpSpaceCount <= 1)) { + spaceCount = 1; + } else { + spaceCount = tmpSpaceCount; + } } else { // From the OpenDocument specification: // "A missing text:c attribute is interpreted as meaning a @@ -289,11 +293,11 @@ } else if (!strcmp(pName, "text:bookmark")) { _flush (); - const gchar * pName = UT_getAttribute ("text:name", ppAtts); + const gchar * pAttr = UT_getAttribute ("text:name", ppAtts); - if(pName) { - _insertBookmark (pName, "start"); - _insertBookmark (pName, "end"); + if(pAttr) { + _insertBookmark (pAttr, "start"); + _insertBookmark (pAttr, "end"); } else { UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); } @@ -301,10 +305,10 @@ } else if (!strcmp(pName, "text:bookmark-start")) { _flush (); - const gchar * pName = UT_getAttribute ("text:name", ppAtts); + const gchar * pAttr = UT_getAttribute ("text:name", ppAtts); - if(pName) { - _insertBookmark (pName, "start"); + if(pAttr) { + _insertBookmark (pAttr, "start"); } else { UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); } @@ -312,10 +316,10 @@ } else if (!strcmp(pName, "text:bookmark-end")) { _flush (); - const gchar * pName = UT_getAttribute ("text:name", ppAtts); + const gchar * pAttr = UT_getAttribute ("text:name", ppAtts); - if(pName) { - _insertBookmark (pName, "end"); + if(pAttr) { + _insertBookmark (pAttr, "end"); } else { UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); } @@ -449,9 +453,8 @@ const gchar* pVal; pVal = UT_getAttribute("text:anchor-type", ppAtts); - UT_ASSERT(pVal); - if (pVal && (!strcmp(pVal, "as-char") || !strcmp(pVal, "char"))) { + if (!pVal || !strcmp(pVal, "as-char") || !strcmp(pVal, "char")) { _flush(); rAction.pushState("Frame"); } else { @@ -493,14 +496,14 @@ } else if (!strcmp(pName, "text:note-body")) { - const gchar* ppAtts[10]; + const gchar* ppAtts2[10]; bool ok; UT_uint32 id; const ODi_NotesConfiguration* pNotesConfig; const ODi_Style_Style* pStyle = NULL; const UT_UTF8String* pCitationStyleName = NULL; UT_uint8 i; - bool isFootnote; + bool isFootnote = false; const gchar* pNoteClass; pNoteClass = m_rElementStack.getStartTag(0)->getAttributeValue("text:note-class"); @@ -534,38 +537,38 @@ } i = 0; - ppAtts[i++] = "type"; + ppAtts2[i++] = "type"; if (isFootnote) { - ppAtts[i++] = "footnote_ref"; - ppAtts[i++] = "footnote-id"; + ppAtts2[i++] = "footnote_ref"; + ppAtts2[i++] = "footnote-id"; } else { - ppAtts[i++] = "endnote_ref"; - ppAtts[i++] = "endnote-id"; + ppAtts2[i++] = "endnote_ref"; + ppAtts2[i++] = "endnote-id"; } - ppAtts[i++] = m_currentNoteId.utf8_str(); + ppAtts2[i++] = m_currentNoteId.utf8_str(); if (pCitationStyleName && (!pCitationStyleName->empty()) && (pStyle != NULL)) { - ppAtts[i++] = "style"; - ppAtts[i++] = pStyle->getDisplayName().utf8_str(); + ppAtts2[i++] = "style"; + ppAtts2[i++] = pStyle->getDisplayName().utf8_str(); } - ppAtts[i++] = "props"; - ppAtts[i++] = "text-position:superscript"; - ppAtts[i] = 0; + ppAtts2[i++] = "props"; + ppAtts2[i++] = "text-position:superscript"; + ppAtts2[i] = 0; - ok = m_pAbiDocument->appendObject(PTO_Field, ppAtts); + ok = m_pAbiDocument->appendObject(PTO_Field, ppAtts2); UT_ASSERT(ok); if (isFootnote) { - ppAtts[0] = "footnote-id"; + ppAtts2[0] = "footnote-id"; } else { - ppAtts[0] = "endnote-id"; + ppAtts2[0] = "endnote-id"; } - ppAtts[1] = m_currentNoteId.utf8_str(); - ppAtts[2] = 0; + ppAtts2[1] = m_currentNoteId.utf8_str(); + ppAtts2[2] = 0; if (isFootnote) { - ok = m_pAbiDocument->appendStrux(PTX_SectionFootnote, ppAtts); + ok = m_pAbiDocument->appendStrux(PTX_SectionFootnote, ppAtts2); } else { - ok = m_pAbiDocument->appendStrux(PTX_SectionEndnote, ppAtts); + ok = m_pAbiDocument->appendStrux(PTX_SectionEndnote, ppAtts2); } UT_ASSERT(ok); @@ -680,7 +683,7 @@ rAction.popState(); } else if (!strcmp(pName, "text:note-body")) { - bool ok; + bool ok = false; const gchar* pNoteClass; pNoteClass = m_rElementStack.getStartTag(1)->getAttributeValue("text:note-class"); @@ -792,7 +795,7 @@ if (!m_stackFmtStartIndex.pop(&start)) return; - UT_uint32 k; + UT_sint32 k; UT_uint32 end = m_vecInlineFmt.getItemCount(); const gchar* p; @@ -904,13 +907,11 @@ // multiple page formats anyway. pMasterPageStyle = m_pStyles->getMasterPageStyle("Standard"); - UT_return_if_fail(pMasterPageStyle); - - UT_ASSERT(pMasterPageStyle->getPageLayout()); - - allProps = pMasterPageStyle->getSectionProps(); - dataID = pMasterPageStyle->getSectionDataID(); - UT_ASSERT(!allProps.empty()); + + if (pMasterPageStyle) { + allProps = pMasterPageStyle->getSectionProps(); + dataID = pMasterPageStyle->getSectionDataID(); + } m_openedFirstAbiSection = true; } @@ -1005,9 +1006,10 @@ /** * Process and startElement calls */ -void ODi_TextContent_ListenerState::_startParagraphElement (const gchar* pName, +void ODi_TextContent_ListenerState::_startParagraphElement (const gchar* /*pName*/, const gchar** ppParagraphAtts, - ODi_ListenerStateAction& rAction) { + ODi_ListenerStateAction& /*rAction*/) +{ bool bIsListParagraph = false; const gchar* pStyleName; const gchar *ppAtts[50]; @@ -1027,7 +1029,10 @@ if (pStyleName) { pStyle = m_pStyles->getParagraphStyle(pStyleName, m_bOnContentStream); - UT_ASSERT(pStyle); + + if (!pStyle) { + pStyle = m_pStyles->getTextStyle(pStyleName, m_bOnContentStream); + } // Damn, use the default style if (!pStyle) { @@ -1242,8 +1247,9 @@ * */ void ODi_TextContent_ListenerState::_endParagraphElement ( - const gchar* pName, - ODi_ListenerStateAction& rAction) { + const gchar* /*pName*/, + ODi_ListenerStateAction& rAction) +{ const gchar* pStyleName; const ODi_Style_Style* pStyle; @@ -1257,7 +1263,10 @@ if (pStyleName) { pStyle = m_pStyles->getParagraphStyle(pStyleName, m_bOnContentStream); - UT_ASSERT(pStyle); + + if (!pStyle) { + pStyle = m_pStyles->getTextStyle(pStyleName, m_bOnContentStream); + } // Damn, use the default style if (!pStyle) { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/Makefile 2008-04-06 22:37:07.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenDocument/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -80,6 +80,8 @@ $(OBJDIR)/ODe_Table_Listener.$(OBJ_SUFFIX) \ $(OBJDIR)/ODe_Text_Listener.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/GNUmakefile.in 2008-04-06 22:37:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/Makefile 2008-04-06 22:37:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/ie_imp_OpenWriter.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_exp_OpenWriter.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/xp/GNUmakefile.in 2008-04-06 22:37:49.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_OPENWRITER_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -344,8 +359,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -375,8 +390,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -384,8 +399,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -441,8 +456,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -454,8 +469,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -465,13 +480,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_exp_OpenWriter.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_exp_OpenWriter.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_exp_OpenWriter.h 2008-04-06 22:37:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_exp_OpenWriter.h 2009-07-15 16:56:23.000000000 +0100 @@ -41,7 +41,7 @@ #include -class ABI_EXPORT IE_Exp_OpenWriter : public IE_Exp +class IE_Exp_OpenWriter : public IE_Exp { public: IE_Exp_OpenWriter(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_impexp_OpenWriter.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_impexp_OpenWriter.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_impexp_OpenWriter.h 2008-04-06 22:37:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_impexp_OpenWriter.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ #include "ie_imp.h" #include "ie_exp.h" -class ABI_EXPORT IE_Imp_OpenWriter_Sniffer : public IE_ImpSniffer +class IE_Imp_OpenWriter_Sniffer : public IE_ImpSniffer { public: IE_Imp_OpenWriter_Sniffer () ; @@ -46,7 +46,7 @@ IEFileType * ft) ; }; -class ABI_EXPORT IE_Exp_OpenWriter_Sniffer : public IE_ExpSniffer +class IE_Exp_OpenWriter_Sniffer : public IE_ExpSniffer { public: IE_Exp_OpenWriter_Sniffer(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp 2008-04-06 22:37:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -264,6 +264,7 @@ void parse (const gchar ** props) { const gchar * val = NULL; + const gchar * val2 = NULL; val = UT_getAttribute ("fo:text-align", props); if (val) @@ -324,10 +325,16 @@ else m_fontSize = UT_String_sprintf ("font-size: %s;", val); } - - if (UT_getAttribute("fo:language", props) && UT_getAttribute("fo:country", props)) - m_lang = UT_String_sprintf ("lang: %s-%s;", UT_getAttribute("fo:language", props), - UT_getAttribute("fo:country", props)); + + val = UT_getAttribute("fo:language", props); + val2 = UT_getAttribute("fo:country", props); + if (val && val2 && *val && *val2) { + if (!strcmp(val, "zxx") && !strcmp(val2, "none")) { + m_lang = "lang:-none-;"; // no proofing + } else { + m_lang = UT_String_sprintf ("lang:%s-%s;", val, val2); + } + } val = UT_getAttribute("style:text-position", props); if(val) { @@ -507,7 +514,7 @@ /*! * Class used to import OpenWriter documents */ -class ABI_EXPORT IE_Imp_OpenWriter : public IE_Imp +class IE_Imp_OpenWriter : public IE_Imp { public: IE_Imp_OpenWriter (PD_Document * pDocument); @@ -594,6 +601,31 @@ g_object_unref (G_OBJECT (pInput)); } + // there's no mimetype stream, so let's check for a content.xml file instead + else + { + pInput = gsf_infile_child_by_name(zip, "content.xml"); + + gsf_off_t size = 0; + if (pInput) + size = gsf_input_size(pInput); + + if (size > 0) + { + int min = UT_MIN(size, 150); + + UT_UTF8String content; + content.append((const char *)gsf_input_read(pInput, min, NULL)); + + if (strstr(content.utf8_str(), " -//#include "../../exp/xp/ie_exp_OpenXML_Sniffer.h" +#include /*****************************************************************************/ /*****************************************************************************/ @@ -42,7 +42,7 @@ ABI_PLUGIN_DECLARE("OpenXML") static IE_Imp_OpenXML_Sniffer* pImp_sniffer = 0; -//static IE_Exp_OpenXML_Sniffer* pExp_sniffer = 0; +static IE_Exp_OpenXML_Sniffer* pExp_sniffer = 0; /** @@ -55,14 +55,15 @@ } IE_Imp::registerImporter (pImp_sniffer); + + if (!pExp_sniffer){ + pExp_sniffer = new IE_Exp_OpenXML_Sniffer (); + } -// if (!pExp_sniffer) -// pExp_sniffer = new IE_Exp_OpenXML_Sniffer (); - -// IE_Exp::registerExporter (pExp_sniffer); + IE_Exp::registerExporter (pExp_sniffer); - mi->name = "OpenXML Filter"; - mi->desc = "Import OpenXML (.docx) files"; + mi->name = "Office Open XML Filter"; + mi->desc = "Import/Export Office Open XML (.docx) files"; mi->version = ABI_VERSION_STRING; mi->author = "Philippe Milot"; mi->usage = "No Usage"; @@ -86,8 +87,8 @@ IE_Imp::unregisterImporter (pImp_sniffer); DELETEP(pImp_sniffer); -// IE_Exp::unregisterExporter (pExp_sniffer); -// DELETEP(pExp_sniffer); + IE_Exp::unregisterExporter (pExp_sniffer); + DELETEP(pExp_sniffer); return 1; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/Makefile 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -22,20 +22,36 @@ include $(ABI_ROOT)/src/config/abi_defs.mk INCLUDES+= -I$(shell pwd) \ + -I$(shell pwd)/../../exp/xp \ -I$(shell pwd)/../../imp/xp TARGETS= $(OBJS) CPPSRCS= ie_impexp_OpenXML.cpp \ OXML_ObjectWithAttrProp.cpp \ OXML_Element.cpp \ - OXML_Element_Text.cpp \ + OXML_Element_Bookmark.cpp \ + OXML_Element_Cell.cpp \ + OXML_Element_Field.cpp \ + OXML_Element_Hyperlink.cpp \ + OXML_Element_Image.cpp \ + OXML_Element_List.cpp \ + OXML_Element_Paragraph.cpp \ + OXML_Element_Row.cpp \ OXML_Element_Run.cpp \ + OXML_Element_Table.cpp \ + OXML_Element_Text.cpp \ + OXML_Element_TextBox.cpp \ + OXML_ObjectWithAttrProp.cpp \ OXML_Section.cpp \ OXML_Document.cpp \ OXML_FontManager.cpp \ OXML_Style.cpp \ + OXML_List.cpp \ + OXML_Image.cpp \ OXML_Theme.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) INCLUDES += -I$(shell pkg-config --cflags libgsf-1) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Document.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Document.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Document.cpp 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Document.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -73,6 +73,8 @@ clearHeaders(); clearFooters(); clearSections(); + clearFootnotes(); + clearEndnotes(); } OXML_Document::~OXML_Document() @@ -81,6 +83,8 @@ clearHeaders(); clearFooters(); clearSections(); + clearFootnotes(); + clearEndnotes(); } OXML_SharedStyle OXML_Document::getStyleById(const std::string & id) @@ -120,6 +124,24 @@ return UT_OK; } +UT_Error OXML_Document::addList(const OXML_SharedList & obj) +{ + UT_return_val_if_fail(obj, UT_ERROR); + + m_lists_by_id[obj->getId()] = obj; + return UT_OK; +} + +UT_Error OXML_Document::addImage(const OXML_SharedImage & obj) +{ + UT_return_val_if_fail(obj, UT_ERROR); + + std::string str(""); + str += obj->getId(); + m_images_by_id[str] = obj; + return UT_OK; +} + UT_Error OXML_Document::clearStyles() { m_styles_by_id.clear(); @@ -148,6 +170,34 @@ return m_headers.size() == 0 ? UT_OK : UT_ERROR; } +UT_Error OXML_Document::addFootnote(const OXML_SharedSection & obj) +{ + UT_return_val_if_fail(obj, UT_ERROR); + + m_footnotes[obj->getId()] = obj; + return UT_OK; +} + +UT_Error OXML_Document::clearFootnotes() +{ + m_footnotes.clear(); + return m_footnotes.size() == 0 ? UT_OK : UT_ERROR; +} + +UT_Error OXML_Document::addEndnote(const OXML_SharedSection & obj) +{ + UT_return_val_if_fail(obj, UT_ERROR); + + m_endnotes[obj->getId()] = obj; + return UT_OK; +} + +UT_Error OXML_Document::clearEndnotes() +{ + m_endnotes.clear(); + return m_endnotes.size() == 0 ? UT_OK : UT_ERROR; +} + OXML_SharedSection OXML_Document::getFooter(const std::string & id) { OXML_SectionMap::iterator it; @@ -227,18 +277,126 @@ return m_fontManager; } -UT_Error OXML_Document::serialize(const std::string & path) +UT_Error OXML_Document::serialize(IE_Exp_OpenXML* exporter) { UT_Error ret = UT_OK; - //Do something here when implementing export filter + + ret = exporter->startDocument(); + if(ret != UT_OK) + return ret; + + OXML_StyleMap::iterator it1; + for (it1 = m_styles_by_id.begin(); it1 != m_styles_by_id.end(); it1++) { + ret = it1->second->serialize(exporter); + if (ret != UT_OK) + return ret; + } + + //serialize abstract numbering definitions + OXML_ListMap::iterator it2; + for (it2 = m_lists_by_id.begin(); it2 != m_lists_by_id.end(); it2++) { + ret = it2->second->serialize(exporter); + if (ret != UT_OK) + return ret; + } + + //serialize actual numbering definitions + OXML_ListMap::iterator it3; + for (it3 = m_lists_by_id.begin(); it3 != m_lists_by_id.end(); it3++) { + ret = it3->second->serializeNumbering(exporter); + if (ret != UT_OK) + return ret; + } + + OXML_ImageMap::iterator it4; + for (it4 = m_images_by_id.begin(); it4 != m_images_by_id.end(); it4++) { + ret = it4->second->serialize(exporter); + if (ret != UT_OK) + return ret; + } + + ret = exporter->writeDefaultStyle(); + if(ret != UT_OK) + return ret; OXML_SectionVector::size_type i; for (i = 0; i < m_sections.size(); i++) { - if (m_sections[i]->serialize(path) != UT_OK) - ret = UT_ERROR; + ret = m_sections[i]->serialize(exporter); + if(ret != UT_OK) + return ret; } - return ret; + + ret = exporter->startSectionProperties(); + if(ret != UT_OK) + return ret; + + bool firstPageHdrFtr = false; + bool evenPageHdrFtr = false; + + //serialize headers + OXML_SectionMap::iterator it5; + for (it5 = m_headers.begin(); it5 != m_headers.end(); it5++) { + + if(it5->second->hasFirstPageHdrFtr()) + firstPageHdrFtr = true; + if(it5->second->hasEvenPageHdrFtr()) + evenPageHdrFtr = true; + + ret = it5->second->serializeHeader(exporter); + if (ret != UT_OK) + return ret; + } + + //serialize footers + OXML_SectionMap::iterator it6; + for (it6 = m_footers.begin(); it6 != m_footers.end(); it6++) { + + if(it6->second->hasFirstPageHdrFtr()) + firstPageHdrFtr = true; + if(it6->second->hasEvenPageHdrFtr()) + evenPageHdrFtr = true; + + ret = it6->second->serializeFooter(exporter); + if (ret != UT_OK) + return ret; + } + + if(firstPageHdrFtr) + { + ret = exporter->setTitlePage(); + if(ret != UT_OK) + return ret; + } + + if(evenPageHdrFtr) + { + ret = exporter->setEvenAndOddHeaders(); + if(ret != UT_OK) + return ret; + } + + ret = exporter->finishSectionProperties(); + if(ret != UT_OK) + return ret; + + //serialize footnotes + OXML_SectionMap::iterator it7; + for (it7 = m_footnotes.begin(); it7 != m_footnotes.end(); it7++) { + ret = it7->second->serializeFootnote(exporter); + if (ret != UT_OK) + return ret; + } + + //serialize endnotes + OXML_SectionMap::iterator it8; + for (it8 = m_endnotes.begin(); it8 != m_endnotes.end(); it8++) { + ret = it8->second->serializeEndnote(exporter); + if (ret != UT_OK) + return ret; + } + + return exporter->finishDocument(); } UT_Error OXML_Document::addToPT(PD_Document * pDocument) @@ -288,4 +446,3 @@ index++; } } - diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Document.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Document.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Document.h 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Document.h 2009-07-15 16:56:23.000000000 +0100 @@ -34,6 +34,7 @@ // AbiWord includes #include #include +#include // External includes #include @@ -63,6 +64,15 @@ UT_Error addStyle(const OXML_SharedStyle & obj); UT_Error clearStyles(); + UT_Error addList(const OXML_SharedList& obj); + UT_Error addImage(const OXML_SharedImage& obj); + + UT_Error addFootnote(const OXML_SharedSection & obj); + UT_Error clearFootnotes(); + + UT_Error addEndnote(const OXML_SharedSection & obj); + UT_Error clearEndnotes(); + //! Returns a reference to the FIRST header with corresponding ID OR empty SharedSection if none found. OXML_SharedSection getHeader(const std::string & id); UT_Error addHeader(const OXML_SharedSection & obj); @@ -86,9 +96,9 @@ //! Writes the OpenXML document and all its content to a file on disk. /*! This method is used during the export process. - \param path String indicating the FULL path of the file. If the file exists, it will be overridden. + \param exporter the actual exporter which handles writing the files. */ - UT_Error serialize(const std::string & path); + UT_Error serialize(IE_Exp_OpenXML* exporter); //! Builds the Abiword Piecetable representation of the OpenXML document and all its content. /*! This method is used during the import process. \param pDocument A valid reference to the PD_Document object. @@ -104,6 +114,8 @@ OXML_SectionMap m_headers; OXML_SectionMap m_footers; + OXML_SectionMap m_footnotes; + OXML_SectionMap m_endnotes; OXML_StyleMap m_styles_by_id; OXML_StyleMap m_styles_by_name; @@ -111,6 +123,9 @@ OXML_SharedTheme m_theme; OXML_SharedFontManager m_fontManager; + OXML_ListMap m_lists_by_id; + OXML_ImageMap m_images_by_id; + void _assignHdrFtrIds(); }; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Bookmark.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Bookmark.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Bookmark.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Bookmark.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,78 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// AbiWord includes +#include +#include +#include + +OXML_Element_Bookmark::OXML_Element_Bookmark(std::string id) : + OXML_Element(id, BOOK_TAG, BOOKMRK) +{ +} + +OXML_Element_Bookmark::~OXML_Element_Bookmark() +{ + +} + +UT_Error OXML_Element_Bookmark::serialize(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + const gchar* type; + const gchar* name; + + err = getAttribute("name", name); + if(err != UT_OK) + return UT_OK; + + if(getAttribute("type", type) == UT_OK) + { + if(strcmp(type, "start") == 0) + { + err = exporter->startBookmark(getId().c_str(), name); + if(err != UT_OK) + return err; + } + else if(strcmp(type, "end") == 0) + { + err = exporter->finishBookmark(getId().c_str()); + if(err != UT_OK) + return err; + } + else + { + UT_DEBUGMSG(("FRT: Unknown Bookmark type\n")); + } + } + + return UT_OK; +} + +UT_Error OXML_Element_Bookmark::addToPT(PD_Document* /*pDocument*/) +{ + //TODO + return UT_OK; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Bookmark.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Bookmark.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Bookmark.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Bookmark.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,46 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_ELEMENT_BOOKMARK_H_ +#define _OXML_ELEMENT_BOOKMARK_H_ + +// Internal includes +#include +#include + +// AbiWord includes +#include +#include +#include + +class OXML_Element_Bookmark : public OXML_Element +{ +public: + OXML_Element_Bookmark(std::string id); + virtual ~OXML_Element_Bookmark(); + + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); + virtual UT_Error addToPT(PD_Document * pDocument); +}; + +#endif //_OXML_ELEMENT_BOOKMARK_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Cell.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Cell.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Cell.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Cell.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,258 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// AbiWord includes +#include +#include +#include + +OXML_Element_Cell::OXML_Element_Cell(std::string id, OXML_Element_Table* tbl, UT_sint32 left, UT_sint32 right, UT_sint32 top, UT_sint32 bottom) : + OXML_Element(id, TC_TAG, CELL), + m_iLeft(left), + m_iRight(right), + m_iTop(top), + m_iBottom(bottom), + table(tbl) +{ + +} + +OXML_Element_Cell::~OXML_Element_Cell() +{ + +} + +UT_Error OXML_Element_Cell::serialize(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + + err = exporter->startCell(); + if(err != UT_OK) + return err; + + err = this->serializeProperties(exporter); + if(err != UT_OK) + return err; + + err = this->serializeChildren(exporter); + if(err != UT_OK) + return err; + + return exporter->finishCell(); +} + +UT_Error OXML_Element_Cell::serializeProperties(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + const gchar* szValue = NULL; + const gchar* borderType = NULL; + const gchar* color = NULL; + const gchar* size = NULL; + + err = exporter->startCellProperties(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + UT_sint32 hspan = getRight()-getLeft(); + UT_sint32 vspan = getBottom()-getTop(); + bool isVertCont = getTop() == -1; + + err = exporter->setColumnWidth(TARGET_DOCUMENT, table->getColumnWidth(getLeft()).c_str()); + if(err != UT_OK) + return err; + + if(getProperty("background-color", szValue) == UT_OK) + { + err = exporter->setBackgroundColor(TARGET_DOCUMENT, szValue); + if(err != UT_OK) + return err; + } + + err = exporter->startCellBorderProperties(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + //left border + borderType = "single"; + if(getProperty("left-style", szValue) == UT_OK) + { + if(strcmp(szValue, "1") != 0) + { + borderType = "dashed"; + } + } + + color = NULL; + if(getProperty("left-color", szValue) == UT_OK) + { + color = szValue; + } + + size = NULL; + if(getProperty("left-thickness", szValue) == UT_OK) + { + size = szValue; + } + + err = exporter->setTableBorder(TARGET_DOCUMENT, "left", borderType, color, size); + if(err != UT_OK) + return err; + + //right border + borderType = "single"; + if(getProperty("right-style", szValue) == UT_OK) + { + if(strcmp(szValue, "1") != 0) + { + borderType = "dashed"; + } + } + + color = NULL; + if(getProperty("right-color", szValue) == UT_OK) + { + color = szValue; + } + + size = NULL; + if(getProperty("right-thickness", szValue) == UT_OK) + { + size = szValue; + } + err = exporter->setTableBorder(TARGET_DOCUMENT, "right", borderType, color, size); + if(err != UT_OK) + return err; + + if(!isVertCont) + { + //top border + borderType = "single"; + if(getProperty("top-style", szValue) == UT_OK) + { + if(strcmp(szValue, "1") != 0) + { + borderType = "dashed"; + } + } + + color = NULL; + if(getProperty("top-color", szValue) == UT_OK) + { + color = szValue; + } + + size = NULL; + if(getProperty("top-thickness", szValue) == UT_OK) + { + size = szValue; + } + err = exporter->setTableBorder(TARGET_DOCUMENT, "top", borderType, color, size); + if(err != UT_OK) + return err; + } + + if(vspan == 1) + { + //bottom border + borderType = "single"; + if(getProperty("bot-style", szValue) == UT_OK) + { + if(strcmp(szValue, "1") != 0) + { + borderType = "dashed"; + } + } + + color = NULL; + if(getProperty("bot-color", szValue) == UT_OK) + { + color = szValue; + } + + size = NULL; + if(getProperty("bot-thickness", szValue) == UT_OK) + { + size = szValue; + } + err = exporter->setTableBorder(TARGET_DOCUMENT, "bottom", borderType, color, size); + if(err != UT_OK) + return err; + } + + err = exporter->finishCellBorderProperties(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + if(hspan > 1) + { + err = exporter->setGridSpan(TARGET_DOCUMENT, hspan); + if(err != UT_OK) + return err; + } + + if(vspan > 1) + { + err = exporter->setVerticalMerge(TARGET_DOCUMENT, "restart"); + if(err != UT_OK) + return err; + } + + if(isVertCont) + { + err = exporter->setVerticalMerge(TARGET_DOCUMENT, "continue"); + if(err != UT_OK) + return err; + } + + return exporter->finishCellProperties(TARGET_DOCUMENT); +} + + +UT_Error OXML_Element_Cell::addToPT(PD_Document * /*pDocument*/) +{ + //TODO + return UT_OK; +} + + +UT_sint32 OXML_Element_Cell::getLeft() +{ + return m_iLeft; +} + +UT_sint32 OXML_Element_Cell::getRight() +{ + return m_iRight; +} + +UT_sint32 OXML_Element_Cell::getTop() +{ + return m_iTop; +} + +UT_sint32 OXML_Element_Cell::getBottom() +{ + return m_iBottom; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Cell.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Cell.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Cell.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Cell.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,58 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_ELEMENT_CELL_H_ +#define _OXML_ELEMENT_CELL_H_ + +// Internal includes +#include +#include +#include + +// AbiWord includes +#include +#include +#include + +class OXML_Element_Table; + +class OXML_Element_Cell : public OXML_Element +{ +public: + OXML_Element_Cell(std::string id, OXML_Element_Table* table, UT_sint32 left, UT_sint32 right, UT_sint32 top, UT_sint32 bottom); + virtual ~OXML_Element_Cell(); + + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); + virtual UT_Error addToPT(PD_Document * pDocument); + UT_sint32 getLeft(); + UT_sint32 getRight(); + UT_sint32 getTop(); + UT_sint32 getBottom(); + +private: + virtual UT_Error serializeProperties(IE_Exp_OpenXML* exporter); + UT_sint32 m_iLeft, m_iRight, m_iTop, m_iBottom; + OXML_Element_Table* table; +}; + +#endif //_OXML_ELEMENT_CELL_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element.cpp 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -36,7 +36,8 @@ #include OXML_Element::OXML_Element(std::string id, OXML_ElementTag tag, OXML_ElementType type) : - OXML_ObjectWithAttrProp(), + OXML_ObjectWithAttrProp(), + TARGET(0), m_id(id), m_tag(tag), m_type(type) @@ -71,6 +72,9 @@ UT_DEBUGMSG(("Bad alloc!\n")); return UT_OUTOFMEM; } UT_END_CATCH + + obj->setTarget(TARGET); //propagate the target + return UT_OK; } @@ -80,21 +84,22 @@ return m_children.size() == 0 ? UT_OK : UT_ERROR; } -UT_Error OXML_Element::serializeChildren(std::string path) +UT_Error OXML_Element::serializeChildren(IE_Exp_OpenXML* exporter) { UT_Error ret = UT_OK; OXML_ElementVector::size_type i; for (i = 0; i < m_children.size(); i++) { - if (m_children[i]->serialize(path) != UT_OK) - ret = UT_ERROR; + ret = m_children[i]->serialize(exporter); + if(ret != UT_OK) + return ret; } return ret; } -UT_Error OXML_Element::serialize(std::string path) +UT_Error OXML_Element::serialize(IE_Exp_OpenXML* exporter) { UT_Error ret = UT_OK; //Do something here when export filter is implemented @@ -102,8 +107,7 @@ if (ret != UT_OK) return ret; - ret = serializeChildren(path); - return ret; + return serializeChildren(exporter); } UT_Error OXML_Element::addChildrenToPT(PD_Document * pDocument) @@ -174,3 +178,7 @@ return ret; } +void OXML_Element::setTarget(int target) +{ + TARGET = target; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Field.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Field.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Field.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Field.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,397 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// AbiWord includes +#include +#include +#include + +OXML_Element_Field::OXML_Element_Field(std::string id, fd_Field::FieldType type, const gchar* value) : + OXML_Element(id, FLD_TAG, FIELD), fieldType(type), fieldValue(value) +{ +} + +OXML_Element_Field::~OXML_Element_Field() +{ + +} + +UT_Error OXML_Element_Field::serialize(IE_Exp_OpenXML* exporter) +{ + //TODO: serialize field here + + const char* format = ""; + + switch(fieldType) + { + case fd_Field::FD_Time: + { + format = "DATE \\@ \"HH:mm:ss am/pm\""; + break; + } + case fd_Field::FD_Date: + { + format = "DATE \\@ \"dddd MMMM dd, yyyy\""; + break; + } + case fd_Field::FD_Date_MMDDYY: + { + format = "DATE \\@ \"MM/dd/yy\""; + break; + } + case fd_Field::FD_Date_DDMMYY: + { + format = "DATE \\@ \"dd/MM/yy\""; + break; + } + case fd_Field::FD_Date_MDY: + { + format = "DATE \\@ \"MMMM d, yyyy\""; + break; + } + case fd_Field::FD_Date_MthDY: + { + format = "DATE \\@ \"MMM d, yyyy\""; + break; + } + case fd_Field::FD_Date_DFL: + { + format = "DATE \\@ \"ddd dd MMM yyyy HH:mm:ss am/pm\""; //no Time Zone in OOXML, so skip it + break; + } + case fd_Field::FD_Date_NTDFL: + { + format = "DATE \\@ \"MM/dd/yyyy\""; + break; + } + case fd_Field::FD_Date_Wkday: + { + format = "DATE \\@ \"dddd\""; + break; + } + case fd_Field::FD_Date_DOY: + { + //TODO + return UT_OK; + } + case fd_Field::FD_Time_MilTime: + { + format = "DATE \\@ \"HH:mm:ss\""; + return UT_OK; + } + case fd_Field::FD_Time_AMPM: + { + format = "DATE \\@ \"am/pm\""; + break; + } + case fd_Field::FD_Time_Zone: + { + //TODO + return UT_OK; + } + case fd_Field::FD_Time_Epoch: + { + //TODO + return UT_OK; + } + case fd_Field::FD_DateTime_Custom: + { + format = "DATE \\@ \"MM/dd/yy HH:mm:ss am/pm\""; + break; + } + case fd_Field::FD_PageNumber: + { + format = "PAGE \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_PageCount: + { + format = "NUMPAGES \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_FileName: + { + format = "FILENAME \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_Doc_WordCount: + { + format = "NUMWORDS \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_Doc_CharCount: + { + format = "DOCPROPERTY CHARACTERSWITHSPACES \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_Doc_LineCount: + { + format = "DOCPROPERTY LINES \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_Doc_ParaCount: + { + format = "DOCPROPERTY PARAGRAPHS \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_Doc_NbspCount: + { + format = "NUMCHARS \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_Meta_Title: + { + format = "TITLE \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_Meta_Creator: + { + format = "AUTHOR \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_Meta_Subject: + { + format = "SUBJECT \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_Meta_Publisher: + { + format = "LASTSAVEDBY \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_Meta_Date: + { + format = "SAVEDATE \\@ \"HH:mm:ss am/pm\""; + break; + } + case fd_Field::FD_Meta_Type: + { + //TODO + return UT_OK; + } + case fd_Field::FD_Meta_Language: + { + //TODO + return UT_OK; + } + case fd_Field::FD_Meta_Rights: + { + //TODO + return UT_OK; + } + case fd_Field::FD_Meta_Keywords: + { + format = "KEYWORDS \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_Meta_Contributor: + { + //TODO + return UT_OK; + } + case fd_Field::FD_Meta_Coverage: + { + //TODO + return UT_OK; + } + case fd_Field::FD_Meta_Description: + { + format = "COMMENTS \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_App_ID: + { + format = "NAMEOFAPPLICATION \\* MERGEFORMAT"; + break; + } + case fd_Field::FD_App_Version: + { + //TODO + return UT_OK; + } + case fd_Field::FD_App_Options: + { + //TODO + return UT_OK; + } + case fd_Field::FD_App_Target: + { + //TODO + return UT_OK; + } + case fd_Field::FD_App_CompileTime: + { + //TODO + return UT_OK; + } + case fd_Field::FD_App_CompileDate: + { + //TODO + return UT_OK; + } + case fd_Field::FD_PageReference: + { + //TODO + return UT_OK; + } + case fd_Field::FD_MailMerge: + { + //TODO + return UT_OK; + } + case fd_Field::FD_Endnote_Ref: + { + UT_Error err = UT_OK; + const gchar* endnoteId; + + err = getAttribute("endnote-id", endnoteId); + if(err != UT_OK) + return UT_OK; + + err = exporter->startRun(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + err = exporter->startRunProperties(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + err = exporter->setSuperscript(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + err = exporter->finishRunProperties(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + err = exporter->setEndnoteReference(endnoteId); + if(err != UT_OK) + return err; + + return exporter->finishRun(TARGET_DOCUMENT); + } + case fd_Field::FD_Endnote_Anchor: + { + UT_Error err = UT_OK; + + err = exporter->startRun(TARGET_ENDNOTE); + if(err != UT_OK) + return err; + + err = exporter->startRunProperties(TARGET_ENDNOTE); + if(err != UT_OK) + return err; + + err = exporter->setSuperscript(TARGET_ENDNOTE); + if(err != UT_OK) + return err; + + err = exporter->finishRunProperties(TARGET_ENDNOTE); + if(err != UT_OK) + return err; + + err = exporter->setEndnoteRef(); + if(err != UT_OK) + return err; + + return exporter->finishRun(TARGET_ENDNOTE); + } + case fd_Field::FD_Footnote_Ref: + { + UT_Error err = UT_OK; + const gchar* footnoteId; + + err = getAttribute("footnote-id", footnoteId); + if(err != UT_OK) + return UT_OK; + + err = exporter->startRun(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + err = exporter->startRunProperties(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + err = exporter->setSuperscript(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + err = exporter->finishRunProperties(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + err = exporter->setFootnoteReference(footnoteId); + if(err != UT_OK) + return err; + + return exporter->finishRun(TARGET_DOCUMENT); + } + case fd_Field::FD_Footnote_Anchor: + { + UT_Error err = UT_OK; + + err = exporter->startRun(TARGET_FOOTNOTE); + if(err != UT_OK) + return err; + + err = exporter->startRunProperties(TARGET_FOOTNOTE); + if(err != UT_OK) + return err; + + err = exporter->setSuperscript(TARGET_FOOTNOTE); + if(err != UT_OK) + return err; + + err = exporter->finishRunProperties(TARGET_FOOTNOTE); + if(err != UT_OK) + return err; + + err = exporter->setFootnoteRef(); + if(err != UT_OK) + return err; + + return exporter->finishRun(TARGET_FOOTNOTE); + } + + default: + return UT_OK; + } + + return exporter->setSimpleField(format, fieldValue); +} + +UT_Error OXML_Element_Field::serializeProperties(IE_Exp_OpenXML* /*exporter*/) +{ + //TODO: Add all the property serializations here + return UT_OK; +} + + +UT_Error OXML_Element_Field::addToPT(PD_Document * /*pDocument*/) +{ + //TODO + return UT_OK; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Field.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Field.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Field.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Field.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,52 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_ELEMENT_FIELD_H_ +#define _OXML_ELEMENT_FIELD_H_ + +// Internal includes +#include +#include +#include + +// AbiWord includes +#include +#include +#include + +class OXML_Element_Field: public OXML_Element +{ +public: + OXML_Element_Field(std::string id, fd_Field::FieldType type, const gchar* value); + virtual ~OXML_Element_Field(); + + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); + virtual UT_Error addToPT(PD_Document * pDocument); + +private: + virtual UT_Error serializeProperties(IE_Exp_OpenXML* exporter); + fd_Field::FieldType fieldType; + const gchar* fieldValue; +}; + +#endif //_OXML_ELEMENT_FIELD_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element.h 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,6 +27,8 @@ #include #include #include "OXML_Style.h" +#include "OXML_List.h" +#include "OXML_Image.h" // AbiWord includes #include @@ -40,6 +42,7 @@ #include class OXML_Element; +class IE_Exp_OpenXML; typedef boost::shared_ptr OXML_SharedElement; typedef std::vector OXML_ElementVector; @@ -78,9 +81,9 @@ /*! This method is used during the export process. * WARNING: If you derive OXML_Element, you should probably override this method. * If you do, make sure to call the method serializeChildren (if applicable). - \param path String indicating the FULL path of the file. If the file exists, it will be overridden. + \param exporter the actual exporter which handles writing the files. */ - virtual UT_Error serialize(std::string path); + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); //! Appends this section and all its content to the Abiword Piecetable. /*! This method is used during the import process. * WARNING: If you derive OXML_Element, you should probably override this method. @@ -89,24 +92,31 @@ */ virtual UT_Error addToPT(PD_Document * pDocument); + void setTarget(int target); + protected: //! Calls the method serialize() on all children. /*! WARNING: if you derive OXML_Element, you probably shouldn't redefine this method. */ - UT_Error serializeChildren(std::string path); + UT_Error serializeChildren(IE_Exp_OpenXML* exporter); //! Calls the method addToPT() on all children. /*! WARNING: if you derive OXML_Element, you probably shouldn't redefine this method. */ UT_Error addChildrenToPT(PD_Document * pDocument); + int TARGET; + private: std::string m_id; OXML_ElementTag m_tag; OXML_ElementType m_type; OXML_ElementVector m_children; + }; typedef std::map OXML_StyleMap; +typedef std::map OXML_ListMap; +typedef std::map OXML_ImageMap; #endif //_OXML_ELEMENT_H_ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Hyperlink.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Hyperlink.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Hyperlink.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Hyperlink.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,84 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// AbiWord includes +#include +#include +#include + +OXML_Element_Hyperlink::OXML_Element_Hyperlink(std::string id) : + OXML_Element(id, HYPR_TAG, HYPRLNK) +{ +} + +OXML_Element_Hyperlink::~OXML_Element_Hyperlink() +{ + +} + +UT_Error OXML_Element_Hyperlink::serialize(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + const gchar* szValue; + + if(getAttribute("xlink:href", szValue) == UT_OK) + { + if(*szValue != '#') + { + //external reference + std::string relId("rId"); + relId += getId(); + + err = exporter->setHyperlinkRelation(TARGET_DOCUMENT_RELATION, relId.c_str(), szValue, "External"); + if(err != UT_OK) + return err; + + err = exporter->startExternalHyperlink(relId.c_str()); + if(err != UT_OK) + return err; + } + else + { + //hyperlink to a bookmark, internal reference + err = exporter->startInternalHyperlink(szValue+1); + if(err != UT_OK) + return err; + } + + err = this->serializeChildren(exporter); + if(err != UT_OK) + return err; + + return exporter->finishHyperlink(); + } + + return UT_OK; +} + +UT_Error OXML_Element_Hyperlink::addToPT(PD_Document* /*pDocument*/) +{ + //TODO + return UT_OK; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Hyperlink.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Hyperlink.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Hyperlink.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Hyperlink.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,46 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_ELEMENT_HYPERLINK_H_ +#define _OXML_ELEMENT_HYPERLINK_H_ + +// Internal includes +#include +#include + +// AbiWord includes +#include +#include +#include + +class OXML_Element_Hyperlink : public OXML_Element +{ +public: + OXML_Element_Hyperlink(std::string id); + virtual ~OXML_Element_Hyperlink(); + + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); + virtual UT_Error addToPT(PD_Document * pDocument); +}; + +#endif //_OXML_ELEMENT_HYPERLINK_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Image.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Image.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Image.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Image.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,84 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// AbiWord includes +#include +#include +#include + +OXML_Element_Image::OXML_Element_Image(std::string id) : + OXML_Element(id, IMG_TAG, IMAGE) +{ +} + +OXML_Element_Image::~OXML_Element_Image() +{ + +} + +UT_Error OXML_Element_Image::serialize(IE_Exp_OpenXML* exporter) +{ + //TODO: serialize image here + UT_Error err = UT_OK; + const gchar* szValue; + const gchar* height; + const gchar* width; + + if(getAttribute("dataid", szValue) == UT_OK) + { + + if(getProperty("height", height) != UT_OK) + height = "1.0in"; + + if(getProperty("width", width) != UT_OK) + width = "1.0in"; + + UT_UTF8String sEscValue = szValue; + sEscValue.escapeXML(); + + std::string filename(""); + filename += sEscValue.utf8_str(); + filename += ".png"; + + std::string relId("rId"); + relId += getId(); + + err = exporter->setImageRelation(filename.c_str(), relId.c_str()); + if(err != UT_OK) + return err; + + err = exporter->setImage(getId().c_str(), relId.c_str(), filename.c_str(), width, height); + if(err != UT_OK) + return err; + } + + return UT_OK; +} + +UT_Error OXML_Element_Image::addToPT(PD_Document * /*pDocument*/) +{ + //TODO + return UT_OK; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Image.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Image.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Image.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Image.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,46 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_ELEMENT_IMAGE_H_ +#define _OXML_ELEMENT_IMAGE_H_ + +// Internal includes +#include +#include + +// AbiWord includes +#include +#include +#include + +class OXML_Element_Image : public OXML_Element +{ +public: + OXML_Element_Image(std::string id); + virtual ~OXML_Element_Image(); + + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); + virtual UT_Error addToPT(PD_Document * pDocument); +}; + +#endif //_OXML_ELEMENT_IMAGE_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_List.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_List.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_List.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_List.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,82 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// AbiWord includes +#include +#include +#include + +OXML_Element_List::OXML_Element_List(std::string id, OXML_Element_Paragraph* paragraph) : + OXML_Element(id, LST_TAG, LIST), parent(paragraph) +{ +} + +OXML_Element_List::~OXML_Element_List() +{ + +} + +UT_Error OXML_Element_List::serialize(IE_Exp_OpenXML* exporter) +{ + //TODO: serialize list here + return serializeProperties(exporter); +} + +UT_Error OXML_Element_List::serializeProperties(IE_Exp_OpenXML* exporter) +{ + //TODO: Add all the property serializations here + UT_Error err = UT_OK; + + err = exporter->startListProperties(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + const gchar* listLevel = parent->getListLevel(); + if(!listLevel) + { + listLevel = "0"; + } + err = exporter->setListLevel(TARGET_DOCUMENT, listLevel); + if(err != UT_OK) + return err; + + const gchar* listId = parent->getListId(); + if(!listId) + { + listId = "1"; + } + err = exporter->setListFormat(TARGET_DOCUMENT, listId); + if(err != UT_OK) + return err; + + return exporter->finishListProperties(TARGET_DOCUMENT); +} + + +UT_Error OXML_Element_List::addToPT(PD_Document * /*pDocument*/) +{ + //TODO + return UT_OK; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_List.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_List.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_List.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_List.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,53 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_ELEMENT_LIST_H_ +#define _OXML_ELEMENT_LIST_H_ + +// Internal includes +#include +#include +#include + +// AbiWord includes +#include +#include +#include + +class OXML_Element_Paragraph; + +class OXML_Element_List : public OXML_Element +{ +public: + OXML_Element_List(std::string id, OXML_Element_Paragraph* paragraph); + virtual ~OXML_Element_List(); + + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); + virtual UT_Error addToPT(PD_Document * pDocument); + +private: + virtual UT_Error serializeProperties(IE_Exp_OpenXML* exporter); + OXML_Element_Paragraph* parent; +}; + +#endif //_OXML_ELEMENT_LIST_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Paragraph.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Paragraph.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Paragraph.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Paragraph.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,240 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// AbiWord includes +#include +#include +#include + +OXML_Element_Paragraph::OXML_Element_Paragraph(std::string id) : + OXML_Element(id, P_TAG, BLOCK), pageBreak(false) +{ +} + +OXML_Element_Paragraph::~OXML_Element_Paragraph() +{ + +} + +UT_Error OXML_Element_Paragraph::serialize(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + + err = exporter->startParagraph(TARGET); + if(err != UT_OK) + return err; + + err = this->serializeProperties(exporter); + if(err != UT_OK) + return err; + + err = this->serializeChildren(exporter); + if(err != UT_OK) + return err; + + return exporter->finishParagraph(TARGET); +} + +UT_Error OXML_Element_Paragraph::serializeChildren(IE_Exp_OpenXML* exporter) +{ + UT_Error ret = UT_OK; + + OXML_ElementVector::size_type i; + OXML_ElementVector children = getChildren(); + for (i = 0; i < children.size(); i++) + { + // LIST children are handled in serializeProperties function + if(children[i]->getType() != LIST) + { + ret = children[i]->serialize(exporter); + if(ret != UT_OK) + return ret; + } + } + + return ret; +} + +UT_Error OXML_Element_Paragraph::serializeProperties(IE_Exp_OpenXML* exporter) +{ + //TODO: Add all the property serializations here + UT_Error err = UT_OK; + const gchar* szValue = NULL; + + err = exporter->startParagraphProperties(TARGET); + if(err != UT_OK) + return err; + + if(pageBreak) + { + err = exporter->setPageBreak(TARGET); + if(err != UT_OK) + return err; + } + + if(getAttribute(PT_STYLE_ATTRIBUTE_NAME, szValue) == UT_OK) + { + err = exporter->setParagraphStyle(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("widows", szValue) == UT_OK) + { + err = exporter->setWidows(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("text-align", szValue) == UT_OK) + { + if(!strcmp(szValue, "justify")) + { + err = exporter->setTextAlignment(TARGET, "both"); + } + else if(!strcmp(szValue, "center")) + { + err = exporter->setTextAlignment(TARGET, "center"); + } + else if(!strcmp(szValue, "right")) + { + err = exporter->setTextAlignment(TARGET, "right"); + } + else if(!strcmp(szValue, "left")) + { + err = exporter->setTextAlignment(TARGET, "left"); + } + + if(err != UT_OK) + return err; + } + + if(getProperty("text-indent", szValue) == UT_OK) + { + err = exporter->setTextIndentation(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("margin-left", szValue) == UT_OK) + { + err = exporter->setParagraphLeftMargin(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("margin-right", szValue) == UT_OK) + { + err = exporter->setParagraphRightMargin(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("margin-bottom", szValue) == UT_OK) + { + err = exporter->setParagraphBottomMargin(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("margin-top", szValue) == UT_OK) + { + err = exporter->setParagraphTopMargin(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("line-height", szValue) == UT_OK) + { + err = exporter->setLineHeight(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("tabstops", szValue) == UT_OK) + { + err = exporter->setTabstops(TARGET, szValue); + if(err != UT_OK) + return err; + } + + //serialize List here if any list appended to the paragraph since we need properties of + //list to be included in paragraph properties section + + OXML_ElementVector::size_type i; + OXML_ElementVector children = getChildren(); + for (i = 0; i < children.size(); i++) + { + if(children[i]->getType() == LIST) + { + err = children[i]->serialize(exporter); + if(err != UT_OK) + return err; + } + } + + return exporter->finishParagraphProperties(TARGET); +} + + +UT_Error OXML_Element_Paragraph::addToPT(PD_Document * pDocument) +{ + //TODO Move the OXML_Element addToPT case P_TAG code here + //the importer needs to be updated to create OXML_Element_Paragraph object + //instead of generic OXML_Element object for representing a paragraph + return OXML_Element::addToPT(pDocument); +} + +const gchar* OXML_Element_Paragraph::getListLevel() +{ + UT_Error err = UT_OK; + const gchar* szValue; + + err = getAttribute("level", szValue); + if(err != UT_OK) + { + return NULL; + } + return szValue; +} + +const gchar* OXML_Element_Paragraph::getListId() +{ + UT_Error err = UT_OK; + const gchar* szValue; + + err = getAttribute("listid", szValue); + if(err != UT_OK) + { + return NULL; + } + return szValue; +} + +void OXML_Element_Paragraph::setPageBreak() +{ + pageBreak = true; +} + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Paragraph.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Paragraph.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Paragraph.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Paragraph.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,54 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_ELEMENT_PARAGRAPH_H_ +#define _OXML_ELEMENT_PARAGRAPH_H_ + +// Internal includes +#include +#include + +// AbiWord includes +#include +#include +#include + +class OXML_Element_Paragraph : public OXML_Element +{ +public: + OXML_Element_Paragraph(std::string id); + virtual ~OXML_Element_Paragraph(); + + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); + virtual UT_Error serializeChildren(IE_Exp_OpenXML* exporter); + virtual UT_Error addToPT(PD_Document * pDocument); + virtual const gchar* getListLevel(); + virtual const gchar* getListId(); + virtual void setPageBreak(); + +private: + virtual UT_Error serializeProperties(IE_Exp_OpenXML* exporter); + bool pageBreak; +}; + +#endif //_OXML_ELEMENT_PARAGRAPH_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Row.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Row.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Row.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Row.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,131 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// AbiWord includes +#include +#include +#include + +OXML_Element_Row::OXML_Element_Row(std::string id, OXML_Element_Table* tbl) : + OXML_Element(id, TR_TAG, ROW), numCols(0), table(tbl) +{ +} + +OXML_Element_Row::~OXML_Element_Row() +{ + +} + +UT_Error OXML_Element_Row::serialize(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + + err = exporter->startRow(); + if(err != UT_OK) + return err; + + err = this->serializeProperties(exporter); + if(err != UT_OK) + return err; + + err = this->serializeChildren(exporter); + if(err != UT_OK) + return err; + + return exporter->finishRow(); +} + +UT_Error OXML_Element_Row::serializeChildren(IE_Exp_OpenXML* exporter) +{ + UT_Error ret = UT_OK; + + OXML_ElementVector children = getChildren(); + + UT_sint32 left = 0; + OXML_Element_Cell* cell = NULL; + + //during the loop check to see if we are missing any cells due to vertical merging + //if so let's add them manually + OXML_ElementVector::size_type i; + for(i=0; i < children.size(); i++) + { + cell = static_cast(get_pointer(children[i])); + + for(; left < cell->getLeft(); left++){ + //top=-1,bottom=0 means vertically continued cell + OXML_Element_Cell temp("", table, left, left+1, -1, 0); + OXML_SharedElement shared_paragraph(new OXML_Element_Paragraph("")); + + ret = temp.appendElement(shared_paragraph); + if(ret != UT_OK) + return ret; + + ret = temp.serialize(exporter); + if(ret != UT_OK) + return ret; + } + + left = cell->getRight(); + + ret = cell->serialize(exporter); + if(ret != UT_OK) + return ret; + } + + //right most vertically merged cells + for(; left < numCols; left++){ + OXML_Element_Cell temp("", table, left, left+1, -1, 0); + OXML_SharedElement shared_paragraph(new OXML_Element_Paragraph("")); + + ret = temp.appendElement(shared_paragraph); + if(ret != UT_OK) + return ret; + + ret = temp.serialize(exporter); + if(ret != UT_OK) + return ret; + } + + return ret; +} + + +UT_Error OXML_Element_Row::serializeProperties(IE_Exp_OpenXML* /*exporter*/) +{ + //TODO + return UT_OK; +} + + +UT_Error OXML_Element_Row::addToPT(PD_Document * /*pDocument*/) +{ + //TODO + return UT_OK; +} + +void OXML_Element_Row::setNumCols(UT_sint32 columns) +{ + numCols = columns; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Row.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Row.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Row.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Row.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,58 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_ELEMENT_ROW_H_ +#define _OXML_ELEMENT_ROW_H_ + +// Internal includes +#include +#include +#include + +// AbiWord includes +#include +#include +#include + +class OXML_Element_Table; + +class OXML_Element_Row : public OXML_Element +{ +public: + OXML_Element_Row(std::string id, OXML_Element_Table* table); + virtual ~OXML_Element_Row(); + + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); + virtual UT_Error addToPT(PD_Document * pDocument); + virtual void setNumCols(UT_sint32 numCols); + +protected: + UT_Error serializeChildren(IE_Exp_OpenXML* exporter); + +private: + virtual UT_Error serializeProperties(IE_Exp_OpenXML* exporter); + UT_sint32 numCols; + OXML_Element_Table* table; +}; + +#endif //_OXML_ELEMENT_ROW_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Run.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Run.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Run.cpp 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Run.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -42,10 +42,142 @@ } -UT_Error OXML_Element_Run::serialize(std::string path) +UT_Error OXML_Element_Run::serialize(IE_Exp_OpenXML* exporter) { - //Empty for now - return this->serializeChildren(path); + UT_Error err = UT_OK; + + err = exporter->startRun(TARGET); + if(err != UT_OK) + return err; + + err = serializeProperties(exporter); + if(err != UT_OK) + return err; + + err = this->serializeChildren(exporter); + if(err != UT_OK) + return err; + + return exporter->finishRun(TARGET); +} + +UT_Error OXML_Element_Run::serializeProperties(IE_Exp_OpenXML* exporter) +{ + //TODO: Add all the property serializations here + UT_Error err = UT_OK; + const gchar* szValue = NULL; + + err = exporter->startRunProperties(TARGET); + if(err != UT_OK) + return err; + + if(getProperty("lang", szValue) == UT_OK) + { + if(!strcmp(szValue, "-none-")) + err = exporter->setNoProof(TARGET); + else + err = exporter->setLanguage(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("font-family", szValue) == UT_OK) + { + err = exporter->setFontFamily(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("font-weight", szValue) == UT_OK) + { + if(!strcmp(szValue, "bold")) + { + err = exporter->setBold(TARGET); + if(err != UT_OK) + return err; + } + } + + if(getProperty("font-style", szValue) == UT_OK) + { + if(!strcmp(szValue, "italic")) + { + err = exporter->setItalic(TARGET); + if(err != UT_OK) + return err; + } + } + + if(getProperty("font-size", szValue) == UT_OK) + { + err = exporter->setFontSize(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("text-decoration", szValue) == UT_OK) + { + if(strstr(szValue, "underline")) + { + err = exporter->setUnderline(TARGET); + if(err != UT_OK) + return err; + } + + if(strstr(szValue, "overline")) + { + err = exporter->setOverline(TARGET); + if(err != UT_OK) + return err; + } + + if(strstr(szValue, "line-through")) + { + err = exporter->setLineThrough(TARGET); + if(err != UT_OK) + return err; + } + } + + if(getProperty("text-position", szValue) == UT_OK) + { + if(!strcmp(szValue, "superscript")) + { + err = exporter->setSuperscript(TARGET); + if(err != UT_OK) + return err; + } + + else if(!strcmp(szValue, "subscript")) + { + err = exporter->setSubscript(TARGET); + if(err != UT_OK) + return err; + } + } + + if(getProperty("color", szValue) == UT_OK) + { + err = exporter->setTextColor(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("bgcolor", szValue) == UT_OK) + { + err = exporter->setBackgroundColor(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("dir-override", szValue) == UT_OK) + { + err = exporter->setTextDirection(TARGET, szValue); + if(err != UT_OK) + return err; + } + + return exporter->finishRunProperties(TARGET); } UT_Error OXML_Element_Run::addToPT(PD_Document * pDocument) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Run.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Run.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Run.h 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Run.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,6 +25,7 @@ // Internal includes #include +#include // AbiWord includes #include @@ -39,8 +40,11 @@ OXML_Element_Run(std::string id); virtual ~OXML_Element_Run(); - virtual UT_Error serialize(std::string path); + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); virtual UT_Error addToPT(PD_Document * pDocument); + +private: + virtual UT_Error serializeProperties(IE_Exp_OpenXML* exporter); }; #endif //_OXML_ELEMENT_RUN_H_ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Table.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Table.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Table.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Table.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,121 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// AbiWord includes +#include +#include +#include + +OXML_Element_Table::OXML_Element_Table(std::string id) : + OXML_Element(id, TBL_TAG, TABLE) +{ +} + +OXML_Element_Table::~OXML_Element_Table() +{ + +} + +UT_Error OXML_Element_Table::serialize(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + + err = exporter->startTable(); + if(err != UT_OK) + return err; + + err = this->serializeProperties(exporter); + if(err != UT_OK) + return err; + + err = this->serializeChildren(exporter); + if(err != UT_OK) + return err; + + return exporter->finishTable(); +} + +UT_Error OXML_Element_Table::serializeProperties(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + const gchar* szValue = NULL; + + if(getProperty("table-column-props", szValue) == UT_OK) + { + err = exporter->startTableGrid(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + std::string col(szValue); + std::string token(""); + + std::string::size_type prev = -1; + std::string::size_type pos = col.find_first_of("/"); + + while (pos != std::string::npos) + { + token = col.substr(prev+1, pos-prev-1); + columnWidth.push_back(token); + err = exporter->setGridCol(TARGET_DOCUMENT, token.c_str()); + if(err != UT_OK) + return err; + prev = pos; + pos = col.find_first_of("/", pos + 1); + } + + err = exporter->finishTableGrid(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + } + + err = exporter->startTableProperties(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + err = exporter->startTableBorderProperties(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + err = exporter->finishTableBorderProperties(TARGET_DOCUMENT); + if(err != UT_OK) + return err; + + return exporter->finishTableProperties(TARGET_DOCUMENT); +} + + +UT_Error OXML_Element_Table::addToPT(PD_Document * /*pDocument*/) +{ + //TODO + return UT_OK; +} + +std::string OXML_Element_Table::getColumnWidth(int colIndex) +{ + if((colIndex < 0) || (colIndex >= (int)columnWidth.size())) + return "0in"; + return columnWidth.at(colIndex); +} + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Table.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Table.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Table.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Table.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,52 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_ELEMENT_TABLE_H_ +#define _OXML_ELEMENT_TABLE_H_ + +// Internal includes +#include +#include + +// AbiWord includes +#include +#include +#include +#include + +class OXML_Element_Table : public OXML_Element +{ +public: + OXML_Element_Table(std::string id); + virtual ~OXML_Element_Table(); + + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); + virtual UT_Error addToPT(PD_Document * pDocument); + virtual std::string getColumnWidth(int colIndex); + +private: + virtual UT_Error serializeProperties(IE_Exp_OpenXML* exporter); + std::vector columnWidth; +}; + +#endif //_OXML_ELEMENT_TABLE_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_TextBox.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_TextBox.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_TextBox.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_TextBox.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,107 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// AbiWord includes +#include +#include +#include + +// External includes +#include + +OXML_Element_TextBox::OXML_Element_TextBox(std::string id) : + OXML_Element(id, TXTBX_TAG, TEXTBOX) +{ + //Intentionally empty +} + +OXML_Element_TextBox::~OXML_Element_TextBox() +{ + +} + +UT_Error OXML_Element_TextBox::serialize(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + + std::string tbId = "textboxId"; + tbId += getId(); + + err = exporter->startTextBox(TARGET, tbId.c_str()); + if(err != UT_OK) + return err; + + err = this->serializeProperties(exporter); + if(err != UT_OK) + return err; + + err = exporter->startTextBoxContent(TARGET); + if(err != UT_OK) + return err; + + err = this->serializeChildren(exporter); + if(err != UT_OK) + return err; + + err = exporter->finishTextBoxContent(TARGET); + if(err != UT_OK) + return err; + + return exporter->finishTextBox(TARGET); +} + +UT_Error OXML_Element_TextBox::serializeProperties(IE_Exp_OpenXML* exporter) +{ + //TODO: Add all the property serializations here + UT_Error err = UT_OK; + const gchar* szValue = NULL; + + err = exporter->startTextBoxProperties(TARGET); + if(err != UT_OK) + return err; + + if(getProperty("frame-width", szValue) == UT_OK) + { + err = exporter->setTextBoxWidth(TARGET, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("frame-height", szValue) == UT_OK) + { + err = exporter->setTextBoxHeight(TARGET, szValue); + if(err != UT_OK) + return err; + } + + return exporter->finishTextBoxProperties(TARGET); +} + +UT_Error OXML_Element_TextBox::addToPT(PD_Document* /*pDocument*/) +{ + //TODO + return UT_OK; +} + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_TextBox.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_TextBox.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_TextBox.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_TextBox.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,51 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_ELEMENT_TEXTBOX_H_ +#define _OXML_ELEMENT_TEXTBOX_H_ + +// Internal includes +#include +#include + +// AbiWord includes +#include +#include + +// External includes +#include + +class OXML_Element_TextBox : public OXML_Element +{ +public: + OXML_Element_TextBox(std::string id); + virtual ~OXML_Element_TextBox(); + + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); + virtual UT_Error addToPT(PD_Document * pDocument); + +private: + virtual UT_Error serializeProperties(IE_Exp_OpenXML* exporter); +}; + +#endif //_OXML_ELEMENT_TEXTBOX_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Text.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Text.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Text.cpp 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Text.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -62,10 +62,25 @@ return m_pString->ucs4_str(); } -UT_Error OXML_Element_Text::serialize(std::string path) +const char * OXML_Element_Text::getText() { - //TODO whenever we're ready to write the export filter - return OXML_Element::serialize(path); + UT_return_val_if_fail(m_pString != NULL, NULL); + return m_pString->utf8_str(); +} + +UT_Error OXML_Element_Text::serialize(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + + err = exporter->startText(TARGET); + if(err != UT_OK) + return err; + + err = exporter->writeText(TARGET, getText()); + if(err != UT_OK) + return err; + + return exporter->finishText(TARGET); } UT_Error OXML_Element_Text::addToPT(PD_Document * pDocument) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Text.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Text.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Text.h 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Element_Text.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,6 +25,7 @@ // Internal includes #include +#include // AbiWord includes #include @@ -43,8 +44,9 @@ void setText(const gchar * text, int length); const UT_UCS4Char * getText_UCS4String(); + const char* getText(); - virtual UT_Error serialize(std::string path); + virtual UT_Error serialize(IE_Exp_OpenXML* exporter); virtual UT_Error addToPT(PD_Document * pDocument); private: UT_UCS4String * m_pString; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Image.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Image.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Image.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Image.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,83 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// Internal includes +#include +#include + +// AbiWord includes +#include +#include +#include + +// External includes +#include + +OXML_Image::OXML_Image() : + OXML_ObjectWithAttrProp(), + id(NULL), + mimeType(NULL), + data(NULL) +{ + +} + +OXML_Image::~OXML_Image() +{ +} + +void OXML_Image::setId(const char* imageId) +{ + id = imageId; +} + +void OXML_Image::setMimeType(const char* imageMimeType) +{ + mimeType = imageMimeType; +} + +void OXML_Image::setData(const UT_ByteBuf* imageData) +{ + data = imageData; +} + +const char* OXML_Image::getId() +{ + return id; +} + +UT_Error OXML_Image::serialize(IE_Exp_OpenXML* exporter) +{ + std::string filename(id); + filename += ".png"; + return exporter->writeImage(filename.c_str(), data); +} + +UT_Error OXML_Image::addToPT(PD_Document * /*pDocument*/) +{ + //TODO + return UT_OK; +} + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Image.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Image.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Image.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Image.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,65 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_IMAGE_H_ +#define _OXML_IMAGE_H_ + +// Internal includes +#include +#include + +// AbiWord includes +#include +#include + +// External includes +#include +#include + +class IE_Exp_OpenXML; + +class OXML_Image : public OXML_ObjectWithAttrProp +{ + +public: + OXML_Image(); + virtual ~OXML_Image(); + + virtual void setId(const char* id); + virtual void setMimeType(const char* mimeType); + virtual void setData(const UT_ByteBuf* data); + + virtual const char* getId(); + + UT_Error serialize(IE_Exp_OpenXML* exporter); + UT_Error addToPT(PD_Document * pDocument); + +private: + const char* id; + const char* mimeType; + const UT_ByteBuf* data; +}; + +typedef boost::shared_ptr OXML_SharedImage; + +#endif //_OXML_IMAGE_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_LangToScriptConverter.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_LangToScriptConverter.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_LangToScriptConverter.h 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_LangToScriptConverter.h 2009-07-15 16:56:23.000000000 +0100 @@ -1,5 +1,5 @@ -/* C++ code produced by gperf version 3.0.2 */ -/* Command-line: gperf OXML_LangToScriptConverter.gperf */ +/* C++ code produced by gperf version 3.0.3 */ +/* Command-line: gperf --initializer-suffix=',""' OXML_LangToScriptConverter.gperf */ /* Computed positions: -k'1-2' */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -116,25 +116,25 @@ { static struct OXML_LangScriptAsso wordlist[] = { - {""}, {""}, {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, #line 197 "OXML_LangToScriptConverter.gperf" {"tn", "Latn"}, #line 173 "OXML_LangToScriptConverter.gperf" {"sd", "Arab"}, - {""}, {""}, + {"",""}, {"",""}, #line 138 "OXML_LangToScriptConverter.gperf" {"mn", "Mong"}, #line 181 "OXML_LangToScriptConverter.gperf" {"sn", "Latn"}, #line 172 "OXML_LangToScriptConverter.gperf" {"sc", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 196 "OXML_LangToScriptConverter.gperf" {"tl", "Latn"}, - {""}, + {"",""}, #line 194 "OXML_LangToScriptConverter.gperf" {"ti", "Ethi"}, - {""}, + {"",""}, #line 137 "OXML_LangToScriptConverter.gperf" {"ml", "Mlym"}, #line 179 "OXML_LangToScriptConverter.gperf" @@ -143,103 +143,103 @@ {"mi", "Latn"}, #line 177 "OXML_LangToScriptConverter.gperf" {"si", "Sinh"}, - {""}, {""}, + {"",""}, {"",""}, #line 193 "OXML_LangToScriptConverter.gperf" {"th", "Thai"}, - {""}, + {"",""}, #line 183 "OXML_LangToScriptConverter.gperf" {"sq", "Latn"}, - {""}, + {"",""}, #line 134 "OXML_LangToScriptConverter.gperf" {"mh", "Latn"}, #line 176 "OXML_LangToScriptConverter.gperf" {"sh", "Cyrl"}, - {""}, + {"",""}, #line 214 "OXML_LangToScriptConverter.gperf" {"yi", "Hebr"}, - {""}, {""}, + {"",""}, {"",""}, #line 180 "OXML_LangToScriptConverter.gperf" {"sm", "Latn"}, #line 90 "OXML_LangToScriptConverter.gperf" {"hi", "Deva"}, #line 198 "OXML_LangToScriptConverter.gperf" {"to", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 202 "OXML_LangToScriptConverter.gperf" {"tw", "Latn"}, #line 139 "OXML_LangToScriptConverter.gperf" {"mo", "Cyrl"}, #line 182 "OXML_LangToScriptConverter.gperf" {"so", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 189 "OXML_LangToScriptConverter.gperf" {"sw", "Latn"}, #line 203 "OXML_LangToScriptConverter.gperf" {"ty", "Latn"}, - {""}, + {"",""}, #line 213 "OXML_LangToScriptConverter.gperf" {"xh", "Latn"}, - {""}, + {"",""}, #line 143 "OXML_LangToScriptConverter.gperf" {"my", "Mymr"}, - {""}, + {"",""}, #line 215 "OXML_LangToScriptConverter.gperf" {"yo", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 209 "OXML_LangToScriptConverter.gperf" {"vi", "Latn"}, #line 91 "OXML_LangToScriptConverter.gperf" {"ho", "Latn"}, #line 192 "OXML_LangToScriptConverter.gperf" {"tg", "Arab"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 133 "OXML_LangToScriptConverter.gperf" {"mg", "Latn"}, #line 175 "OXML_LangToScriptConverter.gperf" {"sg", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 95 "OXML_LangToScriptConverter.gperf" {"hy", "Armn"}, - {""}, + {"",""}, #line 190 "OXML_LangToScriptConverter.gperf" {"ta", "Taml"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 171 "OXML_LangToScriptConverter.gperf" {"sa", "Deva"}, - {""}, {""}, + {"",""}, {"",""}, #line 210 "OXML_LangToScriptConverter.gperf" {"vo", "Latn"}, #line 58 "OXML_LangToScriptConverter.gperf" {"co", "Latn"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 107 "OXML_LangToScriptConverter.gperf" {"ja", "Jpan"}, #line 98 "OXML_LangToScriptConverter.gperf" {"id", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 63 "OXML_LangToScriptConverter.gperf" {"cy", "Latn"}, #line 88 "OXML_LangToScriptConverter.gperf" {"ha", "Latn"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 83 "OXML_LangToScriptConverter.gperf" {"gd", "Latn"}, #line 212 "OXML_LangToScriptConverter.gperf" {"wo", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 85 "OXML_LangToScriptConverter.gperf" {"gn", "Latn"}, - {""}, + {"",""}, #line 101 "OXML_LangToScriptConverter.gperf" {"ii", "Yiii"}, - {""}, {""}, + {"",""}, {"",""}, #line 128 "OXML_LangToScriptConverter.gperf" {"ln", "Latn"}, #line 52 "OXML_LangToScriptConverter.gperf" {"bn", "Beng"}, #line 191 "OXML_LangToScriptConverter.gperf" {"te", "Telu"}, - {""}, + {"",""}, #line 84 "OXML_LangToScriptConverter.gperf" {"gl", "Latn"}, #line 167 "OXML_LangToScriptConverter.gperf" @@ -248,154 +248,154 @@ {"ca", "Latn"}, #line 174 "OXML_LangToScriptConverter.gperf" {"se", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 127 "OXML_LangToScriptConverter.gperf" {"li", "Latn"}, #line 50 "OXML_LangToScriptConverter.gperf" {"bi", "Latn"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 103 "OXML_LangToScriptConverter.gperf" {"io", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 49 "OXML_LangToScriptConverter.gperf" {"bh", "Deva"}, #line 89 "OXML_LangToScriptConverter.gperf" {"he", "Hebr"}, #line 211 "OXML_LangToScriptConverter.gperf" {"wa", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 51 "OXML_LangToScriptConverter.gperf" {"bm", "Latn"}, #line 188 "OXML_LangToScriptConverter.gperf" {"sv", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 166 "OXML_LangToScriptConverter.gperf" {"rm", "Latn"}, - {""}, + {"",""}, #line 129 "OXML_LangToScriptConverter.gperf" {"lo", "Laoo"}, #line 53 "OXML_LangToScriptConverter.gperf" {"bo", "Tibt"}, - {""}, {""}, + {"",""}, {"",""}, #line 108 "OXML_LangToScriptConverter.gperf" {"jv", "Java"}, #line 168 "OXML_LangToScriptConverter.gperf" {"ro", "Latn"}, #line 100 "OXML_LangToScriptConverter.gperf" {"ig", "Latn"}, - {""}, + {"",""}, #line 170 "OXML_LangToScriptConverter.gperf" {"rw", "Latn"}, #line 208 "OXML_LangToScriptConverter.gperf" {"ve", "Latn"}, #line 57 "OXML_LangToScriptConverter.gperf" {"ce", "Cyrl"}, - {""}, {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, #line 97 "OXML_LangToScriptConverter.gperf" {"ia", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 126 "OXML_LangToScriptConverter.gperf" {"lg", "Latn"}, #line 48 "OXML_LangToScriptConverter.gperf" {"bg", "Cyrl"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 82 "OXML_LangToScriptConverter.gperf" {"ga", "Latn"}, #line 204 "OXML_LangToScriptConverter.gperf" {"ug", "Arab"}, - {""}, {""}, + {"",""}, {"",""}, #line 62 "OXML_LangToScriptConverter.gperf" {"cv", "Cyrl"}, #line 124 "OXML_LangToScriptConverter.gperf" {"la", "Latn"}, #line 46 "OXML_LangToScriptConverter.gperf" {"ba", "Cyrl"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 155 "OXML_LangToScriptConverter.gperf" {"oc", "Latn"}, #line 146 "OXML_LangToScriptConverter.gperf" {"nd", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 150 "OXML_LangToScriptConverter.gperf" {"nn", "Latn"}, #line 195 "OXML_LangToScriptConverter.gperf" {"tk", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 136 "OXML_LangToScriptConverter.gperf" {"mk", "Cyrl"}, #line 178 "OXML_LangToScriptConverter.gperf" {"sk", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 149 "OXML_LangToScriptConverter.gperf" {"nl", "Latn"}, #line 201 "OXML_LangToScriptConverter.gperf" {"tt", "Cyrl"}, #line 99 "OXML_LangToScriptConverter.gperf" {"ie", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 142 "OXML_LangToScriptConverter.gperf" {"mt", "Latn"}, #line 186 "OXML_LangToScriptConverter.gperf" {"st", "Latn"}, #line 199 "OXML_LangToScriptConverter.gperf" {"tr", "Latn"}, - {""}, + {"",""}, #line 157 "OXML_LangToScriptConverter.gperf" {"om", "Latn"}, - {""}, + {"",""}, #line 140 "OXML_LangToScriptConverter.gperf" {"mr", "Deva"}, #line 184 "OXML_LangToScriptConverter.gperf" {"sr", "Cyrl"}, - {""}, {""}, + {"",""}, {"",""}, #line 125 "OXML_LangToScriptConverter.gperf" {"lb", "Latn"}, #line 116 "OXML_LangToScriptConverter.gperf" {"kn", "Knda"}, #line 47 "OXML_LangToScriptConverter.gperf" {"be", "Cyrl"}, - {""}, {""}, + {"",""}, {"",""}, #line 93 "OXML_LangToScriptConverter.gperf" {"ht", "Latn"}, #line 40 "OXML_LangToScriptConverter.gperf" {"an", "Latn"}, #line 151 "OXML_LangToScriptConverter.gperf" {"no", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 114 "OXML_LangToScriptConverter.gperf" {"kl", "Latn"}, #line 92 "OXML_LangToScriptConverter.gperf" {"hr", "Latn"}, #line 111 "OXML_LangToScriptConverter.gperf" {"ki", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 87 "OXML_LangToScriptConverter.gperf" {"gv", "Latn"}, #line 154 "OXML_LangToScriptConverter.gperf" {"ny", "Latn"}, #line 200 "OXML_LangToScriptConverter.gperf" {"ts", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 132 "OXML_LangToScriptConverter.gperf" {"lv", "Latn"}, #line 141 "OXML_LangToScriptConverter.gperf" {"ms", "Latn"}, #line 185 "OXML_LangToScriptConverter.gperf" {"ss", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 115 "OXML_LangToScriptConverter.gperf" {"km", "Khmr"}, - {""}, + {"",""}, #line 148 "OXML_LangToScriptConverter.gperf" {"ng", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 39 "OXML_LangToScriptConverter.gperf" {"am", "Ethi"}, #line 59 "OXML_LangToScriptConverter.gperf" {"cr", "Cans"}, #line 117 "OXML_LangToScriptConverter.gperf" {"ko", "Hang"}, - {""}, + {"",""}, #line 162 "OXML_LangToScriptConverter.gperf" {"pl", "Latn"}, #line 122 "OXML_LangToScriptConverter.gperf" @@ -404,192 +404,196 @@ {"pi", "Deva"}, #line 144 "OXML_LangToScriptConverter.gperf" {"na", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 37 "OXML_LangToScriptConverter.gperf" {"af", "Latn"}, #line 123 "OXML_LangToScriptConverter.gperf" {"ky", "Cyrl"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 44 "OXML_LangToScriptConverter.gperf" {"ay", "Latn"}, #line 187 "OXML_LangToScriptConverter.gperf" {"su", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 70 "OXML_LangToScriptConverter.gperf" {"en", "Latn"}, #line 110 "OXML_LangToScriptConverter.gperf" {"kg", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 60 "OXML_LangToScriptConverter.gperf" {"cs", "Latn"}, #line 102 "OXML_LangToScriptConverter.gperf" {"ik", "Latn"}, - {""}, {""}, + {"",""}, {"",""}, #line 69 "OXML_LangToScriptConverter.gperf" {"el", "Grek"}, #line 94 "OXML_LangToScriptConverter.gperf" {"hu", "Latn"}, #line 109 "OXML_LangToScriptConverter.gperf" {"ka", "Geor"}, - {""}, {""}, + {"",""}, {"",""}, #line 96 "OXML_LangToScriptConverter.gperf" {"hz", "Latn"}, #line 105 "OXML_LangToScriptConverter.gperf" {"it", "Latn"}, #line 34 "OXML_LangToScriptConverter.gperf" {"aa", "Ethi"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 145 "OXML_LangToScriptConverter.gperf" {"nb", "Latn"}, #line 147 "OXML_LangToScriptConverter.gperf" {"ne", "Deva"}, - {""}, {""}, + {"",""}, {"",""}, #line 217 "OXML_LangToScriptConverter.gperf" {"zh", "Hans"}, #line 77 "OXML_LangToScriptConverter.gperf" {"fi", "Latn"}, #line 205 "OXML_LangToScriptConverter.gperf" {"uk", "Cyrl"}, - {""}, {""}, + {"",""}, {"",""}, #line 130 "OXML_LangToScriptConverter.gperf" {"lt", "Latn"}, #line 61 "OXML_LangToScriptConverter.gperf" {"cu", "Cyrl"}, #line 71 "OXML_LangToScriptConverter.gperf" {"eo", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 160 "OXML_LangToScriptConverter.gperf" {"pa", "Guru"}, #line 54 "OXML_LangToScriptConverter.gperf" {"br", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 153 "OXML_LangToScriptConverter.gperf" {"nv", "Latn"}, #line 206 "OXML_LangToScriptConverter.gperf" {"ur", "Arab"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 79 "OXML_LangToScriptConverter.gperf" {"fo", "Latn"}, #line 104 "OXML_LangToScriptConverter.gperf" {"is", "Latn"}, - {""}, + {"",""}, #line 76 "OXML_LangToScriptConverter.gperf" {"ff", "Latn"}, - {""}, + {"",""}, #line 35 "OXML_LangToScriptConverter.gperf" {"ab", "Cyrl"}, #line 36 "OXML_LangToScriptConverter.gperf" {"ae", "Avst"}, - {""}, {""}, + {"",""}, {"",""}, #line 81 "OXML_LangToScriptConverter.gperf" {"fy", "Latn"}, - {""}, + {"",""}, #line 165 "OXML_LangToScriptConverter.gperf" {"qu", "Latn"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 55 "OXML_LangToScriptConverter.gperf" {"bs", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 121 "OXML_LangToScriptConverter.gperf" {"kv", "Cyrl"}, #line 216 "OXML_LangToScriptConverter.gperf" {"za", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 43 "OXML_LangToScriptConverter.gperf" {"av", "Cyrl"}, #line 106 "OXML_LangToScriptConverter.gperf" {"iu", "Cans"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 75 "OXML_LangToScriptConverter.gperf" {"fa", "Arab"}, #line 64 "OXML_LangToScriptConverter.gperf" {"da", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 86 "OXML_LangToScriptConverter.gperf" {"gu", "Gujr"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 131 "OXML_LangToScriptConverter.gperf" {"lu", "Latn"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 169 "OXML_LangToScriptConverter.gperf" {"ru", "Cyrl"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 207 "OXML_LangToScriptConverter.gperf" {"uz", "Cyrl"}, #line 68 "OXML_LangToScriptConverter.gperf" {"ee", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 158 "OXML_LangToScriptConverter.gperf" {"or", "Orya"}, - {""}, {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, #line 152 "OXML_LangToScriptConverter.gperf" {"nr", "Latn"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 65 "OXML_LangToScriptConverter.gperf" {"de", "Latn"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 113 "OXML_LangToScriptConverter.gperf" {"kk", "Cyrl"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 38 "OXML_LangToScriptConverter.gperf" {"ak", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 159 "OXML_LangToScriptConverter.gperf" {"os", "Cyrl"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 66 "OXML_LangToScriptConverter.gperf" {"dv", "Thaa"}, #line 118 "OXML_LangToScriptConverter.gperf" {"kr", "Arab"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 41 "OXML_LangToScriptConverter.gperf" {"ar", "Arab"}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, #line 164 "OXML_LangToScriptConverter.gperf" {"pt", "Latn"}, - {""}, {""}, {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, #line 119 "OXML_LangToScriptConverter.gperf" {"ks", "Arab"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 156 "OXML_LangToScriptConverter.gperf" {"oj", "Cans"}, #line 42 "OXML_LangToScriptConverter.gperf" {"as", "Beng"}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, + {"",""}, #line 73 "OXML_LangToScriptConverter.gperf" {"et", "Latn"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 163 "OXML_LangToScriptConverter.gperf" {"ps", "Arab"}, #line 120 "OXML_LangToScriptConverter.gperf" {"ku", "Arab"}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, + {"",""}, {"",""}, #line 45 "OXML_LangToScriptConverter.gperf" {"az", "Latn"}, #line 112 "OXML_LangToScriptConverter.gperf" {"kj", "Latn"}, - {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, #line 80 "OXML_LangToScriptConverter.gperf" {"fr", "Latn"}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 72 "OXML_LangToScriptConverter.gperf" {"es", "Latn"}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, #line 74 "OXML_LangToScriptConverter.gperf" {"eu", "Latn"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 218 "OXML_LangToScriptConverter.gperf" {"zu", "Latn"}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, + {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, + {"",""}, #line 67 "OXML_LangToScriptConverter.gperf" {"dz", "Tibt"}, - {""}, {""}, {""}, {""}, + {"",""}, {"",""}, {"",""}, {"",""}, #line 78 "OXML_LangToScriptConverter.gperf" {"fj", "Latn"} }; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_List.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_List.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_List.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_List.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,310 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// Internal includes +#include +#include + +// AbiWord includes +#include +#include +#include + +// External includes +#include + +OXML_List::OXML_List() : + OXML_ObjectWithAttrProp(), + id(0), + parentId(0), + level(0), + startValue(0), + delim(NULL), + decimal(NULL), + type(NUMBERED_LIST) +{ + +} + +OXML_List::~OXML_List() +{ +} + +void OXML_List::setId(UT_uint32 listId) +{ + id = listId; +} + +void OXML_List::setParentId(UT_uint32 parentListId) +{ + parentId = parentListId; +} + +void OXML_List::setLevel(UT_uint32 lvl) +{ + level = lvl; +} + +void OXML_List::setStartValue(UT_uint32 val) +{ + startValue = val; +} + +void OXML_List::setDelim(const gchar* dlm) +{ + delim = dlm; +} + +void OXML_List::setDecimal(const gchar* dcml) +{ + decimal = dcml; +} + +void OXML_List::setType(FL_ListType typ) +{ + type = typ; +} + +UT_uint32 OXML_List::getId() +{ + return id; +} + +UT_uint32 OXML_List::getParentId() +{ + return parentId; +} + +UT_uint32 OXML_List::getLevel() +{ + return level; +} + +UT_uint32 OXML_List::getStartValue() +{ + return startValue; +} + +const gchar* OXML_List::getDelim() +{ + return delim; +} + +const gchar* OXML_List::getDecimal() +{ + return decimal; +} + +FL_ListType OXML_List::getType() +{ + return type; +} + +/** + * Serializes the abstract numbering definitions. Numbering definitions are serialized + * in serializeNumbering function. + */ +UT_Error OXML_List::serialize(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + + err = exporter->startAbstractNumbering(TARGET_NUMBERING, id); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: Can't start Abstract Numbering\n")); + return err; + } + + err = exporter->setMultilevelType(TARGET_NUMBERING, "hybridMultilevel"); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: Can't set Multilevel Type\n")); + return err; + } + + int i; + for(i=0; i<=8; i++) + { + err = exporter->startNumberingLevel(TARGET_NUMBERING, i); //level + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: Can't start Numbering Level\n")); + return err; + } + + err = exporter->setListStartValue(TARGET_NUMBERING, startValue); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: Can't start List Start Value\n")); + return err; + } + + std::string txt(delim); + const char* search = "%L"; + size_t index = txt.find(search, 0, 2); + + if(index != std::string::npos) + { + txt = txt.replace(index+1, 1, 1, '1'+i); + } + + const gchar* listType = "bullet"; + switch(type) + { + case NUMBERED_LIST: + if((i % 3) == 1){ + listType = "decimal"; + } + else if((i % 3) == 2){ + listType = "lowerLetter"; + } + else{ + listType = "lowerRoman"; + } + break; + + case UPPERCASE_LIST: + listType = "upperLetter"; + break; + + case LOWERCASE_LIST: + listType = "lowerLetter"; + break; + + case UPPERROMAN_LIST: + listType = "upperRoman"; + break; + + case LOWERROMAN_LIST: + listType = "lowerRoman"; + break; + + case ARABICNUMBERED_LIST: + listType = "arabicAbjad"; + break; + + case HEBREW_LIST: + listType = "hebrew1"; + break; + + //the rest is bullet + case DASHED_LIST: + txt = DASH; + break; + case SQUARE_LIST: + txt = SQUARE; + break; + case TRIANGLE_LIST: + txt = TRIANGLE; + break; + case DIAMOND_LIST: + txt = DIAMOND; + break; + case STAR_LIST: + txt = STAR; + break; + case IMPLIES_LIST: + txt = IMPLIES; + break; + case BOX_LIST: + txt = BOX; + break; + case HAND_LIST: + txt = HAND; + break; + case HEART_LIST: + txt = HEART; + break; + case BULLETED_LIST: + txt = BULLET; + break; + default: + txt = BULLET; + break; + } + + err = exporter->setListType(TARGET_NUMBERING, listType); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: Can't set List Type\n")); + return err; + } + + err = exporter->setListLevelText(TARGET_NUMBERING, txt.c_str()); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: Can't set List Level Text\n")); + return err; + } + + err = exporter->finishNumberingLevel(TARGET_NUMBERING); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: Can't finish Numbering Level\n")); + return err; + } + } + + err = exporter->finishAbstractNumbering(TARGET_NUMBERING); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: Can't finish Abstract Numbering\n")); + return err; + } + + return UT_OK; +} + +/** + * Serializes the numbering definitions. Numbering definitions have to + * come after all the abstract numbering definitions. + */ +UT_Error OXML_List::serializeNumbering(IE_Exp_OpenXML* exporter) +{ + UT_Error err = UT_OK; + + err = exporter->startNumbering(TARGET_NUMBERING, id); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: Can't start Numbering\n")); + return err; + } + + err = exporter->setAbstractNumberingId(TARGET_NUMBERING, id); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: Can't set Abstract Numbering Id\n")); + return err; + } + + return exporter->finishNumbering(TARGET_NUMBERING); +} + +UT_Error OXML_List::addToPT(PD_Document * /*pDocument*/) +{ + //TODO + return UT_OK; +} + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_List.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_List.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_List.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_List.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,93 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _OXML_LIST_H_ +#define _OXML_LIST_H_ + +// Internal includes +#include +#include + +// AbiWord includes +#include +#include +#include + +// External includes +#include +#include + +//bullet characters +#define BULLET "•" +#define SQUARE "■" +#define TRIANGLE "▶" +#define DIAMOND "◆" +#define BOX "□" +#define HAND "☞" +#define HEART "♥" +#define STAR "*" +#define IMPLIES "->" +#define DASH "-" + +class IE_Exp_OpenXML; + +class OXML_List : public OXML_ObjectWithAttrProp +{ + +public: + OXML_List(); + virtual ~OXML_List(); + + virtual void setId(UT_uint32 id); + virtual void setParentId(UT_uint32 id); + virtual void setLevel(UT_uint32 id); + virtual void setDelim(const gchar* delim); + virtual void setDecimal(const gchar* decimal); + virtual void setStartValue(UT_uint32 id); + virtual void setType(FL_ListType type); + + UT_uint32 getId(); + UT_uint32 getParentId(); + UT_uint32 getLevel(); + UT_uint32 getStartValue(); + const gchar* getDelim(); + const gchar* getDecimal(); + FL_ListType getType(); + + UT_Error serialize(IE_Exp_OpenXML* exporter); + UT_Error serializeNumbering(IE_Exp_OpenXML* exporter); + UT_Error addToPT(PD_Document * pDocument); + +private: + UT_uint32 id; + UT_uint32 parentId; + UT_uint32 level; + UT_uint32 startValue; + const gchar* delim; + const gchar* decimal; + FL_ListType type; +}; + +typedef boost::shared_ptr OXML_SharedList; + +#endif //_OXML_LIST_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_ObjectWithAttrProp.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_ObjectWithAttrProp.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_ObjectWithAttrProp.cpp 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_ObjectWithAttrProp.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -54,18 +54,30 @@ UT_Error OXML_ObjectWithAttrProp::getAttribute(const gchar * szName, const gchar *& szValue) { + UT_return_val_if_fail(szName && *szName, UT_ERROR); + if(!m_pAttributes) + return UT_ERROR; + UT_Error ret; - if (m_pAttributes == NULL) return UT_ERROR; ret = m_pAttributes->getAttribute(szName, szValue) ? UT_OK : UT_ERROR; - return ret; + if(ret != UT_OK) + return ret; + + return (szValue && *szValue) ? UT_OK : UT_ERROR; } UT_Error OXML_ObjectWithAttrProp::getProperty(const gchar * szName, const gchar *& szValue) { + UT_return_val_if_fail(szName && *szName, UT_ERROR); + if(!m_pAttributes) + return UT_ERROR; + UT_Error ret; - if (m_pAttributes == NULL) return UT_ERROR; ret = m_pAttributes->getProperty(szName, szValue) ? UT_OK : UT_ERROR; - return ret; + if(ret != UT_OK) + return ret; + + return (szValue && *szValue) ? UT_OK : UT_ERROR; } UT_Error OXML_ObjectWithAttrProp::setAttributes(const gchar ** attributes) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Section.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Section.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Section.cpp 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Section.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -40,7 +40,8 @@ OXML_Section::OXML_Section() : OXML_ObjectWithAttrProp(), m_id(""), - m_breakType(NEXTPAGE_BREAK) + m_breakType(NEXTPAGE_BREAK), + TARGET(0) { m_headerIds[0] = NULL; m_headerIds[1] = NULL; m_headerIds[2] = NULL; m_footerIds[0] = NULL; m_footerIds[1] = NULL; m_footerIds[2] = NULL; @@ -50,7 +51,8 @@ OXML_Section::OXML_Section(const std::string & id) : OXML_ObjectWithAttrProp(), m_id(id), - m_breakType(NEXTPAGE_BREAK) + m_breakType(NEXTPAGE_BREAK), + TARGET(0) { m_headerIds[0] = NULL; m_headerIds[1] = NULL; m_headerIds[2] = NULL; m_footerIds[0] = NULL; m_footerIds[1] = NULL; m_footerIds[2] = NULL; @@ -86,6 +88,9 @@ UT_DEBUGMSG(("Bad alloc!\n")); return UT_OUTOFMEM; } UT_END_CATCH + + obj->setTarget(TARGET); + return UT_OK; } @@ -95,18 +100,254 @@ return m_children.size() == 0 ? UT_OK : UT_ERROR; } -UT_Error OXML_Section::serialize(const std::string & path) +UT_Error OXML_Section::serialize(IE_Exp_OpenXML* exporter) { UT_Error ret = UT_OK; - //TODO: do something! + + ret = exporter->startSection(); + if(ret != UT_OK) + return ret; + + ret = this->serializeProperties(exporter); + if(ret != UT_OK) + return ret; OXML_ElementVector::size_type i; for (i = 0; i < m_children.size(); i++) { - if (m_children[i]->serialize(path) != UT_OK) - ret = UT_ERROR; + ret = m_children[i]->serialize(exporter); + if(ret != UT_OK) + return ret; } - return ret; + + return exporter->finishSection(); +} + +UT_Error OXML_Section::serializeProperties(IE_Exp_OpenXML* exporter) +{ + //TODO: Add all the property serializations here + UT_Error err = UT_OK; + const gchar* num = NULL; + const gchar* sep = "off"; + + if(getProperty("columns", num) != UT_OK) + return UT_OK; + + if((getProperty("column-line", sep) != UT_OK) || (strcmp(sep, "on") != 0)) + sep = "off"; + + err = exporter->startSectionProperties(); + if(err != UT_OK) + return err; + + err = exporter->setColumns(TARGET, num, sep); + if(err != UT_OK) + return err; + + return exporter->finishSectionProperties(); +} + +bool OXML_Section::hasFirstPageHdrFtr() +{ + UT_Error ret = UT_OK; + + const gchar* headerType; + + ret = getAttribute("type", headerType); + if(ret != UT_OK) + return false; + + return strstr(headerType, "first"); +} + +bool OXML_Section::hasEvenPageHdrFtr() +{ + UT_Error ret = UT_OK; + + const gchar* headerType; + + ret = getAttribute("type", headerType); + if(ret != UT_OK) + return false; + + return strstr(headerType, "even"); +} + +/** + * Serialize the section as a header + */ +UT_Error OXML_Section::serializeHeader(IE_Exp_OpenXML* exporter) +{ + UT_Error ret = UT_OK; + + const gchar* headerId; + const gchar* headerType; + + ret = getAttribute("id", headerId); + if(ret != UT_OK) + return UT_OK; + + ret = getAttribute("type", headerType); + if(ret != UT_OK) + return UT_OK; + + const gchar* type = "default"; + //OOXML includes default, first and even. + if(strstr(headerType, "first")) + { + type = "first"; + } + else if(strstr(headerType, "even")) + { + type = "even"; + } + else if(strstr(headerType, "last")) + { + //last not implemented in OOXML + return UT_OK; + } + + std::string header("hId"); + header += headerId; + + ret = exporter->setHeaderReference(header.c_str(), type); + if(ret != UT_OK) + return ret; + + ret = exporter->setHeaderRelation(header.c_str(), headerId); + if(ret != UT_OK) + return ret; + + ret = exporter->startHeaderStream(headerId); + if(ret != UT_OK) + return ret; + + OXML_ElementVector::size_type i; + for (i = 0; i < m_children.size(); i++) + { + ret = m_children[i]->serialize(exporter); + if(ret != UT_OK) + return ret; + } + + return exporter->finishHeaderStream(); +} + +/** + * Serialize the section as a footer + */ +UT_Error OXML_Section::serializeFooter(IE_Exp_OpenXML* exporter) +{ + UT_Error ret = UT_OK; + + const gchar* footerId; + const gchar* footerType; + + ret = getAttribute("id", footerId); + if(ret != UT_OK) + return UT_OK; + + std::string footer("fId"); + footer += footerId; + + ret = getAttribute("type", footerType); + if(ret != UT_OK) + return UT_OK; + + const gchar* type = "default"; + //OOXML includes default, first and even. + if(strstr(footerType, "first")) + { + type = "first"; + } + else if(strstr(footerType, "even")) + { + type = "even"; + } + else if(strstr(footerType, "last")) + { + //last not implemented in OOXML + return UT_OK; + } + + + ret = exporter->setFooterReference(footer.c_str(), type); + if(ret != UT_OK) + return ret; + + ret = exporter->setFooterRelation(footer.c_str(), footerId); + if(ret != UT_OK) + return ret; + + ret = exporter->startFooterStream(footerId); + if(ret != UT_OK) + return ret; + + OXML_ElementVector::size_type i; + for (i = 0; i < m_children.size(); i++) + { + ret = m_children[i]->serialize(exporter); + if(ret != UT_OK) + return ret; + } + + return exporter->finishFooterStream(); +} + +/** + * Serialize the section as a footnote + */ +UT_Error OXML_Section::serializeFootnote(IE_Exp_OpenXML* exporter) +{ + UT_Error ret = UT_OK; + + const gchar* footnoteId; + + ret = getAttribute("footnote-id", footnoteId); + if(ret != UT_OK) + return UT_OK; + + ret = exporter->startFootnote(footnoteId); + if(ret != UT_OK) + return ret; + + OXML_ElementVector::size_type i; + for (i = 0; i < m_children.size(); i++) + { + ret = m_children[i]->serialize(exporter); + if(ret != UT_OK) + return ret; + } + + return exporter->finishFootnote(); +} + +/** + * Serialize the section as a endnote + */ +UT_Error OXML_Section::serializeEndnote(IE_Exp_OpenXML* exporter) +{ + UT_Error ret = UT_OK; + + const gchar* endnoteId; + + ret = getAttribute("endnote-id", endnoteId); + if(ret != UT_OK) + return UT_OK; + + ret = exporter->startEndnote(endnoteId); + if(ret != UT_OK) + return ret; + + OXML_ElementVector::size_type i; + for (i = 0; i < m_children.size(); i++) + { + ret = m_children[i]->serialize(exporter); + if(ret != UT_OK) + return ret; + } + + return exporter->finishEndnote(); } UT_Error OXML_Section::addToPT(PD_Document * pDocument) @@ -209,3 +450,7 @@ return UT_OK; } +void OXML_Section::setTarget(int target) +{ + TARGET = target; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Section.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Section.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Section.h 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Section.h 2009-07-15 16:56:23.000000000 +0100 @@ -38,8 +38,8 @@ #include #include - class OXML_Section; +class IE_Exp_OpenXML; typedef boost::shared_ptr OXML_SharedSection; @@ -81,9 +81,16 @@ //! Writes the OpenXML section and all its content to a file on disk. /*! This method is used during the export process. - \param path String indicating the FULL path of the file. If the file exists, it will be overridden. + \param exporter the actual exporter which handles writing the files. */ - UT_Error serialize(const std::string & path); + UT_Error serialize(IE_Exp_OpenXML* exporter); + UT_Error serializeProperties(IE_Exp_OpenXML* exporter); + + UT_Error serializeHeader(IE_Exp_OpenXML* exporter); + UT_Error serializeFooter(IE_Exp_OpenXML* exporter); + UT_Error serializeFootnote(IE_Exp_OpenXML* exporter); + UT_Error serializeEndnote(IE_Exp_OpenXML* exporter); + //! Appends this section and all its content to the Abiword Piecetable. /*! This method is used during the import process. \param pDocument A valid reference to the PD_Document object. @@ -91,12 +98,17 @@ UT_Error addToPT(PD_Document * pDocument); UT_Error addToPTAsHdrFtr(PD_Document * pDocument); + void setTarget(int target); + bool hasFirstPageHdrFtr(); + bool hasEvenPageHdrFtr(); + private: std::string m_id; OXML_SectionBreakType m_breakType; OXML_ElementVector m_children; char * m_headerIds[3]; char * m_footerIds[3]; + int TARGET; UT_Error _setReferenceIds(); }; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Style.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Style.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Style.cpp 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Style.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -38,7 +38,9 @@ OXML_Style::OXML_Style(const std::string & id, const std::string & name) : OXML_ObjectWithAttrProp(), m_id(id), - m_name(name) + m_name(name), + m_basedon(""), + m_followedby("") { setAttribute(PT_NAME_ATTRIBUTE_NAME, name.c_str()); } @@ -47,10 +49,197 @@ { } -UT_Error OXML_Style::serialize(const std::string & path) +UT_Error OXML_Style::serialize(IE_Exp_OpenXML* exporter) { - //TODO - return UT_OK; + UT_Error err = UT_OK; + const gchar* szValue = NULL; + + err = exporter->startStyle(m_name, m_basedon, m_followedby); + if(err != UT_OK) + return err; + + // PARAGRAPH PROPERTIES + + err = exporter->startParagraphProperties(TARGET_STYLES); + if(err != UT_OK) + return err; + + if(getProperty("widows", szValue) == UT_OK) + { + err = exporter->setWidows(TARGET_STYLES, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("text-align", szValue) == UT_OK) + { + if(!strcmp(szValue, "justify")) + { + err = exporter->setTextAlignment(TARGET_STYLES, "both"); + } + else if(!strcmp(szValue, "center")) + { + err = exporter->setTextAlignment(TARGET_STYLES, "center"); + } + else if(!strcmp(szValue, "right")) + { + err = exporter->setTextAlignment(TARGET_STYLES, "right"); + } + else if(!strcmp(szValue, "left")) + { + err = exporter->setTextAlignment(TARGET_STYLES, "left"); + } + + if(err != UT_OK) + return err; + } + + if(getProperty("text-indent", szValue) == UT_OK) + { + err = exporter->setTextIndentation(TARGET_STYLES, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("margin-left", szValue) == UT_OK) + { + err = exporter->setParagraphLeftMargin(TARGET_STYLES, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("margin-right", szValue) == UT_OK) + { + err = exporter->setParagraphRightMargin(TARGET_STYLES, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("margin-bottom", szValue) == UT_OK) + { + err = exporter->setParagraphBottomMargin(TARGET_STYLES, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("margin-top", szValue) == UT_OK) + { + err = exporter->setParagraphTopMargin(TARGET_STYLES, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("line-height", szValue) == UT_OK) + { + err = exporter->setLineHeight(TARGET_STYLES, szValue); + if(err != UT_OK) + return err; + } + + err = exporter->finishParagraphProperties(TARGET_STYLES); + if(err != UT_OK) + return err; + + // RUN PROPERTIES + + err = exporter->startRunProperties(TARGET_STYLES); + if(err != UT_OK) + return err; + + if(getProperty("font-weight", szValue) == UT_OK) + { + if(!strcmp(szValue, "bold")) + { + err = exporter->setBold(TARGET_STYLES); + if(err != UT_OK) + return err; + } + } + + if(getProperty("font-style", szValue) == UT_OK) + { + if(!strcmp(szValue, "italic")) + { + err = exporter->setItalic(TARGET_STYLES); + if(err != UT_OK) + return err; + } + } + + if(getProperty("font-size", szValue) == UT_OK) + { + err = exporter->setFontSize(TARGET_STYLES, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("font-family", szValue) == UT_OK) + { + err = exporter->setFontFamily(TARGET_STYLES, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("text-decoration", szValue) == UT_OK) + { + if(strstr(szValue, "underline")) + { + err = exporter->setUnderline(TARGET_STYLES); + if(err != UT_OK) + return err; + } + + if(strstr(szValue, "overline")) + { + err = exporter->setOverline(TARGET_STYLES); + if(err != UT_OK) + return err; + } + + if(strstr(szValue, "line-through")) + { + err = exporter->setLineThrough(TARGET_STYLES); + if(err != UT_OK) + return err; + } + } + + if(getProperty("text-position", szValue) == UT_OK) + { + if(!strcmp(szValue, "superscript")) + { + err = exporter->setSuperscript(TARGET_STYLES); + if(err != UT_OK) + return err; + } + + else if(!strcmp(szValue, "subscript")) + { + err = exporter->setSubscript(TARGET_STYLES); + if(err != UT_OK) + return err; + } + } + + if(getProperty("color", szValue) == UT_OK) + { + err = exporter->setTextColor(TARGET_STYLES, szValue); + if(err != UT_OK) + return err; + } + + if(getProperty("bgcolor", szValue) == UT_OK) + { + err = exporter->setBackgroundColor(TARGET_STYLES, szValue); + if(err != UT_OK) + return err; + } + + err = exporter->finishRunProperties(TARGET_STYLES); + if(err != UT_OK) + return err; + + return exporter->finishStyle(); } UT_Error OXML_Style::addToPT(PD_Document * pDocument) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Style.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Style.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Style.h 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Style.h 2009-07-15 16:56:23.000000000 +0100 @@ -35,6 +35,8 @@ #include #include +class IE_Exp_OpenXML; + /* \class OXML_Style * \brief This class represents a single style in the OpenXML data model. */ @@ -56,13 +58,19 @@ { m_name = name; setAttribute(PT_NAME_ATTRIBUTE_NAME, name.c_str()); }; const std::string & getName() const { return m_name; } + void setBasedOn(const std::string & basedOn) + { m_basedon = basedOn; } + void setFollowedBy(const std::string & followedBy) + { m_followedby = followedBy; } - UT_Error serialize(const std::string & path); + UT_Error serialize(IE_Exp_OpenXML* exporter); UT_Error addToPT(PD_Document * pDocument); private: std::string m_id; std::string m_name; + std::string m_basedon; + std::string m_followedby; }; typedef boost::shared_ptr OXML_SharedStyle; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Types.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Types.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Types.h 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/common/xp/OXML_Types.h 2009-07-15 16:56:23.000000000 +0100 @@ -64,12 +64,30 @@ T_TAG, PG_BREAK, CL_BREAK, - LN_BREAK + LN_BREAK, + TBL_TAG, + TR_TAG, + TC_TAG, + LST_TAG, + IMG_TAG, + HYPR_TAG, + BOOK_TAG, + FLD_TAG, + TXTBX_TAG }; enum OXML_ElementType { BLOCK, - SPAN + SPAN, + TABLE, + LIST, + ROW, + IMAGE, + CELL, + HYPRLNK, + BOOKMRK, + FIELD, + TEXTBOX }; enum OXML_HeaderFooterType { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/GNUmakefile.am 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,4 @@ +SUBDIRS = xp + +EXTRA_DIST = \ + Makefile diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/GNUmakefile.in 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,630 @@ +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = wp/impexp/OpenXML/exp +DIST_COMMON = $(srcdir)/GNUmakefile.am $(srcdir)/GNUmakefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/ac-helpers/abi-libpng.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-init.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-platform.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-report.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-setup.m4 \ + $(top_srcdir)/ac-helpers/ax_boost_base.m4 \ + $(top_srcdir)/ac-helpers/dyld.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ABICOLLAB_FAKE_CPPFLAGS = @ABICOLLAB_FAKE_CPPFLAGS@ +ABICOLLAB_FAKE_LIBS = @ABICOLLAB_FAKE_LIBS@ +ABICOLLAB_LIBXML2_CPPFLAGS = @ABICOLLAB_LIBXML2_CPPFLAGS@ +ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ +ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ +ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ +ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ +ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ +ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ +ABICOLLAB_TCP_LIBS = @ABICOLLAB_TCP_LIBS@ +ABICOLLAB_XMPP_CPPFLAGS = @ABICOLLAB_XMPP_CPPFLAGS@ +ABICOLLAB_XMPP_LIBS = @ABICOLLAB_XMPP_LIBS@ +ABI_AIKSAURUS_CPPFLAGS = @ABI_AIKSAURUS_CPPFLAGS@ +ABI_AIKSAURUS_LDFLAGS = @ABI_AIKSAURUS_LDFLAGS@ +ABI_BMP_CPPFLAGS = @ABI_BMP_CPPFLAGS@ +ABI_BMP_LDFLAGS = @ABI_BMP_LDFLAGS@ +ABI_CFLAGS = @ABI_CFLAGS@ +ABI_COMMAND_CPPFLAGS = @ABI_COMMAND_CPPFLAGS@ +ABI_COMMAND_LDFLAGS = @ABI_COMMAND_LDFLAGS@ +ABI_CPPFLAGS = @ABI_CPPFLAGS@ +ABI_DOCBOOK_CPPFLAGS = @ABI_DOCBOOK_CPPFLAGS@ +ABI_DOCBOOK_LDFLAGS = @ABI_DOCBOOK_LDFLAGS@ +ABI_GDA_CPPFLAGS = @ABI_GDA_CPPFLAGS@ +ABI_GDA_LDFLAGS = @ABI_GDA_LDFLAGS@ +ABI_GDICT_CPPFLAGS = @ABI_GDICT_CPPFLAGS@ +ABI_GDICT_LDFLAGS = @ABI_GDICT_LDFLAGS@ +ABI_GRAMMAR_CPPFLAGS = @ABI_GRAMMAR_CPPFLAGS@ +ABI_GRAMMAR_LDFLAGS = @ABI_GRAMMAR_LDFLAGS@ +ABI_HANCOM_CPPFLAGS = @ABI_HANCOM_CPPFLAGS@ +ABI_HANCOM_LDFLAGS = @ABI_HANCOM_LDFLAGS@ +ABI_JPEG_CPPFLAGS = @ABI_JPEG_CPPFLAGS@ +ABI_JPEG_LDFLAGS = @ABI_JPEG_LDFLAGS@ +ABI_LIBS = @ABI_LIBS@ +ABI_OPENDOCUMENT_CPPFLAGS = @ABI_OPENDOCUMENT_CPPFLAGS@ +ABI_OPENDOCUMENT_LDFLAGS = @ABI_OPENDOCUMENT_LDFLAGS@ +ABI_OPENWRITER_CPPFLAGS = @ABI_OPENWRITER_CPPFLAGS@ +ABI_OPENWRITER_LDFLAGS = @ABI_OPENWRITER_LDFLAGS@ +ABI_OPENXML_CPPFLAGS = @ABI_OPENXML_CPPFLAGS@ +ABI_OPENXML_LDFLAGS = @ABI_OPENXML_LDFLAGS@ +ABI_OTS_CPPFLAGS = @ABI_OTS_CPPFLAGS@ +ABI_OTS_LDFLAGS = @ABI_OTS_LDFLAGS@ +ABI_PLUGIN_DIR = @ABI_PLUGIN_DIR@ +ABI_PSION_CPPFLAGS = @ABI_PSION_CPPFLAGS@ +ABI_PSION_LDFLAGS = @ABI_PSION_LDFLAGS@ +ABI_SDW_CPPFLAGS = @ABI_SDW_CPPFLAGS@ +ABI_SDW_LDFLAGS = @ABI_SDW_LDFLAGS@ +ABI_WMF_CPPFLAGS = @ABI_WMF_CPPFLAGS@ +ABI_WMF_LDFLAGS = @ABI_WMF_LDFLAGS@ +ABI_XHTML_CPPFLAGS = @ABI_XHTML_CPPFLAGS@ +ABI_XHTML_LDFLAGS = @ABI_XHTML_LDFLAGS@ +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ +GNOMESCAN_LIBS = @GNOMESCAN_LIBS@ +GNOME_CFLAGS = @GNOME_CFLAGS@ +GNOME_LIBS = @GNOME_LIBS@ +GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ +GOFFICE_LIBS = @GOFFICE_LIBS@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ +LIBPNG_PEERDIR = @LIBPNG_PEERDIR@ +LIBRSVG_CPPFLAGS = @LIBRSVG_CPPFLAGS@ +LIBRSVG_LDFLAGS = @LIBRSVG_LDFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBWPG_CPPFLAGS = @LIBWPG_CPPFLAGS@ +LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ +LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ +LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ +LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MATHVIEW_CFLAGS = @MATHVIEW_CFLAGS@ +MATHVIEW_LIBS = @MATHVIEW_LIBS@ +MKDIR_P = @MKDIR_P@ +NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ +NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGAIKSAURUS_CFLAGS = @PKGAIKSAURUS_CFLAGS@ +PKGAIKSAURUS_LIBS = @PKGAIKSAURUS_LIBS@ +PKGGAIKSAURUS_CFLAGS = @PKGGAIKSAURUS_CFLAGS@ +PKGGAIKSAURUS_LIBS = @PKGGAIKSAURUS_LIBS@ +PKG_CONFIG = @PKG_CONFIG@ +PLATFORM_CPPFLAGS = @PLATFORM_CPPFLAGS@ +PLATFORM_LDFLAGS = @PLATFORM_LDFLAGS@ +PRESENTATION_CPPFLAGS = @PRESENTATION_CPPFLAGS@ +PRESENTATION_LDFLAGS = @PRESENTATION_LDFLAGS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +WORDPERFECT_CPPFLAGS = @WORDPERFECT_CPPFLAGS@ +WORDPERFECT_LDFLAGS = @WORDPERFECT_LDFLAGS@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +_abi_dbus_CFLAGS = @_abi_dbus_CFLAGS@ +_abi_dbus_LIBS = @_abi_dbus_LIBS@ +_abi_dbus_glib_CFLAGS = @_abi_dbus_glib_CFLAGS@ +_abi_dbus_glib_LIBS = @_abi_dbus_glib_LIBS@ +_abi_gda_CFLAGS = @_abi_gda_CFLAGS@ +_abi_gda_LIBS = @_abi_gda_LIBS@ +_abi_glib_CFLAGS = @_abi_glib_CFLAGS@ +_abi_glib_LIBS = @_abi_glib_LIBS@ +_abi_grammar_CFLAGS = @_abi_grammar_CFLAGS@ +_abi_grammar_LIBS = @_abi_grammar_LIBS@ +_abi_gtk_CFLAGS = @_abi_gtk_CFLAGS@ +_abi_gtk_LIBS = @_abi_gtk_LIBS@ +_abi_librsvg_CFLAGS = @_abi_librsvg_CFLAGS@ +_abi_librsvg_LIBS = @_abi_librsvg_LIBS@ +_abi_libwpg_CFLAGS = @_abi_libwpg_CFLAGS@ +_abi_libwpg_LIBS = @_abi_libwpg_LIBS@ +_abi_libxml2_CFLAGS = @_abi_libxml2_CFLAGS@ +_abi_libxml2_LIBS = @_abi_libxml2_LIBS@ +_abi_loudmouth_CFLAGS = @_abi_loudmouth_CFLAGS@ +_abi_loudmouth_LIBS = @_abi_loudmouth_LIBS@ +_abi_msworks_CFLAGS = @_abi_msworks_CFLAGS@ +_abi_msworks_LIBS = @_abi_msworks_LIBS@ +_abi_openxml_CFLAGS = @_abi_openxml_CFLAGS@ +_abi_openxml_LIBS = @_abi_openxml_LIBS@ +_abi_ots_CFLAGS = @_abi_ots_CFLAGS@ +_abi_ots_LIBS = @_abi_ots_LIBS@ +_abi_wordperfect_CFLAGS = @_abi_wordperfect_CFLAGS@ +_abi_wordperfect_LIBS = @_abi_wordperfect_LIBS@ +abi_libwmf_config = @abi_libwmf_config@ +abi_tools = @abi_tools@ +abi_wp_impexp = @abi_wp_impexp@ +abi_wp_impexp_graphics = @abi_wp_impexp_graphics@ +abi_wp_scripts = @abi_wp_scripts@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +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@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +psiconvconfig = @psiconvconfig@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = xp +EXTRA_DIST = \ + Makefile + +all: all-recursive + +.SUFFIXES: +$(srcdir)/GNUmakefile.in: $(srcdir)/GNUmakefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign wp/impexp/OpenXML/exp/GNUmakefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign wp/impexp/OpenXML/exp/GNUmakefile +.PRECIOUS: GNUmakefile +GNUmakefile: $(srcdir)/GNUmakefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: GNUmakefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f GNUmakefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-exec-am: + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f GNUmakefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,28 @@ +#! gmake + +## AbiWord +## Copyright (C) 2005 Marc Maurer +## +## This program is free software; you can redistribute it and/or +## modify it under the terms of the GNU General Public License +## as published by the Free Software Foundation; either version 2 +## of the License, or (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. + +ABI_ROOT:=$(shell pwd)/../../../../../abi +include $(ABI_ROOT)/src/config/abi_defs.mk + +DIRS= xp + +CFLAGS+= -DABI_DLL + +include $(ABI_ROOT)/src/config/abi_rules.mk diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/GNUmakefile.am 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,23 @@ +CPPFLAGS = \ + -I$(srcdir) \ + -I$(srcdir)/../../common/xp \ + @ABI_CPPFLAGS@ @CPPFLAGS@ @ABI_OPENXML_CPPFLAGS@ @PLATFORM_CPPFLAGS@ + +LDFLAGS = @LDFLAGS@ @ABI_OPENXML_LDFLAGS@ @PLATFORM_LDFLAGS@ + +noinst_LTLIBRARIES = libAbiOpenXML_exp.la + +libAbiOpenXML_exp_la_SOURCES = \ + ie_exp_OpenXML.cpp \ + ie_exp_OpenXML.h \ + ie_exp_OpenXML_Sniffer.cpp \ + ie_exp_OpenXML_Sniffer.h \ + ie_exp_OpenXML_Listener.cpp \ + ie_exp_OpenXML_Listener.h + +libAbiOpenXML_exp_la_LIBADD = @ABI_LIBS@ + +libAbiOpenXML_exp_la_LDFLAGS = -no-undefined -module -avoid-version + +EXTRA_DIST = \ + Makefile diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/GNUmakefile.in 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,609 @@ +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = wp/impexp/OpenXML/exp/xp +DIST_COMMON = $(srcdir)/GNUmakefile.am $(srcdir)/GNUmakefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/ac-helpers/abi-libpng.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-init.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-platform.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-report.m4 \ + $(top_srcdir)/ac-helpers/abi-plugin-setup.m4 \ + $(top_srcdir)/ac-helpers/ax_boost_base.m4 \ + $(top_srcdir)/ac-helpers/dyld.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libAbiOpenXML_exp_la_DEPENDENCIES = +am_libAbiOpenXML_exp_la_OBJECTS = ie_exp_OpenXML.lo \ + ie_exp_OpenXML_Sniffer.lo ie_exp_OpenXML_Listener.lo +libAbiOpenXML_exp_la_OBJECTS = $(am_libAbiOpenXML_exp_la_OBJECTS) +libAbiOpenXML_exp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libAbiOpenXML_exp_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libAbiOpenXML_exp_la_SOURCES) +DIST_SOURCES = $(libAbiOpenXML_exp_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ABICOLLAB_FAKE_CPPFLAGS = @ABICOLLAB_FAKE_CPPFLAGS@ +ABICOLLAB_FAKE_LIBS = @ABICOLLAB_FAKE_LIBS@ +ABICOLLAB_LIBXML2_CPPFLAGS = @ABICOLLAB_LIBXML2_CPPFLAGS@ +ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ +ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ +ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ +ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ +ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ +ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ +ABICOLLAB_TCP_LIBS = @ABICOLLAB_TCP_LIBS@ +ABICOLLAB_XMPP_CPPFLAGS = @ABICOLLAB_XMPP_CPPFLAGS@ +ABICOLLAB_XMPP_LIBS = @ABICOLLAB_XMPP_LIBS@ +ABI_AIKSAURUS_CPPFLAGS = @ABI_AIKSAURUS_CPPFLAGS@ +ABI_AIKSAURUS_LDFLAGS = @ABI_AIKSAURUS_LDFLAGS@ +ABI_BMP_CPPFLAGS = @ABI_BMP_CPPFLAGS@ +ABI_BMP_LDFLAGS = @ABI_BMP_LDFLAGS@ +ABI_CFLAGS = @ABI_CFLAGS@ +ABI_COMMAND_CPPFLAGS = @ABI_COMMAND_CPPFLAGS@ +ABI_COMMAND_LDFLAGS = @ABI_COMMAND_LDFLAGS@ +ABI_CPPFLAGS = @ABI_CPPFLAGS@ +ABI_DOCBOOK_CPPFLAGS = @ABI_DOCBOOK_CPPFLAGS@ +ABI_DOCBOOK_LDFLAGS = @ABI_DOCBOOK_LDFLAGS@ +ABI_GDA_CPPFLAGS = @ABI_GDA_CPPFLAGS@ +ABI_GDA_LDFLAGS = @ABI_GDA_LDFLAGS@ +ABI_GDICT_CPPFLAGS = @ABI_GDICT_CPPFLAGS@ +ABI_GDICT_LDFLAGS = @ABI_GDICT_LDFLAGS@ +ABI_GRAMMAR_CPPFLAGS = @ABI_GRAMMAR_CPPFLAGS@ +ABI_GRAMMAR_LDFLAGS = @ABI_GRAMMAR_LDFLAGS@ +ABI_HANCOM_CPPFLAGS = @ABI_HANCOM_CPPFLAGS@ +ABI_HANCOM_LDFLAGS = @ABI_HANCOM_LDFLAGS@ +ABI_JPEG_CPPFLAGS = @ABI_JPEG_CPPFLAGS@ +ABI_JPEG_LDFLAGS = @ABI_JPEG_LDFLAGS@ +ABI_LIBS = @ABI_LIBS@ +ABI_OPENDOCUMENT_CPPFLAGS = @ABI_OPENDOCUMENT_CPPFLAGS@ +ABI_OPENDOCUMENT_LDFLAGS = @ABI_OPENDOCUMENT_LDFLAGS@ +ABI_OPENWRITER_CPPFLAGS = @ABI_OPENWRITER_CPPFLAGS@ +ABI_OPENWRITER_LDFLAGS = @ABI_OPENWRITER_LDFLAGS@ +ABI_OPENXML_CPPFLAGS = @ABI_OPENXML_CPPFLAGS@ +ABI_OPENXML_LDFLAGS = @ABI_OPENXML_LDFLAGS@ +ABI_OTS_CPPFLAGS = @ABI_OTS_CPPFLAGS@ +ABI_OTS_LDFLAGS = @ABI_OTS_LDFLAGS@ +ABI_PLUGIN_DIR = @ABI_PLUGIN_DIR@ +ABI_PSION_CPPFLAGS = @ABI_PSION_CPPFLAGS@ +ABI_PSION_LDFLAGS = @ABI_PSION_LDFLAGS@ +ABI_SDW_CPPFLAGS = @ABI_SDW_CPPFLAGS@ +ABI_SDW_LDFLAGS = @ABI_SDW_LDFLAGS@ +ABI_WMF_CPPFLAGS = @ABI_WMF_CPPFLAGS@ +ABI_WMF_LDFLAGS = @ABI_WMF_LDFLAGS@ +ABI_XHTML_CPPFLAGS = @ABI_XHTML_CPPFLAGS@ +ABI_XHTML_LDFLAGS = @ABI_XHTML_LDFLAGS@ +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = \ + -I$(srcdir) \ + -I$(srcdir)/../../common/xp \ + @ABI_CPPFLAGS@ @CPPFLAGS@ @ABI_OPENXML_CPPFLAGS@ @PLATFORM_CPPFLAGS@ + +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ +GNOMESCAN_LIBS = @GNOMESCAN_LIBS@ +GNOME_CFLAGS = @GNOME_CFLAGS@ +GNOME_LIBS = @GNOME_LIBS@ +GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ +GOFFICE_LIBS = @GOFFICE_LIBS@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ @ABI_OPENXML_LDFLAGS@ @PLATFORM_LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ +LIBPNG_PEERDIR = @LIBPNG_PEERDIR@ +LIBRSVG_CPPFLAGS = @LIBRSVG_CPPFLAGS@ +LIBRSVG_LDFLAGS = @LIBRSVG_LDFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBWPG_CPPFLAGS = @LIBWPG_CPPFLAGS@ +LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ +LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ +LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ +LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MATHVIEW_CFLAGS = @MATHVIEW_CFLAGS@ +MATHVIEW_LIBS = @MATHVIEW_LIBS@ +MKDIR_P = @MKDIR_P@ +NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ +NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGAIKSAURUS_CFLAGS = @PKGAIKSAURUS_CFLAGS@ +PKGAIKSAURUS_LIBS = @PKGAIKSAURUS_LIBS@ +PKGGAIKSAURUS_CFLAGS = @PKGGAIKSAURUS_CFLAGS@ +PKGGAIKSAURUS_LIBS = @PKGGAIKSAURUS_LIBS@ +PKG_CONFIG = @PKG_CONFIG@ +PLATFORM_CPPFLAGS = @PLATFORM_CPPFLAGS@ +PLATFORM_LDFLAGS = @PLATFORM_LDFLAGS@ +PRESENTATION_CPPFLAGS = @PRESENTATION_CPPFLAGS@ +PRESENTATION_LDFLAGS = @PRESENTATION_LDFLAGS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +WORDPERFECT_CPPFLAGS = @WORDPERFECT_CPPFLAGS@ +WORDPERFECT_LDFLAGS = @WORDPERFECT_LDFLAGS@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +_abi_dbus_CFLAGS = @_abi_dbus_CFLAGS@ +_abi_dbus_LIBS = @_abi_dbus_LIBS@ +_abi_dbus_glib_CFLAGS = @_abi_dbus_glib_CFLAGS@ +_abi_dbus_glib_LIBS = @_abi_dbus_glib_LIBS@ +_abi_gda_CFLAGS = @_abi_gda_CFLAGS@ +_abi_gda_LIBS = @_abi_gda_LIBS@ +_abi_glib_CFLAGS = @_abi_glib_CFLAGS@ +_abi_glib_LIBS = @_abi_glib_LIBS@ +_abi_grammar_CFLAGS = @_abi_grammar_CFLAGS@ +_abi_grammar_LIBS = @_abi_grammar_LIBS@ +_abi_gtk_CFLAGS = @_abi_gtk_CFLAGS@ +_abi_gtk_LIBS = @_abi_gtk_LIBS@ +_abi_librsvg_CFLAGS = @_abi_librsvg_CFLAGS@ +_abi_librsvg_LIBS = @_abi_librsvg_LIBS@ +_abi_libwpg_CFLAGS = @_abi_libwpg_CFLAGS@ +_abi_libwpg_LIBS = @_abi_libwpg_LIBS@ +_abi_libxml2_CFLAGS = @_abi_libxml2_CFLAGS@ +_abi_libxml2_LIBS = @_abi_libxml2_LIBS@ +_abi_loudmouth_CFLAGS = @_abi_loudmouth_CFLAGS@ +_abi_loudmouth_LIBS = @_abi_loudmouth_LIBS@ +_abi_msworks_CFLAGS = @_abi_msworks_CFLAGS@ +_abi_msworks_LIBS = @_abi_msworks_LIBS@ +_abi_openxml_CFLAGS = @_abi_openxml_CFLAGS@ +_abi_openxml_LIBS = @_abi_openxml_LIBS@ +_abi_ots_CFLAGS = @_abi_ots_CFLAGS@ +_abi_ots_LIBS = @_abi_ots_LIBS@ +_abi_wordperfect_CFLAGS = @_abi_wordperfect_CFLAGS@ +_abi_wordperfect_LIBS = @_abi_wordperfect_LIBS@ +abi_libwmf_config = @abi_libwmf_config@ +abi_tools = @abi_tools@ +abi_wp_impexp = @abi_wp_impexp@ +abi_wp_impexp_graphics = @abi_wp_impexp_graphics@ +abi_wp_scripts = @abi_wp_scripts@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +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@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +psiconvconfig = @psiconvconfig@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +noinst_LTLIBRARIES = libAbiOpenXML_exp.la +libAbiOpenXML_exp_la_SOURCES = \ + ie_exp_OpenXML.cpp \ + ie_exp_OpenXML.h \ + ie_exp_OpenXML_Sniffer.cpp \ + ie_exp_OpenXML_Sniffer.h \ + ie_exp_OpenXML_Listener.cpp \ + ie_exp_OpenXML_Listener.h + +libAbiOpenXML_exp_la_LIBADD = @ABI_LIBS@ +libAbiOpenXML_exp_la_LDFLAGS = -no-undefined -module -avoid-version +EXTRA_DIST = \ + Makefile + +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/GNUmakefile.in: $(srcdir)/GNUmakefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign wp/impexp/OpenXML/exp/xp/GNUmakefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign wp/impexp/OpenXML/exp/xp/GNUmakefile +.PRECIOUS: GNUmakefile +GNUmakefile: $(srcdir)/GNUmakefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libAbiOpenXML_exp.la: $(libAbiOpenXML_exp_la_OBJECTS) $(libAbiOpenXML_exp_la_DEPENDENCIES) + $(libAbiOpenXML_exp_la_LINK) $(libAbiOpenXML_exp_la_OBJECTS) $(libAbiOpenXML_exp_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ie_exp_OpenXML.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ie_exp_OpenXML_Listener.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ie_exp_OpenXML_Sniffer.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: GNUmakefile $(LTLIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f GNUmakefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f GNUmakefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,2787 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + + +// Class definition include +#include + +/** + * Constructor + */ +IE_Exp_OpenXML::IE_Exp_OpenXML (PD_Document * pDocument) + : IE_Exp (pDocument), + root(NULL), + relsDir(NULL), + wordDir(NULL), + wordRelsDir(NULL), + wordMediaDir(NULL), + contentTypesStream(NULL), + relStream(NULL), + wordRelStream(NULL), + documentStream(NULL), + settingsStream(NULL), + stylesStream(NULL), + numberingStream(NULL), + headerStream(NULL), + footerStream(NULL), + footnoteStream(NULL), + endnoteStream(NULL) +{ +} + +/** + * Destructor + */ +IE_Exp_OpenXML::~IE_Exp_OpenXML () +{ + _cleanup(); +} + +/** + * Export the OOXML document here + */ +UT_Error IE_Exp_OpenXML::_writeDocument () +{ + UT_Error err = UT_SAVE_EXPORTERROR; + + IE_Exp_OpenXML_Listener* listener = new IE_Exp_OpenXML_Listener(getDoc()); + + OXML_Document* doc_ptr = listener->getDocument(); + + if(doc_ptr) + err = doc_ptr->serialize(this); + + DELETEP(listener); + + return err; +} + +/** + * Starts exporting the OXML_Document object + */ +UT_Error IE_Exp_OpenXML::startDocument() +{ + GError *err = NULL; + UT_Error error = UT_OK; + + GsfOutput* sink = getFp(); + + if(!sink) + return UT_SAVE_EXPORTERROR; + + root = gsf_outfile_zip_new(sink, &err); + + if(err || !root) + { + UT_DEBUGMSG(("FRT: ERROR, Zip root file couldn't be created\n")); + g_object_unref (G_OBJECT (sink)); + return UT_IE_COULDNOTWRITE; + } + + g_object_unref (G_OBJECT (sink)); + + error = startEndnotes(); + if(error != UT_OK) + return error; + + error = startFootnotes(); + if(error != UT_OK) + return error; + + error = startHeaders(); + if(error != UT_OK) + return error; + + error = startFooters(); + if(error != UT_OK) + return error; + + error = startContentTypes(); + if(error != UT_OK) + return error; + + error = startRelations(); + if(error != UT_OK) + return error; + + error = startWordRelations(); + if(error != UT_OK) + return error; + + error = startWordMedia(); + if(error != UT_OK) + return error; + + error = startMainPart(); + if(error != UT_OK) + return error; + + error = startSettings(); + if(error != UT_OK) + return error; + + error = startStyles(); + if(error != UT_OK) + return error; + + error = startNumbering(); + if(error != UT_OK) + return error; + + return UT_OK; +} + +/** + * Finishes exporting OXML_Document object + */ +UT_Error IE_Exp_OpenXML::finishDocument() +{ + UT_Error error = UT_OK; + + error = finishMainPart(); + if(error != UT_OK) + return error; + + error = finishSettings(); + if(error != UT_OK) + return error; + + error = finishNumbering(); + if(error != UT_OK) + return error; + + error = finishStyles(); + if(error != UT_OK) + return error; + + error = finishWordMedia(); + if(error != UT_OK) + return error; + + error = finishWordRelations(); + if(error != UT_OK) + return error; + + error = finishRelations(); + if(error != UT_OK) + return error; + + error = finishContentTypes(); + if(error != UT_OK) + return error; + + error = finishHeaders(); + if(error != UT_OK) + return error; + + error = finishFooters(); + if(error != UT_OK) + return error; + + error = finishFootnotes(); + if(error != UT_OK) + return error; + + error = finishEndnotes(); + if(error != UT_OK) + return error; + + if(!gsf_output_close(GSF_OUTPUT(root))) + { + UT_DEBUGMSG(("FRT: ERROR, zip root file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + + return UT_OK; +} + +/** + * Starts exporting the OXML_Section object + */ +UT_Error IE_Exp_OpenXML::startSection() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Finishes exporting the OXML_Section object + */ +UT_Error IE_Exp_OpenXML::finishSection() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Starts exporting the OXML_Section object's properties + */ +UT_Error IE_Exp_OpenXML::startSectionProperties() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Finishes exporting the OXML_Section object's properties + */ +UT_Error IE_Exp_OpenXML::finishSectionProperties() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Starts exporting the OXML_Element_Paragraph object + */ +UT_Error IE_Exp_OpenXML::startParagraph(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Finishes exporting the OXML_Element_Paragraph object + */ +UT_Error IE_Exp_OpenXML::finishParagraph(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_Element_Text object + */ +UT_Error IE_Exp_OpenXML::startText(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Writes the actual content of OXML_Element_Text object + */ +UT_Error IE_Exp_OpenXML::writeText(int target, const char* text) +{ + UT_UTF8String sEscText = ""; + + while(text && *text) + { + // ignore invalid XML characters + if((*text >= 0x20 && *text != 0x7f) || (*text == '\n' || *text == '\r' || *text == '\t')) + sEscText += *text; + + // TODO: column breaks and page breaks are being discarded due to the above check + + text++; + } + + sEscText.escapeXML(); + + return writeTargetStream(target, sEscText.utf8_str()); +} + +/** + * Finishes exporting the OXML_Element_Text object + */ +UT_Error IE_Exp_OpenXML::finishText(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_Element_Run object + */ +UT_Error IE_Exp_OpenXML::startRun(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Finishes exporting the OXML_Element_Run object + */ +UT_Error IE_Exp_OpenXML::finishRun(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_Element_Run object's properties + */ +UT_Error IE_Exp_OpenXML::startRunProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Finishes exporting the OXML_Element_Run object's properties + */ +UT_Error IE_Exp_OpenXML::finishRunProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_Element_Paragraph object's properties + */ +UT_Error IE_Exp_OpenXML::startParagraphProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Finishes exporting the OXML_Element_Paragraph object's properties + */ +UT_Error IE_Exp_OpenXML::finishParagraphProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_Element_Table object + */ +UT_Error IE_Exp_OpenXML::startTable() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Finishes exporting the OXML_Element_Table object + */ +UT_Error IE_Exp_OpenXML::finishTable() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Starts exporting the OXML_Element_Table's properties + */ +UT_Error IE_Exp_OpenXML::startTableProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Finishes exporting the OXML_Element_Table's properties + */ +UT_Error IE_Exp_OpenXML::finishTableProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_Element_Table's border properties + */ +UT_Error IE_Exp_OpenXML::startTableBorderProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Finishes exporting the OXML_Element_Table's border properties + */ +UT_Error IE_Exp_OpenXML::finishTableBorderProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_Element_Cell's border properties + */ +UT_Error IE_Exp_OpenXML::startCellBorderProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Finishes exporting the OXML_Element_Cell's border properties + */ +UT_Error IE_Exp_OpenXML::finishCellBorderProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_Element_List properties + */ +UT_Error IE_Exp_OpenXML::startListProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Finishes exporting the OXML_Element_List properties + */ +UT_Error IE_Exp_OpenXML::finishListProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_List abstract numbering + */ +UT_Error IE_Exp_OpenXML::startAbstractNumbering(int target, UT_uint32 id) +{ + char buffer[12]; + int len = snprintf(buffer, 12, "%d", id); + if(len <= 0) + return UT_IE_COULDNOTWRITE; + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Finishes exporting the OXML_List abstract numbering + */ +UT_Error IE_Exp_OpenXML::finishAbstractNumbering(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_List numbering + */ +UT_Error IE_Exp_OpenXML::startNumbering(int target, UT_uint32 id) +{ + char buffer[12]; + int len = snprintf(buffer, 12, "%d", id); + if(len <= 0) + return UT_IE_COULDNOTWRITE; + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Finishes exporting the OXML_List numbering definition + */ +UT_Error IE_Exp_OpenXML::finishNumbering(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_List abstract numbering level + */ +UT_Error IE_Exp_OpenXML::startNumberingLevel(int target, UT_uint32 id) +{ + char buffer[12]; + int len = snprintf(buffer, 12, "%d", id); + if(len <= 0) + return UT_IE_COULDNOTWRITE; + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Finishes exporting the OXML_List abstract numbering level + */ +UT_Error IE_Exp_OpenXML::finishNumberingLevel(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_Element_Row object + */ +UT_Error IE_Exp_OpenXML::startRow() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Finishes exporting the OXML_Element_Row object + */ +UT_Error IE_Exp_OpenXML::finishRow() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Starts exporting the OXML_Element_Cell object + */ +UT_Error IE_Exp_OpenXML::startCell() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Finishes exporting the OXML_Element_Cell object + */ +UT_Error IE_Exp_OpenXML::finishCell() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Starts exporting the OXML_Element_Cell object's properties + */ +UT_Error IE_Exp_OpenXML::startCellProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Finishes exporting the OXML_Element_Cell object's properties + */ +UT_Error IE_Exp_OpenXML::finishCellProperties(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts exporting the OXML_Element_Hyperlink object + */ +UT_Error IE_Exp_OpenXML::startExternalHyperlink(const gchar* id) +{ + std::string str(""; + return writeTargetStream(TARGET_DOCUMENT, str.c_str()); +} + +/** + * Starts exporting the OXML_Element_Hyperlink object + */ +UT_Error IE_Exp_OpenXML::startInternalHyperlink(const gchar* anchor) +{ + UT_UTF8String sEscAnchor = anchor; + sEscAnchor.escapeXML(); + + std::string str(""; + return writeTargetStream(TARGET_DOCUMENT, str.c_str()); +} + +/** + * Finishes exporting the OXML_Element_Hyperlink object + */ +UT_Error IE_Exp_OpenXML::finishHyperlink() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Exports the OXML_Element_BookmarkStart object + */ +UT_Error IE_Exp_OpenXML::startBookmark(const gchar* id, const gchar* name) +{ + UT_UTF8String sEscName = name; + sEscName.escapeXML(); + + std::string str(""; + return writeTargetStream(TARGET_DOCUMENT, str.c_str()); +} + +/** + * Exports the OXML_Element_BookmarkFinish object + */ +UT_Error IE_Exp_OpenXML::finishBookmark(const gchar* id) +{ + std::string str(""; + return writeTargetStream(TARGET_DOCUMENT, str.c_str()); +} + +/** + * Starts exporting the OXML_Element_TextBox object + */ +UT_Error IE_Exp_OpenXML::startTextBox(int target, const gchar* id) +{ + std::string str(""); + str += ""; + str += ""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Starts exporting the OXML_Element_TextBox object's content + */ +UT_Error IE_Exp_OpenXML::startTextBoxContent(int target) +{ + std::string str(""); + str += ""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Finishes exporting the OXML_Element_TextBox object's content + */ +UT_Error IE_Exp_OpenXML::finishTextBoxContent(int target) +{ + std::string str(""); + str += ""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets textbox width + */ +UT_Error IE_Exp_OpenXML::setTextBoxWidth(int target, const gchar* width) +{ + std::string str("width:"); + str += convertToPoints(width); + str += "pt;"; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets textbox height + */ +UT_Error IE_Exp_OpenXML::setTextBoxHeight(int target, const gchar* height) +{ + std::string str("height:"); + str += convertToPoints(height); + str += "pt;"; + return writeTargetStream(target, str.c_str()); +} + +/** + * Writes to the target stream + */ +UT_Error IE_Exp_OpenXML::writeTargetStream(int target, const char* str) +{ + if(!str) + return UT_IE_COULDNOTWRITE; + + if(!gsf_output_puts(getTargetStream(target), str)) + { + UT_DEBUGMSG(("FRT: ERROR, cannot write string %s to target stream %d\n", str, target)); + return UT_IE_COULDNOTWRITE; + } + return UT_OK; +} + +/** + * Retrieves the target stream + */ +GsfOutput* IE_Exp_OpenXML::getTargetStream(int target) +{ + switch(target) + { + case TARGET_STYLES: + return stylesStream; + case TARGET_DOCUMENT: + return documentStream; + case TARGET_DOCUMENT_RELATION: + return wordRelStream; + case TARGET_RELATION: + return relStream; + case TARGET_CONTENT: + return contentTypesStream; + case TARGET_NUMBERING: + return numberingStream; + case TARGET_HEADER: + return headerStream; + case TARGET_FOOTER: + return footerStream; + case TARGET_SETTINGS: + return settingsStream; + case TARGET_FOOTNOTE: + return footnoteStream; + case TARGET_ENDNOTE: + return endnoteStream; + default: + UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); + return documentStream; + } +} + +/** + * Sets bold style + */ +UT_Error IE_Exp_OpenXML::setBold(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Sets italic style + */ +UT_Error IE_Exp_OpenXML::setItalic(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Sets underline style + */ +UT_Error IE_Exp_OpenXML::setUnderline(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Sets overline style + */ +UT_Error IE_Exp_OpenXML::setOverline(int /* target */) +{ + //TODO: Is there an overline option in Word 2007? + return UT_OK; +} + +/** + * Sets line-through style + */ +UT_Error IE_Exp_OpenXML::setLineThrough(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Sets superscript style + */ +UT_Error IE_Exp_OpenXML::setSuperscript(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Sets subscript style + */ +UT_Error IE_Exp_OpenXML::setSubscript(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Sets text color style + */ +UT_Error IE_Exp_OpenXML::setTextColor(int target, const gchar* color) +{ + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets background color style + */ +UT_Error IE_Exp_OpenXML::setBackgroundColor(int target, const gchar* color) +{ + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets font size + */ +UT_Error IE_Exp_OpenXML::setFontSize(int target, const gchar* size) +{ + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets font family + */ +UT_Error IE_Exp_OpenXML::setFontFamily(int target, const gchar* family) +{ + UT_UTF8String sEscFamily = family; + sEscFamily.escapeXML(); + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets language + */ +UT_Error IE_Exp_OpenXML::setLanguage(int target, const gchar* lang) +{ + UT_UTF8String sEscLang = lang; + sEscLang.escapeXML(); + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets no proof + */ +UT_Error IE_Exp_OpenXML::setNoProof(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Sets text direction, eg. right-to-left + */ +UT_Error IE_Exp_OpenXML::setTextDirection(int target, const gchar* direction) +{ + std::string str(direction); + if(str.compare("rtl") == 0) + return writeTargetStream(target, ""); + else if(str.compare("ltr") == 0) + return writeTargetStream(target, ""); + return UT_OK; +} + +/** + * Sets the widows + */ +UT_Error IE_Exp_OpenXML::setWidows(int target, const gchar* widows) +{ + UT_sint32 wdws = atoi(widows); + if(wdws > 0) + return writeTargetStream(target, ""); + return UT_OK; +} + +/** + * Sets text alignment + */ +UT_Error IE_Exp_OpenXML::setTextAlignment(int target, const gchar* alignment) +{ + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets the paragraph style + */ +UT_Error IE_Exp_OpenXML::setParagraphStyle(int target, const gchar* style) +{ + UT_UTF8String sEscStyle = style; + sEscStyle.escapeXML(); + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets text indentation + */ +UT_Error IE_Exp_OpenXML::setTextIndentation(int target, const gchar* indentation) +{ + const gchar* twips = convertToPositiveTwips(indentation); + if(!twips) + return UT_OK; + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets paragraph left margin + */ +UT_Error IE_Exp_OpenXML::setParagraphLeftMargin(int target, const gchar* margin) +{ + const gchar* twips = convertToTwips(margin); + if(!twips) + return UT_OK; + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets paragraph right margin + */ +UT_Error IE_Exp_OpenXML::setParagraphRightMargin(int target, const gchar* margin) +{ + const gchar* twips = convertToTwips(margin); + if(!twips) + return UT_OK; + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets paragraph top margin + */ +UT_Error IE_Exp_OpenXML::setParagraphTopMargin(int target, const gchar* margin) +{ + const gchar* twips = convertToPositiveTwips(margin); + if(!twips) + return UT_OK; + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets the necessary relationship for hyperlink target address + */ +UT_Error IE_Exp_OpenXML::setHyperlinkRelation(int target, const char* id, const char* addr, const char* mode) +{ + UT_UTF8String sEscAddr = addr; + sEscAddr.escapeURL(); + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets the necessary relationships for header + */ +UT_Error IE_Exp_OpenXML::setHeaderRelation(const char* relId, const char* headerId) +{ + UT_Error err = UT_OK; + + std::string str(""; + + err = writeTargetStream(TARGET_DOCUMENT_RELATION, str.c_str()); + if(err != UT_OK) + return err; + + str = ""; + str += ""; + + return writeTargetStream(TARGET_CONTENT, str.c_str()); +} + +/** + * Sets the titlePg tag for the first page headers/footers + */ +UT_Error IE_Exp_OpenXML::setTitlePage() +{ + return writeTargetStream(TARGET_DOCUMENT, ""); +} + +/** + * Sets the evenAndOddHeaders tag for the even/odd page headers/footers + */ +UT_Error IE_Exp_OpenXML::setEvenAndOddHeaders() +{ + return writeTargetStream(TARGET_SETTINGS, ""); +} + +/** + * Sets the necessary relationship for footer + */ +UT_Error IE_Exp_OpenXML::setFooterRelation(const char* relId, const char* footerId) +{ + UT_Error err = UT_OK; + + std::string str(""; + + err = writeTargetStream(TARGET_DOCUMENT_RELATION, str.c_str()); + if(err != UT_OK) + return err; + + str = ""; + str += ""; + + return writeTargetStream(TARGET_CONTENT, str.c_str()); +} + +/** + * Sets paragraph bottom margin + */ +UT_Error IE_Exp_OpenXML::setParagraphBottomMargin(int target, const gchar* margin) +{ + const gchar* twips = convertToPositiveTwips(margin); + if(!twips) + return UT_OK; + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets line height + */ +UT_Error IE_Exp_OpenXML::setLineHeight(int target, const gchar* height) +{ + const gchar* twips = NULL; + const gchar* lineRule = NULL; + + if(strstr(height, "pt+")) + { + lineRule = "atLeast"; + std::string h(height); + h.resize(h.length()-1); //get rid of '+' char + twips = convertToTwips(h.c_str()); + } + else if(strstr(height, "pt")) + { + lineRule = "exact"; + twips = convertToTwips(height); + } + else + { + lineRule = "auto"; + twips = convertToLines(height); + } + + if(!twips) + return UT_OK; + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets tab stops + */ +UT_Error IE_Exp_OpenXML::setTabstops(int target, const gchar* tabstops) +{ + std::string tabs(""); + + std::string str(""); + str += tabstops; + str += ","; + + std::string::size_type prev = -1; + std::string::size_type pos = str.find_first_of(","); + + while (pos != std::string::npos) + { + std::string token(""); + token = str.substr(prev+1, pos-prev-1); + + std::string::size_type typePos = token.find_first_of("/"); + + if(typePos != std::string::npos) + { + std::string tabStopType = token.substr(typePos+1, 1); + std::string type = token.substr(typePos+2, token.length()-1); + token = token.substr(0, typePos); + + if(strstr(tabStopType.c_str(), "L")) + tabs += ""; + } + + prev = pos; + pos = str.find_first_of(",", pos + 1); + } + + tabs += ""; + + return writeTargetStream(target, tabs.c_str()); +} + +/** + * Sets the columns for the section + */ +UT_Error IE_Exp_OpenXML::setColumns(int target, const gchar* num, const gchar* sep) +{ + if(UT_convertDimensionless(num) <= 0) + return UT_OK; + + if((strcmp(sep, "on") != 0) && (strcmp(sep, "off") != 0)) + { + // this code should never be reached due to the string checks in + // OXML_Section::serializeProperties() + UT_ASSERT_NOT_REACHED(); + return UT_OK; + } + + std::string str(""); + str += ""; + + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets grid span for horizontally merged cells + */ +UT_Error IE_Exp_OpenXML::setGridSpan(int target, UT_sint32 hspan) +{ + char buffer[12]; + int len = snprintf(buffer, 12, "%d", hspan); + if(len <= 0) + return UT_IE_COULDNOTWRITE; + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets vertical merge feature for vertically merged cells + */ +UT_Error IE_Exp_OpenXML::setVerticalMerge(int target, const char* vmerge) +{ + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + + +/** + * Sets page break + */ +UT_Error IE_Exp_OpenXML::setPageBreak(int target) +{ + std::string str(""); + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets table border style for the specified border in the table + */ +UT_Error IE_Exp_OpenXML::setTableBorder(int target, const char* border, const char* type, const char* color, const char* size) +{ + UT_return_val_if_fail(type, UT_OK); + + std::string str(""); +} + +/** + * Finishes table grid + */ +UT_Error IE_Exp_OpenXML::finishTableGrid(int target) +{ + return writeTargetStream(target, ""); +} + +/** + * Starts footnote + */ +UT_Error IE_Exp_OpenXML::startFootnote(const char* id) +{ + std::string str(""; + return writeTargetStream(TARGET_FOOTNOTE, str.c_str()); +} + +/** + * Finishes footnote + */ +UT_Error IE_Exp_OpenXML::finishFootnote() +{ + return writeTargetStream(TARGET_FOOTNOTE, ""); +} + +/** + * Starts endnote + */ +UT_Error IE_Exp_OpenXML::startEndnote(const char* id) +{ + std::string str(""; + return writeTargetStream(TARGET_ENDNOTE, str.c_str()); +} + +/** + * Finishes endnote + */ +UT_Error IE_Exp_OpenXML::finishEndnote() +{ + return writeTargetStream(TARGET_ENDNOTE, ""); +} + +/** + * Sets grid column + */ +UT_Error IE_Exp_OpenXML::setGridCol(int target, const char* column) +{ + const gchar* twips = convertToPositiveTwips(column); + if(!twips || !*twips) + return UT_OK; + + std::string str(""); + str += ""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets column width + */ +UT_Error IE_Exp_OpenXML::setColumnWidth(int target, const char* width) +{ + const gchar* twips = convertToPositiveTwips(width); + if(!twips || !*twips) + return UT_OK; + + std::string str(""); + str += ""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets list level + */ +UT_Error IE_Exp_OpenXML::setListLevel(int target, const char* level) +{ + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets list format + */ +UT_Error IE_Exp_OpenXML::setListFormat(int target, const char* format) +{ + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets list type + */ +UT_Error IE_Exp_OpenXML::setListType(int target, const char* type) +{ + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets the start value of the list + */ +UT_Error IE_Exp_OpenXML::setListStartValue(int target, UT_uint32 startValue) +{ + char buffer[12]; + int len = snprintf(buffer, 12, "%d", startValue); + if(len <= 0) + return UT_IE_COULDNOTWRITE; + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets list level text + */ +UT_Error IE_Exp_OpenXML::setListLevelText(int target, const char* text) +{ + UT_UTF8String sEscText = text; + sEscText.escapeXML(); + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets abstract numbering id + */ +UT_Error IE_Exp_OpenXML::setAbstractNumberingId(int target, UT_uint32 id) +{ + char buffer[12]; + int len = snprintf(buffer, 12, "%d", id); + if(len <= 0) + return UT_IE_COULDNOTWRITE; + + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets the numbering format of the list + */ +UT_Error IE_Exp_OpenXML::setNumberingFormat(int target, const char* format) +{ + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets the multilevel type of the list + */ +UT_Error IE_Exp_OpenXML::setMultilevelType(int target, const char* type) +{ + std::string str(""; + return writeTargetStream(target, str.c_str()); +} + +/** + * Sets the image + */ +UT_Error IE_Exp_OpenXML::setImage(const char* id, const char* relId, const char* filename, const char* width, const char* height) +{ + std::string str(""); + std::string h(""); + std::string w(""); + + h += convertToPositiveEmus(height); + w += convertToPositiveEmus(width); + + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + + return writeTargetStream(TARGET_DOCUMENT, str.c_str()); +} + +/** + * Sets the relation of the image + */ +UT_Error IE_Exp_OpenXML::setImageRelation(const char* filename, const char* id) +{ + std::string str(""; + + return writeTargetStream(TARGET_DOCUMENT_RELATION, str.c_str()); +} + +/** + * Sets the simple field + */ +UT_Error IE_Exp_OpenXML::setSimpleField(const char* instr, const char* value) +{ + UT_UTF8String sEscInstr = instr; + sEscInstr.escapeXML(); + UT_UTF8String sEscValue = value; + sEscValue.escapeXML(); + + std::string str(""); + str += ""; + str += ""; + str += ""; + str += sEscValue.utf8_str(); + str += ""; + str += ""; + str += ""; + return writeTargetStream(TARGET_DOCUMENT, str.c_str()); +} + +/** + * Set the header reference + */ +UT_Error IE_Exp_OpenXML::setHeaderReference(const char* id, const char* type) +{ + std::string str(""); + str += ""; + return writeTargetStream(TARGET_DOCUMENT, str.c_str()); +} + +/** + * Set the footnote reference + */ +UT_Error IE_Exp_OpenXML::setFootnoteReference(const char* id) +{ + std::string str(""); + str += ""; + return writeTargetStream(TARGET_DOCUMENT, str.c_str()); +} + +/** + * Set the footnoteRef tag + */ +UT_Error IE_Exp_OpenXML::setFootnoteRef() +{ + std::string str(""); + str += ""; + return writeTargetStream(TARGET_FOOTNOTE, str.c_str()); +} + +/** + * Set the endnote reference + */ +UT_Error IE_Exp_OpenXML::setEndnoteReference(const char* id) +{ + std::string str(""); + str += ""; + return writeTargetStream(TARGET_DOCUMENT, str.c_str()); +} + +/** + * Set the endnoteRef tag + */ +UT_Error IE_Exp_OpenXML::setEndnoteRef() +{ + std::string str(""); + str += ""; + return writeTargetStream(TARGET_ENDNOTE, str.c_str()); +} + +/** + * Set the footer reference + */ +UT_Error IE_Exp_OpenXML::setFooterReference(const char* id, const char* type) +{ + std::string str(""); + str += ""; + return writeTargetStream(TARGET_DOCUMENT, str.c_str()); +} + +/** + * Checks whether the quantity string is a negative quantity + */ +bool IE_Exp_OpenXML::isNegativeQuantity(const gchar* quantity) +{ + return *quantity == '-'; +} + +/** + * Converts the string str to EMUs, returns non-negative whole number + */ +const gchar * IE_Exp_OpenXML::convertToPositiveEmus(const gchar* str) +{ + //1 inch = 914400 EMUs + double emu = UT_convertToInches(str) * 914400; + if(emu < 1.0) + return "0"; + return UT_convertToDimensionlessString(emu, ".0"); +} + +/** + * Converts the string str to points + */ +const gchar * IE_Exp_OpenXML::convertToPoints(const gchar* str) +{ + double pt = UT_convertToPoints(str); + return UT_convertToDimensionlessString(pt, ".0"); +} + +/** + * Converts the string str to twips, returns positive whole number or NULL if twips=0 + */ +const gchar * IE_Exp_OpenXML::convertToPositiveTwips(const gchar* str) +{ + double pt = UT_convertToPoints(str) * 20; + if(pt < 0) + pt = -pt; + if(pt < 1.0) + return NULL; + return UT_convertToDimensionlessString(pt, ".0"); +} + +/** + * Converts the string str to twips, returns NULL if twips=0 + */ +const gchar * IE_Exp_OpenXML::convertToTwips(const gchar* str) +{ + double pt = UT_convertToPoints(str) * 20; + if(pt < 1.0 && pt > -1.0) + return NULL; + return UT_convertToDimensionlessString(pt, ".0"); +} + +/** + * Converts the string str to lines, returns NULL if lines=0 + */ +const gchar * IE_Exp_OpenXML::convertToLines(const gchar* str) +{ + //1 point == 20 twips; 1 line == 12pts --> 1 line == 20*12=240twips + double pt = UT_convertDimensionless(str) * 240; + if(pt < 1.0 && pt > -1.0) + return NULL; + return UT_convertToDimensionlessString(pt, ".0"); +} + +/** + * Converts the string str to eighths of a point + */ +const gchar * IE_Exp_OpenXML::computeBorderWidth(const gchar* str) +{ + //in eighths of a point + double pt = UT_convertDimensionless(str) * 160; + if(pt < 1.0 && pt > -1.0) + return "0"; + return UT_convertToDimensionlessString(pt, ".0"); +} + +/** + * Computes the font-size + */ +const gchar * IE_Exp_OpenXML::computeFontSize(const gchar* str) +{ + //font-size=X pt --> return 2*X + double pt = UT_convertDimensionless(str) * 2; + return UT_convertToDimensionlessString(pt, ".0"); +} + +/** + * Cleans up everything. Called by the destructor. + */ +void IE_Exp_OpenXML::_cleanup () +{ + if(footnoteStream && !gsf_output_is_closed(footnoteStream)) + gsf_output_close(footnoteStream); + + if(endnoteStream && !gsf_output_is_closed(endnoteStream)) + gsf_output_close(endnoteStream); + + if(settingsStream && !gsf_output_is_closed(settingsStream)) + gsf_output_close(settingsStream); + + if(headerStream && !gsf_output_is_closed(headerStream)) + gsf_output_close(headerStream); + + if(footerStream && !gsf_output_is_closed(footerStream)) + gsf_output_close(footerStream); + + if(numberingStream && !gsf_output_is_closed(numberingStream)) + gsf_output_close(numberingStream); + + if(stylesStream && !gsf_output_is_closed(stylesStream)) + gsf_output_close(stylesStream); + + if(contentTypesStream && !gsf_output_is_closed(contentTypesStream)) + gsf_output_close(contentTypesStream); + + if(relStream && !gsf_output_is_closed(relStream)) + gsf_output_close(relStream); + + if(wordRelStream && !gsf_output_is_closed(wordRelStream)) + gsf_output_close(wordRelStream); + + if(documentStream && !gsf_output_is_closed(documentStream)) + gsf_output_close(documentStream); + + if(relsDir) + { + GsfOutput* rels_out = GSF_OUTPUT(relsDir); + if(!gsf_output_is_closed(rels_out)) + gsf_output_close(rels_out); + } + + if(wordMediaDir) + { + GsfOutput* wordMedia_out = GSF_OUTPUT(wordMediaDir); + if(!gsf_output_is_closed(wordMedia_out)) + gsf_output_close(wordMedia_out); + } + + if(wordRelsDir) + { + GsfOutput* wordRels_out = GSF_OUTPUT(wordRelsDir); + if(!gsf_output_is_closed(wordRels_out)) + gsf_output_close(wordRels_out); + } + + if(wordDir) + { + GsfOutput* word_out = GSF_OUTPUT(wordDir); + if(!gsf_output_is_closed(word_out)) + gsf_output_close(word_out); + } + + if(root) + { + GsfOutput* root_out = GSF_OUTPUT(root); + if(!gsf_output_is_closed(root_out)) + gsf_output_close(root_out); + } +} + +/** + * Starts the numbering.xml file which describes the default list styles + */ +UT_Error IE_Exp_OpenXML::startNumbering() +{ + UT_Error err = UT_OK; + + numberingStream = gsf_output_memory_new(); + + if(!numberingStream) + { + UT_DEBUGMSG(("FRT: ERROR, numbering.xml file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + err = writeXmlHeader(numberingStream); + if(err != UT_OK) + { + return err; + } + + std::string str(""); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, cannot write to numbering.xml file\n")); + return err; + } + + GsfOutput* numberingFile = gsf_outfile_new_child(wordDir, "numbering.xml", FALSE); + + if(!numberingFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(numberingFile, gsf_output_size(numberingStream), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(numberingStream)))) + { + gsf_output_close(numberingFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(numberingStream)) + { + gsf_output_close(numberingFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(numberingFile)) + { + UT_DEBUGMSG(("FRT: ERROR, numbering.xml file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + return UT_OK; +} + +/** + * Starts the styles.xml file which describes the default styles + */ +UT_Error IE_Exp_OpenXML::startStyles() +{ + UT_Error err = UT_OK; + + stylesStream = gsf_output_memory_new(); + + if(!stylesStream) + { + UT_DEBUGMSG(("FRT: ERROR, styles.xml file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + err = writeXmlHeader(stylesStream); + if(err != UT_OK) + { + return err; + } + + std::string str(""; + + return writeTargetStream(TARGET_STYLES, str.c_str()); +} + +/** + * Finishes the styles.xml file which describes the contents of the package + */ +UT_Error IE_Exp_OpenXML::finishStyles() +{ + UT_Error err = UT_OK; + + err = writeTargetStream(TARGET_STYLES, ""); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, cannot write to styles.xml file\n")); + return err; + } + + GsfOutput* stylesFile = gsf_outfile_new_child(wordDir, "styles.xml", FALSE); + + if(!stylesFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(stylesFile, gsf_output_size(stylesStream), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(stylesStream)))) + { + gsf_output_close(stylesFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(stylesStream)) + { + gsf_output_close(stylesFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(stylesFile)) + { + UT_DEBUGMSG(("FRT: ERROR, styles.xml file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + return UT_OK; +} + +/** + * Starts the [Content_Types].xml file which describes the contents of the package + */ +UT_Error IE_Exp_OpenXML::startContentTypes() +{ + UT_Error err = UT_OK; + + contentTypesStream = gsf_output_memory_new(); + + if(!contentTypesStream) + { + UT_DEBUGMSG(("FRT: ERROR, [Content_Types].xml file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + //we only have .rels and .xml file types in the simple basis file + //TODO: extend this for other file types as needed + err = writeXmlHeader(contentTypesStream); + if(err != UT_OK) + { + return err; + } + + std::string str(""); + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + + return writeTargetStream(TARGET_CONTENT, str.c_str()); +} + +/** + * Finishes the [Content_Types].xml file which describes the contents of the package + */ +UT_Error IE_Exp_OpenXML::finishContentTypes() +{ + UT_Error err = UT_OK; + + err = writeTargetStream(TARGET_CONTENT, ""); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, cannot write to [Content_Types].xml file\n")); + return err; + } + + GsfOutput* contentTypesFile = gsf_outfile_new_child(root, "[Content_Types].xml", FALSE); + + if(!contentTypesFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(contentTypesFile, gsf_output_size(contentTypesStream), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(contentTypesStream)))) + { + gsf_output_close(contentTypesFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(contentTypesStream)) + { + gsf_output_close(contentTypesFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(contentTypesFile)) + { + UT_DEBUGMSG(("FRT: ERROR, [Content_Types].xml file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + return UT_OK; +} + +/** + * Writes the relationships for the files within the package + * Outputs the _rels folder and _rels/.rels file which defines the package relations. + */ +UT_Error IE_Exp_OpenXML::startRelations() +{ + UT_Error err = UT_OK; + + relStream = gsf_output_memory_new(); + if(!relStream) + { + UT_DEBUGMSG(("FRT: ERROR, .rels file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + err = writeXmlHeader(relStream); + if(err != UT_OK) + { + return err; + } + + std::string str(""); + str += ""; + + return writeTargetStream(TARGET_RELATION, str.c_str()); + +} + +/** + * Finishes the relationships + */ +UT_Error IE_Exp_OpenXML::finishRelations() +{ + UT_Error err = UT_OK; + + err = writeTargetStream(TARGET_RELATION, ""); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, cannot write to .rels file\n")); + return err; + } + + relsDir = GSF_OUTFILE(gsf_outfile_new_child(root, "_rels", TRUE)); + if(!relsDir) + { + UT_DEBUGMSG(("FRT: ERROR, _rels directory couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + GsfOutput* relFile = gsf_outfile_new_child(relsDir, ".rels", FALSE); + + if(!relFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(relFile, gsf_output_size(relStream), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(relStream)))) + { + gsf_output_close(relFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(relStream)) + { + gsf_output_close(relFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(relFile)) + { + UT_DEBUGMSG(("FRT: ERROR, .rels file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + + return UT_OK; +} + +/** + * Outputs the word/_rels folder and word/_rels/document.xml.rels file + */ +UT_Error IE_Exp_OpenXML::startWordRelations() +{ + UT_Error err = UT_OK; + + wordRelStream = gsf_output_memory_new(); + if(!wordRelStream) + { + UT_DEBUGMSG(("FRT: ERROR, document.xml.rels file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + err = writeXmlHeader(wordRelStream); + if(err != UT_OK) + { + return err; + } + + std::string str(""); + str += ""; + str += ""; + str += ""; + str += ""; + str += ""; + + return writeTargetStream(TARGET_DOCUMENT_RELATION, str.c_str()); + +} + +/** + * Finishes the relationships + */ +UT_Error IE_Exp_OpenXML::finishWordRelations() +{ + UT_Error err = UT_OK; + + err = writeTargetStream(TARGET_DOCUMENT_RELATION, ""); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, cannot write to document.xml.rels file\n")); + return err; + } + + wordRelsDir = GSF_OUTFILE(gsf_outfile_new_child(wordDir, "_rels", TRUE)); + if(!wordRelsDir) + { + UT_DEBUGMSG(("FRT: ERROR, word/_rels directory couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + GsfOutput* wordRelFile = gsf_outfile_new_child(wordRelsDir, "document.xml.rels", FALSE); + + if(!wordRelFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(wordRelFile, gsf_output_size(wordRelStream), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(wordRelStream)))) + { + gsf_output_close(wordRelFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(wordRelStream)) + { + gsf_output_close(wordRelFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(wordRelFile)) + { + UT_DEBUGMSG(("FRT: ERROR, document.xml.rels file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + + return UT_OK; +} + +/** + * Does nothing for now. + * If we need a default file in word/media folder we should create the necessary stream here. + */ +UT_Error IE_Exp_OpenXML::startWordMedia() +{ + return UT_OK; +} + +/** + * Exports all the image streams to actual files in the word/media folder + */ +UT_Error IE_Exp_OpenXML::finishWordMedia() +{ + wordMediaDir = GSF_OUTFILE(gsf_outfile_new_child(wordDir, "media", TRUE)); + if(!wordMediaDir) + { + UT_DEBUGMSG(("FRT: ERROR, word/media directory couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + std::map::iterator it; + for (it = mediaStreams.begin(); it != mediaStreams.end(); it++) { + + GsfOutput* imageFile = gsf_outfile_new_child(wordMediaDir, it->first.c_str(), FALSE); + + if(!imageFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(imageFile, gsf_output_size(it->second), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(it->second)))) + { + gsf_output_close(imageFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(it->second)) + { + gsf_output_close(imageFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(imageFile)) + { + UT_DEBUGMSG(("FRT: ERROR, image file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + } + + return UT_OK; +} + +/** + * Starts the main part of the document to word/document.xml file. + */ +UT_Error IE_Exp_OpenXML::startMainPart() +{ + UT_Error err = UT_OK; + + documentStream = gsf_output_memory_new(); + if(!documentStream) + { + UT_DEBUGMSG(("FRT: ERROR, document.xml file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + err = writeXmlHeader(documentStream); + if(err != UT_OK) + { + return err; + } + + std::string str(""; + + return writeTargetStream(TARGET_DOCUMENT, str.c_str()); +} + +/** + * Finishes the main part of the document to word/document.xml file. + */ +UT_Error IE_Exp_OpenXML::finishMainPart() +{ + UT_Error err = UT_OK; + + err = writeTargetStream(TARGET_DOCUMENT, ""); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, cannot write to document.xml file\n")); + return err; + } + + wordDir = GSF_OUTFILE(gsf_outfile_new_child(root, "word", TRUE)); + if(!wordDir) + { + UT_DEBUGMSG(("FRT: ERROR, word directory couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + GsfOutput* documentFile = gsf_outfile_new_child(wordDir, "document.xml", FALSE); + + if(!documentFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(documentFile, gsf_output_size(documentStream), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(documentStream)))) + { + gsf_output_close(documentFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(documentStream)) + { + gsf_output_close(documentFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(documentFile)) + { + UT_DEBUGMSG(("FRT: ERROR, document.xml file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + + return UT_OK; +} + +/** + * Starts the settings of the document in word/settings.xml file. + */ +UT_Error IE_Exp_OpenXML::startSettings() +{ + UT_Error err = UT_OK; + + settingsStream = gsf_output_memory_new(); + if(!settingsStream) + { + UT_DEBUGMSG(("FRT: ERROR, settings.xml file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + err = writeXmlHeader(settingsStream); + if(err != UT_OK) + { + return err; + } + + std::string str(""; + + return writeTargetStream(TARGET_SETTINGS, str.c_str()); +} + +/** + * Finishes the settings of the document in word/setting.xml file. + */ +UT_Error IE_Exp_OpenXML::finishSettings() +{ + UT_Error err = UT_OK; + + err = writeTargetStream(TARGET_SETTINGS, ""); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, cannot write to settings.xml file\n")); + return err; + } + + GsfOutput* settingsFile = gsf_outfile_new_child(wordDir, "settings.xml", FALSE); + + if(!settingsFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(settingsFile, gsf_output_size(settingsStream), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(settingsStream)))) + { + gsf_output_close(settingsFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(settingsStream)) + { + gsf_output_close(settingsFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(settingsFile)) + { + UT_DEBUGMSG(("FRT: ERROR, setting.xml file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + + return UT_OK; +} + +/** + * Does nothing for now. + */ +UT_Error IE_Exp_OpenXML::startHeaders() +{ + return UT_OK; +} + +/** + * Finishes the headers in word/header.xml file. + */ +UT_Error IE_Exp_OpenXML::finishHeaders() +{ + std::map::iterator it; + for (it = headerStreams.begin(); it != headerStreams.end(); it++) { + + std::string filename("header"); + filename += it->first.c_str(); + filename += ".xml"; + + GsfOutput* headerFile = gsf_outfile_new_child(wordDir, filename.c_str(), FALSE); + + if(!headerFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(headerFile, gsf_output_size(it->second), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(it->second)))) + { + gsf_output_close(headerFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(it->second)) + { + gsf_output_close(headerFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(headerFile)) + { + UT_DEBUGMSG(("FRT: ERROR, header file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + } + + return UT_OK; +} + +/** + * Does nothing for now. + */ +UT_Error IE_Exp_OpenXML::startFooters() +{ + return UT_OK; +} + +/** + * Finishes the headers in word/footer.xml file. + */ +UT_Error IE_Exp_OpenXML::finishFooters() +{ + std::map::iterator it; + for (it = footerStreams.begin(); it != footerStreams.end(); it++) { + + std::string filename("footer"); + filename += it->first.c_str(); + filename += ".xml"; + + GsfOutput* footerFile = gsf_outfile_new_child(wordDir, filename.c_str(), FALSE); + + if(!footerFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(footerFile, gsf_output_size(it->second), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(it->second)))) + { + gsf_output_close(footerFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(it->second)) + { + gsf_output_close(footerFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(footerFile)) + { + UT_DEBUGMSG(("FRT: ERROR, footer file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + } + + return UT_OK; +} + +/** + * Starts the footnotes.xml file which describes the footnotes + */ +UT_Error IE_Exp_OpenXML::startFootnotes() +{ + UT_Error err = UT_OK; + + footnoteStream = gsf_output_memory_new(); + + if(!footnoteStream) + { + UT_DEBUGMSG(("FRT: ERROR, footnotes.xml file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + err = writeXmlHeader(footnoteStream); + if(err != UT_OK) + { + return err; + } + + std::string str(""); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, cannot write to footnotes.xml file\n")); + return err; + } + + GsfOutput* footnoteFile = gsf_outfile_new_child(wordDir, "footnotes.xml", FALSE); + + if(!footnoteFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(footnoteFile, gsf_output_size(footnoteStream), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(footnoteStream)))) + { + gsf_output_close(footnoteFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(footnoteStream)) + { + gsf_output_close(footnoteFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(footnoteFile)) + { + UT_DEBUGMSG(("FRT: ERROR, footnotes.xml file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + return UT_OK; +} + +/** + * Starts the endnotes.xml file which describes the endnotes + */ +UT_Error IE_Exp_OpenXML::startEndnotes() +{ + UT_Error err = UT_OK; + + endnoteStream = gsf_output_memory_new(); + + if(!endnoteStream) + { + UT_DEBUGMSG(("FRT: ERROR, endnotes.xml file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + err = writeXmlHeader(endnoteStream); + if(err != UT_OK) + { + return err; + } + + std::string str(""); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, cannot write to endnotes.xml file\n")); + return err; + } + + GsfOutput* endnoteFile = gsf_outfile_new_child(wordDir, "endnotes.xml", FALSE); + + if(!endnoteFile) + return UT_SAVE_EXPORTERROR; + + if(!gsf_output_write(endnoteFile, gsf_output_size(endnoteStream), + gsf_output_memory_get_bytes(GSF_OUTPUT_MEMORY(endnoteStream)))) + { + gsf_output_close(endnoteFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(endnoteStream)) + { + gsf_output_close(endnoteFile); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_close(endnoteFile)) + { + UT_DEBUGMSG(("FRT: ERROR, endnotes.xml file couldn't be closed\n")); + return UT_SAVE_EXPORTERROR; + } + return UT_OK; +} + +/** + * Write the simple xml header to the file + * This function should be called before anything written to file + */ +UT_Error IE_Exp_OpenXML::writeXmlHeader(GsfOutput* file) +{ + gboolean successful = gsf_output_puts(file, ""); + + if(!successful) + { + UT_DEBUGMSG(("FRT: ERROR, xml header couldn't be written\n")); + return UT_IE_COULDNOTWRITE; + } + + return UT_OK; +} + +UT_Error IE_Exp_OpenXML::startStyle(std::string style, std::string basedon, std::string followedby) +{ + UT_UTF8String sEscStyle = style.c_str(); + UT_UTF8String sEscBasedOn = basedon.c_str(); + UT_UTF8String sEscFollowedBy = followedby.c_str(); + + sEscStyle.escapeXML(); + sEscBasedOn.escapeXML(); + sEscFollowedBy.escapeXML(); + + // TODO: export w:type (character or paragraph) + + std::string str(""); + str += ""; + str += ""; + + if(!basedon.empty()) + { + str += ""; + } + if(!followedby.empty()) + { + str += ""; + } + + return writeTargetStream(TARGET_STYLES, str.c_str()); +} + +UT_Error IE_Exp_OpenXML::finishStyle() +{ + return writeTargetStream(TARGET_STYLES, ""); +} + +UT_Error IE_Exp_OpenXML::writeDefaultStyle() +{ + //TODO: add more default settings here + std::string str(""); + str += ""; + str += ""; + str += ""; + return writeTargetStream(TARGET_STYLES, str.c_str()); + +} + +UT_Error IE_Exp_OpenXML::writeImage(const char* filename, const UT_ByteBuf* data) +{ + GsfOutput* imageStream = gsf_output_memory_new(); + + if(!imageStream) + { + UT_DEBUGMSG(("FRT: ERROR, image file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + if(!gsf_output_write(imageStream, data->getLength(), data->getPointer(0))) + { + gsf_output_close(imageStream); + return UT_SAVE_EXPORTERROR; + } + + std::string str(""); + str += filename; + mediaStreams[str] = imageStream; + + return UT_OK; +} + +UT_Error IE_Exp_OpenXML::startHeaderStream(const char* id) +{ + UT_Error err = UT_OK; + + headerStream = gsf_output_memory_new(); + if(!headerStream) + { + UT_DEBUGMSG(("FRT: ERROR, header.xml file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + err = writeXmlHeader(headerStream); + if(err != UT_OK) + return err; + + std::string str(""; + + std::string strId(""); + strId += id; + headerStreams[strId] = headerStream; + + return writeTargetStream(TARGET_HEADER, str.c_str()); +} + +UT_Error IE_Exp_OpenXML::finishHeaderStream() +{ + return writeTargetStream(TARGET_HEADER, ""); +} + +UT_Error IE_Exp_OpenXML::startFooterStream(const char* id) +{ + UT_Error err = UT_OK; + + footerStream = gsf_output_memory_new(); + if(!footerStream) + { + UT_DEBUGMSG(("FRT: ERROR, footer.xml file couldn't be created\n")); + return UT_SAVE_EXPORTERROR; + } + + err = writeXmlHeader(footerStream); + if(err != UT_OK) + return err; + + std::string str(""; + + std::string strId(""); + strId += id; + footerStreams[strId] = footerStream; + + return writeTargetStream(TARGET_FOOTER, str.c_str()); +} + +UT_Error IE_Exp_OpenXML::finishFooterStream() +{ + return writeTargetStream(TARGET_FOOTER, ""); +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,256 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + + +#ifndef _IE_EXP_OPENXML_H_ +#define _IE_EXP_OPENXML_H_ + +// AbiWord includes +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +// External includes +#include +#include +#include +#include +#include +#include + +//target streams +#define TARGET_DOCUMENT 0 +#define TARGET_STYLES 1 +#define TARGET_DOCUMENT_RELATION 2 +#define TARGET_RELATION 3 +#define TARGET_CONTENT 4 +#define TARGET_NUMBERING 5 +#define TARGET_HEADER 6 +#define TARGET_FOOTER 7 +#define TARGET_SETTINGS 8 +#define TARGET_FOOTNOTE 9 +#define TARGET_ENDNOTE 10 + +class OXML_Document; + +/** + * Class used to export OpenXML files + */ +class IE_Exp_OpenXML : public IE_Exp +{ +public: + IE_Exp_OpenXML (PD_Document * pDocument); + virtual ~IE_Exp_OpenXML (); + UT_Error startDocument(); + UT_Error finishDocument(); + UT_Error startSection(); + UT_Error finishSection(); + UT_Error startSectionProperties(); + UT_Error finishSectionProperties(); + UT_Error startParagraph(int target); + UT_Error finishParagraph(int target); + UT_Error startText(int target); + UT_Error writeText(int target, const char* text); + UT_Error finishText(int target); + UT_Error startRun(int target); + UT_Error finishRun(int target); + UT_Error startRunProperties(int target); + UT_Error finishRunProperties(int target); + UT_Error startParagraphProperties(int target); + UT_Error finishParagraphProperties(int target); + UT_Error startCellProperties(int target); + UT_Error finishCellProperties(int target); + UT_Error startStyle(std::string name, std::string basedon, std::string followedby); + UT_Error finishStyle(); + UT_Error startTable(); + UT_Error finishTable(); + UT_Error startTableProperties(int target); + UT_Error finishTableProperties(int target); + UT_Error startTableBorderProperties(int target); + UT_Error finishTableBorderProperties(int target); + UT_Error startCellBorderProperties(int target); + UT_Error finishCellBorderProperties(int target); + UT_Error startListProperties(int target); + UT_Error finishListProperties(int target); + UT_Error startAbstractNumbering(int target, UT_uint32 id); + UT_Error finishAbstractNumbering(int target); + UT_Error startTextBox(int target, const gchar* id); + UT_Error finishTextBox(int target); + UT_Error startTextBoxProperties(int target); + UT_Error finishTextBoxProperties(int target); + UT_Error startTextBoxContent(int target); + UT_Error finishTextBoxContent(int target); + UT_Error startNumbering(int target, UT_uint32 id); + UT_Error finishNumbering(int target); + UT_Error startNumberingLevel(int target, UT_uint32 level); + UT_Error finishNumberingLevel(int target); + UT_Error startRow(); + UT_Error finishRow(); + UT_Error startCell(); + UT_Error finishCell(); + UT_Error startTableGrid(int target); + UT_Error finishTableGrid(int target); + UT_Error startExternalHyperlink(const gchar* id); + UT_Error startInternalHyperlink(const gchar* anchor); + UT_Error setHeaderRelation(const char* relId, const char* headerId); + UT_Error setFooterRelation(const char* relId, const char* footerId); + UT_Error finishHyperlink(); + UT_Error startBookmark(const gchar* id, const gchar* name); + UT_Error finishBookmark(const gchar* id); + UT_Error startFootnote(const gchar* id); + UT_Error finishFootnote(); + UT_Error startEndnote(const gchar* id); + UT_Error finishEndnote(); + UT_Error writeDefaultStyle(); + UT_Error setBold(int target); + UT_Error setItalic(int target); + UT_Error setUnderline(int target); + UT_Error setOverline(int target); + UT_Error setLineThrough(int target); + UT_Error setSuperscript(int target); + UT_Error setSubscript(int target); + UT_Error setTextColor(int target, const gchar* color); + UT_Error setBackgroundColor(int target, const gchar* color); + UT_Error setTextAlignment(int target, const gchar* alignment); + UT_Error setTextIndentation(int target, const gchar* indentation); + UT_Error setParagraphStyle(int target, const gchar* style); + UT_Error setParagraphLeftMargin(int target, const gchar* margin); + UT_Error setParagraphRightMargin(int target, const gchar* margin); + UT_Error setParagraphTopMargin(int target, const gchar* margin); + UT_Error setParagraphBottomMargin(int target, const gchar* margin); + UT_Error setLineHeight(int target, const gchar* height); + UT_Error setTabstops(int target, const gchar* tabstops); + UT_Error setFontSize(int target, const gchar* size); + UT_Error setFontFamily(int target, const gchar* family); + UT_Error setTextDirection(int target, const gchar* direction); + UT_Error setWidows(int target, const gchar* widows); + UT_Error setGridSpan(int target, UT_sint32 hspan); + UT_Error setVerticalMerge(int target, const char* vmerge); + UT_Error setTableBorder(int target, const char* border, const char* type, const char* color, const char* size); + UT_Error setGridCol(int target, const char* column); + UT_Error setColumnWidth(int target, const char* width); + UT_Error setListLevel(int target, const char* level); + UT_Error setListFormat(int target, const char* format); + UT_Error setListStartValue(int target, UT_uint32 startValue); + UT_Error setListLevelText(int target, const char* text); + UT_Error setListType(int target, const char* type); + UT_Error setAbstractNumberingId(int target, UT_uint32 id); + UT_Error setNumberingFormat(int target, const char* format); + UT_Error setMultilevelType(int target, const char* type); + UT_Error setHyperlinkRelation(int target, const char* id, const char* addr, const char* mode); + UT_Error setImage(const char* id, const char* relId, const char* filename, const char* width, const char* height); + UT_Error setImageRelation(const char* filename, const char* id); + UT_Error writeImage(const char* filename, const UT_ByteBuf* data); + UT_Error setSimpleField(const char* instr, const char* value); + UT_Error setHeaderReference(const char* id, const char* type); + UT_Error setFooterReference(const char* id, const char* type); + UT_Error setFootnoteReference(const char* id); + UT_Error setFootnoteRef(); + UT_Error setEndnoteReference(const char* id); + UT_Error setEndnoteRef(); + UT_Error startHeaderStream(const char* id); + UT_Error finishHeaderStream(); + UT_Error startFooterStream(const char* id); + UT_Error finishFooterStream(); + UT_Error setTitlePage(); + UT_Error setEvenAndOddHeaders(); + UT_Error setColumns(int target, const gchar* num, const gchar* sep); + UT_Error setPageBreak(int target); + UT_Error setLanguage(int target, const gchar* lang); + UT_Error setNoProof(int target); + UT_Error setTextBoxWidth(int target, const gchar* width); + UT_Error setTextBoxHeight(int target, const gchar* height); + +protected: + virtual UT_Error _writeDocument(void); + +private: + GsfOutfile* root; //.docx file zip root + GsfOutfile* relsDir; // _rels + GsfOutfile* wordDir; // word + GsfOutfile* wordRelsDir; // word/_rels + GsfOutfile* wordMediaDir; // word/media + GsfOutput* contentTypesStream; // [Content_Types].xml + GsfOutput* relStream; // _rels/.rels + GsfOutput* wordRelStream; // word/_rels/document.xml.rels + GsfOutput* documentStream; // word/document.xml + GsfOutput* settingsStream; // word/settings.xml + GsfOutput* stylesStream; // word/styles.xml + GsfOutput* numberingStream; // word/numbering.xml + GsfOutput* headerStream; //word/headerXX.xml + GsfOutput* footerStream; //word/footerXX.xml + GsfOutput* footnoteStream; //word/footnotes.xml + GsfOutput* endnoteStream; //word/endnotes.xml + std::map mediaStreams; // all image filename, stream pairs + std::map headerStreams; //all header id, stream pairs + std::map footerStreams; //all footer id, stream pairs + + UT_Error startNumbering(); + UT_Error startStyles(); + UT_Error startContentTypes(); + UT_Error startRelations(); + UT_Error startWordRelations(); + UT_Error startWordMedia(); + UT_Error startMainPart(); + UT_Error startHeaders(); + UT_Error startFooters(); + UT_Error startSettings(); + UT_Error startFootnotes(); + UT_Error startEndnotes(); + UT_Error finishNumbering(); + UT_Error finishStyles(); + UT_Error finishContentTypes(); + UT_Error finishRelations(); + UT_Error finishWordRelations(); + UT_Error finishWordMedia(); + UT_Error finishMainPart(); + UT_Error finishHeaders(); + UT_Error finishFooters(); + UT_Error finishSettings(); + UT_Error finishFootnotes(); + UT_Error finishEndnotes(); + UT_Error writeXmlHeader(GsfOutput* file); + + const gchar* convertToPoints(const gchar* str); + const gchar* convertToTwips(const gchar* str); + const gchar* convertToPositiveTwips(const gchar* str); + const gchar* convertToPositiveEmus(const gchar* str); + bool isNegativeQuantity(const gchar* quantity); + const gchar* convertToLines(const gchar* str); + const gchar* computeFontSize(const gchar* str); + const gchar* computeBorderWidth(const gchar* str); + + GsfOutput* getTargetStream(int target); + UT_Error writeTargetStream(int target, const char* str); + + void _cleanup(); +}; + +#endif //_IE_EXP_OPENXML_H_ + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Listener.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Listener.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Listener.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Listener.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,999 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +/** + * IE_Exp_OpenXML_Listener Class responsible for listening to the Abiword Document + */ + +IE_Exp_OpenXML_Listener::IE_Exp_OpenXML_Listener(PD_Document* doc) + : pdoc(doc), + tableHelper(doc), + document(NULL), + section(NULL), + savedSection(NULL), + paragraph(NULL), + savedParagraph(NULL), + table(NULL), + row(NULL), + cell(NULL), + hyperlink(NULL), + bookmark(NULL), + textbox(NULL), + bInTable(false), + bInHyperlink(false), + bInBookmark(false), + bInTextbox(false), + idCount(10), //the first ten IDs are reserved for the XML file references + bookmarkId("") +{ + document = OXML_Document::getNewInstance(); + + if(!pdoc->tellListener(static_cast(this))) + document = NULL; + if(addDocumentStyles() != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, Adding Document Styles Failed\n")); + document = NULL; + } + if(addLists() != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, Adding Lists Failed\n")); + document = NULL; + } + if(addImages() != UT_OK) + { + UT_DEBUGMSG(("FRT: ERROR, Adding Images Failed\n")); + document = NULL; + } +} + +IE_Exp_OpenXML_Listener::~IE_Exp_OpenXML_Listener() +{ + OXML_Document::destroyInstance(); + document = NULL; +} + +bool IE_Exp_OpenXML_Listener::populate(PL_StruxFmtHandle /* sfh */, const PX_ChangeRecord* pcr) +{ + switch (pcr->getType()) + { + case PX_ChangeRecord::PXT_InsertSpan: + { + const PX_ChangeRecord_Span* pcrs = static_cast(pcr); + PT_BufIndex buffer = pcrs->getBufIndex(); + const UT_UCSChar* pData = pdoc->getPointer(buffer); + + if(*pData == UCS_FF) + { + paragraph->setPageBreak(); + return true; + } + + UT_UCS4String str(pData, pcrs->getLength()); + OXML_SharedElement shared_element_text(new OXML_Element_Text(str.utf8_str(), str.length())); + + OXML_Element_Run* element_run = new OXML_Element_Run(getNextId()); + OXML_SharedElement shared_element_run(static_cast(element_run)); + + //add run properties + PT_AttrPropIndex api = pcr->getIndexAP(); + const PP_AttrProp* pAP = NULL; + bool bHaveProp = pdoc->getAttrProp(api,&pAP); + + if(bHaveProp && pAP) + { + const gchar* szValue; + const gchar* szName; + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + if(element_run->setProperty(szName, szValue) != UT_OK) + return false; + } + } + } + + if(bInHyperlink) + { + //make sure hyperlinks are blue and underlined + if(element_run->setProperty("text-decoration", "underline") != UT_OK) + return false; + if(element_run->setProperty("color", "0000FF") != UT_OK) + return false; + if(hyperlink->appendElement(shared_element_run) != UT_OK) + return false; + } + else + { + if(paragraph->appendElement(shared_element_run) != UT_OK) + return false; + } + return element_run->appendElement(shared_element_text) == UT_OK; + } + case PX_ChangeRecord::PXT_InsertObject: + { + const PX_ChangeRecord_Object * pcro = static_cast (pcr); + PT_AttrPropIndex api = pcr->getIndexAP(); + const PP_AttrProp* pAP = NULL; + bool bHaveProp = pdoc->getAttrProp(api,&pAP); + + const gchar* szValue; + const gchar* szName; + + switch (pcro->getObjectType()) + { + case PTO_Field: + { + fd_Field* field = pcro->getField(); + + switch(field->getFieldType()) + { + case fd_Field::FD_ListLabel: + { + + OXML_Element_List* element_list = new OXML_Element_List(getNextId(), paragraph); + OXML_SharedElement shared_element_list(static_cast(element_list)); + + if(bHaveProp && pAP) + { + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("List Property %s=%s\n", szName, szValue)); + if(element_list->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("List Attribute: %s=%s\n", szName, szValue)); + if(element_list->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + } + + return paragraph->appendElement(shared_element_list) == UT_OK; + } + + default: + { + OXML_Element_Field* element_field = new OXML_Element_Field(getNextId(), field->getFieldType(), field->getValue()); + OXML_SharedElement shared_element_field(static_cast(element_field)); + + if(bHaveProp && pAP) + { + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Field Property %s=%s\n", szName, szValue)); + if(element_field->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Field Attribute: %s=%s\n", szName, szValue)); + if(element_field->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + } + + return paragraph->appendElement(shared_element_field) == UT_OK; + } + + } + } + + case PTO_Hyperlink: + { + if(bInHyperlink) + { + bInHyperlink = false; + return true; + } + + bInHyperlink = true; + + hyperlink = new OXML_Element_Hyperlink(getNextId()); + OXML_SharedElement shared_element_hyperlink(static_cast(hyperlink)); + + if(bHaveProp && pAP) + { + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Hyperlink Property %s=%s\n", szName, szValue)); + if(hyperlink->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Hyperlink Attribute: %s=%s\n", szName, szValue)); + if(hyperlink->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + } + + return paragraph->appendElement(shared_element_hyperlink) == UT_OK; + } + + case PTO_Image: + { + OXML_Element_Run* element_run = new OXML_Element_Run(getNextId()); + OXML_SharedElement shared_element_run(static_cast(element_run)); + + if(paragraph->appendElement(shared_element_run) != UT_OK) + return false; + + OXML_Element_Image* element_image = new OXML_Element_Image(getNextId()); + OXML_SharedElement shared_element_image(static_cast(element_image)); + + if(bHaveProp && pAP) + { + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Image Property %s=%s\n", szName, szValue)); + if(element_image->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Image Attribute: %s=%s\n", szName, szValue)); + if(element_image->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + } + return element_run->appendElement(shared_element_image) == UT_OK; + } + + case PTO_Bookmark: + { + if(!bInBookmark) + { + bookmarkId = getNextId(); + } + bInBookmark = !bInBookmark; + + bookmark = new OXML_Element_Bookmark(bookmarkId); + OXML_SharedElement shared_element_bookmark(static_cast(bookmark)); + + if(bHaveProp && pAP) + { + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Bookmark Property %s=%s\n", szName, szValue)); + if(bookmark->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Bookmark Attribute: %s=%s\n", szName, szValue)); + if(bookmark->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + } + return paragraph->appendElement(shared_element_bookmark) == UT_OK; + } + default: + return true; + } + + } + case PX_ChangeRecord::PXT_InsertFmtMark: + default: + return true; + } + return true; +} + +bool IE_Exp_OpenXML_Listener::populateStrux(PL_StruxDocHandle sdh, const PX_ChangeRecord* pcr , PL_StruxFmtHandle* /* psfh */) +{ + if(pcr->getType() != PX_ChangeRecord::PXT_InsertStrux) + return false; + + const PX_ChangeRecord_Strux* pcrx = static_cast (pcr); + + PT_AttrPropIndex api = pcr->getIndexAP(); + const PP_AttrProp* pAP = NULL; + bool bHaveProp = pdoc->getAttrProp(api,&pAP); + + switch (pcrx->getStruxType()) + { + case PTX_Section: + { + section = new OXML_Section(); + section->setTarget(TARGET_DOCUMENT); + OXML_SharedSection shared_section(section); + + //add section properties + if(bHaveProp && pAP) + { + const gchar* szValue; + const gchar* szName; + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Section Property: %s=%s\n", szName, szValue)); + if(section->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Section Attribute: %s=%s\n", szName, szValue)); + if(section->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + } + + return document->appendSection(shared_section) == UT_OK; + } + case PTX_Block: + { + paragraph = new OXML_Element_Paragraph(getNextId()); + OXML_SharedElement shared_paragraph(static_cast(paragraph)); + + //add paragraph properties + if(bHaveProp && pAP) + { + const gchar* szValue; + const gchar* szName; + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + if(paragraph->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + if(paragraph->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + } + + if(bInTable) + return cell->appendElement(shared_paragraph) == UT_OK; + else if(bInTextbox) + return textbox->appendElement(shared_paragraph) == UT_OK; + + return section->appendElement(shared_paragraph) == UT_OK; + } + case PTX_SectionHdrFtr: + { + section = new OXML_Section(getNextId()); + OXML_SharedSection shared_section(static_cast(section)); + + if(bHaveProp && pAP) + { + const gchar* szValue; + const gchar* szName; + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Header/Footer Property: %s=%s\n", szName, szValue)); + if(section->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Header/Footer Attribute: %s=%s\n", szName, szValue)); + if(section->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + + if(pAP->getAttribute("type", szValue)) + { + if(strstr(szValue, "header")) + { + section->setTarget(TARGET_HEADER); + return document->addHeader(shared_section) == UT_OK; + } + else if(strstr(szValue, "footer")) + { + section->setTarget(TARGET_FOOTER); + return document->addFooter(shared_section) == UT_OK; + } + } + } + return true; + } + case PTX_SectionEndnote: + { + savedSection = section; //save the current section + savedParagraph = paragraph; //save the current paragraph + + section = new OXML_Section(getNextId()); + OXML_SharedSection shared_section(static_cast(section)); + + section->setTarget(TARGET_ENDNOTE); + + if(bHaveProp && pAP) + { + const gchar* szValue; + const gchar* szName; + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Endnote Property: %s=%s\n", szName, szValue)); + if(section->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Endnote Attribute: %s=%s\n", szName, szValue)); + if(section->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + } + + return document->addEndnote(shared_section) == UT_OK; + } + case PTX_SectionTable: + { + bInTable = true; + table = new OXML_Element_Table(getNextId()); + OXML_SharedElement shared_table(static_cast(table)); + + if(bHaveProp && pAP) + { + const gchar* szValue; + const gchar* szName; + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Table Property: %s=%s\n", szName, szValue)); + if(table->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Table Attribute: %s=%s\n", szName, szValue)); + if(table->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + } + tableHelper.OpenTable(sdh, pcr->getIndexAP()); + + return section->appendElement(shared_table) == UT_OK; + } + case PTX_SectionCell: + { + tableHelper.OpenCell(api); + UT_sint32 left = tableHelper.getLeft(); + UT_sint32 right = tableHelper.getRight(); + UT_sint32 top = tableHelper.getTop(); + UT_sint32 bottom = tableHelper.getBot(); + + cell = new OXML_Element_Cell(getNextId(), table, left, right, top, bottom); + OXML_SharedElement shared_cell(static_cast(cell)); + + if(bHaveProp && pAP) + { + const gchar* szValue; + const gchar* szName; + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Cell Property: %s=%s\n", szName, szValue)); + if(cell->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Cell Attribute: %s=%s\n", szName, szValue)); + if(cell->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + } + + if(!row || tableHelper.isNewRow()) + { + row = new OXML_Element_Row(getNextId(), table); + row->setNumCols(tableHelper.getNumCols()); + OXML_SharedElement shared_row(static_cast(row)); + if(table->appendElement(shared_row) != UT_OK) + return false; + } + + return row->appendElement(shared_cell) == UT_OK; + } + case PTX_SectionFootnote: + { + savedSection = section; //save the current section + savedParagraph = paragraph; //save the current paragraph + + section = new OXML_Section(getNextId()); + OXML_SharedSection shared_section(static_cast(section)); + + section->setTarget(TARGET_FOOTNOTE); + + if(bHaveProp && pAP) + { + const gchar* szValue; + const gchar* szName; + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Footnote Property: %s=%s\n", szName, szValue)); + if(section->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("Footnote Attribute: %s=%s\n", szName, szValue)); + if(section->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + } + + return document->addFootnote(shared_section) == UT_OK; + } + case PTX_SectionFrame: + { + const gchar* frameType = NULL; + + if(!(bHaveProp && pAP)) + return true; + + if(!(pAP->getProperty("frame-type",frameType) && frameType && *frameType)) + return true; + + if(!strcmp(frameType,"textbox")) + { + bInTextbox = true; + } + else if(!strcmp(frameType,"image")) + { + // TODO: handle positioned images + } + + if(bInTextbox) + { + textbox = new OXML_Element_TextBox(getNextId()); + OXML_SharedElement shared_textbox(static_cast(textbox)); + + OXML_Element_Run* element_run = new OXML_Element_Run(getNextId()); + OXML_SharedElement shared_element_run(static_cast(element_run)); + + if(element_run->appendElement(shared_textbox) != UT_OK) + return false; + + const gchar* szValue; + const gchar* szName; + size_t propCount = pAP->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("TextBox Property: %s=%s\n", szName, szValue)); + if(textbox->setProperty(szName, szValue) != UT_OK) + return false; + } + } + + size_t attrCount = pAP->getAttributeCount(); + + for(i=0; igetNthAttribute(i, szName, szValue)) + { + //TODO: Take the debug message out when we are done + UT_DEBUGMSG(("TextBox Attribute: %s=%s\n", szName, szValue)); + if(textbox->setAttribute(szName, szValue) != UT_OK) + return false; + } + } + + return paragraph->appendElement(shared_element_run) == UT_OK; + } + return true; + } + case PTX_EndCell: + { + tableHelper.CloseCell(); + return true; + } + case PTX_EndTable: + { + bInTable = false; + tableHelper.CloseTable(); + return true; + } + case PTX_EndFootnote: + { + section = savedSection; //recover the last section + paragraph = savedParagraph; //recover the last paragraph + return true; + } + case PTX_EndEndnote: + { + section = savedSection; //recover the last section + paragraph = savedParagraph; //recover the last paragraph + return true; + } + case PTX_EndFrame: + { + if(bInTextbox) + bInTextbox = false; + return true; + } + case PTX_SectionMarginnote: + case PTX_SectionAnnotation: + case PTX_SectionTOC: + case PTX_EndMarginnote: + case PTX_EndAnnotation: + case PTX_EndTOC: + default: + return true; + } + + return true; +} + +bool IE_Exp_OpenXML_Listener::change(PL_StruxFmtHandle /* sfh */, const PX_ChangeRecord* /* pcr */) +{ + return false; //this function not used +} + +bool IE_Exp_OpenXML_Listener::insertStrux(PL_StruxFmtHandle /* sfh */, const PX_ChangeRecord* /* pcr */, PL_StruxDocHandle /* sdhNew */, PL_ListenerId /* lid */, + void (* /* pfnBindHandles */)(PL_StruxDocHandle /* sdhNew */, PL_ListenerId /* lid */, PL_StruxFmtHandle /* sfhNew */)) +{ + return false; //this function not used +} + +bool IE_Exp_OpenXML_Listener::signal(UT_uint32 /* iSignal */) +{ + return false; //this function not used +} + +OXML_Document* IE_Exp_OpenXML_Listener::getDocument() +{ + return document; +} + +UT_Error IE_Exp_OpenXML_Listener::addDocumentStyles() +{ + UT_Error err = UT_OK; + + const PP_AttrProp * pAP = NULL; + const gchar* styleName = NULL; + const gchar* basedOn = NULL; + const gchar* followedBy = NULL; + const gchar* propertyName = NULL; + const gchar* propertyValue = NULL; + PT_AttrPropIndex api = pdoc->getAttrPropIndex(); + bool bHaveProp = pdoc->getAttrProp(api, &pAP); + + if(!bHaveProp || !pAP) + return UT_OK; + + const PD_Style* pStyle = NULL; + + size_t styleCount = pdoc->getStyleCount(); + size_t k; + for(k=0; kenumStyles(k, &styleName, &pStyle)) + continue; + + if(!pStyle) + continue; + + OXML_Style* style = new OXML_Style(styleName, styleName); + OXML_SharedStyle shared_style(style); + + PD_Style* basedOnStyle = pStyle->getBasedOn(); + if(basedOnStyle) + { + basedOn = basedOnStyle->getName(); + style->setBasedOn(basedOn); + } + + PD_Style* followedByStyle = pStyle->getFollowedBy(); + if(followedByStyle) + { + followedBy = followedByStyle->getName(); + style->setFollowedBy(followedBy); + } + + err = document->addStyle(shared_style); + if(err != UT_OK) + return err; + + size_t propCount = pStyle->getPropertyCount(); + + size_t i; + for(i=0; igetNthProperty(i, propertyName, propertyValue)) + continue; + + err = style->setProperty(propertyName, propertyValue); + if(err != UT_OK) + { + UT_DEBUGMSG(("FRT:ERROR, Setting Document Style Property %s=%s failed\n", propertyName, propertyValue)); + return err; + } + } + } + + return UT_OK; +} + +UT_Error IE_Exp_OpenXML_Listener::addLists() +{ + UT_Error err = UT_OK; + + const PP_AttrProp * pAP = NULL; + + PT_AttrPropIndex api = pdoc->getAttrPropIndex(); + bool bHaveProp = pdoc->getAttrProp(api, &pAP); + + if(!bHaveProp || !pAP) + return UT_OK; + + fl_AutoNum* pList = NULL; + + size_t listCount = pdoc->getListsCount(); + size_t k; + for(k=0; kenumLists(k, &pList)) + continue; + + if(!pList) + continue; + + OXML_List* list = new OXML_List(); + OXML_SharedList shared_list(list); + + list->setId(pList->getID()); + list->setParentId(pList->getParentID()); + list->setLevel(pList->getLevel()); + list->setDelim(pList->getDelim()); + list->setDecimal(pList->getDecimal()); + list->setStartValue(pList->getStartValue32()); + list->setType(pList->getType()); + + err = document->addList(shared_list); + if(err != UT_OK) + return err; + } + + return UT_OK; +} + +UT_Error IE_Exp_OpenXML_Listener::addImages() +{ + UT_Error err = UT_OK; + + const char* szName = NULL; + const char* szMimeType = NULL; + const char** pszMimeType = &szMimeType; + const UT_ByteBuf* pByteBuf = NULL; + + UT_uint32 k = 0; + while (pdoc->enumDataItems (k, 0, &szName, &pByteBuf, reinterpret_cast(pszMimeType))) + { + k++; + + if(!szName || (*szName == '\0') || !szMimeType || (*szMimeType == '\0') || !pByteBuf || (pByteBuf->getLength() == 0) || (strcmp(szMimeType, "image/png") != 0)) + { + szName = NULL; + szMimeType = NULL; + pByteBuf = NULL; + continue; + } + + OXML_Image* image = new OXML_Image(); + const OXML_SharedImage shared_image(image); + + image->setId(szName); + image->setMimeType(szMimeType); + image->setData(pByteBuf); + + err = document->addImage(shared_image); + if(err != UT_OK) + return err; + + szName = NULL; + szMimeType = NULL; + pByteBuf = NULL; + } + + return UT_OK; +} + +std::string IE_Exp_OpenXML_Listener::getNextId() +{ + char buffer[12]; + int len = snprintf(buffer, 12, "%d", ++idCount); + if(len <= 0) + return ""; + + std::string str(""); + str += buffer; + return str; +} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Listener.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Listener.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Listener.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Listener.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,110 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _IE_EXP_OPENXMLLISTENER_H_ +#define _IE_EXP_OPENXMLLISTENER_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +class OXML_Document; +class OXML_Element_Paragraph; +class OXML_Element_Table; +class OXML_Element_Row; +class OXML_Element_Cell; +class OXML_Element_List; +class OXML_Element_Hyperlink; +class OXML_Element_Bookmark; +class OXML_Element_Field; +class OXML_Element_TextBox; +class OXML_Image; + +/** + * Class responsible for listening to the Abiword Document + */ + +class IE_Exp_OpenXML_Listener : public PL_Listener +{ +public: + IE_Exp_OpenXML_Listener(PD_Document* doc); + ~IE_Exp_OpenXML_Listener(); + + virtual bool populate(PL_StruxFmtHandle sfh, const PX_ChangeRecord * pcr); + virtual bool populateStrux(PL_StruxDocHandle sdh, const PX_ChangeRecord * pcr, PL_StruxFmtHandle * psfh); + virtual bool change(PL_StruxFmtHandle sfh, const PX_ChangeRecord * pcr); + virtual bool insertStrux(PL_StruxFmtHandle sfh, const PX_ChangeRecord * pcr, PL_StruxDocHandle sdhNew, PL_ListenerId lid, + void (* pfnBindHandles)(PL_StruxDocHandle sdhNew, PL_ListenerId lid, PL_StruxFmtHandle sfhNew)); + virtual bool signal(UT_uint32 iSignal); + + OXML_Document* getDocument(); + +private: + PD_Document* pdoc; + ie_Table tableHelper; + OXML_Document* document; + OXML_Section* section; + OXML_Section* savedSection; + OXML_Element_Paragraph* paragraph; + OXML_Element_Paragraph* savedParagraph; + OXML_Element_Table* table; + OXML_Element_Row* row; + OXML_Element_Cell* cell; + OXML_Element_Hyperlink* hyperlink; + OXML_Element_Bookmark* bookmark; + OXML_Element_TextBox* textbox; + + bool bInTable; + bool bInHyperlink; + bool bInBookmark; + bool bInTextbox; + int idCount; + std::string bookmarkId; + + UT_Error addDocumentStyles(); + UT_Error addLists(); + UT_Error addImages(); + std::string getNextId(); +}; + +#endif //_IE_EXP_OPENXMLLISTENER_H_ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Sniffer.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Sniffer.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Sniffer.cpp 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Sniffer.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,122 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// Class definition include +#include + +// Internal includes +#include + +/** + * Constructor + * + */ +IE_Exp_OpenXML_Sniffer::IE_Exp_OpenXML_Sniffer () : + IE_ExpSniffer("OpenXML::OXML") +{ + +} + +/** + * Destructor + * + */ +IE_Exp_OpenXML_Sniffer::~IE_Exp_OpenXML_Sniffer () +{ +} + +/** + * Recognize the contents as best we can + * + */ +bool IE_Exp_OpenXML_Sniffer::recognizeSuffix (const char * szSuffix) +{ + if (g_ascii_strcasecmp(szSuffix,".docx") == 0) + { + return true; + } + if (g_ascii_strcasecmp(szSuffix,".dotx") == 0) + { + return true; + } + if (g_ascii_strcasecmp(szSuffix,".docm") == 0) + { + return true; + } + if (g_ascii_strcasecmp(szSuffix,".dotm") == 0) + { + return true; + } + return false; +} + +UT_Confidence_t IE_Exp_OpenXML_Sniffer::supportsMIME(const char * szMIME) +{ + if (g_ascii_strcasecmp(szMIME, "application/vnd.openxmlformats-officedocument.wordprocessingml.document") == 0) + { + return UT_CONFIDENCE_PERFECT; + } + if (g_ascii_strcasecmp(szMIME, "application/vnd.openxmlformats-officedocument.wordprocessingml.template") == 0) + { + return UT_CONFIDENCE_PERFECT; + } + if (g_ascii_strcasecmp(szMIME, "application/vnd.ms-word.document") == 0) + { + return UT_CONFIDENCE_SOSO; + } + if (g_ascii_strcasecmp(szMIME, "application/vnd.ms-word.template") == 0) + { + return UT_CONFIDENCE_SOSO; + } + return UT_CONFIDENCE_ZILCH; +} + +/** + * Construct an exporter for ourselves + * + */ +UT_Error IE_Exp_OpenXML_Sniffer::constructExporter ( + PD_Document* pDocument, + IE_Exp** ppie) +{ + UT_DEBUGMSG(("FRT: Constructing an OpenXML Exporter\n")); + IE_Exp_OpenXML* p = new IE_Exp_OpenXML(pDocument); + *ppie = p; + + return UT_OK; +} + +/** + * Get the dialog labels + * + */ +bool IE_Exp_OpenXML_Sniffer::getDlgLabels (const char ** szDesc, + const char ** szSuffixList, + IEFileType * ft) +{ + *szDesc = "Office Open XML (.docx)"; + *szSuffixList = "*.docx"; + *ft = getFileType(); + + return true; +} + diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Sniffer.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Sniffer.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Sniffer.h 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/ie_exp_OpenXML_Sniffer.h 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,46 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + +/* AbiSource + * + * Copyright (C) 2008 Firat Kiyak + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _IE_EXP_OPENXMLSNIFFER_H_ +#define _IE_EXP_OPENXMLSNIFFER_H_ + +#include + +class IE_Exp_OpenXML_Sniffer : public IE_ExpSniffer +{ +public: + IE_Exp_OpenXML_Sniffer () ; + + virtual ~IE_Exp_OpenXML_Sniffer (); + + virtual bool recognizeSuffix (const char* szSuffix); + + virtual UT_Confidence_t supportsMIME(const char * szMIME); + virtual UT_Error constructExporter (PD_Document * pDocument, + IE_Exp ** ppie) ; + + virtual bool getDlgLabels (const char ** szDesc, + const char ** szSuffixList, + IEFileType * ft) ; +}; + +#endif //_IE_EXP_OPENXMLSNIFFER_H_ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/exp/xp/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/exp/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -0,0 +1,43 @@ +#! gmake + +## AbiWord +## Copyright (C) 2005 Marc Maurer +## +## This program is free software; you can redistribute it and/or +## modify it under the terms of the GNU General Public License +## as published by the Free Software Foundation; either version 2 +## of the License, or (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. + +ABI_ROOT:=$(shell pwd)/../../../../../../abi +include $(ABI_ROOT)/src/config/abi_defs.mk + +INCLUDES+= -I$(shell pwd) \ + -I$(shell pwd)/../../common/xp + +TARGETS= $(OBJS) +CPPSRCS= ie_exp_OpenXML.cpp \ + ie_exp_OpenXML_Sniffer.cpp \ + ie_exp_OpenXML_Listener.cpp + +CFLAGS+= -DABI_DLL + +ifeq ($(ABI_FE), Win32) +ifeq ($(OS_NAME), MINGW32) + INCLUDES+= -I$(shell pkg-config --cflags libgsf-1) + INCLUDES+= -I$(ABI_ROOT)/../libs/boost +endif +endif + +include $(ABI_ROOT)/src/config/abi_rules.mk + +build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/GNUmakefile.am 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = common imp +SUBDIRS = common exp imp plugindir = @ABI_PLUGIN_DIR@ @@ -10,8 +10,10 @@ libAbiOpenXML_la_SOURCES = dummy.c -libAbiOpenXML_la_LIBADD = @ABI_LIBS@ \ +libAbiOpenXML_la_LIBADD = \ + @ABI_LIBS@ \ common/xp/libAbiOpenXML_common.la \ + exp/xp/libAbiOpenXML_exp.la \ imp/xp/libAbiOpenXML_imp.la libAbiOpenXML_la_LDFLAGS = -no-undefined -module -avoid-version diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/GNUmakefile.in 2008-04-06 22:37:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ pluginLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(plugin_LTLIBRARIES) libAbiOpenXML_la_DEPENDENCIES = common/xp/libAbiOpenXML_common.la \ - imp/xp/libAbiOpenXML_imp.la + exp/xp/libAbiOpenXML_exp.la imp/xp/libAbiOpenXML_imp.la am_libAbiOpenXML_la_OBJECTS = dummy.lo libAbiOpenXML_la_OBJECTS = $(am_libAbiOpenXML_la_OBJECTS) libAbiOpenXML_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -96,6 +96,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -161,14 +163,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -185,6 +187,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_OPENXML_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -201,6 +206,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -211,7 +219,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -277,7 +290,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -308,6 +321,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -321,14 +335,17 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = common imp +SUBDIRS = common exp imp plugindir = @ABI_PLUGIN_DIR@ plugin_LTLIBRARIES = libAbiOpenXML.la libAbiOpenXML_la_SOURCES = dummy.c -libAbiOpenXML_la_LIBADD = @ABI_LIBS@ \ +libAbiOpenXML_la_LIBADD = \ + @ABI_LIBS@ \ common/xp/libAbiOpenXML_common.la \ + exp/xp/libAbiOpenXML_exp.la \ imp/xp/libAbiOpenXML_imp.la libAbiOpenXML_la_LDFLAGS = -no-undefined -module -avoid-version @@ -345,8 +362,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -376,8 +393,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -385,8 +402,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -510,8 +527,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -536,8 +553,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -547,13 +564,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/GNUmakefile.in 2008-04-06 22:37:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -305,8 +320,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -412,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/Makefile 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -23,4 +23,6 @@ DIRS= xp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/GNUmakefile.am /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/GNUmakefile.am --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/GNUmakefile.am 2008-04-06 22:36:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/GNUmakefile.am 2009-07-15 16:56:23.000000000 +0100 @@ -1,36 +1,37 @@ CPPFLAGS = \ -I$(srcdir) \ -I$(srcdir)/../../common/xp \ + -I$(srcdir)/../../exp/xp \ @ABI_CPPFLAGS@ @CPPFLAGS@ @ABI_OPENXML_CPPFLAGS@ @PLATFORM_CPPFLAGS@ LDFLAGS = @LDFLAGS@ @ABI_OPENXML_LDFLAGS@ @PLATFORM_LDFLAGS@ noinst_LTLIBRARIES = libAbiOpenXML_imp.la -libAbiOpenXML_imp_la_SOURCES= ie_imp_OpenXML.cpp \ - ie_imp_OpenXML_Sniffer.cpp \ - OXMLi_StreamListener.cpp \ - OXMLi_ListenerState.cpp \ - OXMLi_ListenerState_MainDocument.cpp \ - OXMLi_ListenerState_Styles.cpp \ - OXMLi_ListenerState_Theme.cpp \ - OXMLi_ListenerState_DocSettings.cpp \ - OXMLi_ListenerState_HdrFtr.cpp \ - OXMLi_ListenerState_Common.cpp \ - OXMLi_PackageManager.cpp \ - \ - ie_imp_OpenXML.h \ - ie_imp_OpenXML_Sniffer.h \ - OXMLi_StreamListener.h \ - OXMLi_ListenerState.h \ - OXMLi_ListenerState_MainDocument.h \ - OXMLi_ListenerState_Styles.h \ - OXMLi_ListenerState_Theme.h \ - OXMLi_ListenerState_DocSettings.h \ - OXMLi_ListenerState_HdrFtr.h \ - OXMLi_ListenerState_Common.h \ - OXMLi_PackageManager.h \ - OXMLi_Types.h +libAbiOpenXML_imp_la_SOURCES = \ + ie_imp_OpenXML.cpp \ + ie_imp_OpenXML.h \ + ie_imp_OpenXML_Sniffer.cpp \ + ie_imp_OpenXML_Sniffer.h \ + OXMLi_ListenerState_Common.cpp \ + OXMLi_ListenerState_Common.h \ + OXMLi_ListenerState_DocSettings.cpp \ + OXMLi_ListenerState_DocSettings.h \ + OXMLi_ListenerState.cpp \ + OXMLi_ListenerState.h \ + OXMLi_ListenerState_HdrFtr.cpp \ + OXMLi_ListenerState_HdrFtr.h \ + OXMLi_ListenerState_MainDocument.cpp \ + OXMLi_ListenerState_MainDocument.h \ + OXMLi_ListenerState_Styles.cpp \ + OXMLi_ListenerState_Styles.h \ + OXMLi_ListenerState_Theme.cpp \ + OXMLi_ListenerState_Theme.h \ + OXMLi_PackageManager.cpp \ + OXMLi_PackageManager.h \ + OXMLi_StreamListener.cpp \ + OXMLi_StreamListener.h \ + OXMLi_Types.h libAbiOpenXML_imp_la_LIBADD = @ABI_LIBS@ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/GNUmakefile.in 2008-04-06 22:37:50.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,12 +50,12 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) libAbiOpenXML_imp_la_DEPENDENCIES = am_libAbiOpenXML_imp_la_OBJECTS = ie_imp_OpenXML.lo \ - ie_imp_OpenXML_Sniffer.lo OXMLi_StreamListener.lo \ - OXMLi_ListenerState.lo OXMLi_ListenerState_MainDocument.lo \ + ie_imp_OpenXML_Sniffer.lo OXMLi_ListenerState_Common.lo \ + OXMLi_ListenerState_DocSettings.lo OXMLi_ListenerState.lo \ + OXMLi_ListenerState_HdrFtr.lo \ + OXMLi_ListenerState_MainDocument.lo \ OXMLi_ListenerState_Styles.lo OXMLi_ListenerState_Theme.lo \ - OXMLi_ListenerState_DocSettings.lo \ - OXMLi_ListenerState_HdrFtr.lo OXMLi_ListenerState_Common.lo \ - OXMLi_PackageManager.lo + OXMLi_PackageManager.lo OXMLi_StreamListener.lo libAbiOpenXML_imp_la_OBJECTS = $(am_libAbiOpenXML_imp_la_OBJECTS) libAbiOpenXML_imp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ @@ -92,6 +92,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -152,6 +154,7 @@ CPPFLAGS = \ -I$(srcdir) \ -I$(srcdir)/../../common/xp \ + -I$(srcdir)/../../exp/xp \ @ABI_CPPFLAGS@ @CPPFLAGS@ @ABI_OPENXML_CPPFLAGS@ @PLATFORM_CPPFLAGS@ CXX = @CXX@ @@ -161,14 +164,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -185,6 +188,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_OPENXML_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -201,6 +207,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -211,7 +220,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -277,7 +291,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -308,6 +322,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -321,33 +336,34 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libAbiOpenXML_imp.la -libAbiOpenXML_imp_la_SOURCES = ie_imp_OpenXML.cpp \ - ie_imp_OpenXML_Sniffer.cpp \ - OXMLi_StreamListener.cpp \ - OXMLi_ListenerState.cpp \ - OXMLi_ListenerState_MainDocument.cpp \ - OXMLi_ListenerState_Styles.cpp \ - OXMLi_ListenerState_Theme.cpp \ - OXMLi_ListenerState_DocSettings.cpp \ - OXMLi_ListenerState_HdrFtr.cpp \ - OXMLi_ListenerState_Common.cpp \ - OXMLi_PackageManager.cpp \ - \ - ie_imp_OpenXML.h \ - ie_imp_OpenXML_Sniffer.h \ - OXMLi_StreamListener.h \ - OXMLi_ListenerState.h \ - OXMLi_ListenerState_MainDocument.h \ - OXMLi_ListenerState_Styles.h \ - OXMLi_ListenerState_Theme.h \ - OXMLi_ListenerState_DocSettings.h \ - OXMLi_ListenerState_HdrFtr.h \ - OXMLi_ListenerState_Common.h \ - OXMLi_PackageManager.h \ - OXMLi_Types.h +libAbiOpenXML_imp_la_SOURCES = \ + ie_imp_OpenXML.cpp \ + ie_imp_OpenXML.h \ + ie_imp_OpenXML_Sniffer.cpp \ + ie_imp_OpenXML_Sniffer.h \ + OXMLi_ListenerState_Common.cpp \ + OXMLi_ListenerState_Common.h \ + OXMLi_ListenerState_DocSettings.cpp \ + OXMLi_ListenerState_DocSettings.h \ + OXMLi_ListenerState.cpp \ + OXMLi_ListenerState.h \ + OXMLi_ListenerState_HdrFtr.cpp \ + OXMLi_ListenerState_HdrFtr.h \ + OXMLi_ListenerState_MainDocument.cpp \ + OXMLi_ListenerState_MainDocument.h \ + OXMLi_ListenerState_Styles.cpp \ + OXMLi_ListenerState_Styles.h \ + OXMLi_ListenerState_Theme.cpp \ + OXMLi_ListenerState_Theme.h \ + OXMLi_PackageManager.cpp \ + OXMLi_PackageManager.h \ + OXMLi_StreamListener.cpp \ + OXMLi_StreamListener.h \ + OXMLi_Types.h libAbiOpenXML_imp_la_LIBADD = @ABI_LIBS@ libAbiOpenXML_imp_la_LDFLAGS = -no-undefined -module -avoid-version @@ -362,8 +378,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -449,8 +465,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -462,8 +478,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -473,13 +489,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML.cpp 2008-04-06 22:36:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -88,20 +88,17 @@ //These calls build the data model if (UT_OK != (ret = mgr->parseDocumentTheme())) { - _cleanup(); - return ret; + UT_DEBUGMSG(("OpenXML import: failed to parse the document theme\n")); } if (UT_OK != (ret = mgr->parseDocumentSettings())) { - _cleanup(); - return ret; + UT_DEBUGMSG(("OpenXML import: failed to parse the document settings\n")); } if (UT_OK != (ret = mgr->parseDocumentStyles())) { - _cleanup(); - return ret; + UT_DEBUGMSG(("OpenXML import: failed to parse the document styles\n")); } if (UT_OK != (ret = mgr->parseDocumentStream())) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML.h 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML.h 2009-07-15 16:56:23.000000000 +0100 @@ -33,7 +33,7 @@ /** * Class used to import OpenXML files */ -class ABI_EXPORT IE_Imp_OpenXML : public IE_Imp +class IE_Imp_OpenXML : public IE_Imp { public: IE_Imp_OpenXML (PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML_Sniffer.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML_Sniffer.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML_Sniffer.cpp 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML_Sniffer.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -124,7 +124,7 @@ const char ** szSuffixList, IEFileType * ft) { - *szDesc = "OpenXML (.docx, .dotx, .docm, .dotm)"; + *szDesc = "Office Open XML (.docx, .dotx, .docm, .dotm)"; *szSuffixList = "*.docx; *.dotx; *.docm; *.dotm"; *ft = getFileType(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML_Sniffer.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML_Sniffer.h --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML_Sniffer.h 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/ie_imp_OpenXML_Sniffer.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ #include -class ABI_EXPORT IE_Imp_OpenXML_Sniffer : public IE_ImpSniffer +class IE_Imp_OpenXML_Sniffer : public IE_ImpSniffer { public: IE_Imp_OpenXML_Sniffer () ; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/Makefile 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -22,7 +22,8 @@ include $(ABI_ROOT)/src/config/abi_defs.mk INCLUDES+= -I$(shell pwd) \ - -I$(shell pwd)/../../common/xp + -I$(shell pwd)/../../common/xp \ + -I$(shell pwd)/../../exp/xp TARGETS= $(OBJS) CPPSRCS= ie_imp_OpenXML.cpp \ @@ -37,6 +38,8 @@ OXMLi_StreamListener.cpp \ OXMLi_PackageManager.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) INCLUDES+= -I$(shell pkg-config --cflags libgsf-1) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/OXMLi_ListenerState_Common.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/OXMLi_ListenerState_Common.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/OXMLi_ListenerState_Common.cpp 2008-04-06 22:36:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/OXMLi_ListenerState_Common.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -98,7 +98,10 @@ if (!strcmp(rqst->pName, "jc")) { const gchar * val = UT_getAttribute("w:val", rqst->ppAtts); - UT_return_if_fail( _error_if_fail(val != NULL) ); + + if (!val || !*val) + return; + if (!strcmp(val, "left")) { UT_return_if_fail( _error_if_fail( UT_OK == para->setProperty("text-align", "left") )); } else if (!strcmp(val, "center")) { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/OXMLi_ListenerState_Styles.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/OXMLi_ListenerState_Styles.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/imp/xp/OXMLi_ListenerState_Styles.cpp 2008-04-06 22:36:54.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/imp/xp/OXMLi_ListenerState_Styles.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -63,11 +63,16 @@ } else if (!strcmp(rqst->pName, "style")) { const gchar * id = UT_getAttribute("w:styleId", rqst->ppAtts); const gchar * type = UT_getAttribute("w:type", rqst->ppAtts); - UT_return_if_fail( _error_if_fail( id != NULL && type != NULL )); + UT_return_if_fail( _error_if_fail( id != NULL )); if (!strcmp(id, "Normal")) id = "_Normal"; //Cannot interfere with document defaults m_pCurrentStyle = new OXML_Style(id, ""); //TODO: wrap this in try/catch - if (!strcmp(type, "character")) { + if (!type || !*type) { + // default to paragraph in the case of a missing/blank attribute + // (as specified by the spec: 2.7.3.17) + type = "P"; + } + else if (!strcmp(type, "character")) { type = "C"; //Type is C for "character" } else { type = "P"; //Type is P for "paragraph", "numbering", and "table" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/Makefile 2008-04-06 22:36:55.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -21,33 +21,52 @@ ABI_ROOT:=$(shell pwd)/../../../../abi include $(ABI_ROOT)/src/config/abi_defs.mk -DIRS= common imp +DIRS= common imp exp LIBRARY_NAME= AbiOpenXML LIBRARY_VERSION= $(ABI_VERSION) TARGETS= $(PLUGIN) OBJS= $(OBJDIR)/ie_impexp_OpenXML.$(OBJ_SUFFIX) \ - $(OBJDIR)/OXML_ObjectWithAttrProp.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Document.$(OBJ_SUFFIX) \ $(OBJDIR)/OXML_Element.$(OBJ_SUFFIX) \ - $(OBJDIR)/OXML_Element_Text.$(OBJ_SUFFIX) \ $(OBJDIR)/OXML_Element_Run.$(OBJ_SUFFIX) \ - $(OBJDIR)/OXML_Section.$(OBJ_SUFFIX) \ - $(OBJDIR)/OXML_Document.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Element_Text.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Element_Paragraph.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Element_Table.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Element_Row.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Element_Cell.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Element_List.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Element_Image.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Element_Hyperlink.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Element_Bookmark.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Element_Field.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Element_TextBox.$(OBJ_SUFFIX) \ $(OBJDIR)/OXML_FontManager.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_ObjectWithAttrProp.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Section.$(OBJ_SUFFIX) \ $(OBJDIR)/OXML_Style.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_List.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXML_Image.$(OBJ_SUFFIX) \ $(OBJDIR)/OXML_Theme.$(OBJ_SUFFIX) \ + \ + $(OBJDIR)/ie_exp_OpenXML.$(OBJ_SUFFIX) \ + $(OBJDIR)/ie_exp_OpenXML_Sniffer.$(OBJ_SUFFIX) \ + $(OBJDIR)/ie_exp_OpenXML_Listener.$(OBJ_SUFFIX) \ + \ $(OBJDIR)/ie_imp_OpenXML.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_imp_OpenXML_Sniffer.$(OBJ_SUFFIX) \ - $(OBJDIR)/OXMLi_StreamListener.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXMLi_ListenerState_Common.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXMLi_ListenerState_DocSettings.$(OBJ_SUFFIX) \ $(OBJDIR)/OXMLi_ListenerState.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXMLi_ListenerState_HdrFtr.$(OBJ_SUFFIX) \ $(OBJDIR)/OXMLi_ListenerState_MainDocument.$(OBJ_SUFFIX) \ $(OBJDIR)/OXMLi_ListenerState_Styles.$(OBJ_SUFFIX) \ $(OBJDIR)/OXMLi_ListenerState_Theme.$(OBJ_SUFFIX) \ - $(OBJDIR)/OXMLi_ListenerState_DocSettings.$(OBJ_SUFFIX) \ - $(OBJDIR)/OXMLi_ListenerState_HdrFtr.$(OBJ_SUFFIX) \ - $(OBJDIR)/OXMLi_ListenerState_Common.$(OBJ_SUFFIX) \ - $(OBJDIR)/OXMLi_PackageManager.$(OBJ_SUFFIX) + $(OBJDIR)/OXMLi_PackageManager.$(OBJ_SUFFIX) \ + $(OBJDIR)/OXMLi_StreamListener.$(OBJ_SUFFIX) + +CFLAGS+= -DABI_DLL ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/plugin.m4 /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/plugin.m4 --- abiword-2.6.2/abiword-plugins/wp/impexp/OpenXML/plugin.m4 2008-04-06 22:36:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/OpenXML/plugin.m4 2009-07-15 16:56:23.000000000 +0100 @@ -6,7 +6,7 @@ dnl= abi_plugin_macro="ABIPGN_OPENXML" dnl= dnl= # 2. abi_plugin_files is the list of files that configure must generate: -dnl= abi_plugin_files="GNUmakefile common/GNUmakefile common/xp/GNUmakefile imp/GNUmakefile imp/xp/GNUmakefile" +dnl= abi_plugin_files="GNUmakefile common/GNUmakefile common/xp/GNUmakefile exp/GNUmakefile exp/xp/GNUmakefile imp/GNUmakefile imp/xp/GNUmakefile" dnl= dnl= # 3. abi_plugin_desc is a short description of the plugin dnl= abi_plugin_desc="Plugin to allow AbiWord to read OpenXML .docx files" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/opml/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/opml/GNUmakefile.in 2008-04-06 22:37:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/opml/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/opml/Makefile 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/ie_imp_OPML.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/opml/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/opml/xp/GNUmakefile.in 2008-04-06 22:37:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -337,8 +352,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -368,8 +383,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -377,8 +392,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -432,8 +447,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -445,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -456,13 +471,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/opml/xp/ie_imp_OPML.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/xp/ie_imp_OPML.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/opml/xp/ie_imp_OPML.cpp 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/xp/ie_imp_OPML.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -172,6 +172,7 @@ IE_Imp_OPML::IE_Imp_OPML(PD_Document * pDocument) : IE_Imp_XML (pDocument, false), + m_bOpenedBlock(false), m_iCurListID(AUTO_LIST_RESERVED), m_iOutlineDepth(0), m_sMetaTag("") @@ -260,6 +261,9 @@ { X_VerifyParseState(_PS_Init); m_parseState = _PS_Doc; + // append the section here (rather than the TT_SECTION case) in case + // the file is lacking a body element + X_CheckError(appendStrux(PTX_Section, NULL)); return; } @@ -268,7 +272,6 @@ X_VerifyParseState(_PS_Doc); m_parseState = _PS_Sec; - X_CheckError(appendStrux(PTX_Section,static_cast(NULL))); return; } @@ -361,6 +364,10 @@ case TT_DOCUMENT: { X_VerifyParseState(_PS_Doc); + + if(!m_bOpenedBlock) + X_CheckError(appendStrux(PTX_Block, NULL)); + m_parseState = _PS_Init; return; } @@ -468,6 +475,7 @@ buf[9] = (gchar *)g_strdup(val.c_str()); X_CheckError(appendStrux(PTX_Block, const_cast(buf))); + m_bOpenedBlock = true; // add the list label const gchar * buf2 [3]; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/opml/xp/ie_imp_OPML.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/xp/ie_imp_OPML.h --- abiword-2.6.2/abiword-plugins/wp/impexp/opml/xp/ie_imp_OPML.h 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/xp/ie_imp_OPML.h 2009-07-15 16:56:23.000000000 +0100 @@ -27,7 +27,7 @@ #include "fl_AutoNum.h" -class ABI_EXPORT IE_Imp_OPML_Sniffer : public IE_ImpSniffer +class IE_Imp_OPML_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -42,7 +42,7 @@ virtual UT_Error constructImporter (PD_Document * pDocument, IE_Imp ** ppie); }; -class ABI_EXPORT IE_Imp_OPML : public IE_Imp_XML +class IE_Imp_OPML : public IE_Imp_XML { public: IE_Imp_OPML(PD_Document * pDocument); @@ -57,6 +57,7 @@ void _createBullet(void); void _createList(void); + bool m_bOpenedBlock; UT_uint32 m_iCurListID; UT_uint32 m_iOutlineDepth; UT_UTF8String m_sMetaTag; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/opml/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/opml/xp/Makefile 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/opml/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= ie_imp_OPML.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/GNUmakefile.in 2008-04-06 22:37:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/Makefile 2008-04-06 22:36:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -30,6 +30,8 @@ OBJS= $(OBJDIR)/ie_exp_passepartout.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_impexp_passepartout.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/xp/GNUmakefile.in 2008-04-06 22:37:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -338,8 +353,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -369,8 +384,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -378,8 +393,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -434,8 +449,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -447,8 +462,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -458,13 +473,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/xp/ie_exp_Passepartout.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/xp/ie_exp_Passepartout.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/xp/ie_exp_Passepartout.cpp 2008-04-06 22:36:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/xp/ie_exp_Passepartout.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -36,7 +36,7 @@ /*****************************************************************/ /*****************************************************************/ -class ABI_EXPORT IE_Exp_Passepartout : public IE_Exp +class IE_Exp_Passepartout : public IE_Exp { public: IE_Exp_Passepartout(PD_Document * pDocument); @@ -55,7 +55,7 @@ // into a passepartout stream. ////////////////////////////////////////////////////////////////// -class ABI_EXPORT Passepartout_Listener : public PL_Listener +class Passepartout_Listener : public PL_Listener { public: Passepartout_Listener(PD_Document * pDocument, diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/xp/ie_exp_Passepartout.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/xp/ie_exp_Passepartout.h --- abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/xp/ie_exp_Passepartout.h 2008-04-06 22:36:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/xp/ie_exp_Passepartout.h 2009-07-15 16:56:23.000000000 +0100 @@ -29,7 +29,7 @@ // The exporter/writer for Plain Passepartout Files. -class ABI_EXPORT IE_Exp_Passepartout_Sniffer : public IE_ExpSniffer +class IE_Exp_Passepartout_Sniffer : public IE_ExpSniffer { friend class IE_Exp; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/passepartout/xp/Makefile 2008-04-06 22:36:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/passepartout/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -25,6 +25,8 @@ CPPSRCS= ie_exp_Passepartout.cpp \ ie_impexp_Passepartout.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/pdb/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/pdb/GNUmakefile.in 2008-04-06 22:37:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/pdb/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/pdb/Makefile 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/ie_imp_PalmDoc.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_impexp_PalmDoc.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/pdb/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/pdb/xp/GNUmakefile.in 2008-04-06 22:37:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -338,8 +353,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -369,8 +384,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -378,8 +393,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -448,8 +463,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -459,13 +474,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/pdb/xp/ie_exp_PalmDoc.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/xp/ie_exp_PalmDoc.h --- abiword-2.6.2/abiword-plugins/wp/impexp/pdb/xp/ie_exp_PalmDoc.h 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/xp/ie_exp_PalmDoc.h 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ /*****************************************************************/ /*****************************************************************/ -class ABI_EXPORT IE_Exp_PalmDoc_Sniffer : public IE_ExpSniffer +class IE_Exp_PalmDoc_Sniffer : public IE_ExpSniffer { friend class IE_Exp; @@ -48,7 +48,7 @@ IE_Exp ** ppie); }; -class ABI_EXPORT IE_Exp_PalmDoc : public IE_Exp_Text +class IE_Exp_PalmDoc : public IE_Exp_Text { public: IE_Exp_PalmDoc(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/pdb/xp/ie_imp_PalmDoc.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/xp/ie_imp_PalmDoc.h --- abiword-2.6.2/abiword-plugins/wp/impexp/pdb/xp/ie_imp_PalmDoc.h 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/xp/ie_imp_PalmDoc.h 2009-07-15 16:56:23.000000000 +0100 @@ -32,7 +32,7 @@ // The importer/reader for Palm Doc Database Files. -class ABI_EXPORT IE_Imp_PalmDoc_Sniffer : public IE_ImpSniffer +class IE_Imp_PalmDoc_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -52,7 +52,7 @@ }; -class ABI_EXPORT IE_Imp_PalmDoc : public IE_Imp +class IE_Imp_PalmDoc : public IE_Imp { public: IE_Imp_PalmDoc(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/pdb/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/pdb/xp/Makefile 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdb/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,6 +26,8 @@ ie_imp_PalmDoc.cpp \ ie_impexp_PalmDoc.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/pdf/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdf/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/pdf/GNUmakefile.in 2008-04-06 22:37:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdf/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/pdf/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdf/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/pdf/Makefile 2008-04-06 22:37:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdf/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/ie_exp_PDF_sniffer.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_exp_PDF_util.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/pdf/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdf/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/pdf/xp/GNUmakefile.in 2008-04-06 22:37:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdf/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -330,8 +345,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -361,8 +376,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -370,8 +385,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -425,8 +440,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -438,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -449,13 +464,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp 2008-04-06 22:37:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -60,7 +60,7 @@ return UT_OK; } -class ABI_EXPORT IE_Imp_PDF : public IE_Imp +class IE_Imp_PDF : public IE_Imp { public: @@ -165,7 +165,7 @@ { IE_MIME_MATCH_BOGUS, "", UT_CONFIDENCE_ZILCH } }; -class ABI_EXPORT IE_Imp_PDF_Sniffer : public IE_ImpSniffer +class IE_Imp_PDF_Sniffer : public IE_ImpSniffer { public: diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/pdf/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdf/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/pdf/xp/Makefile 2008-04-06 22:37:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/pdf/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= ie_exp_PDF.cpp ie_exp_PDF_util.cpp \ ie_exp_PDF_sniffer.cpp + +CFLAGS+= -DABI_DLL ifeq ($(OS_NAME), MINGW32) INCLUDES+= -I$(ABI_ZLIB_INC) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/psion/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/psion/GNUmakefile.in 2008-04-06 22:37:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/psion/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/psion/Makefile 2008-04-06 22:36:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/ie_imp_Psion.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_exp_Psion.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) # common to all Win32 compilers diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/psion/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/psion/xp/GNUmakefile.in 2008-04-06 22:37:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_PSION_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -338,8 +353,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -369,8 +384,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -378,8 +393,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -435,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -448,8 +463,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -459,13 +474,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/psion/xp/ie_exp_Psion.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/xp/ie_exp_Psion.h --- abiword-2.6.2/abiword-plugins/wp/impexp/psion/xp/ie_exp_Psion.h 2008-04-06 22:36:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/xp/ie_exp_Psion.h 2009-07-15 16:56:23.000000000 +0100 @@ -38,7 +38,7 @@ * This sniffer class is specific for Psion Word files. It does not extend * the basic IE_ExpSniffer class. */ -class ABI_PLUGIN_EXPORT IE_Exp_Psion_Word_Sniffer : public IE_ExpSniffer +class IE_Exp_Psion_Word_Sniffer : public IE_ExpSniffer { public: IE_Exp_Psion_Word_Sniffer (const char * name): IE_ExpSniffer(name) {} @@ -58,7 +58,7 @@ * This sniffer class is specific for Psion TextEd files. It does not extend * the basic IE_ExpSniffer class. */ -class ABI_PLUGIN_EXPORT IE_Exp_Psion_TextEd_Sniffer : public IE_ExpSniffer +class IE_Exp_Psion_TextEd_Sniffer : public IE_ExpSniffer { public: IE_Exp_Psion_TextEd_Sniffer (const char * name): IE_ExpSniffer(name) {} @@ -202,7 +202,7 @@ * the _writeDocument method, which you do not need to override in the * derived classes. */ -class ABI_PLUGIN_EXPORT IE_Exp_Psion: public IE_Exp +class IE_Exp_Psion: public IE_Exp { public: // Constructors and destructor @@ -224,7 +224,7 @@ * The only method which this class overrides is the _constructListener * method, that is made to return a listener of type PL_Psion_TextEd_Listener. */ -class ABI_PLUGIN_EXPORT IE_Exp_Psion_TextEd : public IE_Exp_Psion +class IE_Exp_Psion_TextEd : public IE_Exp_Psion { public: // Constructors and destructor @@ -243,7 +243,7 @@ * The only method which this class overrides is the _constructListener * method, that is made to return a listener of type PL_Psion_Word_Listener. */ -class ABI_PLUGIN_EXPORT IE_Exp_Psion_Word : public IE_Exp_Psion +class IE_Exp_Psion_Word : public IE_Exp_Psion { public: // Constructors and destructor diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/psion/xp/ie_imp_Psion.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/xp/ie_imp_Psion.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/psion/xp/ie_imp_Psion.cpp 2008-04-06 22:36:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/xp/ie_imp_Psion.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -522,6 +522,7 @@ if ((res = readParagraphs(layout->footer->text->paragraphs,NULL))) return res; } + return res; } /*! diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/psion/xp/ie_imp_Psion.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/xp/ie_imp_Psion.h --- abiword-2.6.2/abiword-plugins/wp/impexp/psion/xp/ie_imp_Psion.h 2008-04-06 22:36:57.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/psion/xp/ie_imp_Psion.h 2009-07-15 16:56:23.000000000 +0100 @@ -35,7 +35,7 @@ // The importer/reader for Psion Word and TextEd Files. -class ABI_PLUGIN_EXPORT IE_Imp_Psion_Sniffer : public IE_ImpSniffer +class IE_Imp_Psion_Sniffer : public IE_ImpSniffer { public: IE_Imp_Psion_Sniffer(const char * name): IE_ImpSniffer(name) {} @@ -45,7 +45,7 @@ psiconv_file_type_t filetype); }; -class ABI_PLUGIN_EXPORT IE_Imp_Psion_Word_Sniffer : public IE_Imp_Psion_Sniffer +class IE_Imp_Psion_Word_Sniffer : public IE_Imp_Psion_Sniffer { public: IE_Imp_Psion_Word_Sniffer(const char * name): IE_Imp_Psion_Sniffer(name) {} @@ -62,7 +62,7 @@ IE_Imp ** ppie); }; -class ABI_PLUGIN_EXPORT IE_Imp_Psion_TextEd_Sniffer : +class IE_Imp_Psion_TextEd_Sniffer : public IE_Imp_Psion_Sniffer { public: @@ -81,7 +81,7 @@ IE_Imp ** ppie); }; -class ABI_PLUGIN_EXPORT IE_Imp_Psion : public IE_Imp +class IE_Imp_Psion : public IE_Imp { public: IE_Imp_Psion(PD_Document * pDocument): IE_Imp(pDocument),list(false) {} @@ -115,7 +115,7 @@ bool list; }; -class ABI_PLUGIN_EXPORT IE_Imp_Psion_Word : public IE_Imp_Psion +class IE_Imp_Psion_Word : public IE_Imp_Psion { public: IE_Imp_Psion_Word(PD_Document * pDocument): IE_Imp_Psion(pDocument) {} @@ -125,7 +125,7 @@ virtual UT_Error parseFile(const psiconv_file psionfile); }; -class ABI_PLUGIN_EXPORT IE_Imp_Psion_TextEd : public IE_Imp_Psion +class IE_Imp_Psion_TextEd : public IE_Imp_Psion { public: IE_Imp_Psion_TextEd(PD_Document * pDocument): IE_Imp_Psion(pDocument) {} diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/sdw/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/sdw/GNUmakefile.in 2008-04-06 22:37:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/sdw/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/sdw/Makefile 2008-04-06 22:37:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -32,6 +32,8 @@ $(OBJDIR)/sdw_cryptor.$(OBJ_SUFFIX) \ $(OBJDIR)/docinfo.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= $(ABI_GSF_LIB) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/docinfo.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/docinfo.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/docinfo.cpp 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/docinfo.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -113,66 +113,76 @@ aDoc->setMetaDataProp(aKey, str); } -void SDWDocInfo::load(GsfInfile* aDoc, PD_Document* aPDDoc) UT_THROWS((UT_Error)) { - UT_DEBUGMSG(("SDW: Loading Docinfo...\n")); - // firstly, set StarOffice as generator - aPDDoc->setMetaDataProp(PD_META_KEY_GENERATOR, UT_UTF8String("StarOffice")); - AutoGsfInput docInfo = gsf_infile_child_by_name(aDoc, "SfxDocumentInfo"); - if (!(GsfInput*)docInfo) - UT_THROW(UT_IE_BOGUSDOCUMENT); - - char* headStr; - readByteString(docInfo, headStr); - if (strcmp(headStr, "SfxDocumentInfo") != 0) - UT_THROW(UT_IE_BOGUSDOCUMENT); - - UT_uint16 version; - streamRead(docInfo, version); - bool pwProtect; - streamRead(docInfo, pwProtect); - UT_uint16 charset; - streamRead(docInfo, charset); - auto_iconv converter(findConverter((UT_uint8)charset)); - if (!UT_iconv_isValid(converter)) - UT_THROW(UT_IE_BOGUSDOCUMENT); - - bool graphPortable, queryTemplateReload; - streamRead(docInfo, graphPortable); - streamRead(docInfo, queryTemplateReload); - - TimeStamp stamp(converter); - stamp.load(docInfo); // creator - do_SetMetadata(aPDDoc, PD_META_KEY_CREATOR, stamp.mString); - aPDDoc->setMetaDataProp(PD_META_KEY_DATE, stamp.ToString()); - stamp.load(docInfo); // modifier - // (ab-)using Contributor as the person who last modified the doc... - do_SetMetadata(aPDDoc, PD_META_KEY_CONTRIBUTOR, stamp.mString); - aPDDoc->setMetaDataProp(PD_META_KEY_DATE_LAST_CHANGED, stamp.ToString()); - stamp.load(docInfo); // printer (person, not device) - - UT_UCS4String data; - readPaddedByteString(docInfo, data, converter, 63); - do_SetMetadata(aPDDoc, PD_META_KEY_TITLE, data); - readPaddedByteString(docInfo, data, converter, 63); - do_SetMetadata(aPDDoc, PD_META_KEY_SUBJECT, data); - readPaddedByteString(docInfo, data, converter, 255); - do_SetMetadata(aPDDoc, PD_META_KEY_DESCRIPTION, data); - readPaddedByteString(docInfo, data, converter, 127); - do_SetMetadata(aPDDoc, PD_META_KEY_KEYWORDS, data); - - // Read user-defined data - for (int i = 0; i < 4; i++) { - UT_UCS4String key, value; - readPaddedByteString(docInfo, key, converter, 19); - readPaddedByteString(docInfo, value, converter, 19); - UT_String prefixedKey = CUSTOM_META_PREFIX + UT_String(UT_UTF8String(key).utf8_str()); - do_SetMetadata(aPDDoc, prefixedKey, value); - } +void SDWDocInfo::load(GsfInfile* aDoc, PD_Document* aPDDoc) + UT_THROWS((UT_Error)) +{ + char* headStr = NULL; + + try { + UT_DEBUGMSG(("SDW: Loading Docinfo...\n")); + // firstly, set StarOffice as generator + aPDDoc->setMetaDataProp(PD_META_KEY_GENERATOR, UT_UTF8String("StarOffice")); + AutoGsfInput docInfo = gsf_infile_child_by_name(aDoc, "SfxDocumentInfo"); + if (!(GsfInput*)docInfo) + UT_THROW(UT_IE_BOGUSDOCUMENT); + + readByteString(docInfo, headStr); + if (strcmp(headStr, "SfxDocumentInfo") != 0) + UT_THROW(UT_IE_BOGUSDOCUMENT); + + UT_uint16 version; + streamRead(docInfo, version); + bool pwProtect; + streamRead(docInfo, pwProtect); + UT_uint16 charset; + streamRead(docInfo, charset); + auto_iconv converter(findConverter((UT_uint8)charset)); + if (!UT_iconv_isValid(converter)) + UT_THROW(UT_IE_BOGUSDOCUMENT); + + bool graphPortable, queryTemplateReload; + streamRead(docInfo, graphPortable); + streamRead(docInfo, queryTemplateReload); + + TimeStamp stamp(converter); + stamp.load(docInfo); // creator + do_SetMetadata(aPDDoc, PD_META_KEY_CREATOR, stamp.mString); + aPDDoc->setMetaDataProp(PD_META_KEY_DATE, stamp.ToString()); + stamp.load(docInfo); // modifier + // (ab-)using Contributor as the person who last modified the doc... + do_SetMetadata(aPDDoc, PD_META_KEY_CONTRIBUTOR, stamp.mString); + aPDDoc->setMetaDataProp(PD_META_KEY_DATE_LAST_CHANGED, stamp.ToString()); + stamp.load(docInfo); // printer (person, not device) + + UT_UCS4String data; + readPaddedByteString(docInfo, data, converter, 63); + do_SetMetadata(aPDDoc, PD_META_KEY_TITLE, data); + readPaddedByteString(docInfo, data, converter, 63); + do_SetMetadata(aPDDoc, PD_META_KEY_SUBJECT, data); + readPaddedByteString(docInfo, data, converter, 255); + do_SetMetadata(aPDDoc, PD_META_KEY_DESCRIPTION, data); + readPaddedByteString(docInfo, data, converter, 127); + do_SetMetadata(aPDDoc, PD_META_KEY_KEYWORDS, data); + + // Read user-defined data + for (int i = 0; i < 4; i++) { + UT_UCS4String key, value; + readPaddedByteString(docInfo, key, converter, 19); + readPaddedByteString(docInfo, value, converter, 19); + UT_String prefixedKey = CUSTOM_META_PREFIX + UT_String(UT_UTF8String(key).utf8_str()); + do_SetMetadata(aPDDoc, prefixedKey, value); + } - // rest of the stream contains no useful information + // rest of the stream contains no useful information - // FIXME make sure the exception cleanup go here... - delete [] headStr; - UT_DEBUGMSG(("SDW: Docinfo done loading\n")); + delete [] headStr; + UT_DEBUGMSG(("SDW: Docinfo done loading\n")); + } + catch(UT_Error & e) { + if(headStr) { + delete [] headStr; + } + throw e; + } } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/docinfo.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/docinfo.h --- abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/docinfo.h 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/docinfo.h 2009-07-15 16:56:23.000000000 +0100 @@ -31,7 +31,7 @@ /** Class for reading the DocInfo stream (=metadata) and setting it on a * PD_Document */ -class ABI_EXPORT SDWDocInfo { +class SDWDocInfo { public: SDWDocInfo(); ~SDWDocInfo(); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/GNUmakefile.in 2008-04-06 22:38:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_SDW_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -348,8 +363,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -379,8 +394,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -388,8 +403,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -446,8 +461,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -459,8 +474,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -470,13 +485,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/ie_imp_StarOffice.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/ie_imp_StarOffice.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/ie_imp_StarOffice.cpp 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/ie_imp_StarOffice.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -327,8 +327,8 @@ // Data structure: // Count(8) | Position (in twips) (32) | Adjustment (8) | Decimal Separator (?) (8) | Fill character (8) // (total size per tab = 7) - UT_sint8 count = aAttr.data[0]; - for (int i = 1; (i + 6) < aAttr.dataLen; i += 7) { + // UT_sint8 count = aAttr.data[0]; + for (UT_uint32 i = 1; (i + 6) < aAttr.dataLen; i += 7) { // Abiword wants: 12.3cm/L0, where 0 indicates what to fill with UT_uint16 posInTwips = GSF_LE_GET_GUINT32(aAttr.data + i); UT_String pos = twipsToSizeString(posInTwips); @@ -377,7 +377,7 @@ static void hexdump(void* aPtr, UT_uint32 aLen) { unsigned char* ptr = (unsigned char*)aPtr; for (UT_uint32 i = 0; i < aLen; i++) { - fprintf(stderr, "%02x ", ptr[i], ptr[i]); + fprintf(stderr, "%02x ", ptr[i]); } } #endif @@ -787,9 +787,9 @@ // now insert the spans of text UT_uint32 len = textNode.length(); UT_uint32 lastInsPos = 0; - for (int i = 1; i < len; i++) { + for (UT_uint32 i = 1; i < len; i++) { bool doInsert = false; // whether there was an attribute change - for (int j = 0; j < charAttributes.getItemCount(); j++) { + for (UT_uint32 j = 0; j < charAttributes.getItemCount(); j++) { const TextAttr* a = reinterpret_cast(charAttributes[j]); // clear the last attribute, if set if (a->endSet && a->end == (i - 1)) { @@ -1031,8 +1031,8 @@ } ABI_FAR_CALL -int abi_plugin_supports_version (UT_uint32 major, UT_uint32 minor, - UT_uint32 release) +int abi_plugin_supports_version (UT_uint32 /*major*/, UT_uint32 /*minor*/, + UT_uint32 /*release*/) { return 1; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/ie_imp_StarOffice.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/ie_imp_StarOffice.h --- abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/ie_imp_StarOffice.h 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/ie_imp_StarOffice.h 2009-07-15 16:56:23.000000000 +0100 @@ -59,7 +59,7 @@ * @param cryptor (Optional) The cryptor used for decrypting the string */ void readByteString(GsfInput* stream, UT_UCS4Char*& str, UT_iconv_t converter, SDWCryptor* cryptor = NULL) UT_THROWS((UT_Error)); -class ABI_EXPORT DocHdr { +class DocHdr { public: DocHdr() : sBlockName(NULL), converter(reinterpret_cast(-1)) {} ~DocHdr() { if (sBlockName) free(sBlockName); if (UT_iconv_isValid(converter)) UT_iconv_close(converter); } @@ -161,7 +161,7 @@ #define IDX_NOCONV_FF 0xFFFC // Staroffice document sniffer. -class ABI_EXPORT IE_Imp_StarOffice_Sniffer : public IE_ImpSniffer +class IE_Imp_StarOffice_Sniffer : public IE_ImpSniffer { public: IE_Imp_StarOffice_Sniffer(); @@ -175,7 +175,7 @@ }; // Actual Importer -class ABI_EXPORT IE_Imp_StarOffice : public IE_Imp +class IE_Imp_StarOffice : public IE_Imp { public: IE_Imp_StarOffice(PD_Document *pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/Makefile 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -27,6 +27,8 @@ sdw_cryptor.cpp \ docinfo.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) INCLUDES+= $(ABI_GSF_INC) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/sdw_cryptor.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/sdw_cryptor.h --- abiword-2.6.2/abiword-plugins/wp/impexp/sdw/xp/sdw_cryptor.h 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/sdw/xp/sdw_cryptor.h 2009-07-15 16:56:23.000000000 +0100 @@ -25,7 +25,7 @@ #include "ut_string_class.h" /** Decryptor for .sdw files */ -class ABI_EXPORT SDWCryptor { +class SDWCryptor { public: /** Maximum length of the password */ enum { maxPWLen = 16 }; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/t602/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/t602/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/t602/GNUmakefile.in 2008-04-06 22:38:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/t602/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/t602/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/t602/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/t602/Makefile 2008-04-06 22:36:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/t602/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/ie_imp_T602.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/t602/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/t602/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/t602/xp/GNUmakefile.in 2008-04-06 22:38:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/t602/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -337,8 +352,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -368,8 +383,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -377,8 +392,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -432,8 +447,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -445,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -456,13 +471,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/t602/xp/ie_imp_T602.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/t602/xp/ie_imp_T602.h --- abiword-2.6.2/abiword-plugins/wp/impexp/t602/xp/ie_imp_T602.h 2008-04-06 22:36:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/t602/xp/ie_imp_T602.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,7 +30,7 @@ // The importer for T602 documents. -class ABI_EXPORT IE_Imp_T602_Sniffer : public IE_ImpSniffer +class IE_Imp_T602_Sniffer : public IE_ImpSniffer { friend class IE_Imp; friend class IE_Imp_T602; @@ -46,7 +46,7 @@ virtual UT_Error constructImporter (PD_Document * pDocument, IE_Imp ** ppie); }; -class ABI_EXPORT IE_Imp_T602 : public IE_Imp +class IE_Imp_T602 : public IE_Imp { public: IE_Imp_T602(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/t602/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/t602/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/t602/xp/Makefile 2008-04-06 22:36:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/t602/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= ie_imp_T602.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wml/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/wml/GNUmakefile.in 2008-04-06 22:38:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wml/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/wml/Makefile 2008-04-06 22:37:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/ie_imp_WML.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_impexp_WML.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wml/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/wml/xp/GNUmakefile.in 2008-04-06 22:38:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,6 +94,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -159,14 +161,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -183,6 +185,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -199,6 +204,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -209,7 +217,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -275,7 +288,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -306,6 +319,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -319,6 +333,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -337,8 +352,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -368,8 +383,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -377,8 +392,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -434,8 +449,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -447,8 +462,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -458,13 +473,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wml/xp/ie_exp_WML.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/xp/ie_exp_WML.h --- abiword-2.6.2/abiword-plugins/wp/impexp/wml/xp/ie_exp_WML.h 2008-04-06 22:37:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/xp/ie_exp_WML.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,7 +30,7 @@ // the exporter/writer for WML 1.1 -class ABI_EXPORT IE_Exp_WML_Sniffer : public IE_ExpSniffer +class IE_Exp_WML_Sniffer : public IE_ExpSniffer { friend class IE_Exp; @@ -46,7 +46,7 @@ IE_Exp ** ppie); }; -class ABI_EXPORT IE_Exp_WML : public IE_Exp +class IE_Exp_WML : public IE_Exp { public: IE_Exp_WML(PD_Document *pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wml/xp/ie_imp_WML.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/xp/ie_imp_WML.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/wml/xp/ie_imp_WML.cpp 2008-04-06 22:37:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/xp/ie_imp_WML.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -113,6 +113,8 @@ IE_Imp_WML::IE_Imp_WML (PD_Document * pDocument) : IE_Imp_XML(pDocument,false), + m_bOpenedBlock(false), + m_bOpenedSection(false), m_iColumns(0), m_iImages(0), m_iOpenedColumns(0), @@ -310,6 +312,7 @@ // Keep this appendStrux() call here to support files with more // than one X_CheckError(appendStrux(PTX_Section,static_cast(NULL))); + m_bOpenedSection = true; return; } @@ -417,6 +420,7 @@ } X_CheckError(appendStrux(PTX_Block, (left ? NULL : const_cast(buf)))); + m_bOpenedBlock = true; return; } @@ -425,7 +429,10 @@ X_CheckError((m_parseState == _PS_Block) || (m_parseState == _PS_Cell) || (m_parseState == _PS_Sec)); if(m_parseState == _PS_Sec) + { X_CheckError(appendStrux(PTX_Block,NULL)); + m_bOpenedBlock = true; + } const gchar *p_val = NULL; p_val = _getXMLPropValue(static_cast("src"), atts); @@ -621,6 +628,13 @@ case TT_DOCUMENT: { X_VerifyParseState(_PS_Doc); + + if(!m_bOpenedSection) + { + X_CheckError(appendStrux(PTX_Section, NULL)); + X_CheckError(appendStrux(PTX_Block, NULL)); + } + m_parseState = _PS_Init; return; } @@ -629,6 +643,12 @@ { X_VerifyParseState(_PS_Sec); m_parseState = _PS_Doc; + + if(!m_bOpenedBlock) + X_CheckError(appendStrux(PTX_Block, NULL)); + + m_bOpenedBlock = false; + return; } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wml/xp/ie_imp_WML.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/xp/ie_imp_WML.h --- abiword-2.6.2/abiword-plugins/wp/impexp/wml/xp/ie_imp_WML.h 2008-04-06 22:37:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/xp/ie_imp_WML.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,7 +30,7 @@ // The importer/reader for WML files. -class ABI_EXPORT IE_Imp_WML_Sniffer : public IE_ImpSniffer +class IE_Imp_WML_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -50,7 +50,7 @@ }; -class ABI_EXPORT IE_Imp_WML : public IE_Imp_XML +class IE_Imp_WML : public IE_Imp_XML { public: IE_Imp_WML(PD_Document * pDocument); @@ -70,6 +70,8 @@ void closeCell(void); void createImage(const char *name, const gchar **atts); + bool m_bOpenedBlock; + bool m_bOpenedSection; UT_sint32 m_iColumns; UT_uint32 m_iImages; UT_sint32 m_iOpenedColumns; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wml/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/wml/xp/Makefile 2008-04-06 22:37:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wml/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,6 +26,8 @@ ie_imp_WML.cpp \ ie_impexp_WML.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/GNUmakefile.in 2008-04-06 22:38:00.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/Makefile 2008-04-06 22:36:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/ie_imp_WordPerfect.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_exp_WordPerfect.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= $(shell pkg-config --libs libwpd-0.8) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/xp/GNUmakefile.in 2008-04-06 22:38:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ @WORDPERFECT_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -345,8 +360,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -376,8 +391,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -385,8 +400,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -442,8 +457,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -455,8 +470,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -466,13 +481,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/xp/ie_exp_WordPerfect.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/xp/ie_exp_WordPerfect.h --- abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/xp/ie_exp_WordPerfect.h 2008-04-06 22:36:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/xp/ie_exp_WordPerfect.h 2009-07-15 16:56:23.000000000 +0100 @@ -59,7 +59,7 @@ // The exporter for WordPerfect 6/7/8/9 documents. -class ABI_EXPORT IE_Exp_WordPerfect_Sniffer : public IE_ExpSniffer +class IE_Exp_WordPerfect_Sniffer : public IE_ExpSniffer { friend class IE_Exp; friend class IE_Exp_WordPerfect; @@ -76,7 +76,7 @@ IE_Exp ** ppie); }; -class ABI_EXPORT IE_Exp_WordPerfect : public IE_Exp +class IE_Exp_WordPerfect : public IE_Exp { friend class WordPerfect_Listener; @@ -103,7 +103,7 @@ int m_ptrDesiredFontUseCount; }; -class ABI_EXPORT WordPerfect_Listener : public PL_Listener +class WordPerfect_Listener : public PL_Listener { public: WordPerfect_Listener(PD_Document * pDocument, diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.cpp 2008-04-06 22:36:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -313,6 +313,7 @@ m_bParagraphInSection(false), m_bInSection(false), m_bSectionChanged(false), + m_bRequireBlock(false), m_iCurrentListLevel(0), m_bInCell(false), m_bHdrFtrOpenCount(0) @@ -541,6 +542,7 @@ propsArray[1] = propBuffer.c_str(); propsArray[2] = NULL; X_CheckDocumentError(appendStrux(PTX_Block, propsArray)); + m_bRequireBlock = false; if (propList["fo:break-before"]) { @@ -880,6 +882,7 @@ listAttribs[attribsCount++] = NULL; X_CheckDocumentError(appendStrux(PTX_Block, listAttribs)); + m_bRequireBlock = false; // hang text off of a list label getDoc()->appendFmtMark(); @@ -902,6 +905,13 @@ { if (m_bHdrFtrOpenCount) return; // HACK + if (!m_bInSection) + { + X_CheckDocumentError(appendStrux(PTX_Section, NULL)); + X_CheckDocumentError(appendStrux(PTX_Block,NULL)); + m_bInSection = true; + } + const gchar** propsArray = NULL; UT_String footnoteId; @@ -921,6 +931,7 @@ X_CheckDocumentError(appendStrux(PTX_SectionFootnote,attribs)); X_CheckDocumentError(appendStrux(PTX_Block,NULL)); + m_bRequireBlock = false; propsArray = static_cast(UT_calloc(7, sizeof(gchar *))); propsArray [0] = "type"; @@ -961,6 +972,7 @@ X_CheckDocumentError(appendStrux(PTX_SectionEndnote,attribs)); X_CheckDocumentError(appendStrux(PTX_Block,NULL)); + m_bRequireBlock = false; propsArray = static_cast(UT_calloc(7, sizeof(gchar *))); propsArray [0] = "type"; @@ -1114,6 +1126,7 @@ // FIXME: NEED TO PASS THE CURRENT PROPERTIES INSTEAD OF NULL // NOTE: THIS SUCKS......... X_CheckDocumentError(appendStrux(PTX_Block, NULL)); + m_bRequireBlock = false; } UT_Error IE_Imp_WordPerfect::_appendSection(int numColumns, const float marginLeft, const float marginRight) @@ -1123,6 +1136,11 @@ UT_String myProps("") ; UT_LocaleTransactor lt(LC_NUMERIC, "C"); myProps += UT_String_sprintf("columns:%d; page-margin-left:%.4fin; page-margin-right:%.4fin", numColumns, marginLeft, marginRight); + + if(m_bInSection && m_bRequireBlock) // AbiWord will hang on an empty
+ { + X_CheckDocumentError(appendStrux(PTX_Block,NULL)); + } const gchar * propsArray[3]; propsArray[0] = "props"; @@ -1131,6 +1149,7 @@ X_CheckDocumentError(appendStrux(PTX_Section, propsArray)); m_bInSection = true; + m_bRequireBlock = true; m_bSectionChanged = false; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.h --- abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.h 2008-04-06 22:36:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.h 2009-07-15 16:56:23.000000000 +0100 @@ -74,7 +74,7 @@ int m_iOutlineHash; }; -class ABI_EXPORT IE_Imp_WordPerfect_Sniffer : public IE_ImpSniffer +class IE_Imp_WordPerfect_Sniffer : public IE_ImpSniffer { friend class IE_Imp; friend class IE_Imp_WordPerfect; @@ -93,11 +93,11 @@ IE_Imp ** ppie); }; -class ABI_EXPORT IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl +class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl { public: IE_Imp_WordPerfect(PD_Document * pDocument); - ~IE_Imp_WordPerfect(); + virtual ~IE_Imp_WordPerfect(); virtual void pasteFromBuffer(PD_DocumentRange * pDocRange, UT_uint8 * pData, UT_uint32 lenData, const char * szEncoding = 0); @@ -189,6 +189,7 @@ bool m_bParagraphInSection; bool m_bInSection; bool m_bSectionChanged; + bool m_bRequireBlock; int m_iCurrentListLevel; bool m_bInCell; @@ -199,7 +200,7 @@ #ifdef HAVE_LIBWPS -class ABI_EXPORT IE_Imp_MSWorks_Sniffer : public IE_ImpSniffer +class IE_Imp_MSWorks_Sniffer : public IE_ImpSniffer { friend class IE_Imp; friend class IE_Imp_MSWorks; diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/wordperfect/xp/Makefile 2008-04-06 22:36:56.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/wordperfect/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,6 +26,8 @@ ie_imp_WordPerfect.cpp \ ie_exp_WordPerfect.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) INCLUDES+= $(shell pkg-config --cflags libwpd-0.8) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/GNUmakefile.in 2008-04-06 22:38:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -307,8 +322,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -414,8 +429,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -440,8 +455,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -451,13 +466,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/Makefile 2008-04-06 22:36:59.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/HTML_Parser.$(OBJ_SUFFIX) \ $(OBJDIR)/HTML_StyleString.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) OS_LIBS+= wsock32.lib ole32.lib oleaut32.lib EXTRA_LIBS+= $(BINDIR)/AbiWord.$(LIB_SUFFIX) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/xp/GNUmakefile.in 2008-04-06 22:38:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -101,6 +101,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -166,14 +168,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -190,6 +192,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @ABI_XHTML_LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -206,6 +211,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -216,7 +224,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -282,7 +295,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -313,6 +326,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -326,6 +340,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -357,8 +372,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -388,8 +403,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -397,8 +412,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -455,8 +470,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -468,8 +483,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -479,13 +494,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/xp/ie_imp_MHT.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/xp/ie_imp_MHT.h --- abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/xp/ie_imp_MHT.h 2008-04-06 22:36:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/xp/ie_imp_MHT.h 2009-07-15 16:56:23.000000000 +0100 @@ -40,7 +40,7 @@ //class UT_StringPtrMap; //class UT_Vector; -class ABI_EXPORT UT_Multipart +class UT_Multipart { enum ContentTransferEncoding { @@ -102,7 +102,7 @@ char m_b64buffer[80]; }; -class ABI_EXPORT IE_Imp_MHT_Sniffer : public IE_ImpSniffer +class IE_Imp_MHT_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -121,7 +121,7 @@ UT_Error constructImporter (PD_Document * pDocument, IE_Imp ** ppie); }; -class ABI_EXPORT IE_Imp_MHT : public IE_Imp_XHTML +class IE_Imp_MHT : public IE_Imp_XHTML { public: IE_Imp_MHT (PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/xp/Makefile 2008-04-06 22:36:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,6 +26,8 @@ HTML_Parser.cpp \ HTML_StyleString.cpp +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) DEFINES+=-DABI_PLUGIN_VERSION=\"2.0.0\" INCLUDES+= -I$(ABI_ROOT)/../libs/libxml diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/xp/tidyImporter.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/xp/tidyImporter.h --- abiword-2.6.2/abiword-plugins/wp/impexp/xhtml/xp/tidyImporter.h 2008-04-06 22:36:58.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xhtml/xp/tidyImporter.h 2009-07-15 16:56:23.000000000 +0100 @@ -22,7 +22,7 @@ #include "ie_imp_XHTML.h" -class ABI_EXPORT IE_Imp_Tidy_Sniffer : public IE_ImpSniffer +class IE_Imp_Tidy_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -42,7 +42,7 @@ virtual UT_Error constructImporter (PD_Document * pDocument, IE_Imp ** ppie); }; -class ABI_EXPORT IE_Imp_HTML : public IE_Imp_XHTML +class IE_Imp_HTML : public IE_Imp_XHTML { public: IE_Imp_HTML (PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/GNUmakefile.in 2008-04-06 22:38:01.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/Makefile 2008-04-06 22:37:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -31,6 +31,8 @@ $(OBJDIR)/ie_imp_XSL-FO.$(OBJ_SUFFIX) \ $(OBJDIR)/ie_impexp_XSL-FO.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) ifeq ($(OS_NAME), MINGW32) EXTRA_LIBS+= -lAbiWord.exe diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/xp/GNUmakefile.in 2008-04-06 22:38:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -160,14 +162,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -184,6 +186,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -200,6 +205,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -210,7 +218,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -276,7 +289,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -307,6 +320,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,6 +334,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -345,8 +360,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -376,8 +391,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -385,8 +400,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -442,8 +457,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -455,8 +470,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -466,13 +481,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_exp_XSL-FO.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_exp_XSL-FO.cpp --- abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_exp_XSL-FO.cpp 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_exp_XSL-FO.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -1422,10 +1422,12 @@ } #define PROPERTY(x) \ - if (pAP->getProperty(x, szValue)) \ + if (pAP->getProperty(x, szValue) && szValue && *szValue) \ { \ + UT_UTF8String esc = szValue; \ + esc.escapeXML(); \ buf += " "x"=\""; \ - buf += szValue; \ + buf += esc.utf8_str(); \ buf += "\""; \ } diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_exp_XSL-FO.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_exp_XSL-FO.h --- abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_exp_XSL-FO.h 2008-04-06 22:37:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_exp_XSL-FO.h 2009-07-15 16:56:23.000000000 +0100 @@ -30,7 +30,7 @@ // The exporter/writer for the XML/XSL FO spec -class ABI_EXPORT IE_Exp_XSL_FO_Sniffer : public IE_ExpSniffer +class IE_Exp_XSL_FO_Sniffer : public IE_ExpSniffer { friend class IE_Exp; @@ -46,7 +46,7 @@ IE_Exp ** ppie); }; -class ABI_EXPORT IE_Exp_XSL_FO : public IE_Exp +class IE_Exp_XSL_FO : public IE_Exp { public: IE_Exp_XSL_FO(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_imp_XSL-FO.h /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_imp_XSL-FO.h --- abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_imp_XSL-FO.h 2008-04-06 22:37:08.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/xp/ie_imp_XSL-FO.h 2009-07-15 16:56:23.000000000 +0100 @@ -29,7 +29,7 @@ // The importer/reader for XSL-FO files. -class ABI_EXPORT IE_Imp_XSL_FO_Sniffer : public IE_ImpSniffer +class IE_Imp_XSL_FO_Sniffer : public IE_ImpSniffer { friend class IE_Imp; @@ -49,7 +49,7 @@ }; -class ABI_EXPORT IE_Imp_XSL_FO : public IE_Imp_XML +class IE_Imp_XSL_FO : public IE_Imp_XML { public: IE_Imp_XSL_FO(PD_Document * pDocument); diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/impexp/xsl-fo/xp/Makefile 2008-04-06 22:37:09.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/impexp/xsl-fo/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -26,6 +26,8 @@ ie_imp_XSL-FO.cpp \ ie_impexp_XSL-FO.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk build:: $(TARGETS) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/scripts/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/scripts/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/scripts/GNUmakefile.in 2008-04-06 22:38:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/scripts/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,6 +66,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -131,14 +133,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -155,6 +157,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -171,6 +176,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -181,7 +189,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -247,7 +260,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -278,6 +291,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -291,6 +305,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/scripts/shell/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/scripts/shell/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/scripts/shell/GNUmakefile.in 2008-04-06 22:38:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/scripts/shell/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,6 +67,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -132,14 +134,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -156,6 +158,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -172,6 +177,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -182,7 +190,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,7 +261,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,6 +306,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xp @@ -306,8 +321,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -413,8 +428,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -450,13 +465,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/scripts/shell/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/scripts/shell/Makefile --- abiword-2.6.2/abiword-plugins/wp/scripts/shell/Makefile 2008-04-06 22:37:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/scripts/shell/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -29,6 +29,8 @@ OBJS= $(OBJDIR)/ScriptHappy.$(OBJ_SUFFIX) +CFLAGS+= -DABI_DLL + ifeq ($(ABI_FE), Win32) EXTRA_LIBS+= $(OBJDIR)/abi_ver.$(OBJ_SUFFIX) # EXTRA_LIBS+= $(OBJDIR)/libAbiUtil_s.$(LIB_SUFFIX) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/scripts/shell/xp/GNUmakefile.in /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/scripts/shell/xp/GNUmakefile.in --- abiword-2.6.2/abiword-plugins/wp/scripts/shell/xp/GNUmakefile.in 2008-04-06 22:38:02.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/scripts/shell/xp/GNUmakefile.in 2009-07-15 16:56:23.000000000 +0100 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,6 +85,8 @@ ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@ ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@ ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@ +ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@ +ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@ ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@ ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@ ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@ @@ -150,14 +152,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GNOMESCAN_CFLAGS = @GNOMESCAN_CFLAGS@ @@ -174,6 +176,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX_CFLAGS = @LATEX_CFLAGS@ +LATEX_LIBS = @LATEX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ @PLATFORM_LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -190,6 +195,9 @@ LIBWPG_LDFLAGS = @LIBWPG_LDFLAGS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LOADBINDINGS_CPPFLAGS = @LOADBINDINGS_CPPFLAGS@ LOADBINDINGS_LDFLAGS = @LOADBINDINGS_LDFLAGS@ @@ -200,7 +208,12 @@ MKDIR_P = @MKDIR_P@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -266,7 +279,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -297,6 +310,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +324,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ plugindir = @ABI_PLUGIN_DIR@ @@ -328,8 +343,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -359,8 +374,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -368,8 +383,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -423,8 +438,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -436,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -447,13 +462,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/scripts/shell/xp/Makefile /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/scripts/shell/xp/Makefile --- abiword-2.6.2/abiword-plugins/wp/scripts/shell/xp/Makefile 2008-04-06 22:37:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/scripts/shell/xp/Makefile 2009-07-15 16:56:23.000000000 +0100 @@ -24,6 +24,8 @@ TARGETS= $(OBJS) CPPSRCS= ScriptHappy.cpp +CFLAGS+= -DABI_DLL + include $(ABI_ROOT)/src/config/abi_rules.mk #ifeq ($(ABI_FE), Win32) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/abiword-plugins/wp/scripts/shell/xp/ScriptHappy.cpp /tmp/h31VACJmYg/abiword-2.6.8repack2/abiword-plugins/wp/scripts/shell/xp/ScriptHappy.cpp --- abiword-2.6.2/abiword-plugins/wp/scripts/shell/xp/ScriptHappy.cpp 2008-04-06 22:37:11.000000000 +0100 +++ abiword-2.6.8repack2/abiword-plugins/wp/scripts/shell/xp/ScriptHappy.cpp 2009-07-15 16:56:23.000000000 +0100 @@ -86,7 +86,7 @@ * */ -class ABI_EXPORT ScriptHappy : public UT_Script +class ScriptHappy : public UT_Script { public: ScriptHappy () @@ -134,7 +134,7 @@ } ; -class ABI_EXPORT ScriptHappy_Sniffer : public UT_ScriptSniffer +class ScriptHappy_Sniffer : public UT_ScriptSniffer { public : ScriptHappy_Sniffer() diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword-common.dirs /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword-common.dirs --- abiword-2.6.2/debian/abiword-common.dirs 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword-common.dirs 2009-07-16 17:24:14.000000000 +0100 @@ -0,0 +1 @@ +usr/share/pixmaps diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword-dev.files /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword-dev.files --- abiword-2.6.2/debian/abiword-dev.files 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword-dev.files 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -/usr/include diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword.dirs /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword.dirs --- abiword-2.6.2/debian/abiword.dirs 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword.dirs 2009-07-16 17:24:14.000000000 +0100 @@ -1,6 +1,5 @@ usr/bin usr/share/applications usr/share/mime-info -usr/share/pixmaps usr/share/application-registry diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword.files /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword.files --- abiword-2.6.2/debian/abiword.files 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword.files 2009-07-16 17:24:14.000000000 +0100 @@ -0,0 +1,3 @@ +usr/bin/abiword +usr/lib/abiword-2.6 +usr/share/applications diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword-help.doc-base /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword-help.doc-base --- abiword-2.6.2/debian/abiword-help.doc-base 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword-help.doc-base 2009-07-16 17:24:14.000000000 +0100 @@ -4,7 +4,7 @@ Abstract: This set of documents provides help for using the AbiWord word processor, meant to be accessed from within the program itself but also available here. -Section: Apps/Editors +Section: Office Format: html Index: /usr/share/doc/abiword-help/html/index.html diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword-plugin-mathview.dirs /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword-plugin-mathview.dirs --- abiword-2.6.2/debian/abiword-plugin-mathview.dirs 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword-plugin-mathview.dirs 2009-07-16 17:24:14.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/abiword-2.6/plugins diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword-plugins.dirs /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword-plugins.dirs --- abiword-2.6.2/debian/abiword-plugins.dirs 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword-plugins.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -usr/share/applications -usr/share/mime-info -usr/share/application-registry - diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword-plugins.files /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword-plugins.files --- abiword-2.6.2/debian/abiword-plugins.files 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword-plugins.files 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -usr/lib/abiword-2.6/plugins/libAbiGrammar.* -usr/lib/abiword-2.6/plugins/libAbiMathView.* - diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword-plugins-gnome.files /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword-plugins-gnome.files --- abiword-2.6.2/debian/abiword-plugins-gnome.files 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword-plugins-gnome.files 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/lib/abiword-2.6/plugins/libAbiGOffice.* - diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword-plugins.mime /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword-plugins.mime --- abiword-2.6.2/debian/abiword-plugins.mime 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword-plugins.mime 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ - diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword-plugins.postinst /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword-plugins.postinst --- abiword-2.6.2/debian/abiword-plugins.postinst 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword-plugins.postinst 2009-07-16 17:24:14.000000000 +0100 @@ -0,0 +1,19 @@ +#!/bin/sh + +# Remove the diversions made by the old package. +if [ "$1" = configure ] && dpkg --compare-versions "$2" lt 2.6.4-4; then + for file in /usr/share/application-registry/abiword.applications \ + /usr/share/mime-info/abiword.keys \ + /usr/share/mime-info/abiword.mime \ + /usr/share/applications/abiword.desktop; do + dpkg-divert --package abiword-plugins --remove --rename --divert \ + $file.no-plugins $file + done + + # Rerun update-desktop-database to immediately register the desktop file. + if which update-desktop-database >/dev/null 2>&1 ; then + update-desktop-database -q + fi +fi + +#DEBHELPER# diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword-plugins.postrm /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword-plugins.postrm --- abiword-2.6.2/debian/abiword-plugins.postrm 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword-plugins.postrm 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -#!/bin/sh - -if [ "$1" = remove ]; then - - for file in /usr/share/application-registry/abiword.applications /usr/share/mime-info/abiword.keys /usr/share/mime-info/abiword.mime /usr/share/applications/abiword.desktop; do - dpkg-divert --package abiword-plugins --remove --rename --divert \ - $file.no-plugins $file - done -fi - -#DEBHELPER# diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword-plugins.preinst /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword-plugins.preinst --- abiword-2.6.2/debian/abiword-plugins.preinst 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword-plugins.preinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh - -for file in /usr/share/application-registry/abiword.applications /usr/share/mime-info/abiword.keys /usr/share/mime-info/abiword.mime /usr/share/applications/abiword.desktop; do - dpkg-divert --package abiword-plugins --add --rename --divert \ - $file.no-plugins $file -done - -#DEBHELPER# diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword.postinst /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword.postinst --- abiword-2.6.2/debian/abiword.postinst 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword.postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -#!/bin/sh - -#DEBHELPER# diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/abiword.preinst /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/abiword.preinst --- abiword-2.6.2/debian/abiword.preinst 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/abiword.preinst 2009-07-16 17:24:14.000000000 +0100 @@ -17,16 +17,9 @@ case "$1" in install|upgrade) -# if [ "$1" = "upgrade" ] -# then -# start-stop-daemon --stop --quiet --oknodo \ -# --pidfile /var/run/dvipsk-ja.pid \ -# --exec /usr/sbin/dvipsk-ja 2>/dev/null || true -# fi - if [ -f /usr/bin/defoma-app ] ; then - defoma-app purge abiword > /dev/null || true - fi - + if [ -f /usr/bin/defoma-app ] ; then + defoma-app purge abiword > /dev/null || true + fi ;; abort-upgrade) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/changelog /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/changelog --- abiword-2.6.2/debian/changelog 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/changelog 2009-07-16 17:24:14.000000000 +0100 @@ -1,28 +1,134 @@ -abiword (2.6.2-0ubuntu2+ppa3~dapper4) dapper; urgency=low +abiword (2.6.8repack2-0ubuntu2+abiword1) dapper; urgency=low - * Fix botched upload. + * New upstream release - using modified pre-2.6.8 debian packaging + - Removed Print Preview patch, included in 2.6.5. + - Remove obsolete reference to abw2html.pl in rules + - See www.abisource.com for upstream release notes - many improvements + since 2.4.2 (last Dapper PPA build). + * Backport to Dapper. + - Modify compat file. + - Add patch 05_pango_build_fix_r26205 for FTBFS (abi bug #12026) + - Add back the libgnutls build dep + - Update build dependencies to permit either pre-1.35 (libboost-dev) + or 1.35 (libboost1.35-dev) boost libraries. + - Disable grammar and goffice plugins and their packages. + - Change format of subst vars in control file + * Add back README.source. + * Merge testing versions 2.6.8repack through 2.6.8repack2-0ubuntu1+ppa5 + for release in main AbiWord PPA. - -- Ryan Pavlik Mon, 28 Apr 2008 08:46:14 +0200 + -- Ryan Pavlik Thu, 16 Jul 2009 10:43:48 -0500 -abiword (2.6.2-0ubuntu2+ppa3~dapper3) dapper; urgency=low +abiword (2.6.4-5) unstable; urgency=low - * Add libgnutls-dev build dep for AbiCollab. + * Fix a crash when returning from Print Preview. closes: #492211 - -- Ryan Pavlik Mon, 28 Apr 2008 08:29:03 +0200 + -- Joshua Kwan Tue, 19 Aug 2008 19:55:01 -0700 -abiword (2.6.2-0ubuntu2+ppa3~dapper2) dapper; urgency=low +abiword (2.6.4-4) unstable; urgency=high - * Add libboost-dev build dep. + * The "Strike three, yer out!" release. + * Creating the dummy abiword-plugins package created yet another scenario + where we have to remove the diversions to the desktop files created by + the old packages. - -- Ryan Pavlik Sun, 27 Apr 2008 14:52:38 +0200 + -- Joshua Kwan Tue, 22 Jul 2008 22:20:21 -0700 -abiword (2.6.2-0ubuntu2+ppa3~dapper1) dapper; urgency=low +abiword (2.6.4-3) unstable; urgency=medium - * Backport new Hardy package. - * Remove libasio and libboost dependencies, disabling TCP. - * Remove libwpg dependency, disabling that plugin. + * The "Strike two" release. + * Creating the dummy abiword-plugins package created a scenario where + abiword-plugin-grammar would conflict filewise with the old + abiword-plugins package, so add a Conflicts for abiword-plugins (<< 2.6.4) + to the grammar and mathview plugin packages. - -- Ryan Pavlik Sun, 27 Apr 2008 12:45:54 +0200 + -- Joshua Kwan Mon, 14 Jul 2008 17:29:27 -0700 + +abiword (2.6.4-2) unstable; urgency=medium + + * I disabled the "auto-save by default" patch by mistake and kept + a "disable smooth scrolling by default" patch in that I decided + to drop at the last minute. Fix dumb mistake. + + -- Joshua Kwan Mon, 14 Jul 2008 12:02:50 -0700 + +abiword (2.6.4-1) unstable; urgency=medium + + * The "Please Ubuntu, take this package!" release. + * New upstream stable release, incorporating many build bits from Ryan + Pavlik. Thanks! (His Ubuntu changelogs follow this entry.) + closes: #473508, #488069 + * Using medium priority to try and beat the freeze given the NEW delay + that this package will incur. + + * Major changes: + - Split out the abiword-plugins and abiword-plugins-gnome package into + three individual plugin packages: + + Recommended: abiword-plugin-mathview, abiword-plugin-grammar + Suggested: abiword-plugin-goffice (due to GNOME dependencies) + + - The old abiword-plugins and abiword-plugins-gnome packages have been + obsoleted and abiword-plugins-gnome is now a Conflicts/Replaces in + abiword. Because abiword-plugins has been split into two packages, + though, there is a dummy abiword-plugins package to ease upgrades. + + - There is no more abiword-gnome package. We only ship the GTK2 version, + which does depend on GNOME-Print, but that does not rely on the usual + large set of GNOME UI libraries. + + - Many of the file import/export plugins formerly provided only by the + abiword-plugins package are now included in the base distribution to + provide the best out-of-box functionality for those who install only + the abiword package. This means that no matter what, the abiword package + now has ODF/OOXML support. + + * Minor changes: + - Drop psiconv support overall to alleviate dependency bloat/package spam, + at the risk of offending the one guy who still has a Psion 5. + - Upgrade to debhelper 7 and Policy 3.8.0. + - Drop one of Ryan's Ubuntu patches by building abiword-2.6.pc in the + configure stage of debian/rules. Lose autoconf/automake build dep. + - Upgrade boost build-dependency to 1.35 to quell some apt-get insanity + while pbuilder satisfies the Build-Depends. + + * Bug fixes from upstream: + - Print preview now matches onscreen layout more accurately. + closes: #336216 + - Font operations are all done using Pango now, so the XAP_UnixFont + crash should no longer occur. closes: #443048, #444957 + - Spellcheck button is no longer greyed out gratuitously. closes: #422520 + - "!!" and "??" in DejaVu Sans Mono seem to be correctly monospaced + now. closes: #470949 + - AbiWord can now import OpenWriter files without a MIME type. + closes: #376417 + - Build error affecting 2.4.6 was already fixed upstream, but thanks + to Peter Green for the patch and Lucas Nussbaum for the report. + closes: #490414 + + -- Joshua Kwan Mon, 14 Jul 2008 10:26:14 -0700 + +abiword (2.6.3-0ubuntu1+ppa2) hardy; urgency=low + + * Add dh_desktop to register MIME types. + * Update control for better upgrading. + + -- Ryan Pavlik Mon, 26 May 2008 14:41:28 -0500 + +abiword (2.6.3-0ubuntu1+ppa1) hardy; urgency=low + + * Fix FTBFS due to problem in 02_add_mimetypes_to_desktop.dpatch + + -- Ryan Pavlik Fri, 02 May 2008 18:51:01 +0200 + +abiword (2.6.3-0ubuntu1) hardy; urgency=low + + * Update to new upstream release. + * Remove debian/patches/50_backport_pre263.dpatch due to update. + * Remove debian/patches/20_disable_smooth_scrolling_default.dpatch + based on additional feedback on modern (Hardy-class) machines. + + -- Ryan Pavlik Thu, 01 May 2008 23:39:57 +0200 abiword (2.6.2-0ubuntu2+ppa3) hardy; urgency=low @@ -114,34 +220,24 @@ -- Ryan Pavlik Mon, 21 Apr 2008 18:53:02 +0200 -abiword (2.4.6-3ubuntu3) hardy; urgency=low - - * debian/control: update build-dep from libgoffice-0-5-dev to - libgoffice-0-6-dev to fix FTBFS (LP: #194443) +abiword (2.4.6-5) unstable; urgency=low - -- Andrea Colangelo Fri, 22 Feb 2008 22:03:47 +0100 + * Rebuilt with the new libots-1-0. + * Bumped to Standards-Version: 3.7.3. + * Fixed various lintian warnings. -abiword (2.4.6-3ubuntu2) hardy; urgency=low + -- Masayuki Hatta (mhatta) Sun, 09 Dec 2007 14:21:36 +0900 - * Disable the Psion functionality, psiconv is in universe. +abiword (2.4.6-4) unstable; urgency=low - -- Steve Kowalik Mon, 26 Nov 2007 18:15:49 +1100 + * Sorted out dpatch names. + 0- : Debian specific + 20-: Translation related + 30-: Temporary build fixes. + * Rebuilt with libpoppler2, thanks Dmitry E. Oboukhov for build fix! + - closes: #452676 -abiword (2.4.6-3ubuntu1) hardy; urgency=low - - * Merge from Debian unstable. - * Remaining Ubuntu changes: - - Add poppler06-api patch that corrects calls for the new poppler API. - - Weave i18n magic in debian/rules. - - Add intltool to Build-Depends. - - Modify Maintainer field as per spec. - * Ubuntu changes dropped: - - debian/patches/15_poppler_API_change.dpatch: fix call to poppler - - debian/abiword-plugins-gnome.files: don't try to - abiword-common/usr/lib/AbiWord-2.4/plugins/libAbiGOChart.so, it's not - there. - - -- Steve Kowalik Sat, 24 Nov 2007 21:52:39 +1100 + -- Masayuki Hatta (mhatta) Tue, 04 Dec 2007 16:23:30 +0900 abiword (2.4.6-3) unstable; urgency=low @@ -161,29 +257,6 @@ -- Andreas Barth Tue, 3 Jul 2007 18:20:08 +0000 -abiword (2.4.6-2ubuntu2) gutsy; urgency=low - - * Rebuild for the libpoppler1 -> libpopper2 transistion. - * Add poppler06-api patch that corrects calls for the new poppler API. - - -- Steve Kowalik Thu, 6 Sep 2007 15:42:28 +1000 - -abiword (2.4.6-2ubuntu1) gutsy; urgency=low - - * Resynchronized with Debian, remaining Ubuntu changes: - - debian/patches/15_poppler_API_change.dpatch: fix call to poppler - function. - - debian/control: - - Maintainer: Ubuntu Core Developers - - - libgoffice-1-dev -> libgoffice-0-dev. - - debian/rules, debian/control: i18n magic. - - debian/abiword-plugins-gnome.files: don't try to - abiword-common/usr/lib/AbiWord-2.4/plugins/libAbiGOChart.so, it's not - there. - - -- Daniel Holbach Fri, 18 May 2007 08:51:51 +0200 - abiword (2.4.6-2) unstable; urgency=low * Acknowledged NMU - closes: #403352 @@ -1764,4 +1837,3 @@ * Initial Release (canceled, see above). -- Darren Benham Tue, 16 Mar 1999 12:59:22 -0800 - diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/compat /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/compat --- abiword-2.6.2/debian/compat 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/compat 2009-07-16 17:24:14.000000000 +0100 @@ -1 +1 @@ -4 +5 diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/control /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/control --- abiword-2.6.2/debian/control 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/control 2009-07-16 17:24:14.000000000 +0100 @@ -1,19 +1,33 @@ Source: abiword Section: gnome Priority: optional -Maintainer: Ubuntu Core Developers -XSBC-Original-Maintainer: Masayuki Hatta (mhatta) +Maintainer: Ryan Pavlik Uploaders: Joshua Kwan -Build-Depends: debhelper (>> 4.0.0), dpatch, intltool, libaiksaurus-1.2-dev (>= 1.2.1+dev-0.12-1.1), libaiksaurusgtk-1.2-dev (>= 1.2.1+dev-0.12-1.1), libboost-dev (>= 1.33.1), libenchant-dev (>= 1.1.6-1), libfreetype6-dev, libfribidi-dev, libglade2-dev, libglib2.0-dev, libgnomeprintui2.2-dev, libgnutls-dev, libgsf-1-dev (>= 1.13.2), libgtk2.0-dev, libgtkmathview-dev (>= 0.7.5), liblink-grammar4-dev, libloudmouth1-dev, libots-dev, libpng12-dev, libpopt-dev, libreadline5-dev | libreadline-dev, librsvg2-dev (>= 2.9.5-5), libwmf-dev, libwpd8-dev (>= 0.8.3-2), libwv-dev (>= 1.2) +Build-Depends: debhelper (>= 5), dpatch, libaiksaurus-1.2-dev (>= 1.2.1+dev-0.12-1.1), libaiksaurusgtk-1.2-dev (>= 1.2.1+dev-0.12-1.1), libboost-date-time-dev(>=1.33.1) | libboost-date-time1.35-dev, libboost-dev (>=1.33.1) | libboost1.35-dev, libboost-regex-dev (>=1.33.1) | libboost-regex1.35-dev, libenchant-dev (>= 1.1.6), libfreetype6-dev, libfribidi-dev, libglade2-dev, libglib2.0-dev, libgnomeprintui2.2-dev, libgnutls-dev, libgsf-1-dev (>= 1.13.2), libgtk2.0-dev, libgtkmathview-dev (>= 0.7.5), liblink-grammar4-dev, libloudmouth1-dev, libots-dev, libpng12-dev, libpopt-dev, libreadline5-dev | libreadline-dev, librsvg2-dev (>= 2.9.5-5), libwmf-dev, libwpd8-dev (>= 0.8.3-2), libwv-dev (>= 1.2) Standards-Version: 3.7.2 +Package: abiword-common +Section: editors +Architecture: all +Depends: ${misc:Depends}, abiword (>= ${Source-Version}) +Recommends: abiword-help, aspell-en | aspell-dictionary +Description: efficient, featureful word processor with collaboration -- common files + AbiWord is a full-featured, efficient word processing application. + It is suitable for a wide variety of word processing tasks, and + is extensible with a variety of plugins. + . + This package contains the common files that are used on all architectures + without modification. + Package: abiword Section: editors Architecture: any -Depends: ${shlibs:Depends}, gsfonts -Conflicts: abiword-gtk, abiword-gnome, abiword-doc (<< 2.0.0), abiword-plugins (<< 1.1.3), xfonts-abi (<< 2.0.0), abiword-plugins (<< 2.6.0), abiword-plugins-gnome (<< 2.6.0), abiword-help (<< 2.6.0) -Replaces: abiword-common, abiword-gtk, abiword-gnome, abiword-doc (<< 2.0.0), xfonts-abi (<< 2.0.0), abiword-plugins (<< 2.6.0) -Recommends: abiword-plugins, abiword-help, aspell-en | aspell-dictionary, poppler-utils +Depends: ${shlibs:Depends}, abiword-common (>= ${Source-Version}), gsfonts +Conflicts: abiword-gnome +Replaces: abiword-gnome +Provides: abiword-gnome +Recommends: abiword-plugin-grammar, abiword-plugin-mathview, abiword-help, aspell-en | aspell-dictionary, poppler-utils +Suggests: abiword-plugin-goffice Description: efficient, featureful word processor with collaboration AbiWord is a full-featured, efficient word processing application. It is suitable for a wide variety of word processing tasks, and @@ -24,39 +38,22 @@ includes tools plugins, offering live collaboration with AbiWord users on Linux (using Jabber/XMPP), web translation and dictionary support, and more. - -Package: abiword-plugins -Section: editors -Architecture: any -Depends: ${shlibs:Depends}, abiword (>= 2.6.0) -Replaces: abiword-plugins-gnome (<< 2.6.0) -Suggests: gimp -Recommends: latex-xft-fonts -Description: plugins for AbiWord - AbiWord is a full-featured, efficient word processing application. - It is suitable for a wide variety of word processing tasks, and - is extensible with a variety of plugins. . - This package contains several plugins shipped with AbiWord. - - Grammar Checker - - Equation Editor - - Thesaurus - - PDF text import - - Text summarizer + Additional plugins that require significant amounts of extra software to + function are in the various abiword-plugin-* packages. -Package: abiword-plugins-gnome -Section: gnome +Package: abiword-plugin-mathview +Section: editors Architecture: any -Depends: ${shlibs:Depends}, abiword (>= 2.6.0) -Replaces: abiword-plugins (<< 2.0.10) -Conflicts: abiword-plugins (<< 2.0.10) -Description: plugins for AbiWord (with GNOME dependency) +Depends: ${shlibs:Depends}, abiword (= ${Source-Version}), latex-xft-fonts +Conflicts: abiword-plugins (<< 2.6.8) +Description: equation editor plugin for AbiWord AbiWord is a full-featured, efficient word processing application. It is suitable for a wide variety of word processing tasks, and is extensible with a variety of plugins. . - This package contains plugins to interoperate with other GNOME - applications. + This package contains an equation editing system for AbiWord + documents. Package: abiword-help Section: doc @@ -69,3 +66,16 @@ is extensible with a variety of plugins. . This package contains online help files (in HTML format) for AbiWord. + +Package: abiword-plugins +Section: editors +Architecture: all +Depends: abiword-plugin-mathview +Description: transitional plugins package for AbiWord + AbiWord is a full-featured, efficient word processing application. + It is suitable for a wide variety of word processing tasks, and + is extensible with a variety of plugins. + . + This package contains nothing and only serves as a transitional + package to the new abiword-plugin-* packages by depending on them. + You can safely remove this package at any time. diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/misc/AbiWord.applications.plugins /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/misc/AbiWord.applications.plugins --- abiword-2.6.2/debian/misc/AbiWord.applications.plugins 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/misc/AbiWord.applications.plugins 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -abiword - requires_terminal=false - expects_uris=false - command=abiword - can_open_multiple_files=true - name=AbiWord Word Processor - mime_types=application/docbook+xml,application/msword,application/rtf,application/vnd.oasis.opendocument.text,application/vnd.palm,application/vnd.plain,application/vnd.stardivision.writer,application/vnd.sun.xml.writer,application/vnd.wordperfect,application/wordperfect5.1,application/wordperfect6,application/x-abiword,application/x-applix-word,application/xhtml+xml,application/x-kword,application/x-mif,application/x-mswrite,application/x-palm-database,application/x-t602,text/abiword,text/html,text/plain,text/richtext,text/rtf,text/vnd.wap.wml,text/x-abiword,text/x-xml-abiword diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/misc/AbiWord.keys.plugins /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/misc/AbiWord.keys.plugins --- abiword-2.6.2/debian/misc/AbiWord.keys.plugins 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/misc/AbiWord.keys.plugins 1970-01-01 01:00:00.000000000 +0100 @@ -1,80 +0,0 @@ -application/docbook+xml: - ext=dbk - -application/msword: - ext=doc - -application/rtf: - ext=rtf - -application/vnd.oasis.opendocument.text: - ext=odt - -application/vnd.palm: - ext=prc pdb pqa oprc - -application/vnd.plain: - ext=txt - -application/vnd.stardivision.writer: - ext=sdw - -application/vnd.sun.xml.writer: - ext=sxw - -application/vnd.wordperfect: - ext=wpd - -application/wordperfect5.1: - ext=wp5 - -application/wordperfect6: - ext=wp6 - -application/x-abiword: - ext=abw - -application/x-applix-word: - ext=awd - -application/xhtml+xml: - ext=xhtml - -application/x-kword: - ext=kwd - -application/x-mif: - ext=mif - -application/x-mswrite: - ext=wri - -application/x-palm-database: - ext=pdb prc - -application/x-t602: - ext=602 - -text/abiword: - ext=abw - -text/html: - ext=html - -text/plain: - ext=txt - -text/richtext: - ext=rtf - -text/rtf: - ext=rtf - -text/vnd.wap.wml: - ext=wml - -text/x-abiword: - ext=abw - -text/x-xml-abiword: - ext=abw diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/misc/AbiWord.mime.plugins /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/misc/AbiWord.mime.plugins --- abiword-2.6.2/debian/misc/AbiWord.mime.plugins 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/misc/AbiWord.mime.plugins 1970-01-01 01:00:00.000000000 +0100 @@ -1,109 +0,0 @@ -application/docbook+xml: - open=abiword %f - open=abiword %f - -application/msword: - open=abiword %f - open=abiword %f - -application/rtf: - open=abiword %f - open=abiword %f - -application/vnd.oasis.opendocument.text: - open=abiword %f - open=abiword %f - -application/vnd.palm: - open=abiword %f - open=abiword %f - -application/vnd.plain: - open=abiword %f - open=abiword %f - -application/vnd.stardivision.writer: - open=abiword %f - open=abiword %f - -application/vnd.sun.xml.writer: - open=abiword %f - open=abiword %f - -application/vnd.wordperfect: - open=abiword %f - open=abiword %f - -application/wordperfect5.1: - open=abiword %f - open=abiword %f - -application/wordperfect6: - open=abiword %f - open=abiword %f - -application/x-abiword: - open=abiword %f - open=abiword %f - -application/x-applix-word: - open=abiword %f - open=abiword %f - -application/xhtml+xml: - open=abiword %f - open=abiword %f - -application/x-kword: - open=abiword %f - open=abiword %f - -application/x-mif: - open=abiword %f - open=abiword %f - -application/x-mswrite: - open=abiword %f - open=abiword %f - -application/x-palm-database: - open=abiword %f - open=abiword %f - -application/x-t602: - open=abiword %f - open=abiword %f - -text/abiword: - open=abiword %f - open=abiword %f - -text/html: - open=abiword %f - open=abiword %f - -text/plain: - open=abiword %f - open=abiword %f - -text/richtext: - open=abiword %f - open=abiword %f - -text/rtf: - open=abiword %f - open=abiword %f - -text/vnd.wap.wml: - open=abiword %f - open=abiword %f - -text/x-abiword: - open=abiword %f - open=abiword %f - -text/x-xml-abiword: - open=abiword %f - open=abiword %f - - diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/patches/00list /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/patches/00list --- abiword-2.6.2/debian/patches/00list 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/patches/00list 2009-07-16 17:24:14.000000000 +0100 @@ -1,6 +1,5 @@ 02_add_mimetypes_to_desktop -03_modify_extras_pkgconfig +05_pango_build_fix_r26205 +#03_nosmoothscroll_default - don't want this right now. 04_autosave_default 14_comma_subscript -20_disable_smooth_scrolling_default -50_backport_pre263 diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/patches/02_add_mimetypes_to_desktop.dpatch /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/patches/02_add_mimetypes_to_desktop.dpatch --- abiword-2.6.2/debian/patches/02_add_mimetypes_to_desktop.dpatch 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/patches/02_add_mimetypes_to_desktop.dpatch 2009-07-16 17:24:14.000000000 +0100 @@ -6,12 +6,11 @@ ## DP: by the plugins we package. @DPATCH@ -diff -urNad abiword-2.6.2~/abiword/abiword.desktop abiword-2.6.2/abiword/abiword.desktop ---- abiword-2.6.2~/abiword/abiword.desktop 2008-04-07 18:58:58.000000000 +0200 -+++ abiword-2.6.2/abiword/abiword.desktop 2008-04-07 22:15:08.000000000 +0200 -@@ -3,13 +3,13 @@ - Encoding=UTF-8 - Name=AbiWord +diff -urNad abiword-2.6.3~/abiword/abiword.desktop abiword-2.6.3/abiword/abiword.desktop +--- abiword-2.6.3~/abiword/abiword.desktop 2008-05-02 18:29:09.000000000 +0200 ++++ abiword-2.6.3/abiword/abiword.desktop 2008-05-02 18:35:54.000000000 +0200 +@@ -1,13 +1,13 @@ + [Desktop Entry] Exec=abiword -Icon=abiword_48 +Icon=abiword @@ -19,9 +18,10 @@ Type=Application Categories=Application;Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base; StartupNotify=true + Encoding=UTF-8 X-Desktop-File-Install-Version=0.9 -MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1; +MimeType=application/docbook+xml;application/msword;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.palm;application/vnd.plain;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/wordperfect5.1;application/wordperfect6;application/x-abiword;application/x-applix-word;application/xhtml+xml;application/x-kword;application/x-mif;application/x-mswrite;application/x-palm-database;application/x-t602;text/abiword;text/html;text/plain;text/richtext;text/rtf;text/vnd.wap.wml;text/x-abiword;text/x-xml-abiword; + Name=AbiWord GenericName=Word Processor Comment=AbiWord Word Processor - Name[de]=Textverarbeitung diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/patches/03_modify_extras_pkgconfig.dpatch /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/patches/03_modify_extras_pkgconfig.dpatch --- abiword-2.6.2/debian/patches/03_modify_extras_pkgconfig.dpatch 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/patches/03_modify_extras_pkgconfig.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_modify_extras_pkgconfig.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix the pkg-config name sought by abiword-extras when compiling against -## DP: a non-installed abiword. - -@DPATCH@ -diff -urNad abiword-2.6.2~/abiword-extras/configure.ac abiword-2.6.2/abiword-extras/configure.ac ---- abiword-2.6.2~/abiword-extras/configure.ac 2008-04-06 23:23:51.000000000 +0200 -+++ abiword-2.6.2/abiword-extras/configure.ac 2008-04-07 15:54:49.000000000 +0200 -@@ -6,7 +6,7 @@ - AC_C_BIGENDIAN - AM_CONDITIONAL(BIGENDIAN,[ test "x$ac_cv_c_bigendian" = "xyes" ]) - --abi_pkg='abiword-2.6' -+abi_pkg='abiword' - PKG_CHECK_MODULES([ABIWORD_EXTRAS_DEPS], [ "$abi_pkg" ], [ - ABIWORD_EXTRAS_PKGDATADIR=`$PKG_CONFIG --variable=pkgdatadir $abi_pkg` - ]) diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/patches/03_nosmoothscroll_default.dpatch /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/patches/03_nosmoothscroll_default.dpatch --- abiword-2.6.2/debian/patches/03_nosmoothscroll_default.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/debian/patches/03_nosmoothscroll_default.dpatch 2009-07-16 17:24:14.000000000 +0100 @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_nosmoothscroll_default.dpatch by Joshua Kwan +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +--- abiword-2.6.3/abiword/src/af/xap/xp/xap_Prefs_SchemeIds.h~ 2008-07-11 14:15:15.000000000 +0300 ++++ abiword-2.6.3/abiword/src/af/xap/xp/xap_Prefs_SchemeIds.h 2008-07-11 14:15:28.000000000 +0300 +@@ -139,7 +139,7 @@ + #define XAP_PREF_DEFAULT_AllowCustomToolbars "0" + + #define XAP_PREF_KEY_EnableSmoothScrolling "EnableSmoothScrolling" +-#define XAP_PREF_DEFAULT_EnableSmoothScrolling "1" ++#define XAP_PREF_DEFAULT_EnableSmoothScrolling "0" + + #define XAP_PREF_KEY_HaveCustomToolbars "HaveCustomToolbars" + #define XAP_PREF_DEFAULT_HaveCustomToolbars "0" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/patches/05_pango_build_fix_r26205.dpatch /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/patches/05_pango_build_fix_r26205.dpatch --- abiword-2.6.2/debian/patches/05_pango_build_fix_r26205.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/debian/patches/05_pango_build_fix_r26205.dpatch 2009-07-16 17:24:14.000000000 +0100 @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_pango_build_fix_r26205.dpatch by uwog@uwog.net packaged by Ryan Pavlik +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix compile error with patch from svn r26205, referenced in: +## DP: http://bugzilla.abisource.com/show_bug.cgi?id=12026 + +--- abiword-2.6.8/abiword/src/af/gr/unix/gr_UnixPangoGraphics.cpp~ 2009/05/07 06:52:51 26204 ++++ abiword-2.6.8/abiword/src/af/gr/unix/gr_UnixPangoGraphics.cpp 2009/05/07 14:29:55 26205 +@@ -22,6 +22,10 @@ + #include "config.h" + #endif + ++// need this to include what Pango considers 'low-level' api ++#define PANGO_ENABLE_ENGINE ++#define PANGO_ENABLE_BACKEND ++ + #include "gr_UnixPangoGraphics.h" + #include "gr_Painter.h" + +@@ -42,9 +46,6 @@ + #include "ut_vector.h" + #include "ut_locale.h" + +-// need this to include what Pango considers 'low-level' api +-#define PANGO_ENABLE_ENGINE +- + #include + #include + #include diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/patches/20_disable_smooth_scrolling_default.dpatch /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/patches/20_disable_smooth_scrolling_default.dpatch --- abiword-2.6.2/debian/patches/20_disable_smooth_scrolling_default.dpatch 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/patches/20_disable_smooth_scrolling_default.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_disable_smooth_scrolling_default.dpatch by Ryan Pavlik -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: For improved responsiveness disable smooth scrolling by default - -@DPATCH@ -diff -urNad abiword-2.6.2~/abiword/src/af/xap/xp/xap_Prefs_SchemeIds.h abiword-2.6.2/abiword/src/af/xap/xp/xap_Prefs_SchemeIds.h ---- abiword-2.6.2~/abiword/src/af/xap/xp/xap_Prefs_SchemeIds.h 2008-04-06 17:59:55.000000000 +0200 -+++ abiword-2.6.2/abiword/src/af/xap/xp/xap_Prefs_SchemeIds.h 2008-04-27 03:24:11.000000000 +0200 -@@ -139,7 +139,7 @@ - #define XAP_PREF_DEFAULT_AllowCustomToolbars "0" - - #define XAP_PREF_KEY_EnableSmoothScrolling "EnableSmoothScrolling" --#define XAP_PREF_DEFAULT_EnableSmoothScrolling "1" -+#define XAP_PREF_DEFAULT_EnableSmoothScrolling "0" - - #define XAP_PREF_KEY_HaveCustomToolbars "HaveCustomToolbars" - #define XAP_PREF_DEFAULT_HaveCustomToolbars "0" diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/patches/50_backport_pre263.dpatch /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/patches/50_backport_pre263.dpatch --- abiword-2.6.2/debian/patches/50_backport_pre263.dpatch 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/patches/50_backport_pre263.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19788 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 50_backport_pre263.dpatch by Ryan Pavlik -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove this patch when we use a 2.6.3 upstream. -## DP: Patches backported from SVN for reliability/crasher fixes. -## DP: - r23441_fix_html_toc_export.diff -## DP: - r23443_escape_style_names_in_css.diff -## DP: - r23446_fix_language_code_de_CH_template.diff -## DP: - r23451_prevent_footnote_endnote_crashes.diff -## DP: - r23453_fix_rtf_transparent_handler.diff -## DP: - r23477_dont_use_deprecated_libxml2_apis.diff -## DP: - r23481_fix_spelling_menu_crash.diff -## DP: - r23482_fix_related_crashes.diff -## DP: - r23526_fix_crash_on_import_crafted_odt.diff - -@DPATCH@ -diff -urNad abiword-2.6.2~/abiword/src/af/util/xp/ut_xml_libxml2.cpp abiword-2.6.2/abiword/src/af/util/xp/ut_xml_libxml2.cpp ---- abiword-2.6.2~/abiword/src/af/util/xp/ut_xml_libxml2.cpp 2008-04-17 13:12:33.000000000 +0200 -+++ abiword-2.6.2/abiword/src/af/util/xp/ut_xml_libxml2.cpp 2008-04-17 21:45:40.000000000 +0200 -@@ -207,7 +207,7 @@ - { - if(getNumMinorErrors() > getNumRecoveredErrors()) - { -- UT_DEBUGMSG (("Error - 1 parsing '%s' (Line: %d, Column: %d)\n", szFilename, getLineNumber(ctxt), getColumnNumber(ctxt))); -+ UT_DEBUGMSG (("Error - 1 parsing '%s' (Line: %d, Column: %d)\n", szFilename, xmlSAX2GetLineNumber(ctxt), xmlSAX2GetColumnNumber(ctxt))); - ret = UT_IE_IMPORTERROR; - break; - } -@@ -218,7 +218,7 @@ - { - if (xmlParseChunk (ctxt, "", 0, 1)) - { -- UT_DEBUGMSG (("Error -2 parsing '%s' (Line: %d, Column: %d)\n", szFilename, getLineNumber(ctxt), getColumnNumber(ctxt))); -+ UT_DEBUGMSG (("Error -2 parsing '%s' (Line: %d, Column: %d)\n", szFilename, xmlSAX2GetLineNumber(ctxt), xmlSAX2GetColumnNumber(ctxt))); - ret = UT_IE_IMPORTERROR; - } - } -diff -urNad abiword-2.6.2~/abiword/src/text/fmt/xp/fp_Run.cpp abiword-2.6.2/abiword/src/text/fmt/xp/fp_Run.cpp ---- abiword-2.6.2~/abiword/src/text/fmt/xp/fp_Run.cpp 2008-04-17 13:12:32.000000000 +0200 -+++ abiword-2.6.2/abiword/src/text/fmt/xp/fp_Run.cpp 2008-04-17 21:45:40.000000000 +0200 -@@ -4809,10 +4809,16 @@ - fp_FieldFootnoteRefRun::fp_FieldFootnoteRefRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) - { - const PP_AttrProp * pp = getSpanAP(); -+ UT_return_if_fail(pp); -+ - const gchar * footid; - bool bRes = pp->getAttribute("footnote-id", footid); - -- UT_ASSERT(bRes); -+ if(!bRes || !footid) -+ { -+ UT_DEBUGMSG(("fp_FieldFootnoteRefRun::fp_FieldFootnoteRefRun: Missing footnote-id attribute. Probably a malformed file.\n")); -+ return; -+ } - m_iPID = atol(footid); - - // see bug 9793 -@@ -4830,9 +4836,9 @@ - const gchar * footid = NULL; - bool bRes = pp->getAttribute("footnote-id", footid); - -- UT_ASSERT(bRes); -- if(!bRes) -+ if(!bRes || !footid) - { -+ UT_DEBUGMSG(("fp_FieldFootnoteRefRun::calculateValue: Missing footnote-id attribute. Probably a malformed file.\n")); - return false; - } - FV_View * pView = _getView(); -@@ -4858,10 +4864,16 @@ - fp_FieldFootnoteAnchorRun::fp_FieldFootnoteAnchorRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) - { - const PP_AttrProp * pp = getSpanAP(); -- const gchar * footid; -+ UT_return_if_fail(pp); -+ -+ const gchar * footid = NULL; - bool bRes = pp->getAttribute("footnote-id", footid); - -- UT_ASSERT(bRes); -+ if(!bRes || !footid) -+ { -+ UT_DEBUGMSG(("fp_FieldFootnoteAnchorRun::fp_FieldFootnoteAnchorRun: Missing footnote-id attribute. Probably a malformed file.\n")); -+ return; -+ } - m_iPID = atol(footid); - - // see bug 9793 -@@ -4872,12 +4884,14 @@ - bool fp_FieldFootnoteAnchorRun::calculateValue(void) - { - const PP_AttrProp * pp = getSpanAP(); -+ UT_return_val_if_fail(pp, false); -+ - const gchar * footid = NULL; - bool bRes = pp->getAttribute("footnote-id", footid); - -- UT_ASSERT(bRes); -- if(footid == NULL) -+ if(!bRes || !footid) - { -+ UT_DEBUGMSG(("fp_FieldFootnoteAnchorRun::calculateValue: Missing footnote-id attribute. Probably a malformed file.\n")); - return false; - } - UT_uint32 iPID = atoi(footid); -@@ -4900,10 +4914,16 @@ - fp_FieldEndnoteAnchorRun::fp_FieldEndnoteAnchorRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) - { - const PP_AttrProp * pp = getSpanAP(); -- const gchar * footid; -+ UT_return_if_fail(pp); -+ -+ const gchar * footid = NULL; - bool bRes = pp->getAttribute("endnote-id", footid); - -- UT_ASSERT(bRes); -+ if(!bRes || !footid) -+ { -+ UT_DEBUGMSG(("fp_FieldEndnoteAnchorRun::fp_FieldEndnoteAnchorRun: Missing endnote-id attribute. Probably a malformed file.\n")); -+ return; -+ } - m_iPID = atoi(footid); - - // see bug 9793 -@@ -4913,14 +4933,15 @@ - // Appears in the EndnoteSection, one per endnote. - bool fp_FieldEndnoteAnchorRun::calculateValue(void) - { -- - const PP_AttrProp * pp = getSpanAP(); -+ UT_return_val_if_fail(pp, false); -+ - const gchar * footid = NULL; - bool bRes = pp->getAttribute("endnote-id", footid); - -- UT_ASSERT(bRes); -- if(footid == NULL) -+ if(!bRes || !footid) - { -+ UT_DEBUGMSG(("fp_FieldEndnoteAnchorRun::calculateValue: Missing endnote-id attribute. Probably a malformed file.\n")); - return false; - } - UT_uint32 iPID = atoi(footid); -@@ -4943,10 +4964,16 @@ - fp_FieldEndnoteRefRun::fp_FieldEndnoteRefRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) - { - const PP_AttrProp * pp = getSpanAP(); -+ UT_return_if_fail(pp); -+ - const gchar * footid; - bool bRes = pp->getAttribute("endnote-id", footid); - -- UT_ASSERT(bRes); -+ if(!bRes || !footid) -+ { -+ UT_DEBUGMSG(("fp_FieldEndnoteRefRun::fp_FieldEndnoteRefRun: Missing endnote-id attribute. Probably a malformed file.\n")); -+ return; -+ } - m_iPID = atoi(footid); - - // see bug 9793 -@@ -4956,14 +4983,15 @@ - // Appears in the EndnoteSection, one per endnote. - bool fp_FieldEndnoteRefRun::calculateValue(void) - { -- - const PP_AttrProp * pp = getSpanAP(); -+ UT_return_val_if_fail(pp, false); -+ - const gchar * footid = NULL; - bool bRes = pp->getAttribute("endnote-id", footid); - -- UT_ASSERT(bRes); -- if(footid == NULL) -+ if(!bRes || !footid) - { -+ UT_DEBUGMSG(("fp_FieldEndnoteRefRun::calculateValue: Missing endnote-id attribute. Probably a malformed file.\n")); - return false; - } - UT_uint32 iPID = atoi(footid); -@@ -5045,7 +5073,7 @@ - char szFieldValue[FPFIELD_MAX_LENGTH + 1]; - - PD_Document * pDoc = getBlock()->getDocument(); -- UT_ASSERT(pDoc); -+ UT_return_val_if_fail(pDoc, false); - - //copy in the name or some wierd char instead - const char * name = pDoc->getFilename(); -diff -urNad abiword-2.6.2~/abiword/src/text/fmt/xp/fp_Run.cpp.orig abiword-2.6.2/abiword/src/text/fmt/xp/fp_Run.cpp.orig ---- abiword-2.6.2~/abiword/src/text/fmt/xp/fp_Run.cpp.orig 1970-01-01 01:00:00.000000000 +0100 -+++ abiword-2.6.2/abiword/src/text/fmt/xp/fp_Run.cpp.orig 2008-04-17 21:45:40.000000000 +0200 -@@ -0,0 +1,5820 @@ -+/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ -+ -+/* AbiWord -+ * Copyright (C) 1998 AbiSource, Inc. -+ * Copyright (c) 2001,2002 Tomas Frydrych -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+ -+#include -+#include -+#include -+#include -+ -+ -+#include "fp_Run.h" -+#include "fp_TextRun.h" -+#include "fl_DocLayout.h" -+#include "fl_BlockLayout.h" -+#include "fp_Line.h" -+ -+#include "fp_Column.h" -+#include "fp_Page.h" -+#include "pp_Property.h" -+#include "gr_Graphics.h" -+#include "pd_Document.h" -+#include "gr_DrawArgs.h" -+#include "pp_AttrProp.h" -+#include "fd_Field.h" -+#include "po_Bookmark.h" -+#include "ut_debugmsg.h" -+#include "ut_assert.h" -+#include "ut_string.h" -+#include "ut_growbuf.h" -+#include "fp_TableContainer.h" -+#include "fl_TableLayout.h" -+#include "fl_FootnoteLayout.h" -+#include "fp_FootnoteContainer.h" -+#include "fl_AutoNum.h" -+#include "fv_View.h" -+#include "fl_TOCLayout.h" -+#include "ap_Prefs.h" -+#include "ap_Strings.h" -+#include "xap_Frame.h" -+#include "gr_Painter.h" -+ -+#include "ut_sleep.h" -+ -+// define this if you want fp_Run::lookupProperties() to dump props and attr belonging to -+// this run. NB this has a very adverse effect on performance, so it should be turned off -+// before committing -+//#define FPRUN_PROPS_MINI_DUMP -+ -+#ifdef _MSC_VER -+// MSVC++ warns about using 'this' in initializer list. -+#pragma warning(disable: 4355) -+#endif -+ -+// TODO can we use the indexAP provided in the change records -+// TODO to remember the attr/prop for each run rather than -+// TODO looking it up each time we call lookupProperties() -- jeff 4/19/99 -+ -+ -+// findPointCoords: -+// Can be called to find the position and size of the point (cursor) -+// for an offset both before, inside and after the Run. -+// Before: When the Run is the first on a Line and point is a BOL. -+// Inside: When the point is inside the Run. -+// After : Point is at the start of the next Run, but insertion is -+// done with the properties of this Run so cursor size/position -+// must reflect that. -+// -+// Previous implementations would assert that the offset was within the -+// Run, but that would always fail for the 'After' case. -+ -+/*****************************************************************/ -+ -+/* -+ TODO this file is too long -- it needs to be broken -+ up into several pieces. -+*/ -+ -+fp_Run::fp_Run(fl_BlockLayout* pBL, -+ UT_uint32 iOffsetFirst, -+ UT_uint32 iLen, -+ FP_RUN_TYPE iType) : -+ fp_ContainerObject(FP_CONTAINER_RUN, pBL->getSectionLayout()), -+ m_iType (iType), -+ m_pLine(0), -+ m_pBL(pBL), -+ m_pNext(0), -+ m_pPrev(0), -+ m_iX(0), -+ m_iOldX(0), -+ m_iY(0), -+ m_iWidth(0), -+ m_iHeight(0), -+ m_iAscent(0), -+ m_iDescent(0), -+ m_iOffsetFirst(iOffsetFirst), -+ m_iLen(iLen), -+ m_bDirty(true), // a run which has just been created is not onscreen, therefore it is dirty -+ m_pField(0), -+ m_iDirection(UT_BIDI_WS), //by default all runs are whitespace -+ m_iVisDirection(UT_BIDI_UNSET), -+ m_eRefreshDrawBuffer(GRSR_Unknown), // everything -+ m_pColorHL(255,255,255,true), // set highlight colour to transparent -+ m_pFont(0), -+ m_bRecalcWidth(false), -+ m_fDecorations(0), -+ m_iLineWidth(0), -+ m_iLinethickness(0), -+ m_iUnderlineXoff(0), -+ m_imaxUnderline(0), -+ m_iminOverline(0), -+ m_iOverlineXoff(0), -+ m_pHyperlink(0), -+ m_pRevisions(NULL), -+ m_eVisibility(FP_VISIBLE), -+ m_bIsCleared(true), -+ m_FillType(NULL,static_cast(this),FG_FILL_TRANSPARENT), -+ m_bPrinting(false), -+ m_pG(NULL), -+ m_iTmpX(0), -+ m_iTmpY(0), -+ m_iTmpWidth(0), -+ m_pTmpLine(NULL), -+ m_bDrawSelection(false), -+ m_iSelLow(0), -+ m_iSelHigh(0), -+ m_bMustClearScreen(false) -+#ifdef DEBUG -+ ,m_iFontAllocNo(0) -+#endif -+{ -+ xxx_UT_DEBUGMSG(("fp_Run %x created!!! \n",this)); -+ pBL->setPrevListLabel(false); -+ m_FillType.setDocLayout(m_pBL->getDocLayout()); -+} -+ -+fp_Run::~fp_Run() -+{ -+ // no impl. -+ xxx_UT_DEBUGMSG(("~fp_Run %x deleted!!! \n",this)); -+ -+// Zero these to trap mem errors. -+#if 1 -+ m_pPrev = NULL; -+ m_pNext = NULL; -+ m_pBL = NULL; -+ m_pLine = NULL; -+#endif -+ -+ DELETEP(m_pRevisions); -+} -+ -+UT_sint32 fp_Run::getHeight() const -+{ -+ if(isHidden() == FP_VISIBLE) -+ { -+ return m_iHeight; -+ } -+ return 0; -+} -+ -+UT_sint32 fp_Run::getWidth() const -+{ -+ if(isHidden() == FP_VISIBLE) -+ return m_iWidth; -+ -+ return 0; -+} -+ -+UT_uint32 fp_Run::getAscent() const -+{ -+ if(isHidden() == FP_VISIBLE) -+ { -+ FL_DocLayout * pLayout = getBlock()->getDocLayout(); -+ if(getGraphics() && pLayout->isQuickPrint() && getGraphics()->queryProperties(GR_Graphics::DGP_PAPER) && (getType() != FPRUN_IMAGE) && (getType() != FPRUN_TEXT)&& (getType() != FPRUN_FIELD)) -+ { -+ return static_cast(static_cast(m_iAscent)*getGraphics()->getResolutionRatio()); -+ } -+ return m_iAscent; -+ } -+ return 0; -+} -+ -+UT_uint32 fp_Run::getDescent() const -+{ -+ if(isHidden() == FP_VISIBLE) -+ { -+ FL_DocLayout * pLayout = getBlock()->getDocLayout(); -+ if(getGraphics() && pLayout->isQuickPrint() && getGraphics()->queryProperties(GR_Graphics::DGP_PAPER)) -+ { -+ return static_cast(static_cast(m_iDescent)*getGraphics()->getResolutionRatio()); -+ } -+ return m_iDescent; -+ } -+ -+ return 0; -+} -+ -+UT_sint32 fp_Run::getDrawingWidth() const -+{ -+ if(isHidden() == FP_VISIBLE) -+ return static_cast(m_iWidth); -+ -+ return 0; -+} -+ -+ -+fg_FillType * fp_Run::getFillType(void) -+{ -+ return &m_FillType; -+} -+ -+bool fp_Run::isInSelectedTOC(void) -+{ -+ if(getBlock()->isContainedByTOC()) -+ { -+ fl_TOCLayout * pTOCL = static_cast(getBlock()->myContainingLayout()); -+ return pTOCL->isSelected(); -+ } -+ else -+ { -+ return false; -+ } -+ -+} -+ -+/*! -+ * The following are methods to avoid flickering while changing a selection. -+ * The idea is to generate a cliprect around just the selected text. -+ */ -+ -+/*! -+ * Set the selection draw mode. -+ */ -+void fp_Run::setSelectionMode(PT_DocPosition posLow, PT_DocPosition posHigh) -+{ -+ m_bDrawSelection = true; -+ m_iSelLow = posLow; -+ m_iSelHigh = posHigh; -+} -+ -+/*! -+ * Clear the selection mode -+ */ -+void fp_Run::clearSelectionMode(void) -+{ -+ m_bDrawSelection = false; -+ m_iSelLow = 0; -+ m_iSelHigh = 0; -+} -+ -+bool fp_Run::isSelectionDraw(void) const -+{ -+ return m_bDrawSelection; -+} -+ -+PT_DocPosition fp_Run::posSelLow(void) const -+{ -+ return m_iSelLow; -+} -+ -+PT_DocPosition fp_Run::posSelHigh(void) const -+{ -+ return m_iSelHigh; -+} -+/*! -+ * This method looks at the values of TmpX and TmpWidth and compares them -+ * to the new ones. If they're different we do a clearscreen on them. -+ */ -+bool fp_Run::clearIfNeeded(void) -+{ -+ // only do this on runs that have not been cleared already -+ // see bug 8154 -+ if(m_bIsCleared &&!getMustClearScreen() ) -+ return true; -+ -+ // if((getTmpX() == getX()) && (getTmpWidth() == getWidth()) && (getTmpY() == getY())) -+ if((getTmpX() == getX()) && (getTmpY() == getY()) && (getTmpLine() == getLine()) && !getMustClearScreen() ) -+ { -+ return true; -+ } -+ if(getTmpLine() && (getLine() != getTmpLine())) -+ { -+ fp_Line * pTmpLine = getTmpLine(); -+ UT_sint32 i = getBlock()->findLineInBlock(pTmpLine); -+ if(i < 0) -+ { -+ markWidthDirty(); -+ return false; -+ } -+ fp_Run * pLastRun = pTmpLine->getLastRun(); -+ pTmpLine->clearScreenFromRunToEnd(pLastRun); -+ markWidthDirty(); -+ return false; -+ } -+ UT_sint32 iWidth = getWidth(); -+ UT_sint32 iX = getX(); -+ UT_sint32 iY = getY(); -+ _setWidth(getTmpWidth()); -+ // -+ // Special case of merging the first char into the first run of -+ // block -+ // -+ if(getMustClearScreen() && (getTmpWidth() == 0) && (getX() == getTmpX())) -+ _setWidth(iWidth); -+ _setX(getTmpX()); -+ _setY(getTmpY()); -+ // -+ // If a run was created by "split" it initially has X value zero. Don't -+ // reset the "clear" in this. -+ // -+ // If the run was just newly inserted (and is, therefore, not on screen) do not reset -+ // its clear flag -+ // -+ if(getTmpX() != 0 && getTmpWidth() != 0) -+ { -+ m_bIsCleared = false; -+ } -+ clearScreen(); -+ markWidthDirty(); -+ _setX(iX); -+ _setWidth(iWidth); -+ _setY(iY); -+ return false; -+} -+void fp_Run::Fill(GR_Graphics * pG, UT_sint32 x, UT_sint32 y, UT_sint32 width, -+ UT_sint32 height) -+{ -+ xxx_UT_DEBUGMSG(("-------------------Fill called!!!!---- x %d width %d \n",x,width)); -+ if((width < 1) || (height < 1)) -+ { -+ return; -+ } -+ UT_sint32 srcX = 0; -+ UT_sint32 srcY = 0; -+ fp_Line * pLine = getLine(); -+ UT_sint32 xoff=0,yoff=0; -+ if(pLine) -+ { -+ pLine->getScreenOffsets(this,xoff,yoff); -+ fp_Page * pPage = pLine->getPage(); -+ srcX = x - xoff; -+ if(pPage) -+ { -+ pPage->expandDamageRect(xoff+getX()+srcX,yoff+getY(),width,height); -+ } -+ } -+ bool bDoGrey = (pG->queryProperties(GR_Graphics::DGP_SCREEN) && -+ ((getType() == FPRUN_FIELD) || getBlock()->isContainedByTOC())); -+ if(bDoGrey && isInSelectedTOC()) -+ { -+ bDoGrey = false; -+ } -+ if(!bDoGrey) -+ { -+ m_FillType.Fill(pG,srcX,srcY,x,y,width,height); -+ } -+ else -+ { -+ if(x>=xoff && width <= getWidth()) -+ { -+ UT_RGBColor grey(192,192,192); -+ // UT_RGBColor white(255,255,255); -+ GR_Painter painter(pG); -+ // painter.fillRect(white,x,y,width,height); -+ painter.fillRect(grey,x,y,width,height); -+ } -+ else -+ { -+ m_FillType.Fill(pG,srcX,srcY,x,y,width,height); -+ } -+ } -+} -+ -+void fp_Run::lookupProperties(GR_Graphics * pG) -+{ -+ const PP_AttrProp * pSpanAP = NULL; -+ const PP_AttrProp * pBlockAP = NULL; -+ const PP_AttrProp * pSectionAP = NULL; // TODO do we care about section-level inheritance? -+ bool bGraphicsNull = false; -+ getBlockAP(pBlockAP); -+ -+ PD_Document * pDoc = m_pBL->getDocument(); -+ -+#ifdef FPRUN_PROPS_MINI_DUMP -+ UT_DEBUGMSG(("fp_Run::lookupProperties: dumping block AP\n")); -+ if(pBlockAP) -+ pBlockAP->miniDump(pDoc); -+#endif -+ // examining the m_pRevisions contents is too involved, it is -+ // faster to delete it and create a new instance if needed -+ if(m_pRevisions) -+ { -+ delete m_pRevisions; -+ m_pRevisions = NULL; -+ } -+ -+ setVisibility(FP_VISIBLE); // set default visibility -+ -+ // NB the call will recreate m_pRevisions for us and it will -+ // change visibility if it is affected by the presence of revisions -+ if(!getBlock()->isContainedByTOC()) -+ { -+ getSpanAP(pSpanAP); -+ } -+ else -+ { -+ pSpanAP = pBlockAP; -+ } -+ xxx_UT_DEBUGMSG(("fp_Run: pSpanAP %x \n",pSpanAP)); -+ -+#ifdef FPRUN_PROPS_MINI_DUMP -+ UT_DEBUGMSG(("fp_Run::lookupProperties: dumping span AP\n")); -+ if(pSpanAP) -+ pSpanAP->miniDump(pDoc); -+#endif -+ -+ //evaluate the "display" property and superimpose it over anything -+ //we got as the result of revisions -+ const gchar *pszDisplay = PP_evalProperty("display",pSpanAP,pBlockAP, -+ pSectionAP, pDoc, true); -+ -+ if(pszDisplay && !strcmp(pszDisplay,"none")) -+ { -+ if(m_eVisibility == FP_VISIBLE) -+ setVisibility(FP_HIDDEN_TEXT); -+ else -+ setVisibility(FP_HIDDEN_REVISION_AND_TEXT); -+ } -+ -+ // here we handle background colour -- we parse the property into -+ // m_pColorHL and then call updateHighlightColor() to overlay any -+ // colour from higher layout elements -+ const char * pszBGcolor = PP_evalProperty("bgcolor",pSpanAP,pBlockAP,pSectionAP, pDoc, true); -+ _setColorHL(pszBGcolor); -+ // m_FillType.setColor(pszBGcolor); // we should clear with screen color -+ // and draw with background color -+ if(pG == NULL) -+ { -+ m_bPrinting = false; -+ pG = getGraphics(); -+ bGraphicsNull = true; -+ } -+ else if(pG->queryProperties(GR_Graphics::DGP_PAPER)) -+ { -+ m_bPrinting = true; -+ m_pG = pG; -+ } -+ if(!m_pBL->isContainedByTOC()) -+ { -+ if(bGraphicsNull) -+ _lookupProperties(pSpanAP, pBlockAP, pSectionAP,NULL); -+ else -+ _lookupProperties(pSpanAP, pBlockAP, pSectionAP,pG); -+ } -+ else -+ { -+ if(bGraphicsNull) -+ _lookupProperties(NULL, pBlockAP, pSectionAP,NULL); -+ else -+ _lookupProperties(NULL, pBlockAP, pSectionAP,pG); -+ } -+ -+ // here we used to set revision-based visibility, but that has to -+ // be done inside getSpanAP() because we need to know whether the -+ // revision is to be visible or not before we can properly apply -+ // any properties the revision contains. -+ -+} -+#undef FPRUN_PROPS_MINI_DUMP -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+/* -+ Determine best split point in Run -+ \param iMaxLeftWidth Width to split at -+ \retval si Split information (left width, right width, and position) -+ \param bForce Force a split at first opportunity (max width) -+ \return True if split point was found in this Run, otherwise false. -+ -+ This implementation simply returns false, forcing line breaker to -+ look for a split point in previous Runs. -+*/ -+bool fp_Run::findMaxLeftFitSplitPoint(UT_sint32 /* iMaxLeftWidth */, -+ fp_RunSplitInfo& /* si */, -+ bool /* bForce */) -+{ -+ return false; -+} -+ -+bool fp_Run::hasLayoutProperties(void) const -+{ -+ return false; -+} -+ -+/*! -+ Find previous Run in block which holds property information -+ \return Run with property information or NULL -+*/ -+fp_Run* -+fp_Run::_findPrevPropertyRun(void) const -+{ -+ fp_Run* pRun = getPrevRun(); -+ while (pRun && (!pRun->hasLayoutProperties() || pRun->isHidden() || (pRun->getType() == FPRUN_IMAGE))) -+ pRun = pRun->getPrevRun(); -+ if(pRun == NULL) -+ { -+ pRun = getPrevRun(); -+ while (pRun && (!pRun->hasLayoutProperties() || pRun->isHidden())) -+ pRun = pRun->getPrevRun(); -+ -+ } -+ return pRun; -+} -+ -+/*! -+ Inherit attribute properties from previous Run -+ -+ This is used by Runs for which it does not make sense to have -+ properties, such as forced line breaks end EOP Runs. -+*/ -+void -+fp_Run::_inheritProperties(void) -+{ -+ if(m_pG == NULL) -+ { -+ m_pG = getGraphics(); -+ } -+ fp_Run* pRun = _findPrevPropertyRun(); -+ if (pRun) -+ { -+ xxx_UT_DEBUGMSG(("fp_Run::_inheritProperties: from prev run\n")); -+ _setAscent(pRun->getAscent()); -+ _setDescent(pRun->getDescent()); -+ _setHeight(pRun->getHeight()); -+ xxx_UT_DEBUGMSG(("fp_Run::_inheritProperties: from prev run height is %d \n",getHeight())); -+ -+ } -+ else -+ { -+ // look for fonts in this DocLayout's font cache -+ //UT_DEBUGMSG(("fp_Run::_inheritProperties: from current font\n")); -+ const PP_AttrProp * pSpanAP = NULL; -+ const PP_AttrProp * pBlockAP = NULL; -+ const PP_AttrProp * pSectionAP = NULL; // TODO do we care about section-level inheritance? -+ -+ //m_pBL->getSpanAttrProp(getBlockOffset(),true,&pSpanAP); -+ getSpanAP(pSpanAP); -+ getBlockAP(pBlockAP); -+ -+ FL_DocLayout * pLayout = getBlock()->getDocLayout(); -+ const GR_Font * pFont = pLayout->findFont(pSpanAP,pBlockAP,pSectionAP,m_pG); -+ -+ if ((pFont != _getFont()) || (getType() == FPRUN_ENDOFPARAGRAPH)) -+ { -+ _setFont(pFont); -+ _setAscent(getGraphics()->getFontAscent(pFont)); -+ _setDescent(getGraphics()->getFontDescent(pFont)); -+ _setHeight(getGraphics()->getFontHeight(pFont)); -+ } -+ xxx_UT_DEBUGMSG(("fp_Run::_inheritProperties: No prev run run height is %d \n",getHeight())); -+ } -+} -+ -+GR_Graphics * fp_Run::getGraphics(void) const -+{ -+ if(m_bPrinting) -+ { -+ return m_pG; -+ } -+ else -+ { -+ return getBlock()->getDocLayout()->getGraphics(); -+ } -+} -+ -+void fp_Run::insertIntoRunListBeforeThis(fp_Run& newRun) -+{ -+ newRun.unlinkFromRunList(); -+ newRun.setNextRun(this); -+ if (m_pPrev) -+ { -+ m_pPrev->setNextRun(&newRun); -+ if(newRun.getType()!= FPRUN_HYPERLINK) -+ newRun.setHyperlink( m_pPrev->getHyperlink()); -+ } -+ newRun.setPrevRun(m_pPrev); -+ setPrevRun(&newRun); -+ -+} -+ -+void fp_Run::insertIntoRunListAfterThis(fp_Run& newRun) -+{ -+ newRun.unlinkFromRunList(); -+ newRun.setPrevRun(this); -+ if(newRun.getType()!= FPRUN_HYPERLINK) -+ newRun.setHyperlink(m_pHyperlink); -+ if (m_pNext) -+ { -+ m_pNext->setPrevRun(&newRun); -+ } -+ newRun.setNextRun(m_pNext); -+ setNextRun(&newRun); -+} -+ -+void fp_Run::unlinkFromRunList() -+{ -+ //first if this is the start of a hyperlink run, -+ //remove the references to it from the following runs -+ if(getType() == FPRUN_HYPERLINK) -+ { -+ fp_HyperlinkRun * pH = static_cast(this); -+ if(pH->isStartOfHyperlink()) -+ { -+ fp_Run * pRun = getNextRun(); -+ -+ while(pRun && pRun->getHyperlink() == pH) -+ { -+ pRun->setHyperlink(NULL); -+ pRun = pRun->getNextRun(); -+ } -+ } -+ } -+ -+ if (m_pPrev) -+ { -+ m_pPrev->setNextRun(m_pNext); -+ } -+ if (m_pNext) -+ { -+ m_pNext->setPrevRun(m_pPrev); -+ setNextRun(0); -+ } -+ setPrevRun(0); -+} -+ -+void fp_Run::setHyperlink(fp_HyperlinkRun * pH) -+{ -+ if(pH != m_pHyperlink) -+ { -+ _setHyperlink(pH); -+ clearScreen(); -+ } -+} -+ -+/*! returns PP_AttrProp associated with this span, taking on board the -+ presence of revisions -+ \returns pSpan : location to store the PP_AttrProp -+*/ -+const PP_AttrProp * fp_Run::getSpanAP(void) -+{ -+ const PP_AttrProp * pAP = NULL; -+ getSpanAP(pAP); -+ return pAP; -+} -+ -+/*! returns PP_AttrProp associated with this span, taking on board the -+ presence of revisions -+ \param pSpan : location to store the PP_AttrProp -+*/ -+void fp_Run::getSpanAP(const PP_AttrProp * &pSpanAP) -+{ -+ if(getBlock()->isContainedByTOC()) -+ { -+ getBlockAP(pSpanAP); -+ return; -+ } -+ -+ //first we need to ascertain if this revision is visible -+ FV_View* pView = _getView(); -+ UT_return_if_fail(pView); -+ -+ UT_uint32 iId = pView->getRevisionLevel(); -+ bool bShow = pView->isShowRevisions(); -+ bool bHiddenRevision = false; -+ -+ if(getType() != FPRUN_FMTMARK && getType() != FPRUN_DUMMY && getType() != FPRUN_DIRECTIONMARKER) -+ { -+ getBlock()->getSpanAttrProp(getBlockOffset(),false,&pSpanAP,&m_pRevisions,bShow,iId,bHiddenRevision); -+ } -+ else -+ { -+ getBlock()->getSpanAttrProp(getBlockOffset(),true,&pSpanAP,&m_pRevisions,bShow,iId,bHiddenRevision); -+ } -+ if(pSpanAP == NULL) -+ { -+ // FIXME for now lets work around this -+ // UT_ASSERT(UT_SHOULD_NOT_HAPPEN); track these down later. -+ // -+ getBlockAP(pSpanAP); -+ return; -+ } -+ if(bHiddenRevision) -+ { -+ setVisibility(FP_HIDDEN_REVISION); -+ } -+ else -+ { -+ setVisibility(FP_VISIBLE); -+ } -+} -+ -+void fp_Run::setX(UT_sint32 iX, bool bDontClearIfNeeded) -+{ -+ Run_setX(iX, FP_CLEARSCREEN_AUTO); -+} -+ -+// the parameter eClearScreen has a default value AUTO -+// we need this extra parameter be able to specify false when calling from -+// inside of the first pass of fp_Line::layout(), which sets -+// only a temporary value of iX which is then adjusted in the -+// second pass, without this the run will redraw twice, once always unnecessarily -+// and most of the time both times unnecessarily -+void fp_Run::Run_setX(UT_sint32 iX, FPRUN_CLEAR_SCREEN eClearScreen) -+{ -+ switch(eClearScreen) -+ { -+ case FP_CLEARSCREEN_AUTO: -+ if (iX == m_iX) -+ { -+ return; -+ } -+ //otherwise fall through -+ case FP_CLEARSCREEN_FORCE: -+ m_iX = m_iOldX; -+ clearScreen(); -+ m_iOldX = iX; -+ m_iX = iX; -+ break; -+ case FP_CLEARSCREEN_NEVER: -+ // only set m_iX and leave m_iOldX alone; this allows for -+ // multiple calls to setX with the NEVER parameter without -+ // intervening FORCE or AUTO -+ m_iX = iX; -+ break; -+ default: -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ } -+ -+} -+ -+void fp_Run::setY(UT_sint32 iY) -+{ -+ if (iY == m_iY) -+ { -+ return; -+ } -+ -+ clearScreen(); -+ -+ m_iY = iY; -+} -+ -+void fp_Run::setLine(fp_Line* pLine) -+{ -+ if (pLine == m_pLine) -+ { -+ return; -+ } -+ clearScreen(); -+ -+ m_pLine = pLine; -+ if(pLine != NULL) -+ { -+ m_FillType.setParent(pLine->getFillType()); -+ } -+ else -+ { -+ m_FillType.setParent(NULL); -+ } -+} -+ -+ -+/* -+ In the BIDI build, changing runs next or previous can result in -+ change of visual appearance of the run or a run immediately adjucent -+ (say deleting last character of a word may require that the new -+ last character is displayed using a final-form glyph which). -+ Consequently we need to mark the width and draw buffer as dirty, -+ and that is what happens when the bRefresh is true (which is the -+ default value). However, the refresh is very expensive, and sometimes -+ we know that it is not needed (e.g. simply merging neigbouring runs -+ does not change context, merely the way we store the stuff) -- in that -+ case we specify bRefresh false -+ -+*/ -+ -+void fp_Run::setNextRun(fp_Run* p, bool bRefresh) -+{ -+ if(p != m_pNext) -+ { -+ // change of context, need to refresh draw buffer if context sensitive -+ if(bRefresh) -+ orDrawBufferDirty(GRSR_ContextSensitive); -+ -+ //m_bRecalcWidth |= bRefresh; -- will be taken care of when -+ //buffer is recalculated -+#if 0 -+ // we do not do ligatures across run boundaries any more, -+ // Tomas, Nov 15, 2003 -+ // because we support 2-char ligatures, the change of next -+ // can also influence the run ahead of us -+ // we will just mark it -+ if(m_pPrev && bRefresh) -+ { -+ m_pPrev->markDrawBufferDirty(); -+ m_pPrev->markWidthDirty(); -+ } -+#endif -+ m_pNext = p; -+ } -+} -+ -+void fp_Run::setPrevRun(fp_Run* p, bool bRefresh) -+{ -+ if(p != m_pPrev) -+ { -+ // change of context, need to refresh draw buffer if context sensitive -+ if(bRefresh) -+ orDrawBufferDirty(GRSR_ContextSensitive); -+ -+ // m_bRecalcWidth |= bRefresh; -- will be taken care of when -+ // buffer is recacluated -+#if 0 -+ // we do not do ligatures across run boundaries any more, -+ // Tomas, Nov 15, 2003 -+ // because we support 2-char ligatures, the change of prev -+ // can also influence the run that follows us -+ // we will just mark it -+ if(m_pNext && bRefresh) -+ { -+ m_pNext->markDrawBufferDirty(); -+ m_pNext->markWidthDirty(); -+ } -+#endif -+ m_pPrev = p; -+ } -+} -+ -+bool fp_Run::isLastRunOnLine(void) const -+{ -+ return (getLine()->getLastRun() == this); -+} -+ -+bool fp_Run::isFirstRunOnLine(void) const -+{ -+ return (getLine()->getFirstRun() == this); -+} -+ -+bool fp_Run::isLastVisRunOnLine(void) const -+{ -+ return (getLine()->getLastVisRun() == this); -+} -+ -+bool fp_Run::isFirstVisRunOnLine(void) const -+{ -+ return (getLine()->getFirstVisRun() == this); -+} -+ -+void fp_Run::markAsDirty(void) -+{ -+ xxx_UT_DEBUGMSG(("Run %x marked dirty \n")); -+ m_bDirty = true; -+} -+ -+ -+/*! -+ * return an rectangle that covers this object on the screen -+ * The calling routine is resposible for deleting the returned struct -+ */ -+UT_Rect * fp_Run::getScreenRect(void) -+{ -+ UT_sint32 xoff = 0; -+ UT_sint32 yoff = 0; -+ UT_Rect * pRec = NULL; -+ fp_Line * pLine = getLine(); -+ if(pLine) -+ { -+ pLine->getScreenOffsets(this,xoff,yoff); -+ pRec= new UT_Rect(xoff,yoff,getWidth(),getHeight()); -+ return pRec; -+ } -+ else -+ { -+ return NULL; -+ } -+} -+ -+/*! -+ * Marks Dirty any runs that overlap the supplied rectangle. This rectangle -+ * is relative to the screen. -+ */ -+void fp_Run::markDirtyOverlappingRuns(UT_Rect & recScreen) -+{ -+ UT_Rect * pRec = NULL; -+ pRec = getScreenRect(); -+ if(pRec && recScreen.intersectsRect(pRec)) -+ { -+ fp_Run::markAsDirty(); -+ delete pRec; -+ return; -+ } -+ DELETEP(pRec); -+ return; -+} -+ -+void fp_Run::setCleared(void) -+{ -+ m_bIsCleared = true; -+} -+ -+bool fp_Run::isOnlyRunOnLine(void) const -+{ -+ if (getLine()->countRuns() == 1) -+ { -+ UT_ASSERT(isFirstRunOnLine()); -+ UT_ASSERT(isLastRunOnLine()); -+ -+ return true; -+ } -+ -+ return false; -+} -+ -+void fp_Run::setLength(UT_uint32 iLen, bool bRefresh) -+{ -+ if (iLen == getLength()) -+ { -+ return; -+ } -+ m_bRecalcWidth |= bRefresh; -+ if(getWidth() > 0) -+ clearScreen(); -+ // UT_ASSERT((getType() == FPRUN_FMTMARK) || (iLen > 0)); -+ m_iLen = iLen; -+ -+ // change of length generally means something got deleted, and -+ // that affects all text in the present run, and shaping in the -+ // runs adjacent -+ if(bRefresh) -+ { -+ orDrawBufferDirty(GRSR_Unknown); -+ -+ if(m_pPrev) -+ { -+ m_pPrev->orDrawBufferDirty(GRSR_ContextSensitive); -+ } -+ -+ if(m_pNext) -+ { -+ m_pNext->orDrawBufferDirty(GRSR_ContextSensitive); -+ } -+ } -+} -+ -+void fp_Run::setBlockOffset(UT_uint32 offset) -+{ -+ m_iOffsetFirst = offset; -+} -+ -+void fp_Run::clearScreen(void) -+{ -+ Run_ClearScreen(false); -+} -+ -+void fp_Run::Run_ClearScreen(bool bFullLineHeightRect) -+{ -+ if(!getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)) -+ { -+ return; -+ } -+ markAsDirty(); -+ if (m_bIsCleared && !getMustClearScreen()) -+ { -+ // no need to clear if we've already done so. -+ return; -+ } -+ m_bMustClearScreen = false; -+ -+ if (!getLine()) -+ { -+ // nothing to clear if this run is not currently on a line -+ return; -+ } -+ xxx_UT_DEBUGMSG(("SEVIOR: Doing Run_ClearScreen in run %x \n",this)); -+ if(getLine()->getContainer() != NULL) -+ { -+ if(getLine()->getContainer()->getPage() != 0) -+ { -+ UT_Rect clip(0,0,0,0); -+ if(isSelectionDraw()) -+ { -+ if(getType() == FPRUN_TEXT) -+ { -+ bool bRTL = (getVisDirection() == UT_BIDI_RTL); -+ -+ UT_sint32 xoff,yoff; -+ getLine()->getScreenOffsets(this, xoff, yoff); -+ UT_sint32 xLeft = xoff; -+ UT_sint32 xRight = xLeft + getWidth(); -+ UT_sint32 x1,y1,x2,y2,height; -+ bool bDir; -+ if(posSelLow() > getBlock()->getPosition(true) + getBlockOffset()) -+ { -+ findPointCoords(posSelLow() - getBlock()->getPosition(true), x1,y1,x2,y2,height,bDir); -+ -+ if(bRTL) //rtl needs translation -+ { -+ xRight = x1 + _getView()->getPageViewLeftMargin(); -+ xRight -= _getView()->getXScrollOffset(); -+ } -+ else -+ { -+ xLeft = x1 + _getView()->getPageViewLeftMargin(); -+ xLeft -= _getView()->getXScrollOffset(); -+ } -+ -+ } -+ if(posSelHigh() < getBlock()->getPosition(true) + getBlockOffset() + getLength()) -+ { -+ findPointCoords(posSelHigh() - getBlock()->getPosition(true) +1, x1,y1,x2,y2,height,bDir); -+ if(bRTL) //rtl needs translation -+ { -+ xLeft = x1 + _getView()->getPageViewLeftMargin();; -+ xLeft -= _getView()->getXScrollOffset(); -+ } -+ else -+ { -+ xRight = x1 + _getView()->getPageViewLeftMargin();; -+ xRight -= _getView()->getXScrollOffset(); -+ } -+ } -+ clip.set(xLeft,yoff,xRight-xLeft,getLine()->getHeight()); -+ getGraphics()->setClipRect(&clip); -+ } -+ } -+ _clearScreen(bFullLineHeightRect); -+ if(isSelectionDraw()) -+ { -+ getGraphics()->setClipRect(NULL); -+ } -+ // make sure we only get erased once -+ _setDirty(true); -+ m_bIsCleared = true; -+ } -+ else -+ { -+ xxx_UT_DEBUGMSG(("fp_Run: Clearscreen on line without page \n")); -+ } -+ } -+ else -+ { -+ xxx_UT_DEBUGMSG(("fpRun: Clearscreen on line without container \n")); -+ } -+ fp_Line * pLine = getLine(); -+ if(pLine) -+ { -+ pLine->setNeedsRedraw(); -+ } -+ -+ xxx_UT_DEBUGMSG(("fp_Run: clearscreen applied \n")); -+} -+ -+static UT_RGBColor s_fgColor; -+ -+const UT_RGBColor fp_Run::getFGColor(void) const -+{ -+ // revision colours -+ FV_View * pView = _getView(); -+ UT_return_val_if_fail(pView, s_fgColor); -+ bool bShow = pView->isShowRevisions(); -+ -+ if(m_pRevisions && bShow) -+ { -+ bool bMark = pView->isMarkRevisions(); -+ const PP_Revision * r = m_pRevisions->getLastRevision(); -+ -+ UT_return_val_if_fail(r != NULL, _getColorFG()); -+ -+ bool bRevColor = false; -+ -+ if(!bMark) -+ { -+ // this is the case when we are in non-marking mode ... -+ bRevColor = true; -+ } -+ -+ UT_uint32 iId = r->getId(); -+ UT_uint32 iShowId = pView->getRevisionLevel(); -+ -+ if(bMark && iShowId == 0) -+ { -+ // this is the case where we are in marking mode and are -+ // supposed to reveal all -+ bRevColor = true; -+ } -+ -+ if(bMark && iShowId != 0 && (iId-1 == iShowId)) -+ { -+ // this is the case when we are in marking mode, and are -+ // supposed to reveal id > iShowId -+ bRevColor = true; -+ } -+ -+ if(!bRevColor) -+ return _getColorFG(); -+ -+ s_fgColor = _getView()->getColorRevisions(iId-1); -+ } -+ else if(m_pHyperlink && getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)) -+ { -+ s_fgColor = _getView()->getColorHyperLink(); -+ } -+ else -+ return _getColorFG(); -+ -+ return s_fgColor; -+} -+ -+void fp_Run::_setFont(const GR_Font * f) -+{ -+ m_pFont = f; -+ -+#ifdef DEBUG -+ if(f) -+ m_iFontAllocNo = f->getAllocNumber(); -+#endif -+} -+ -+const GR_Font * fp_Run::_getFont(void) const -+{ -+#ifdef DEBUG -+ if(m_pFont) -+ { -+ // if this assert fails we are in deep trouble; basically, the font pointer points -+ // to some other font that it was when it was set -+ UT_ASSERT_HARMLESS( m_iFontAllocNo == m_pFont->getAllocNumber()); -+ } -+#endif -+ -+ return m_pFont; -+} -+ -+void fp_Run::_setDirty(bool b) -+{ -+ xxx_UT_DEBUGMSG(("fp_Run:: run %x Dirty state set to %d \n",this,b)); -+ m_bDirty = b; -+} -+ -+void fp_Run::draw(dg_DrawArgs* pDA) -+{ -+ if (pDA->bDirtyRunsOnly && !m_bDirty) -+ { -+ xxx_UT_DEBUGMSG(("fp_Run::Run %x not dirty returning \n",this)); -+ return; -+ } -+ -+ if(isHidden()) -+ { -+ // this run is marked as hidden, nothing to do -+ return; -+ } -+ -+ m_bIsCleared = false; -+ fp_Line * pLine = getLine(); -+ if (pLine) -+ pLine->setScreenCleared(false); -+ -+ //UT_usleep(100000); // 0.1 seconds useful for debugging -+ xxx_UT_DEBUGMSG(("SEVIOR: draw Run this %x line %x \n",this, getLine())); -+ GR_Graphics * pG = pDA->pG; -+ // shortcircuit drawing if we're way off base. -+ long imax = (1 << 15) - 1; -+ if (((pDA->yoff < -imax) || (pDA->yoff > imax)) && pG->queryProperties(GR_Graphics::DGP_SCREEN)) -+ return; -+ -+ if(pG->queryProperties(GR_Graphics::DGP_PAPER)) -+ { -+ m_bPrinting = true; -+ m_pG = pG; -+ lookupProperties(pG); -+ } -+ pG->setColor(getFGColor()); -+ UT_Rect clip(0,0,0,0); -+ if(isSelectionDraw()) -+ { -+ if((getType() == FPRUN_TEXT) && getLine()) -+ { -+ bool bRTL = (getVisDirection() == UT_BIDI_RTL); -+ UT_sint32 xLeft = pDA->xoff; -+ UT_sint32 xRight = xLeft + getWidth(); -+ UT_sint32 x1,y1,x2,y2,height; -+ bool bDir; -+ -+ if(posSelLow() > getBlock()->getPosition(true) + getBlockOffset()) -+ { -+ findPointCoords(posSelLow() - getBlock()->getPosition(true), x1,y1,x2,y2,height,bDir); -+ if(bRTL) -+ { -+ xRight = x1 + _getView()->getPageViewLeftMargin(); -+ xRight -= _getView()->getXScrollOffset(); -+ } -+ else -+ { -+ xLeft = x1 + _getView()->getPageViewLeftMargin(); -+ xLeft -= _getView()->getXScrollOffset(); -+ } -+ } -+ if(posSelHigh() < getBlock()->getPosition(true) + getBlockOffset() + getLength()) -+ { -+ findPointCoords(posSelHigh() - getBlock()->getPosition(true) +1, x1,y1,x2,y2,height,bDir); -+ if(bRTL) -+ { -+ xLeft = x1 + _getView()->getPageViewLeftMargin(); -+ xLeft -= _getView()->getXScrollOffset(); -+ } -+ else -+ { -+ xRight = x1 + _getView()->getPageViewLeftMargin(); -+ xRight -= _getView()->getXScrollOffset(); -+ } -+ } -+ UT_sint32 width = xRight-xLeft; -+ clip.set(xLeft,pDA->yoff-getLine()->getAscent(),width,getLine()->getHeight()); -+ pDA->pG->setClipRect(&clip); -+ } -+ } -+ UT_RGBColor OldCol = *m_FillType.getColor(); -+ UT_RGBColor bgCol = _getColorHL(); -+ xxx_UT_DEBUGMSG((" bg red %d rg blue %d bg green %d trans %d \n",bgCol.m_red,bgCol.m_blu,bgCol.m_grn,bgCol.m_bIsTransparent)); -+ if(!bgCol.isTransparent()) -+ { -+ m_FillType.setColor(bgCol); -+ } -+ UT_DEBUGMSG(("Drawing pDA->yoff %d \n",pDA->yoff)); -+ _draw(pDA); -+ if(!bgCol.isTransparent()) -+ { -+ m_FillType.setColor(OldCol); // restore the old clear color -+ } -+ if(isSelectionDraw()) -+ { -+ pDA->pG->setClipRect(NULL); -+ } -+ FV_View* pView = _getView(); -+ UT_return_if_fail(pView); -+ bool bShowRevs = pView->isShowRevisions(); -+ -+ UT_uint32 i2Du = pDA->pG->tlu(1); // changed this to 1 to fix various pixel dirt -+ -+ if(m_pRevisions && bShowRevs) -+ { -+ GR_Painter painter(pG); -+ const PP_Revision * r = m_pRevisions->getLastRevision(); -+ UT_ASSERT(r != NULL); -+ -+ if (r) { -+ PP_RevisionType r_type = r->getType(); -+ UT_uint32 iId = r->getId(); -+ UT_uint32 iShowId = pView->getRevisionLevel(); -+ bool bMark = pView->isMarkRevisions(); -+ -+ if(bMark && iShowId != 0) -+ iId--; -+ -+ if(!bMark || !iShowId || iId == iShowId) -+ { -+ pG->setColor(getFGColor()); -+ -+ UT_uint32 iWidth = getDrawingWidth(); -+ -+ if(r_type == PP_REVISION_ADDITION || r_type == PP_REVISION_ADDITION_AND_FMT) -+ { -+ painter.fillRect(s_fgColor,pDA->xoff, pDA->yoff + i2Du, iWidth, getGraphics()->tlu(1)); -+ painter.fillRect(s_fgColor,pDA->xoff, pDA->yoff + i2Du + getGraphics()->tlu(2), -+ iWidth, getGraphics()->tlu(1)); -+ -+ } -+ else if(r_type == PP_REVISION_FMT_CHANGE) -+ { -+ // draw a thick line underneath -+ painter.fillRect(s_fgColor,pDA->xoff, pDA->yoff + i2Du, iWidth, getGraphics()->tlu(2)); -+ } -+ else -+ { -+ // draw a strike-through line -+ -+ painter.fillRect(s_fgColor,pDA->xoff, pDA->yoff - m_iHeight/3, -+ iWidth, getGraphics()->tlu(2)); -+ } -+ } -+ } -+ } -+ -+ if(m_pHyperlink && pG->queryProperties(GR_Graphics::DGP_SCREEN)) -+ { -+ // have to set the colour again, since fp_TextRun::_draw can set it to red -+ // for drawing sguiggles -+ GR_Painter painter(pG); -+ pG->setColor(_getView()->getColorHyperLink()); -+ pG->setLineProperties(pG->tluD(1.0), -+ GR_Graphics::JOIN_MITER, -+ GR_Graphics::CAP_PROJECTING, -+ GR_Graphics::LINE_SOLID); -+ -+ painter.drawLine(pDA->xoff, pDA->yoff + i2Du, pDA->xoff + m_iWidth, pDA->yoff + i2Du); -+ } -+ -+ if(m_eVisibility == FP_HIDDEN_TEXT || m_eVisibility == FP_HIDDEN_REVISION_AND_TEXT) -+ { -+ GR_Painter painter(pG); -+ pG->setColor(getFGColor()); -+ pG->setLineProperties(pG->tluD(1.0), -+ GR_Graphics::JOIN_MITER, -+ GR_Graphics::CAP_PROJECTING, -+ GR_Graphics::LINE_DOTTED); -+ -+ painter.drawLine(pDA->xoff, pDA->yoff + i2Du, pDA->xoff + m_iWidth, pDA->yoff + i2Du); -+ -+ } -+ m_bIsCleared = false; -+ _setDirty(false); -+ if(pG->queryProperties(GR_Graphics::DGP_PAPER)) -+ { -+ m_bPrinting = false; -+ m_pG = NULL; -+ lookupProperties(NULL); -+ } -+} -+ -+/*! -+ Determines if run is currently visible or hidden -+ run is hidden in the following circumstances: -+ -+ a) it is formatted as hidden and show para is off -+ -+ b) it is part of a revision that makes it hidden; several cases -+ fall into this category, but that is immaterial here (the -+ decision on this is made in lookupProperties() -+bool fp_Run::isHidden() const -+*/ -+ -+/*! -+ Determines if run would be hidden if its visibility was set to the -+ given value eVisibility -+*/ -+bool fp_Run::_wouldBeHidden(FPVisibility eVisibility) const -+{ -+ FV_View* pView = _getView(); -+ bool bShowHidden = pView->getShowPara(); -+ -+ bool bHidden = ((eVisibility == FP_HIDDEN_TEXT && !bShowHidden) -+ || eVisibility == FP_HIDDEN_REVISION -+ || eVisibility == FP_HIDDEN_REVISION_AND_TEXT); -+ -+ return bHidden; -+} -+ -+/*! -+ changes the visibility of the present run; this requires -+ invalidating different things depending on circumstances -+*/ -+void fp_Run::setVisibility(FPVisibility eVis) -+{ -+ if(m_eVisibility == eVis) -+ return; -+ -+ if(eVis == FP_HIDDEN_TEXT && !_wouldBeHidden(eVis) && m_iWidth == 0) -+ { -+ // we are asked to mark text as hidden, and under the present settings it would be -+ // visible, but its width == 0. While the 0 width could be legitimate, it is more -+ // likely that the run was previously hidden due to ShowPara == false and now is -+ // being shown -- we need to make sure everything gets updated -+ // (this case avoids the logic below, because of the way that lookupProperties() -+ // works -- it might be worth redesigning that -+ m_bIsCleared = true; -+ m_bDirty = true; -+ m_bRecalcWidth = true; -+ m_eVisibility = eVis; -+ return; -+ } -+ -+ if( (isHidden() && _wouldBeHidden(eVis)) -+ || (!isHidden() && !_wouldBeHidden(eVis))) -+ { -+ // this run will remain as it is, so we just set visibility to -+ // the new value -+ m_eVisibility = eVis; -+ return; -+ } -+ -+ if(_wouldBeHidden(eVis)) -+ { -+ // we are going into hiding, so we need to clear screen first -+ clearScreen(); -+ -+ // we do not need to redraw -+ m_bDirty = false; -+ m_bRecalcWidth = true; -+ m_eVisibility = eVis; -+ return; -+ } -+ -+ // we are unhiding: need to mark everything dirty -+ m_bIsCleared = true; -+ m_bDirty = true; -+ m_bRecalcWidth = true; -+ m_eVisibility = eVis; -+ -+ /* recalculate width immediately so that any calls to getWidth() are -+ * accurate -+ */ -+ _recalcWidth(); -+ -+ return; -+} -+ -+bool fp_Run::deleteFollowingIfAtInsPoint() const -+{ -+ if(isHidden()) -+ return true; -+ else -+ return _deleteFollowingIfAtInsPoint(); -+} -+ -+bool fp_Run::_deleteFollowingIfAtInsPoint() const -+{ -+ return false; -+} -+ -+ -+bool fp_Run::canContainPoint(void) const -+{ -+ if(isHidden()) -+ return false; -+ else -+ return _canContainPoint(); -+} -+ -+bool fp_Run::_canContainPoint(void) const -+{ -+ return true; -+} -+ -+bool fp_Run::letPointPass(void) const -+{ -+ if(isHidden()) -+ return true; -+ else -+ return _letPointPass(); -+} -+ -+bool fp_Run::_letPointPass(void) const -+{ -+ return true; -+} -+ -+bool fp_Run::recalcWidth(void) -+{ -+ if(isHidden()) -+ { -+ if(m_iWidth != 0) -+ { -+ m_iWidth = 0; -+ return true; -+ } -+ -+ return false; -+ } -+ else -+ return _recalcWidth(); -+} -+ -+/*! -+ update ascent, decent and height -+*/ -+void fp_Run::updateVerticalMetric() -+{ -+ if(m_pFont) -+ { -+ _setAscent(getGraphics()->getFontAscent(m_pFont)); -+ _setDescent(getGraphics()->getFontDescent(m_pFont)); -+ _setHeight(getGraphics()->getFontHeight(m_pFont)); -+ } -+} -+ -+ -+bool fp_Run::_recalcWidth(void) -+{ -+ // do nothing. subclasses may override this. -+ return false; -+} -+ -+void fp_Run::drawDecors(UT_sint32 xoff, UT_sint32 yoff, GR_Graphics * pG) -+{ -+ UT_DEBUGMSG(("drawDecors xoff %d \n",xoff)); -+ /* -+ Upon entry to this function, yoff is the TOP of the run, -+ NOT the baseline. -+ */ -+ -+ /* -+ Here is the code to work out the position and thickness of under -+ and overlines for a run of text. This is neccessary because an -+ underline or overline could shift position depending on the -+ text size - particularly for subscripts and superscripts. We -+ can't work out where to put the lines until the end of the -+ lined span. This info is saved in the fp_Run class. If a -+ underline or overline is pending (because the next run -+ continues the underline or overline), mark the next run as -+ dirty to make sure it is drawn. -+ */ -+ -+ if((_getDecorations() & (TEXT_DECOR_UNDERLINE | TEXT_DECOR_OVERLINE | -+ TEXT_DECOR_LINETHROUGH | TEXT_DECOR_TOPLINE | TEXT_DECOR_BOTTOMLINE)) == 0) -+ { -+ return; -+ } -+ -+ GR_Painter painter(pG); -+ const UT_sint32 old_LineWidth = m_iLineWidth; -+ UT_sint32 cur_linewidth = pG->tlu(1) + UT_MAX(pG->tlu(10),static_cast(getAscent())-pG->tlu(10))/8; -+// -+// Line thickness is too thick. -+// -+ cur_linewidth = UT_MAX(pG->tlu(1),cur_linewidth/2); -+ UT_sint32 iDrop = 0; -+ -+ // need to do this in the visual space -+ fp_Run* P_Run = getPrevVisual(); -+ fp_Run* N_Run = getNextVisual(); -+ -+ const bool b_Underline = isUnderline(); -+ const bool b_Overline = isOverline(); -+ const bool b_Strikethrough = isStrikethrough(); -+ const bool b_Topline = isTopline(); -+ const bool b_Bottomline = isBottomline(); -+ -+ // again, need to do this in visual space -+ const bool b_Firstrun = (P_Run == NULL) || (getLine()->getFirstVisRun()== this); -+ const bool b_Lastrun = (N_Run == NULL) || (getLine()->getLastVisRun()== this); -+ -+ /* If the previous run is NULL or if this is the first run of a -+ line, we are on the first run of the line so set the linethickness, -+ start of the line span and the overline and underline positions from -+ the current measurements. -+ */ -+ if(P_Run == NULL || b_Firstrun ) -+ { -+ setLinethickness(cur_linewidth); -+ if(b_Underline) -+ { -+ iDrop = yoff + getAscent() + getDescent()/3 + pG->tlu(1); -+ xxx_UT_DEBUGMSG(("underline getAscent() %d getDescent() %d tlu 1 %d \n",getAscent(),getDescent(), pG->tlu(1))); -+ setUnderlineXoff( xoff); -+ setMaxUnderline(iDrop); -+ } -+ if(b_Overline) -+ { -+ iDrop = yoff + pG->tlu(1) + UT_MAX(pG->tlu(10),static_cast(getAscent()) - pG->tlu(10))/8; -+ setOverlineXoff( xoff); -+ setMinOverline(iDrop); -+ } -+ } -+ /* -+ Otherwise look to see if the previous run had an underline or -+overline. If it does, merge the information with the present information. Take -+the Maximum of the underline offsets and the minimum of the overline offsets. -+Always take the maximum of the linewidths. If there is no previous underline -+or overline set the underline and overline locations with the current data. -+ */ -+ else -+ { -+ if (!P_Run->isUnderline() && !P_Run->isOverline() && -+ !P_Run->isStrikethrough()) -+ { -+ setLinethickness(cur_linewidth); -+ } -+ else -+ { -+ setLinethickness(UT_MAX(P_Run->getLinethickness(),cur_linewidth)); -+ } -+ if (b_Underline) -+ { -+ iDrop = yoff + getAscent() + getDescent()/3; -+ xxx_UT_DEBUGMSG(("underline getAscent() %d getDescent() %d m_iDescent %d \n",getAscent(),getDescent(),m_iDescent)); -+ if(!P_Run->isUnderline()) -+ { -+ setUnderlineXoff( xoff); -+ setMaxUnderline(iDrop); -+ } -+ else -+ { -+ setUnderlineXoff( P_Run->getUnderlineXoff()); -+ setMaxUnderline(UT_MAX( P_Run->getMaxUnderline(), iDrop)); -+ } -+ } -+ if (b_Overline) -+ { -+ iDrop = yoff + pG->tlu(1) + UT_MAX(pG->tlu(10),static_cast(getAscent()) - pG->tlu(10))/8; -+ if(!P_Run->isOverline()) -+ { -+ setOverlineXoff( xoff); -+ setMinOverline(iDrop); -+ } -+ else -+ { -+ setOverlineXoff( P_Run->getOverlineXoff()); -+ setMinOverline(UT_MIN( P_Run->getMinOverline(), iDrop)); -+ } -+ } -+ } -+ m_iLineWidth = getLinethickness(); -+ pG->setLineWidth(m_iLineWidth); -+ /* -+ If the next run returns NULL or if we are on the last run -+ we've reached the of the line of text so the overlines and underlines must -+be drawn. -+ */ -+ if(N_Run == NULL || b_Lastrun) -+ { -+ if ( b_Underline) -+ { -+ iDrop = UT_MAX( getMaxUnderline(), iDrop); -+ UT_sint32 totx = getUnderlineXoff(); -+ painter.drawLine(totx, iDrop, xoff+getWidth(), iDrop); -+ } -+ if ( b_Overline) -+ { -+ iDrop = UT_MIN( getMinOverline(), iDrop); -+ UT_sint32 totx = getOverlineXoff(); -+ painter.drawLine(totx, iDrop, xoff+getWidth(), iDrop); -+ } -+ } -+ /* -+ Otherwise look to see if the next run has an underline or overline -+if not, draw the line, if does mark the next run as dirty to make sure it -+is drawn later. -+ */ -+ else -+ { -+ if ( b_Underline ) -+ { -+ if(!N_Run->isUnderline() || isSelectionDraw()) -+ { -+ iDrop = UT_MAX( getMaxUnderline(), iDrop); -+ UT_sint32 totx = getUnderlineXoff(); -+ xxx_UT_DEBUGMSG(("Underlining y-logical %d \n",iDrop)); -+ painter.drawLine(totx, iDrop, xoff+getWidth(), iDrop); -+ } -+ else -+ { -+ N_Run->markAsDirty(); -+ } -+ } -+ if ( b_Overline ) -+ { -+ if(!N_Run->isOverline() || isSelectionDraw()) -+ { -+ iDrop = UT_MIN( getMinOverline(), iDrop); -+ UT_sint32 totx = getOverlineXoff(); -+ painter.drawLine(totx, iDrop, xoff+getWidth(), iDrop); -+ } -+ else -+ { -+ N_Run->markAsDirty(); -+ } -+ } -+ } -+ /* -+ We always want strikethrough to go right through the middle of the -+text so we can keep the original code. -+ */ -+ if ( b_Strikethrough) -+ { -+ iDrop = yoff + getAscent() * 2 / 3; -+ painter.drawLine(xoff, iDrop, xoff+getWidth(), iDrop); -+ } -+ /* -+ Restore the previous line width. -+ */ -+ _setLineWidth(old_LineWidth); -+ pG->setLineWidth(_getLineWidth()); -+ if(!b_Topline && !b_Bottomline) -+ return; -+ /* -+ We always draw Topline right at the top of the line so there is no ambiguity -+ */ -+ UT_sint32 ithick = getToplineThickness(); -+ -+ UT_RGBColor clrFG; -+ const PP_AttrProp * pSpanAP = NULL; -+ const PP_AttrProp * pBlockAP = NULL; -+ const PP_AttrProp * pSectionAP = NULL; -+ -+ PD_Document * pDoc = getBlock()->getDocument(); -+ -+ getSpanAP(pSpanAP); -+ getBlockAP(pBlockAP); -+ UT_parseColor(PP_evalProperty("color",pSpanAP,pBlockAP, pSectionAP, pDoc, true), clrFG); -+ -+ // This gives the baseline of the selection. -+ // need to clear full height of line, in case we had a selection -+// UT_sint32 xxoff=0 ,ybase =0; -+// getLine()->getScreenOffsets(this, xxoff, ybase); -+ -+ -+ if ( b_Topline) -+ { -+ UT_sint32 ybase = yoff + getAscent() - getLine()->getAscent() + pG->tlu(1); -+ painter.fillRect(clrFG, xoff, ybase, getWidth(), ithick); -+ } -+ /* -+ We always draw bottomline right at the bottom so there is no ambiguity -+ */ -+ if ( b_Bottomline) -+ { -+ painter.fillRect(clrFG, xoff, yoff+getLine()->getHeight()-ithick+pG->tlu(1), getWidth(), ithick); -+ } -+} -+ -+inline bool fp_Run::isUnderline(void) const -+{ -+ return ((m_fDecorations & TEXT_DECOR_UNDERLINE) != 0); -+} -+ -+ -+inline bool fp_Run::isOverline(void) const -+{ -+ return ((m_fDecorations & TEXT_DECOR_OVERLINE) != 0); -+} -+ -+inline bool fp_Run::isStrikethrough(void) const -+{ -+ return ((m_fDecorations & TEXT_DECOR_LINETHROUGH) != 0); -+} -+ -+ -+inline bool fp_Run::isTopline(void) const -+{ -+ return ((m_fDecorations & TEXT_DECOR_TOPLINE) != 0); -+} -+ -+ -+inline bool fp_Run::isBottomline(void) const -+{ -+ return ((m_fDecorations & TEXT_DECOR_BOTTOMLINE) != 0); -+} -+ -+void fp_Run::setLinethickness(UT_sint32 max_linethickness) -+{ -+ m_iLinethickness = max_linethickness; -+} -+ -+void fp_Run::setUnderlineXoff(UT_sint32 xoff) -+{ -+ m_iUnderlineXoff = xoff; -+} -+ -+UT_sint32 fp_Run::getUnderlineXoff(void) -+{ -+ return m_iUnderlineXoff; -+} -+ -+void fp_Run::setOverlineXoff(UT_sint32 xoff) -+{ -+ m_iOverlineXoff = xoff; -+} -+ -+UT_sint32 fp_Run::getOverlineXoff(void) -+{ -+ return m_iOverlineXoff; -+} -+ -+void fp_Run::setMaxUnderline(UT_sint32 maxh) -+{ -+ m_imaxUnderline = maxh; -+} -+ -+UT_sint32 fp_Run::getMaxUnderline(void) -+{ -+ return m_imaxUnderline; -+} -+ -+void fp_Run::setMinOverline(UT_sint32 minh) -+{ -+ m_iminOverline = minh; -+} -+ -+UT_sint32 fp_Run::getMinOverline(void) -+{ -+ return m_iminOverline; -+} -+ -+UT_sint32 fp_Run::getLinethickness( void) -+{ -+ return m_iLinethickness; -+} -+ -+UT_sint32 fp_Run::getToplineThickness(void) -+{ -+ return UT_convertToLogicalUnits("0.8pt"); -+} -+ -+/*! -+ * This draws a line with some text in the center. -+ * \param xOff the x offset of the left end of the line -+ * \param yOff the y offset of the top (maybe bottom, I don't know) of -+ * the line -+ * \param iWidth the desired length of the line. -+ * \param iHeight the desired height of the line. Note that the line -+ * will almost certainly take up more vertical space than this, since -+ * the text will be taller than the line. -+ * \param pText the text to be displayed in the middle of the line -+ * \bug Currently, this does not detect whether it is on the screen or -+ * not, so it redraws way too often. -+*/ -+void fp_Run::_drawTextLine(UT_sint32 xoff,UT_sint32 yoff,UT_uint32 iWidth,UT_uint32 iHeight,UT_UCSChar *pText) -+{ -+ GR_Font *pFont = getGraphics()->getGUIFont(); -+ -+ GR_Painter painter(getGraphics()); -+ getGraphics()->setFont(pFont); -+ -+ UT_uint32 iTextLen = UT_UCS4_strlen(pText); -+ UT_uint32 iTextWidth = getGraphics()->measureString(pText,0,iTextLen,NULL); -+ UT_uint32 iTextHeight = getGraphics()->getFontHeight(pFont); -+ -+ UT_uint32 xoffText = xoff + (iWidth - iTextWidth) / 2; -+ UT_uint32 yoffText = yoff - getGraphics()->getFontAscent(pFont) * 2 / 3; -+ -+ painter.drawLine(xoff,yoff,xoff + iWidth,yoff); -+ -+ if((iTextWidth < iWidth) && (iTextHeight < iHeight)) -+ { -+ Fill(getGraphics(),xoffText,yoffText,iTextWidth,iTextHeight); -+ painter.drawChars(pText,0,iTextLen,xoffText,yoffText); -+ } -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+fp_TabRun::fp_TabRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) -+ : fp_Run(pBL, iOffsetFirst, iLen, FPRUN_TAB), -+ m_leader(FL_LEADER_NONE), -+ m_TabType(FL_TAB_NONE), -+ m_bIsTOC(false), -+ m_bIsTOCListLabel(false) -+{ -+ lookupProperties(); -+} -+ -+void fp_TabRun::_lookupProperties(const PP_AttrProp * pSpanAP, -+ const PP_AttrProp * pBlockAP, -+ const PP_AttrProp * pSectionAP, -+ GR_Graphics * pG) -+{ -+ bool bChanged = false; -+ -+ fd_Field * fd = NULL; -+ getBlock()->getField(getBlockOffset(),fd); -+ _setField(fd); -+ if(pG == NULL) -+ { -+ pG = getGraphics(); -+ } -+ UT_RGBColor clrFG; -+ UT_parseColor(PP_evalProperty("color",pSpanAP,pBlockAP,pSectionAP, getBlock()->getDocument(), true), clrFG); -+ bChanged |= (clrFG != _getColorFG()); -+ _setColorFG(clrFG); -+ -+ // look for fonts in this DocLayout's font cache -+ FL_DocLayout * pLayout = getBlock()->getDocLayout(); -+ const GR_Font * pFont = pLayout->findFont(pSpanAP,pBlockAP,pSectionAP,getGraphics()); -+ -+ if (pFont != _getFont()) -+ { -+ _setFont(pFont); -+ _setAscent(pG->getFontAscent(pFont)); -+ _setDescent(pG->getFontDescent(pFont)); -+ _setHeight(pG->getFontHeight(pFont)); -+ bChanged = true; -+ } -+ -+ if(getDirection() != UT_BIDI_WS) -+ { -+ _setDirection(UT_BIDI_WS); -+ bChanged = true; -+ //setDirectionProperty(UT_BIDI_WS); -+ } -+// -+// Lookup Decoration properties for this run -+// -+ const gchar *pszDecor = PP_evalProperty("text-decoration",pSpanAP,pBlockAP,pSectionAP, getBlock()->getDocument(), true); -+ _setLineWidth(getToplineThickness()); -+ -+ UT_uint32 oldDecors = _getDecorations(); -+ _setDecorations(0); -+ gchar* p; -+ if (!(p = g_strdup(pszDecor))) -+ { -+ // TODO outofmem -+ } -+ UT_ASSERT(p || !pszDecor); -+ gchar* q = strtok(p, " "); -+ -+ while (q) -+ { -+ if (0 == strcmp(q, "underline")) -+ { -+ _orDecorations(TEXT_DECOR_UNDERLINE); -+ } -+ else if (0 == strcmp(q, "overline")) -+ { -+ _orDecorations(TEXT_DECOR_OVERLINE); -+ } -+ else if (0 == strcmp(q, "line-through")) -+ { -+ _orDecorations(TEXT_DECOR_LINETHROUGH); -+ } -+ else if (0 == strcmp(q, "topline")) -+ { -+ _orDecorations(TEXT_DECOR_TOPLINE); -+ } -+ else if (0 == strcmp(q, "bottomline")) -+ { -+ _orDecorations(TEXT_DECOR_BOTTOMLINE); -+ } -+ q = strtok(NULL, " "); -+ } -+ g_free(p); -+ -+ bChanged |= (oldDecors != _getDecorations()); -+ -+ if(bChanged) -+ clearScreen(); -+ -+} -+ -+bool fp_TabRun::canBreakAfter(void) const -+{ -+ return false; -+} -+ -+bool fp_TabRun::canBreakBefore(void) const -+{ -+ return false; -+} -+ -+bool fp_TabRun::_letPointPass(void) const -+{ -+ return true; -+} -+ -+bool fp_TabRun::hasLayoutProperties(void) const -+{ -+ return true; -+} -+ -+void fp_TabRun::mapXYToPosition(UT_sint32 x, UT_sint32 /*y*/, PT_DocPosition& pos, bool& bBOL, bool& bEOL, bool &isTOC) -+{ -+ // If X is left of the middle, return offset to the left, -+ // otherwise the offset to the right. -+ if (x < (getWidth() / 2)) -+ pos = getBlock()->getPosition() + getBlockOffset(); -+ else -+ pos = getBlock()->getPosition() + getBlockOffset() + getLength(); -+ -+ bBOL = false; -+ bEOL = false; -+} -+ -+void fp_TabRun::findPointCoords(UT_uint32 iOffset, UT_sint32& x, UT_sint32& y, UT_sint32& x2, UT_sint32& y2, UT_sint32& height, bool& bDirection) -+{ -+ //UT_DEBUGMSG(("fintPointCoords: TabRun\n")); -+ UT_sint32 xoff; -+ UT_sint32 yoff; -+ UT_sint32 xoff2; -+ UT_sint32 yoff2; -+ -+ UT_ASSERT(getLine()); -+ if(getLine()->getY() == -2000000) -+ { -+ // UT_ASSERT(UT_SHOULD_NOT_HAPPEN); // might need this later -+ } -+ getLine()->getOffsets(this, xoff, yoff); -+ -+ fp_Run * pRun = 0; -+ UT_sint32 iNextDir = getVisDirection(); -+ -+ if (iOffset == (getBlockOffset() + getLength())) //#TF is this the right-most logical element of the run? -+ { -+ pRun = getNextRun(); -+ if(pRun) -+ { -+ pRun->getLine()->getOffsets(pRun, xoff2, yoff2); -+ iNextDir = pRun->getVisDirection(); -+ } -+ } -+ -+ UT_sint32 iDirection = getVisDirection(); -+ -+ x = xoff; -+ -+ if(iDirection == UT_BIDI_LTR) -+ { -+ xxx_UT_DEBUGMSG(("iOffset %d, getBlockOffset() %d, getLength() %d\n", iOffset,getBlockOffset(),getLength())); -+ if(iOffset != getBlockOffset()) -+ { -+ // this happens when a tab run is last run in a block and the eop's run -+ //findPointCoords() is called ... -+ //UT_ASSERT(iOffset == (getBlockOffset() + getLength())); -+ x += getWidth(); -+ } -+ } -+ else -+ { -+ if(iOffset == getBlockOffset()) -+ { -+ x += getWidth(); -+ } -+ } -+ -+ -+ if(pRun && (iNextDir != iDirection)) //if this run precedes run of different direction, we have to split the caret -+ { -+ x2 = (iNextDir == UT_BIDI_LTR) ? xoff + pRun->getWidth() : xoff2; -+ y2 = yoff2; -+ } -+ else -+ { -+ x2 = x; -+ y2 = yoff; -+ } -+ -+ bDirection = (iDirection != UT_BIDI_LTR); -+ y = yoff; -+ height = getHeight(); -+} -+ -+bool fp_TabRun::isTOCTab(void) -+{ -+ return m_bIsTOC; -+} -+ -+ -+void fp_TabRun::setTOCTabListLabel(void) -+{ -+ m_bIsTOCListLabel = true; -+ _setLength(0); -+ m_leader = FL_LEADER_NONE; -+ m_TabType = FL_TAB_LEFT; -+} -+ -+void fp_TabRun::setTabWidth(UT_sint32 iWidth) -+{ -+ clearScreen(); -+ fp_Run::_setWidth(iWidth); -+} -+ -+void fp_TabRun::setLeader(eTabLeader iLeader) -+{ -+ clearScreen(); -+ m_leader = iLeader; -+} -+ -+eTabLeader fp_TabRun::getLeader(void) -+{ -+ return m_leader; -+} -+ -+ -+void fp_TabRun::setTabType(eTabType iTabType) -+{ -+ m_TabType = iTabType; -+} -+ -+eTabType fp_TabRun::getTabType(void) const -+{ -+ return m_TabType; -+} -+ -+ -+void fp_TabRun::_clearScreen(bool /* bFullLineHeightRect */) -+{ -+ // UT_ASSERT(!isDirty()); -+ UT_ASSERT(getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)); -+ -+ UT_sint32 xoff = 0, yoff = 0; -+ -+ // need to clear full height of line, in case we had a selection -+ getLine()->getScreenOffsets(this, xoff, yoff); -+ Fill(getGraphics(),xoff, yoff, getWidth(), getLine()->getHeight()); -+} -+ -+void fp_TabRun::_drawArrow(UT_uint32 iLeft,UT_uint32 iTop,UT_uint32 iWidth, UT_uint32 iHeight) -+{ -+ if (!(getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN))){ -+ return; -+ } -+ -+#define NPOINTS 6 -+ -+ UT_Point points[NPOINTS]; -+ -+ UT_sint32 cur_linewidth = getGraphics()->tlu(1) + UT_MAX(getGraphics()->tlu(10),static_cast(getAscent()) - getGraphics()->tlu(10)) / 8; -+ UT_uint32 iyAxis = iTop + getLine()->getAscent() * 2 / 3; -+ UT_uint32 iMaxWidth = UT_MIN(iWidth / 10 * 6, static_cast(cur_linewidth) * 9); -+ UT_uint32 ixGap = (iWidth - iMaxWidth) / 2; -+ -+ //UT_DEBUGMSG(("iLeft %d, iWidth %d, visDir \"%s\"\n", iLeft,iWidth, getVisDirection() == UT_BIDI_LTR ? "ltr":"rtl")); -+ if(getVisDirection() == UT_BIDI_LTR) -+ { -+ points[0].x = iLeft + ixGap + iMaxWidth - cur_linewidth * 4; -+ points[0].y = iyAxis - cur_linewidth * 2; -+ -+ points[1].x = points[0].x + cur_linewidth; -+ points[1].y = points[0].y; -+ -+ points[2].x = iLeft + iWidth - ixGap; -+ points[2].y = iyAxis; -+ } -+ else -+ { -+ //iLeftAdj -= getWidth(); -+ -+ points[0].x = iLeft + ixGap + cur_linewidth * 4; -+ points[0].y = iyAxis - cur_linewidth * 2; -+ -+ points[1].x = points[0].x - cur_linewidth; -+ points[1].y = points[0].y; -+ -+ points[2].x = iLeft + ixGap; -+ points[2].y = iyAxis; -+ -+ } -+ -+ points[3].x = points[1].x; -+ points[3].y = iyAxis + cur_linewidth * 2; -+ -+ points[4].x = points[0].x; -+ points[4].y = points[3].y; -+ -+ points[5].x = points[0].x; -+ points[5].y = points[0].y; -+ -+ GR_Painter painter(getGraphics()); -+ -+ UT_RGBColor clrShowPara(_getView()->getColorShowPara()); -+ painter.polygon(clrShowPara,points,NPOINTS); -+ -+ xxx_UT_DEBUGMSG(("fp_TabRun::_drawArrow: iLeft %d, iyAxis %d, cur_linewidth %d, iMaxWidth %d\n", -+ iLeft, iyAxis, cur_linewidth, iMaxWidth)); -+ -+ // only draw the rectangle if iMaxWidth - cur_linewidth * 4 > 0, otherwise -+ // we get the rect running pass the end of the line and off the screen -+ if(static_cast(iMaxWidth - cur_linewidth * 4) > 0) -+ if(getVisDirection() == UT_BIDI_LTR) -+ { -+ painter.fillRect(clrShowPara,iLeft + ixGap,iyAxis - cur_linewidth / 2,iMaxWidth - cur_linewidth * 4,cur_linewidth); -+ } -+ else -+ { -+ painter.fillRect(clrShowPara,iLeft + ixGap + cur_linewidth * 4,iyAxis - cur_linewidth / 2,iMaxWidth - cur_linewidth * 4,cur_linewidth); -+ } -+#undef NPOINTS -+} -+ -+void fp_TabRun::_draw(dg_DrawArgs* pDA) -+{ -+ xxx_UT_DEBUGMSG(("fp_TabRun::_draw (0x%x)\n",this)); -+ GR_Graphics * pG = pDA->pG; -+ -+ // need to draw to the full height of line to join with line above. -+ UT_sint32 xoff= 0, yoff=0, DA_xoff = pDA->xoff; -+ -+ getLine()->getScreenOffsets(this, xoff, yoff); -+ -+ // need to clear full height of line, in case we had a selection -+ -+ UT_sint32 iFillHeight = getLine()->getHeight(); -+ UT_sint32 iFillTop = pDA->yoff - getLine()->getAscent(); -+ -+ xxx_UT_DEBUGMSG(("iFillTop Tab %d YTopOfRun %d \n",iFillTop, pDA->yoff - getAscent())); -+ FV_View* pView = _getView(); -+ UT_uint32 iSelAnchor = pView->getSelectionAnchor(); -+ UT_uint32 iPoint = pView->getPoint(); -+ -+ UT_uint32 iSel1 = UT_MIN(iSelAnchor, iPoint); -+ UT_uint32 iSel2 = UT_MAX(iSelAnchor, iPoint); -+ -+ UT_ASSERT(iSel1 <= iSel2); -+ -+ UT_uint32 iRunBase = getBlock()->getPosition() + getOffsetFirstVis(); //getBlockOffset(); -+ -+ UT_RGBColor clrFG; -+ const PP_AttrProp * pSpanAP = NULL; -+ const PP_AttrProp * pBlockAP = NULL; -+ const PP_AttrProp * pSectionAP = NULL; -+ -+ PD_Document * pDoc = getBlock()->getDocument(); -+ -+ getSpanAP(pSpanAP); -+ getBlockAP(pBlockAP); -+ -+ UT_parseColor(PP_evalProperty("color",pSpanAP,pBlockAP, pSectionAP, pDoc, true), clrFG); -+ -+ GR_Painter painter(pG); -+ -+ if ( isInSelectedTOC() || -+ /* pView->getFocus()!=AV_FOCUS_NONE && */ -+ (iSel1 <= iRunBase) -+ && (iSel2 > iRunBase) -+ ) -+ { -+ painter.fillRect(_getView()->getColorSelBackground(), /*pDA->xoff*/DA_xoff, iFillTop, getWidth(), iFillHeight); -+ if(pView->getShowPara()){ -+ _drawArrow(/*pDA->xoff*/DA_xoff, iFillTop, getWidth(), iFillHeight); -+ } -+ } -+ else -+ { -+ Fill(pG,DA_xoff, iFillTop, getWidth(), iFillHeight); -+ if(pView->getShowPara()){ -+ _drawArrow(/*pDA->xoff*/DA_xoff, iFillTop, getWidth(), iFillHeight); -+ } -+ } -+ if (m_leader != FL_LEADER_NONE) -+ { -+ UT_UCSChar tmp[151]; -+ UT_GrowBufElement wid[151]; -+ int i, cumWidth; -+ -+ tmp[0] = 150; -+ switch (m_leader) -+ { -+ case FL_LEADER_DOT: -+ tmp[1] = '.'; -+ break; -+ case FL_LEADER_HYPHEN: -+ tmp[1] = '-'; -+ break; -+ case FL_LEADER_UNDERLINE: -+ tmp[1] = '_'; -+ break; -+ default: -+ tmp[1] = ' '; -+ break; -+ } -+ -+ for (i = 2; i < 151; i++) -+ tmp[i] = tmp[1]; -+ -+ -+ pG->setFont(_getFont()); -+ pG->measureString(tmp, 1, 150, wid); -+ // one would think that one could measure -+ // one character and divide the needed -+ // width by that; would one be so wrong? -+ // we're not dealing with different letters -+ // here, after all. -+ -+ i = 1; -+ cumWidth = 0; -+ FL_DocLayout * pLayout = getBlock()->getDocLayout(); -+ UT_sint32 iTabTop = pDA->yoff - getAscent(); -+ if(pG && pLayout->isQuickPrint() && pG->queryProperties(GR_Graphics::DGP_PAPER)) -+ { -+ iTabTop = pDA->yoff - pG->getFontAscent(_getFont()); -+ } -+ while (cumWidth < getWidth() && i < 151) -+ { -+ if(pG && pLayout->isQuickPrint() && pG->queryProperties(GR_Graphics::DGP_PAPER)) -+ { -+ wid[i] = static_cast(wid[i]*pG->getResolutionRatio()); -+ } -+ cumWidth += wid[i++]; -+ } -+ i = (i>=3) ? i - 2 : 1; -+ pG->setColor(clrFG); -+ painter.drawChars(tmp, 1, i, /*pDA->xoff*/DA_xoff, iTabTop,wid); -+ } -+// -+// Draw underline/overline/strikethough -+// -+ UT_sint32 yTopOfRun = pDA->yoff - getAscent()-1; // Hack to remove -+ //character dirt -+ drawDecors( xoff, yTopOfRun,pG); -+// -+// Draw bar seperators -+// -+ if(FL_TAB_BAR == getTabType()) -+ { -+ // need to draw to the full height of line to join with line above. -+ UT_sint32 iFillHeight = getLine()->getHeight(); -+// -+// Scale the vertical line thickness for printers -+// -+ UT_sint32 ithick = getToplineThickness(); -+ painter.fillRect(clrFG, /*pDA->xoff*/DA_xoff+getWidth()-ithick, iFillTop, ithick, iFillHeight); -+ } -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+fp_ForcedLineBreakRun::fp_ForcedLineBreakRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_Run(pBL, iOffsetFirst, iLen, FPRUN_FORCEDLINEBREAK) -+{ -+ //UT_DEBUGMSG(("fp_ForcedLineBreakRun constructor\n")); -+ lookupProperties(); -+} -+ -+void fp_ForcedLineBreakRun::_lookupProperties(const PP_AttrProp * pSpanAP, -+ const PP_AttrProp * pBlockAP, -+ const PP_AttrProp * pSectionAP, -+ GR_Graphics * pG) -+{ -+ //UT_DEBUGMSG(("fp_ForcedLineBreakRun::lookupProperties\n")); -+ fd_Field * fd = NULL; -+ getBlock()->getField(getBlockOffset(),fd); -+ _setField(fd); -+ if(pG == NULL) -+ { -+ pG = getGraphics(); -+ } -+ _inheritProperties(); -+ FV_View* pView = _getView(); -+ if (pView && pView->getShowPara()) -+ { -+ //UT_UCSChar pEOP[] = { UCS_LINESEP, 0 }; - see bug 1279 -+ UT_UCSChar pEOP[] = { '^', 'l', 0 }; -+ UT_uint32 iTextLen = UT_UCS4_strlen(pEOP); -+ -+ fp_Run* pPropRun = _findPrevPropertyRun(); -+ if (pPropRun && (FPRUN_TEXT == pPropRun->getType())) -+ { -+ fp_TextRun* pTextRun = static_cast(pPropRun); -+ pG->setFont(pTextRun->getFont()); -+ } -+ else -+ { -+ // look for fonts in this DocLayout's font cache -+ FL_DocLayout * pLayout = getBlock()->getDocLayout(); -+ -+ const GR_Font * pFont = pLayout->findFont(pSpanAP,pBlockAP,pSectionAP,getGraphics()); -+ getGraphics()->setFont(pFont); -+ } -+ _setWidth(getGraphics()->measureString(pEOP, 0, iTextLen, NULL)); -+ xxx_UT_DEBUGMSG(("fp_EndOfParagraphRun::lookupProperties: width %d\n", getWidth())); -+ } -+ else -+ { -+ _setWidth(16); -+ } -+} -+ -+bool fp_ForcedLineBreakRun::canBreakAfter(void) const -+{ -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ -+ return false; -+} -+ -+bool fp_ForcedLineBreakRun::canBreakBefore(void) const -+{ -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ -+ return false; -+} -+ -+bool fp_ForcedLineBreakRun::_letPointPass(void) const -+{ -+ return false; -+} -+ -+void fp_ForcedLineBreakRun::mapXYToPosition(UT_sint32 /* x */, UT_sint32 /*y*/, PT_DocPosition& pos, bool& bBOL, bool& bEOL, bool &isTOC) -+{ -+ //UT_DEBUGMSG(("fp_ForcedLineBreakRun::mapXYToPosition\n")); -+ pos = getBlock()->getPosition() + getBlockOffset(); -+ bBOL = false; -+ bEOL = false; -+} -+ -+void fp_ForcedLineBreakRun::findPointCoords(UT_uint32 iOffset, UT_sint32& x, UT_sint32& y, UT_sint32& x2, UT_sint32& y2, UT_sint32& height, bool& bDirection) -+{ -+ // this assert is wrong -- a run can be asked to return coords for position it does -+ // not contain if the run which contains it cannot contain point -+ // UT_ASSERT(getBlockOffset() == iOffset || getBlockOffset()+1 == iOffset); -+ -+ UT_sint32 xoff, yoff; -+ -+ fp_Run* pPropRun = _findPrevPropertyRun(); -+ -+ if (pPropRun) -+ { -+ if(FPRUN_TEXT == pPropRun->getType()) -+ { -+ pPropRun->findPointCoords(iOffset, x, y, x2, y2, height, bDirection); -+ } -+ else -+ { -+ height = getHeight(); -+ getLine()->getOffsets(this, xoff, yoff); -+ x = xoff; -+ y = yoff; -+ } -+ } -+ else -+ { -+ height = getHeight(); -+ getLine()->getOffsets(this, xoff, yoff); -+ x = xoff; -+ y = yoff; -+ } -+ -+ if (iOffset == getBlockOffset()+1) -+ { -+ FV_View* pView = _getView(); -+ if (pView && pView->getShowPara()) -+ { -+ x += getWidth(); -+ } -+ } -+ -+ x2 = x; -+ y2 = y; -+ //UT_DEBUGMSG(("fintPointCoords: ForcedLineBreakRun: x=%d, y=%d, h=%d\n", x,y,height)); -+} -+ -+void fp_ForcedLineBreakRun::_clearScreen(bool /* bFullLineHeightRect */) -+{ -+ // UT_ASSERT(!isDirty()); -+ UT_ASSERT(getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)); -+} -+ -+void fp_ForcedLineBreakRun::_draw(dg_DrawArgs* pDA) -+{ -+ -+ UT_sint32 iXoffText = 0; -+ UT_sint32 iYoffText = 0; -+ -+ FV_View* pView = _getView(); -+ if(!pView || !pView->getShowPara()) -+ { -+ if(getWidth()) -+ { -+ _setWidth(0); -+ } -+ return; -+ } -+ -+ GR_Painter painter(getGraphics()); -+ -+ UT_uint32 iRunBase = getBlock()->getPosition() + getBlockOffset(); -+ -+ UT_uint32 iSelAnchor = pView->getSelectionAnchor(); -+ UT_uint32 iPoint = pView->getPoint(); -+ -+ UT_uint32 iSel1 = UT_MIN(iSelAnchor, iPoint); -+ UT_uint32 iSel2 = UT_MAX(iSelAnchor, iPoint); -+ -+ UT_ASSERT(iSel1 <= iSel2); -+ -+ bool bIsSelected = false; -+ if (/* pView->getFocus()!=AV_FOCUS_NONE && */ isInSelectedTOC() || (iSel1 <= iRunBase) && (iSel2 > iRunBase)) -+ bIsSelected = true; -+ -+ UT_RGBColor clrShowPara(pView->getColorShowPara()); -+ -+ //UT_UCSChar pEOP[] = { UCS_LINESEP, 0 }; -+ UT_UCSChar pEOP[] = { '^', 'l', 0 }; -+ UT_uint32 iTextLen = UT_UCS4_strlen(pEOP); -+ UT_sint32 iAscent; -+ -+ fp_Run* pPropRun = _findPrevPropertyRun(); -+ if (pPropRun && (FPRUN_TEXT == pPropRun->getType())) -+ { -+ fp_TextRun* pTextRun = static_cast(pPropRun); -+ getGraphics()->setFont(pTextRun->getFont()); -+ iAscent = pTextRun->getAscent(); -+ } -+ else -+ { -+ const PP_AttrProp * pSpanAP = NULL; -+ const PP_AttrProp * pBlockAP = NULL; -+ const PP_AttrProp * pSectionAP = NULL; -+ -+ getSpanAP(pSpanAP); -+ getBlockAP(pBlockAP); -+ -+ // look for fonts in this DocLayout's font cache -+ FL_DocLayout * pLayout = getBlock()->getDocLayout(); -+ -+ const GR_Font * pFont = pLayout->findFont(pSpanAP,pBlockAP,pSectionAP,getGraphics()); -+ getGraphics()->setFont(pFont); -+ iAscent = getGraphics()->getFontAscent(); -+ } -+ -+ // if we currently have a 0 width, i.e., we draw in response to the -+ // showPara being turned on, then we obtain the new width, and then -+ // tell the line to redo its layout and redraw instead of drawing ourselves -+ // bool bWidthChange = false; -+ // if(!getWidth()) -+ // bWidthChange = true; -+ -+ _setWidth(getGraphics()->measureString(pEOP, 0, iTextLen, NULL)); -+ // if(bWidthChange) -+ // { -+ // getLine()->layout(); -+ // getLine()->redrawUpdate(); -+ // return; -+ // } -+ -+ _setHeight(getGraphics()->getFontHeight()); -+ iXoffText = pDA->xoff; -+ -+ if(getBlock()->getDominantDirection() == UT_BIDI_RTL) -+ { -+ iXoffText -= getWidth(); -+ } -+ -+ iYoffText = pDA->yoff - iAscent; -+ xxx_UT_DEBUGMSG(("fp_EndOfParagraphRun::draw: width %d\n", getWidth())); -+ -+ if (bIsSelected) -+ { -+ painter.fillRect(_getView()->getColorSelBackground(), iXoffText, iYoffText, getWidth(), getLine()->getHeight()); -+ } -+ else -+ { -+ Fill(getGraphics(),iXoffText, iYoffText, getWidth(), getLine()->getHeight()); -+ } -+ if (pView->getShowPara()) -+ { -+ // Draw pilcrow -+ getGraphics()->setColor(clrShowPara); -+ painter.drawChars(pEOP, 0, iTextLen, iXoffText, iYoffText); -+ } -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+fp_FieldStartRun::fp_FieldStartRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_Run(pBL, iOffsetFirst, iLen, FPRUN_FIELDSTARTRUN) -+{ -+ lookupProperties(); -+} -+ -+void fp_FieldStartRun::_lookupProperties(const PP_AttrProp * /*pSpanAP*/, -+ const PP_AttrProp * /*pBlockAP*/, -+ const PP_AttrProp * /*pSectionAP*/, -+ GR_Graphics *) -+{ -+ fd_Field * fd = NULL; -+ getBlock()->getField(getBlockOffset(),fd); -+ _setField(fd); -+ _setWidth(0); -+} -+ -+bool fp_FieldStartRun::canBreakAfter(void) const -+{ -+ return true; -+} -+ -+bool fp_FieldStartRun::canBreakBefore(void) const -+{ -+ return true; -+} -+ -+bool fp_FieldStartRun::_letPointPass(void) const -+{ -+ return true; -+} -+ -+void fp_FieldStartRun::mapXYToPosition(UT_sint32 /* x */, UT_sint32 /*y*/, PT_DocPosition& pos, bool& bBOL, bool& bEOL, bool &isTOC) -+{ -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ -+ pos = getBlock()->getPosition() + getBlockOffset(); -+ bBOL = false; -+ bEOL = false; -+} -+ -+ -+void fp_FieldStartRun::findPointCoords(UT_uint32 iOffset, UT_sint32& x, UT_sint32& y, UT_sint32& x2, UT_sint32& y2, UT_sint32& height, bool& bDirection) -+{ -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+} -+ -+void fp_FieldStartRun::_clearScreen(bool /* bFullLineHeightRect */) -+{ -+ // UT_ASSERT(!isDirty()); -+ UT_ASSERT(getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)); -+} -+ -+void fp_FieldStartRun::_draw(dg_DrawArgs* pDA) -+{ -+ -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+fp_FieldEndRun::fp_FieldEndRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_Run(pBL, iOffsetFirst, iLen, FPRUN_FIELDENDRUN) -+{ -+ lookupProperties(); -+} -+ -+void fp_FieldEndRun::_lookupProperties(const PP_AttrProp * /*pSpanAP*/, -+ const PP_AttrProp * /*pBlockAP*/, -+ const PP_AttrProp * /*pSectionAP*/, -+ GR_Graphics *) -+{ -+ fd_Field * fd = NULL; -+ getBlock()->getField(getBlockOffset(),fd); -+ _setField(fd); -+ _setWidth(0); -+} -+ -+bool fp_FieldEndRun::canBreakAfter(void) const -+{ -+ return true; -+} -+ -+bool fp_FieldEndRun::canBreakBefore(void) const -+{ -+ return true; -+} -+ -+bool fp_FieldEndRun::_letPointPass(void) const -+{ -+ return true; -+} -+ -+void fp_FieldEndRun::mapXYToPosition(UT_sint32 /* x */, UT_sint32 /*y*/, PT_DocPosition& pos, bool& bBOL, bool& bEOL, bool &isTOC) -+{ -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ -+ pos = getBlock()->getPosition() + getBlockOffset(); -+ bBOL = false; -+ bEOL = false; -+} -+ -+void fp_FieldEndRun::findPointCoords(UT_uint32 iOffset, UT_sint32& x, UT_sint32& y, UT_sint32& x2, UT_sint32& y2, UT_sint32& height, bool& bDirection) -+{ -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+} -+ -+void fp_FieldEndRun::_clearScreen(bool /* bFullLineHeightRect */) -+{ -+ // UT_ASSERT(!isDirty()); -+ UT_ASSERT(getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)); -+} -+ -+void fp_FieldEndRun::_draw(dg_DrawArgs* pDA) -+{ -+ -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+ -+ -+fp_BookmarkRun::fp_BookmarkRun( fl_BlockLayout* pBL, -+ UT_uint32 iOffsetFirst, -+ UT_uint32 iLen) -+ : fp_Run(pBL, iOffsetFirst, iLen, FPRUN_BOOKMARK) -+{ -+ m_pBookmark = getBlock()->getBookmark(iOffsetFirst); -+ UT_return_if_fail(m_pBookmark); -+ -+ _setDirty(true); -+ -+ UT_ASSERT((pBL)); -+ _setDirection(UT_BIDI_WS); -+ -+ m_bIsStart = (po_Bookmark::POBOOKMARK_START == m_pBookmark->getBookmarkType()); -+ -+ // have to cache the name, since we will need to use it for a while -+ // after the associated PT fragment has been deleted. -+ strncpy(m_pName, m_pBookmark->getName(), BOOKMARK_NAME_SIZE); -+ m_pName[BOOKMARK_NAME_SIZE] = 0; -+ -+ _setWidth(0); -+ _setRecalcWidth(false); -+} -+ -+bool fp_BookmarkRun::isComrade(fp_BookmarkRun *pBR) const -+{ -+ UT_ASSERT(m_pName && *m_pName && pBR->m_pName && *pBR->m_pName); -+ return (0 == strcmp(m_pName, pBR->m_pName)); -+} -+ -+void fp_BookmarkRun::_lookupProperties(const PP_AttrProp * /*pSpanAP*/, -+ const PP_AttrProp * /*pBlockAP*/, -+ const PP_AttrProp * /*pSectionAP*/, -+ GR_Graphics *) -+{ -+} -+ -+bool fp_BookmarkRun::canBreakAfter(void) const -+{ -+ return true; -+} -+ -+bool fp_BookmarkRun::canBreakBefore(void) const -+{ -+ return true; -+} -+ -+bool fp_BookmarkRun::_letPointPass(void) const -+{ -+ return true; -+} -+ -+bool fp_BookmarkRun::_canContainPoint(void) const -+{ -+ return false; -+} -+ -+bool fp_BookmarkRun::_deleteFollowingIfAtInsPoint() const -+{ -+ return true; -+} -+ -+/*! -+ When working with bookmarks, the run block offset does not always adequately represent the -+ location of the bookmark. For example, if the user bookmarks the same place in the doc with -+ several bookmarks, the run offsets for each associated run will be different, but most of the -+ time we are interested in the offset to the left or right of all stacked up bookmarks. Similarly, -+ a bookmark that is immediately after a start of block needs to be treated in certain situations -+ as if the block strux was also sellected. This function implements the necessary logic. -+ -+ In general, when we jump to bookmarks, we go to the range in between the two bookmark -+ object. However, for purposes of TOCs, we are interested in the range that is just outside the -+ two objects. -+ -+ \parameter bAfter: indicates if we want offset to the right (true) or left (false) of the -+ bookmark -+ -+ \return: the return value is document offset of the bookmarked position -+*/ -+UT_uint32 fp_BookmarkRun::getBookmarkedDocPosition(bool bAfter) const -+{ -+ if(bAfter) -+ { -+ fp_Run * pRun = getNextRun(); -+ const fp_Run * pPrevRun = this; -+ -+ while(pRun) -+ { -+ switch (pRun->getType()) -+ { -+ case FPRUN_BOOKMARK: -+ case FPRUN_FMTMARK: -+ pPrevRun = pRun; -+ pRun = pRun->getNextRun(); -+ break; -+ -+ default: -+ return getBlock()->getPosition(false) + pRun->getBlockOffset(); -+ } -+ } -+ -+ UT_ASSERT_HARMLESS( !pRun ); -+ return getBlock()->getPosition(false) + pPrevRun->getBlockOffset() + pPrevRun->getLength(); -+ } -+ else -+ { -+ fp_Run * pRun = getPrevRun(); -+ -+ while(pRun) -+ { -+ switch (pRun->getType()) -+ { -+ case FPRUN_BOOKMARK: -+ case FPRUN_FMTMARK: -+ pRun = pRun->getPrevRun(); -+ break; -+ -+ default: -+ return getBlock()->getPosition(false) + pRun->getBlockOffset() + pRun->getLength(); -+ } -+ } -+ -+ UT_ASSERT_HARMLESS( !pRun ); -+ return getBlock()->getPosition(true); // offset of the block strux -+ } -+} -+ -+void fp_BookmarkRun::mapXYToPosition(UT_sint32 x, UT_sint32 y, PT_DocPosition& pos, bool& bBOL, bool& bEOL, bool &isTOC) -+{ -+ fp_Run *pRun = getNextRun(); -+ UT_ASSERT(pRun); -+ pRun->mapXYToPosition(x, y, pos, bBOL, bEOL,isTOC); -+} -+ -+void fp_BookmarkRun::findPointCoords(UT_uint32 iOffset, UT_sint32& x, UT_sint32& y, UT_sint32& x2, UT_sint32& y2, UT_sint32& height, bool& bDirection) -+{ -+ fp_Run * pRun = getNextRun(); -+ UT_ASSERT(pRun); -+ -+ pRun->findPointCoords(iOffset, x, y, x2, y2, height, bDirection); -+} -+ -+void fp_BookmarkRun::_clearScreen(bool /* bFullLineHeightRect */) -+{ -+ UT_ASSERT(getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)); -+ -+ FV_View* pView = _getView(); -+ if(!pView || !pView->getShowPara()) -+ { -+ return; -+ } -+ -+ -+ UT_sint32 xoff = 0, yoff = 0; -+ getLine()->getScreenOffsets(this, xoff, yoff); -+ -+ if(m_bIsStart) -+ Fill(getGraphics(), xoff, yoff, 4, 8); -+ else -+ Fill(getGraphics(),xoff - 4, yoff, 4, 8); -+ -+} -+ -+void fp_BookmarkRun::_draw(dg_DrawArgs* pDA) -+{ -+ GR_Graphics * pG = pDA->pG; -+ if (!(pG->queryProperties(GR_Graphics::DGP_SCREEN))){ -+ return; -+ } -+ -+ FV_View* pView = _getView(); -+ if(!pView || !pView->getShowPara()) -+ { -+ return; -+ } -+ -+ -+ UT_uint32 iRunBase = getBlock()->getPosition() + getBlockOffset(); -+ -+ UT_uint32 iSelAnchor = pView->getSelectionAnchor(); -+ UT_uint32 iPoint = pView->getPoint(); -+ -+ UT_uint32 iSel1 = UT_MIN(iSelAnchor, iPoint); -+ UT_uint32 iSel2 = UT_MAX(iSelAnchor, iPoint); -+ -+ UT_ASSERT(iSel1 <= iSel2); -+ -+ bool bIsSelected = false; -+ if (/* pView->getFocus()!=AV_FOCUS_NONE && */isInSelectedTOC() || (iSel1 <= iRunBase) && (iSel2 > iRunBase)) -+ bIsSelected = true; -+ -+ pG->setColor(_getView()->getColorShowPara()); -+ -+ -+ #define NPOINTS 4 -+ -+ UT_Point points[NPOINTS]; -+ -+ points[0].y = pDA->yoff; -+ -+ -+ if(m_bIsStart) -+ { -+ points[0].x = pDA->xoff - 4; -+ points[1].x = pDA->xoff; -+ } -+ else -+ { -+ points[0].x = pDA->xoff; -+ points[1].x = points[0].x - 4; -+ } -+ -+ points[1].y = points[0].y + 4; -+ -+ points[2].x = points[0].x; -+ points[2].y = points[0].y + 8; -+ -+ points[3].x = points[0].x; -+ points[3].y = points[0].y; -+ -+ UT_RGBColor clrShowPara(_getView()->getColorShowPara()); -+ -+ GR_Painter painter(pG); -+ painter.polygon(clrShowPara,points,NPOINTS); -+ #undef NPOINTS -+ -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+fp_HyperlinkRun::fp_HyperlinkRun( fl_BlockLayout* pBL, -+ UT_uint32 iOffsetFirst, -+ UT_uint32 /*iLen*/) -+ : fp_Run(pBL, iOffsetFirst, 1, FPRUN_HYPERLINK) -+{ -+ _setLength(1); -+ _setDirty(false); -+ _setWidth(0); -+ _setRecalcWidth(false); -+ -+ UT_ASSERT((pBL)); -+ _setDirection(UT_BIDI_WS); -+ -+ const PP_AttrProp * pAP = NULL; -+ -+ getSpanAP(pAP); -+ -+ const gchar * pTarget; -+ const gchar * pName; -+ bool bFound = false; -+ UT_uint32 k = 0; -+ -+ while(pAP->getNthAttribute(k++, pName, pTarget)) -+ { -+ bFound = (0 == g_ascii_strncasecmp(pName,"xlink:href",10)); -+ if(bFound) -+ break; -+ } -+ -+ // we have got to keep a local copy, since the pointer we get -+ // is to a potentially volatile location -+ if(bFound) -+ { -+ UT_uint32 iTargetLen = strlen(pTarget); -+ m_pTarget = new gchar [iTargetLen + 1]; -+ strncpy(m_pTarget, pTarget, iTargetLen + 1); -+ m_bIsStart = true; -+ //if this is a start of the hyperlink, we set m_pHyperlink to this, -+ //so that when a run gets inserted after this one, its m_pHyperlink is -+ //set correctly -+ _setHyperlink(this); -+ } -+ else -+ { -+ m_bIsStart = false; -+ m_pTarget = NULL; -+ _setHyperlink(NULL); -+ } -+ -+} -+ -+ -+fp_HyperlinkRun::~fp_HyperlinkRun() -+{ -+ if(m_pTarget) -+ delete [] m_pTarget; -+} -+ -+void fp_HyperlinkRun::_lookupProperties(const PP_AttrProp * /*pSpanAP*/, -+ const PP_AttrProp * /*pBlockAP*/, -+ const PP_AttrProp * /*pSectionAP*/, -+ GR_Graphics *) -+{ -+} -+ -+bool fp_HyperlinkRun::canBreakAfter(void) const -+{ -+ return false; -+} -+ -+bool fp_HyperlinkRun::canBreakBefore(void) const -+{ -+ return true; -+} -+ -+bool fp_HyperlinkRun::_letPointPass(void) const -+{ -+ return true; -+} -+ -+bool fp_HyperlinkRun::_canContainPoint(void) const -+{ -+ return false; -+} -+ -+bool fp_HyperlinkRun::_deleteFollowingIfAtInsPoint() const -+{ -+ return true; -+} -+ -+void fp_HyperlinkRun::mapXYToPosition(UT_sint32 x, UT_sint32 y, PT_DocPosition& pos, bool& bBOL, bool& bEOL, bool &isTOC) -+{ -+ fp_Run *pRun = getNextRun(); -+ UT_ASSERT(pRun); -+ pRun->mapXYToPosition(x, y, pos, bBOL, bEOL,isTOC); -+} -+ -+void fp_HyperlinkRun::findPointCoords(UT_uint32 iOffset, UT_sint32& x, UT_sint32& y, UT_sint32& x2, UT_sint32& y2, UT_sint32& height, bool& bDirection) -+{ -+ fp_Run * pRun = getNextRun(); -+ UT_ASSERT(pRun); -+ -+ pRun->findPointCoords(iOffset, x, y, x2, y2, height, bDirection); -+} -+ -+void fp_HyperlinkRun::_clearScreen(bool /* bFullLineHeightRect */) -+{ -+} -+ -+void fp_HyperlinkRun::_draw(dg_DrawArgs* /*pDA*/) -+{ -+} -+ -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+fp_EndOfParagraphRun::fp_EndOfParagraphRun(fl_BlockLayout* pBL, -+ UT_uint32 iOffsetFirst, -+ UT_uint32 iLen) -+ : fp_Run(pBL, iOffsetFirst, iLen, FPRUN_ENDOFPARAGRAPH) -+{ -+ -+ _setLength(1); -+ _setDirty(true); -+ xxx_UT_DEBUGMSG(("fp_EndOfParagraphRun::created this %x block %x \n",this,getBlock())); -+ -+ UT_ASSERT((pBL)); -+ _setDirection(pBL->getDominantDirection()); -+ lookupProperties(); -+} -+ -+ -+bool fp_EndOfParagraphRun::_recalcWidth(void) -+{ -+ return false; -+} -+ -+void fp_EndOfParagraphRun::_lookupProperties(const PP_AttrProp * pSpanAP, -+ const PP_AttrProp * pBlockAP, -+ const PP_AttrProp * pSectionAP, -+ GR_Graphics * pG) -+{ -+ xxx_UT_DEBUGMSG(("fp_EndOfParagraphRun::lookupProperties this %x block %x \n",this,getBlock())); -+ _inheritProperties(); -+ xxx_UT_DEBUGMSG(("After Inherit props Height is %d \n",getHeight())); -+ const gchar* pRevision = NULL; -+ -+ if(pBlockAP && pBlockAP->getAttribute("revision", pRevision)) -+ { -+ // we will not in fact be doing anything with the actual -+ // properties and attributes contained in the revision -+ // we just need its representation so the base class can -+ // handle us properly -+ PP_RevisionAttr * pRev = getRevisions(); -+ -+ if(pRev) -+ delete pRev; -+ -+ _setRevisions(new PP_RevisionAttr(pRevision)); -+ } -+ -+ FV_View* pView = _getView(); -+ if(pG == NULL) -+ { -+ pG = getGraphics(); -+ } -+ if (pView && pView->getShowPara()) -+ { -+ // Find width of Pilcrow -+ UT_UCSChar pEOP[] = { UCS_PILCROW, 0 }; -+ UT_uint32 iTextLen = UT_UCS4_strlen(pEOP); -+ -+ fp_Run* pPropRun = _findPrevPropertyRun(); -+ if (pPropRun && (FPRUN_TEXT == pPropRun->getType())) -+ { -+ fp_TextRun* pTextRun = static_cast(pPropRun); -+ pG->setFont(pTextRun->getFont()); -+ } -+ else -+ { -+ // look for fonts in this DocLayout's font cache -+ FL_DocLayout * pLayout = getBlock()->getDocLayout(); -+ -+ const GR_Font * pFont = pLayout->findFont(pSpanAP,pBlockAP,pSectionAP,getGraphics()); -+ pG->setFont(pFont); -+ } -+ m_iDrawWidth = pG->measureString(pEOP, 0, iTextLen, NULL); -+ xxx_UT_DEBUGMSG(("fp_EndOfParagraphRun::lookupProperties: width %d\n", getWidth())); -+ } -+ else -+ { -+ // FIXME:jskov This should probably be the width of the -+ // document to the right of the pilcrow, see Paul's suggested -+ // selection behaviors. Doesn't matter until we get selection -+ // support though (which requires PT changes). -+ -+ // I have changed this to 0, because otherwise it figures in -+ // calculation of line width, and the last line in righ-aligned -+ // paragraphs is shifted by the width of the pilcrow. -+ // this required some additional changes to the _draw function -+ // Tomas -+ m_iDrawWidth = 0; -+ } -+} -+ -+bool fp_EndOfParagraphRun::canBreakAfter(void) const -+{ -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ -+ return false; -+} -+ -+bool fp_EndOfParagraphRun::canBreakBefore(void) const -+{ -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ -+ return false; -+} -+ -+bool fp_EndOfParagraphRun::_letPointPass(void) const -+{ -+ return false; -+} -+ -+void fp_EndOfParagraphRun::mapXYToPosition(UT_sint32 /* x */, UT_sint32 /*y*/, PT_DocPosition& pos, bool& bBOL, bool& bEOL, bool &isTOC) -+{ -+ pos = getBlock()->getPosition() + getBlockOffset(); -+ bBOL = false; -+ bEOL = true; -+} -+ -+void fp_EndOfParagraphRun::findPointCoords(UT_uint32 iOffset, -+ UT_sint32& x, UT_sint32& y, -+ UT_sint32& x2, UT_sint32& y2, -+ UT_sint32& height, -+ bool& bDirection) -+{ -+ // FIXME:jskov Find out why we are sometimes asked to find pos at -+ // right of pilcrow. Should never ever happen... But does. -+ // fjsdkjfklsdsdfsdsd move cursor back -+ // UT_ASSERT(getBlockOffset() == iOffset); -+ -+ fp_Run* pPropRun = _findPrevPropertyRun(); -+ -+ height = getHeight(); -+ if(pPropRun && pPropRun->getType() == FPRUN_IMAGE) -+ { -+ height = static_cast(pPropRun)->getPointHeight(); -+ } -+ xxx_UT_DEBUGMSG((" Got initial height of %d \n",height)); -+ if (pPropRun) -+ { -+ xxx_UT_DEBUGMSG(("Got propRun in EOPRun \n")); -+ height = pPropRun->getHeight(); -+ if(pPropRun->getType() == FPRUN_IMAGE) -+ { -+ height = static_cast(pPropRun)->getPointHeight(); -+ } -+ -+ // If property Run is on the same line, get y location from -+ // it (to reflect proper ascent). -+ if (pPropRun->getLine() == getLine()) -+ { -+ pPropRun->findPointCoords(iOffset, x, y, x2, y2, height, bDirection); -+ xxx_UT_DEBUGMSG(("Got propRun in EOPRun inherited height %d \n",height)); -+ if(pPropRun->getType() == FPRUN_IMAGE) -+ { -+ height = static_cast(pPropRun)->getPointHeight(); -+ } -+ return; -+ } -+ } -+ xxx_UT_DEBUGMSG((" Got final height of %d \n",height)); -+ -+ getLine()->getOffsets(this, x, y); -+ x2 = x; -+ y2 = y; -+} -+ -+void fp_EndOfParagraphRun::_clearScreen(bool /* bFullLineHeightRect */) -+{ -+ // UT_ASSERT(!isDirty()); -+ UT_ASSERT(getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)); -+ if(m_iDrawWidth == 0 ) -+ { -+ return; -+ } -+ UT_sint32 xoff = 0, yoff = 0; -+ getLine()->getScreenOffsets(this, xoff, yoff); -+ -+ if(getBlock()->getDominantDirection() == UT_BIDI_RTL) -+ { -+ xoff -= m_iDrawWidth; -+ } -+ Fill(getGraphics(),xoff, yoff+1, m_iDrawWidth, getLine()->getHeight()+1); -+} -+ -+/*! -+ Draw end-of-paragraph Run graphical representation -+ \param pDA Draw arguments -+ Draws the pilcrow character (reverse P) in show paragraphs mode. -+ \fixme Make it use the same typeface as preceding text. -+ \note This _draw function is special in that it does (partly) lookup -+ as well. That's because the pilcrow's typeface is controlled by the -+ preceding character. Eventually, when the PT learns about EOP, it -+ should be possible to just deal with this in the lookup function. -+*/ -+void fp_EndOfParagraphRun::_draw(dg_DrawArgs* pDA) -+{ -+ // if showPara is turned off we will not draw anything at all; however, -+ // we will ensure that the width is set to 0, and if it is currently not -+ // we will get our line to redo its layout and redraw. -+ FV_View* pView = _getView(); -+ if(!pView || !pView->getShowPara()) -+ { -+ if(m_iDrawWidth) -+ { -+ m_iDrawWidth = 0; -+ //getLine()->layout(); -+ //getLine()->redrawUpdate(); -+ } -+ return; -+ } -+ -+ UT_uint32 iRunBase = getBlock()->getPosition() + getBlockOffset(); -+ -+ UT_uint32 iSelAnchor = pView->getSelectionAnchor(); -+ UT_uint32 iPoint = pView->getPoint(); -+ -+ UT_uint32 iSel1 = UT_MIN(iSelAnchor, iPoint); -+ UT_uint32 iSel2 = UT_MAX(iSelAnchor, iPoint); -+ -+ UT_ASSERT(iSel1 <= iSel2); -+ -+ bool bIsSelected = false; -+ if (/* pView->getFocus()!=AV_FOCUS_NONE && */isInSelectedTOC() || (iSel1 <= iRunBase) && (iSel2 > iRunBase)) -+ bIsSelected = true; -+ -+ GR_Painter painter(getGraphics()); -+ -+ UT_UCSChar pEOP[] = { UCS_PILCROW, 0 }; -+ UT_uint32 iTextLen = UT_UCS4_strlen(pEOP); -+ UT_sint32 iAscent; -+ -+ fp_Run* pPropRun = _findPrevPropertyRun(); -+ if (pPropRun && (FPRUN_TEXT == pPropRun->getType())) -+ { -+ fp_TextRun* pTextRun = static_cast(pPropRun); -+ getGraphics()->setFont(pTextRun->getFont()); -+ iAscent = pTextRun->getAscent(); -+ } -+ else -+ { -+ const PP_AttrProp * pSpanAP = NULL; -+ const PP_AttrProp * pBlockAP = NULL; -+ const PP_AttrProp * pSectionAP = NULL; -+ -+ getSpanAP(pSpanAP); -+ getBlockAP(pBlockAP); -+ -+ // look for fonts in this DocLayout's font cache -+ FL_DocLayout * pLayout = getBlock()->getDocLayout(); -+ -+ const GR_Font * pFont = pLayout->findFont(pSpanAP,pBlockAP,pSectionAP,getGraphics()); -+ getGraphics()->setFont(pFont); -+ iAscent = getGraphics()->getFontAscent(); -+ } -+ -+ // if we currently have a 0 width, i.e., we draw in response to the -+ // showPara being turned on, then we obtain the new width, and then -+ // tell the line to redo its layout and redraw instead of drawing ourselves -+// bool bWidthChange = false; -+// if(!m_iDrawWidth) -+// bWidthChange = true; -+ -+ m_iDrawWidth = getGraphics()->measureString(pEOP, 0, iTextLen, NULL); -+// if(bWidthChange) -+// { -+// getLine()->layout(); -+// getLine()->redrawUpdate(); -+// return; -+// } -+ -+ _setHeight(getGraphics()->getFontHeight()); -+ m_iXoffText = pDA->xoff; -+ -+ if(getBlock()->getDominantDirection() == UT_BIDI_RTL) -+ { -+ m_iXoffText -= m_iDrawWidth; -+ } -+ -+ m_iYoffText = pDA->yoff - iAscent; -+ xxx_UT_DEBUGMSG(("fp_EndOfParagraphRun::draw: width %d\n", m_iDrawWidth)); -+ -+ if (bIsSelected) -+ { -+ painter.fillRect(_getView()->getColorSelBackground(), m_iXoffText, m_iYoffText, m_iDrawWidth, getLine()->getHeight()); -+ } -+ else -+ { -+ Fill(getGraphics(),m_iXoffText, m_iYoffText, m_iDrawWidth, getLine()->getHeight()); -+ } -+ if (getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN) && pView->getShowPara()) -+ { -+ // Draw pilcrow -+ // use the hard-coded colour only if not revised -+ if(!getRevisions() || !pView->isShowRevisions()) -+ getGraphics()->setColor(pView->getColorShowPara()); -+ painter.drawChars(pEOP, 0, iTextLen, m_iXoffText, m_iYoffText); -+ } -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+ -+fp_ImageRun::fp_ImageRun(fl_BlockLayout* pBL, -+ UT_uint32 iOffsetFirst, -+ UT_uint32 iLen, FG_Graphic * pFG) : -+ fp_Run(pBL, iOffsetFirst, iLen, FPRUN_IMAGE), -+ m_pFGraphic(pFG), -+ m_iPointHeight(0), -+ m_pSpanAP(NULL), -+ m_bImageForPrinter (false) -+{ -+#if 0 // put this back later -+ UT_ASSERT(pImage); -+#endif -+ -+ m_pImage = pFG->generateImage(getGraphics(), NULL, 0, 0); -+ m_sCachedWidthProp = pFG->getWidthProp(); -+ m_sCachedHeightProp = pFG->getHeightProp(); -+ m_iGraphicTick = pBL->getDocLayout()->getGraphicTick(); -+ lookupProperties(); -+} -+ -+fp_ImageRun::~fp_ImageRun() -+{ -+ if (m_pImage) -+ { -+ delete m_pImage; -+ } -+ if(m_pFGraphic) -+ { -+ delete m_pFGraphic; -+ } -+} -+ -+void fp_ImageRun::regenerateImage(GR_Graphics * pG) -+{ -+ DELETEP(m_pImage); -+ m_pImage = m_pFGraphic->regenerateImage(pG); -+ m_bImageForPrinter = pG->queryProperties(GR_Graphics::DGP_PAPER); -+ m_iGraphicTick = getBlock()->getDocLayout()->getGraphicTick(); -+ -+} -+ -+void fp_ImageRun::_lookupProperties(const PP_AttrProp * pSpanAP, -+ const PP_AttrProp * /*pBlockAP*/, -+ const PP_AttrProp * /*pSectionAP*/, -+ GR_Graphics * pG) -+{ -+ fd_Field * fd = NULL; -+ UT_return_if_fail(pSpanAP); -+ m_pSpanAP = pSpanAP; -+ getBlock()->getField(getBlockOffset(), fd); -+ _setField(fd); -+ const gchar * szWidth = NULL; -+ pSpanAP->getProperty("width", szWidth); -+ if(szWidth == NULL) -+ { -+ szWidth = "0in"; -+ } -+ const gchar * szHeight = NULL; -+ pSpanAP->getProperty("height", szHeight); -+ if(pG == NULL) -+ { -+ pG = getGraphics(); -+ } -+ if(szHeight == NULL) -+ { -+ szHeight = "0in"; -+ } -+ -+ // Also get max width, height ready for generateImage. -+ -+ fl_DocSectionLayout * pDSL = getBlock()->getDocSectionLayout(); -+ fp_Page * p = NULL; -+ if(pDSL->getFirstContainer()) -+ { -+ p = pDSL->getFirstContainer()->getPage(); -+ } -+ else -+ { -+ p = pDSL->getDocLayout()->getNthPage(0); -+ } -+ UT_sint32 maxW = static_cast(static_cast(pDSL->getActualColumnWidth())*0.95); -+ UT_sint32 maxH = static_cast(static_cast(pDSL->getActualColumnHeight())*0.95); -+ fl_ContainerLayout * pCL = getBlock()->myContainingLayout(); -+ if(pCL && pCL->getContainerType() == FL_CONTAINER_FRAME) -+ { -+ fl_FrameLayout * pFL = static_cast(pCL); -+ maxW = pFL->getFrameWidth(); -+ maxH = pFL->getFrameHeight(); -+ if(getLine()) -+ { -+ maxH -= getLine()->getY(); // take Y height into account. -+ } -+ } -+ else if (pCL && pCL->getContainerType() == FL_CONTAINER_CELL) -+ { -+ fl_CellLayout * pCell = static_cast(pCL); -+ maxW = static_cast(static_cast(maxW)*0.95); -+ maxH = static_cast(static_cast(maxH)*0.95); -+ if(pCell->getCellWidth() > pG->tlu(2) && pCell->getCellWidth() < maxW) -+ { -+ maxW = pCell->getCellWidth(); -+ } -+ } -+ if(pG->tdu(maxW) < 3) -+ { -+ maxW = pG->tlu(3); -+ } -+ if(pG->tdu(maxH) < 3) -+ { -+ maxH = pG->tlu(3); -+ } -+ UT_DEBUGMSG(("Image szWidth %s Image szHeight %s \n",szWidth,szHeight)); -+ if((pG->queryProperties(GR_Graphics::DGP_PAPER) != m_bImageForPrinter) || -+ (strcmp(m_sCachedWidthProp.c_str(),szWidth) != 0) || -+ (strcmp(m_sCachedHeightProp.c_str(),szHeight) != 0) || -+ UT_convertToLogicalUnits(szHeight) > maxH || -+ UT_convertToLogicalUnits(szWidth) > maxW) -+ { -+ m_sCachedWidthProp = szWidth; -+ m_sCachedHeightProp = szHeight; -+ DELETEP(m_pImage); -+ UT_sint32 iH = UT_convertToLogicalUnits(szHeight); -+ UT_sint32 iW = UT_convertToLogicalUnits(szWidth); -+ if((iW < maxW) && (iW > 30)) -+ { -+ maxW = iW; -+ UT_DEBUGMSG(("Change Image Width to %d \n",maxW)); -+ } -+ if((iH < maxH) && (iH > 30)) -+ { -+ maxH = iH; -+ UT_DEBUGMSG(("Change Image Height to %d \n",maxH)); -+ } -+ m_pImage = m_pFGraphic->generateImage(pG, pSpanAP, maxW, maxH); -+ m_bImageForPrinter = pG->queryProperties(GR_Graphics::DGP_PAPER); -+ markAsDirty(); -+ if(getLine()) -+ { -+ getLine()->setNeedsRedraw(); -+ } -+ } -+ if (m_pImage) -+ { -+ _setWidth(pG->tlu(m_pImage->getDisplayWidth())); -+ _setHeight(pG->tlu(m_pImage->getDisplayHeight())); -+ } -+ else -+ { -+ // If we have no image, we simply insert a square "slug" -+ -+ _setWidth(UT_convertToLogicalUnits("0.5in")); -+ _setHeight(UT_convertToLogicalUnits("0.5in")); -+ } -+ -+ // these asserts are no longer valid -- image can be hidden due to -+ //hidden text mark up or revisions -+ //UT_ASSERT(getWidth() > 0); -+ //UT_ASSERT(getHeight() > 0); -+ m_iImageWidth = getWidth(); -+ m_iImageHeight = getHeight(); -+ -+ _setAscent(_getHeight()); -+ _setDescent(0); -+ const PP_AttrProp * pBlockAP = NULL; -+ const PP_AttrProp * pSectionAP = NULL; -+ -+ getBlockAP(pBlockAP); -+ -+ FL_DocLayout * pLayout = getBlock()->getDocLayout(); -+ const GR_Font * pFont = pLayout->findFont(pSpanAP,pBlockAP,pSectionAP,getGraphics()); -+ -+ if (pFont != _getFont()) -+ { -+ _setFont(pFont); -+ } -+ m_iPointHeight = pG->getFontAscent(pFont) + getGraphics()->getFontDescent(pFont); -+} -+ -+bool fp_ImageRun::canBreakAfter(void) const -+{ -+ return true; -+} -+ -+bool fp_ImageRun::canBreakBefore(void) const -+{ -+ return true; -+} -+ -+bool fp_ImageRun::_letPointPass(void) const -+{ -+ return false; -+} -+ -+bool fp_ImageRun::hasLayoutProperties(void) const -+{ -+ return true; -+} -+ -+void fp_ImageRun::mapXYToPosition(UT_sint32 x, UT_sint32 /*y*/, PT_DocPosition& pos, bool& bBOL, bool& bEOL, bool &isTOC) -+{ -+ if (x > getWidth()) -+ pos = getBlock()->getPosition() + getBlockOffset() + getLength(); -+ else -+ pos = getBlock()->getPosition() + getBlockOffset(); -+ -+ bBOL = false; -+ bEOL = false; -+} -+ -+void fp_ImageRun::findPointCoords(UT_uint32 iOffset, UT_sint32& x, UT_sint32& y, UT_sint32& x2, UT_sint32& y2, UT_sint32& height, bool& bDirection) -+{ -+ //UT_DEBUGMSG(("fintPointCoords: ImmageRun\n")); -+ UT_sint32 xoff; -+ UT_sint32 yoff; -+ -+ UT_ASSERT(getLine()); -+ -+ getLine()->getOffsets(this, xoff, yoff); -+ if (iOffset == (getBlockOffset() + getLength())) -+ { -+ x = xoff + getWidth(); -+ x2 = x; -+ } -+ else -+ { -+ x = xoff; -+ x2 = x; -+ } -+ y = yoff + getHeight() - m_iPointHeight; -+ height = m_iPointHeight; -+ y2 = y; -+ bDirection = (getVisDirection() != UT_BIDI_LTR); -+} -+ -+void fp_ImageRun::_clearScreen(bool bFullLineHeightRect ) -+{ -+ // UT_ASSERT(!isDirty()); -+ -+ UT_ASSERT(getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)); -+ -+ UT_sint32 xoff = 0, yoff = 0; -+ -+ // need to clear full height of line, in case we had a selection -+ getLine()->getScreenOffsets(this, xoff, yoff); -+ UT_sint32 iLineHeight = getLine()->getHeight(); -+ Fill(getGraphics(),xoff, yoff, getWidth(), iLineHeight); -+ markAsDirty(); -+ setCleared(); -+} -+ -+const char * fp_ImageRun::getDataId(void) const -+{ -+ return m_pFGraphic->getDataId(); -+} -+ -+void fp_ImageRun::_draw(dg_DrawArgs* pDA) -+{ -+ GR_Graphics *pG = pDA->pG; -+ if(getBlock()->getDocLayout()->getGraphicTick() != m_iGraphicTick) -+ { -+ regenerateImage(pG); -+ } -+ else if(!pG->queryProperties(GR_Graphics::DGP_SCREEN)) -+ { -+ regenerateImage(pG); -+ m_iGraphicTick = getBlock()->getDocLayout()->getGraphicTick()+999; -+ } -+ UT_sint32 xoff = 0, yoff = 0; -+ -+ if(pG->queryProperties(GR_Graphics::DGP_SCREEN)) -+ { -+ getLine()->getScreenOffsets(this, xoff, yoff); -+ } -+ else -+ { -+ getLine()->getOffsets(this, xoff, yoff); -+ if(_getView()->getViewMode() != VIEW_PRINT) -+ { -+ yoff += static_cast(getBlock()->getDocSectionLayout())->getTopMargin(); -+ } -+ } -+ -+ yoff += getLine()->getAscent() - getAscent() + 1; -+ -+ // clip drawing to the page -+ UT_Rect pClipRect; -+ pClipRect.top = yoff; -+ pClipRect.left = xoff; -+ pClipRect.height = getLine()->getContainer()->getHeight(); -+ pClipRect.width = getLine()->getContainer()->getWidth(); -+ pClipRect.height -= getLine()->getY(); -+ // -+ // SEVIOR Says don't touch this if statement unless you know how to make windows -+ // and gnome-print print images. Otherwise your commit priviliges will be revoked. -+ // -+ const UT_Rect * pSavedRect = NULL; -+ if(pG->getClipRect()) -+ { -+ pSavedRect = pG->getClipRect(); -+ } -+ if(pG->queryProperties(GR_Graphics::DGP_SCREEN)) -+ { -+ // -+ // Take the interesction of the applied rectangle; -+ if(pSavedRect != NULL) -+ { -+ UT_sint32 iTop,iLeft,iWidth,iHeight; -+ iTop = 0; -+ iLeft = 0; -+ iWidth = 0; -+ iHeight = 0; -+ iTop = pClipRect.top; -+ if(pSavedRect->top > pClipRect.top) -+ { -+ iTop = pSavedRect->top; -+ } -+ UT_sint32 iBot = pClipRect.top + pClipRect.height; -+ if((pSavedRect->top + pSavedRect->height) < (pClipRect.top + pClipRect.height)) -+ { -+ iBot = pSavedRect->top + pSavedRect->height; -+ } -+ iHeight = iBot - iTop; -+ if(iHeight < pG->tlu(1)) -+ { -+ iHeight = pG->tlu(2); -+ } -+ iLeft = pClipRect.left; -+ if(pSavedRect->left > pClipRect.left) -+ { -+ iLeft = pSavedRect->left; -+ } -+ UT_sint32 iRight = pClipRect.left + pClipRect.width; -+ if((pSavedRect->left + pSavedRect->width) < (pClipRect.left + pClipRect.width)) -+ { -+ iRight = pSavedRect->left + pSavedRect->width; -+ } -+ iWidth = iRight - iLeft; -+ if(iWidth < pG->tlu(1)) -+ { -+ iWidth = pG->tlu(2); -+ } -+ pClipRect.left = iLeft; -+ pClipRect.width = iWidth; -+ pClipRect.top = iTop; -+ pClipRect.height = iHeight; -+ pG->setClipRect(&pClipRect); -+ } -+ -+ } -+ -+ FV_View* pView = _getView(); -+ -+ GR_Painter painter(pG); -+ -+ if (m_pImage) -+ { -+ // draw the image (always) -+ xxx_UT_DEBUGMSG(("SEVIOR: Drawing image now \n")); -+ painter.drawImage(m_pImage, xoff, yoff); -+ -+ // if we're the selection, draw some pretty selection markers -+ if (pG->queryProperties(GR_Graphics::DGP_SCREEN)) -+ { -+ UT_uint32 iRunBase = getBlock()->getPosition() + getBlockOffset(); -+ -+ UT_uint32 iSelAnchor = pView->getSelectionAnchor(); -+ UT_uint32 iPoint = pView->getPoint(); -+ -+ UT_uint32 iSel1 = UT_MIN(iSelAnchor, iPoint); -+ UT_uint32 iSel2 = UT_MAX(iSelAnchor, iPoint); -+ -+ UT_ASSERT(iSel1 <= iSel2); -+ -+ if ( -+ /* pView->getFocus()!=AV_FOCUS_NONE && */ -+ (iSel1 <= iRunBase) -+ && (iSel2 > iRunBase) -+ ) -+ { -+ UT_uint32 top = yoff; -+ UT_uint32 left = xoff; -+ UT_uint32 right = xoff + getWidth() - pG->tlu(1); -+ UT_uint32 bottom = yoff + getHeight() - pG->tlu(1); -+ -+ UT_Rect box(left, top, right - left, bottom - top); -+ pView->drawSelectionBox(box, true); -+ } -+ } -+ -+ } -+ else -+ { -+ painter.fillRect(pView->getColorImage(), xoff, yoff, getWidth(), getHeight()); -+ } -+ -+ // unf*ck clipping rect -+ pG->setClipRect(pSavedRect); -+} -+ -+GR_Image * fp_ImageRun::getImage() -+{ -+ return m_pImage; -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+#define _FIELD(type,desc,tag) /*nothing*/ -+#define _FIELDTYPE(type,desc) {FPFIELDTYPE_##type, NULL, desc}, -+ -+fp_FieldTypeData fp_FieldTypes[] = { -+ -+#include "fp_Fields.h" -+ -+ {FPFIELDTYPE_END, NULL, 0} }; -+ -+#undef _FIELD -+#undef _FIELDTYPE -+ -+// The way to turn macro argument into string constant -+#define xstr2(x) #x -+#define xstr(x) xstr2(x) -+#define _FIELD(type,desc,tag) {FPFIELDTYPE_##type, FPFIELD_##tag, NULL, xstr(tag), desc}, -+#define _FIELDTYPE(type,desc) /*nothing*/ -+ -+fp_FieldData fp_FieldFmts[] = { -+ -+#include "fp_Fields.h" -+ -+ {FPFIELDTYPE_END, FPFIELD_end, NULL, NULL, 0} }; -+ -+#undef xstr2 -+#undef xstr -+#undef _FIELD -+#undef _FIELDTYPE -+ -+fp_FieldRun::fp_FieldRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) -+ : fp_Run(pBL, iOffsetFirst, iLen, FPRUN_FIELD), -+ m_iFieldType(FPFIELD_start), -+ m_pParameter(0), -+ m_fPosition(TEXT_POSITION_NORMAL) -+{ -+ fd_Field * fd; -+ lookupProperties(); -+ if(!getBlock()->isContainedByTOC()) -+ { -+ bool gotField = pBL->getField(iOffsetFirst,fd); -+ if(gotField) -+ { -+ _setField(fd); -+ } -+ } -+ // UT_ASSERT(gotField); -+ m_sFieldValue[0] = 0; -+} -+ -+fp_FieldRun::~fp_FieldRun(void) -+{ -+ xxx_UT_DEBUGMSG(("FieldRun deleted %x FieldType %d \n",this,getFieldType())); -+ return; -+} -+ -+bool fp_FieldRun::_recalcWidth() -+{ -+ // TODO -- is this really needed ??? -+ // this should not be needed, since lookup properties is called -+ // when formatting changes - Tomas -+ //lookupProperties(); -+ -+ getGraphics()->setFont(_getFont()); -+ UT_sint32 iNewWidth = 0; -+ if(UT_UCS4_strlen(m_sFieldValue) > 0) -+ { -+ iNewWidth = getGraphics()->measureString(m_sFieldValue, -+ 0, -+ UT_UCS4_strlen(m_sFieldValue), -+ NULL); -+ } -+ if (iNewWidth != getWidth()) -+ { -+ clearScreen(); -+ markAsDirty(); -+ if(getLine()) -+ { -+ getLine()->setNeedsRedraw(); -+ } -+ if(getBlock()) -+ { -+ getBlock()->setNeedsRedraw(); -+ } -+ _setWidth(iNewWidth); -+ -+ return true; -+ } -+ -+ return false; -+} -+ -+bool fp_FieldRun::_setValue(const UT_UCSChar *p_new_value) -+{ -+ if (0 != UT_UCS4_strcmp(p_new_value, m_sFieldValue)) -+ { -+ xxx_UT_DEBUGMSG(("fp_FieldRun::_setValue: setting new value\n")); -+ clearScreen(); -+ markAsDirty(); -+ if(getLine()) -+ { -+ getLine()->setNeedsRedraw(); -+ } -+ if(getBlock()) -+ { -+ getBlock()->setNeedsRedraw(); -+ } -+ -+ markDrawBufferDirty(); -+ UT_uint32 iLen = UT_UCS4_strlen(p_new_value); -+ iLen = UT_MIN(iLen,FPFIELD_MAX_LENGTH); -+ -+ if(iLen > 1 && XAP_App::getApp()->theOSHasBidiSupport() == XAP_App::BIDI_SUPPORT_GUI) -+ { -+ UT_BidiCharType prevType, myType; -+ -+ if(getPrevRun()) -+ prevType = getPrevRun()->getVisDirection(); -+ else -+ prevType = getBlock()->getDominantDirection(); -+ -+ myType = prevType; -+ UT_bidiReorderString(p_new_value, iLen, myType, m_sFieldValue); -+ -+ m_sFieldValue[iLen] = 0; -+ } -+ else -+ { -+ UT_UCS4_strcpy(m_sFieldValue, p_new_value); -+ } -+ -+ { -+ // TODO -- is this really needed??? -+ // should not be, since lookupProperties is called on -+ // formatting changes - Tomas -+ // lookupProperties(); -+ -+ getGraphics()->setFont(_getFont()); -+ -+ UT_sint32 iNewWidth = -+ getGraphics()->measureString(m_sFieldValue, -+ 0, -+ UT_UCS4_strlen(m_sFieldValue), -+ NULL); -+ if (iNewWidth != getWidth()) -+ { -+ _setWidth(iNewWidth); -+ markWidthDirty(); -+ return true; -+ } -+ -+ } -+ } -+ xxx_UT_DEBUGMSG(("fp_FieldRun::_setValue: value has not changed [0] %x \n", m_sFieldValue[0])); -+ -+ return false; -+} -+ -+void fp_FieldRun::_lookupProperties(const PP_AttrProp * pSpanAP, -+ const PP_AttrProp * pBlockAP, -+ const PP_AttrProp * pSectionAP, -+ GR_Graphics * pG) -+{ -+ if(pG == NULL) -+ { -+ pG = getGraphics(); -+ } -+ PD_Document * pDoc = getBlock()->getDocument(); -+ fd_Field * fd = NULL; -+ if(!getBlock()->isContainedByTOC()) -+ { -+ getBlock()->getField(getBlockOffset() /*+1*/,fd); // Next Pos? -+ _setField(fd); -+ } -+ else -+ { -+ _setField(NULL); -+ } -+ if(getField() != NULL) -+ { -+ getField()->setBlock(getBlock()); -+ } -+ // look for fonts in this DocLayout's font cache -+ FL_DocLayout * pLayout = getBlock()->getDocLayout(); -+ -+ UT_RGBColor clrFG; -+ UT_parseColor(PP_evalProperty("color",pSpanAP,pBlockAP,pSectionAP, getBlock()->getDocument(), true), clrFG); -+ _setColorFG(clrFG); -+ -+ const char * pszFieldColor = NULL; -+ pszFieldColor = PP_evalProperty("field-color",pSpanAP,pBlockAP,pSectionAP, getBlock()->getDocument(), true); -+ -+ const char * pszBGColor = NULL; -+ pszBGColor = PP_evalProperty("bgcolor",pSpanAP,pBlockAP,pSectionAP, getBlock()->getDocument(), true); -+ -+// -+// FIXME: The "ffffff" is for backwards compatibility. If we don't exclude this -+// no prexisting docs will be able to change the Highlight color in paragraphs -+// with lists. I think this is a good solution for now. However it does mean -+// field-color of "ffffff", pure white is actually transparent. -+// -+ if(pszFieldColor && strcmp(pszFieldColor,"transparent") != 0 && strcmp(pszFieldColor,"ffffff" ) != 0 && pG->queryProperties(GR_Graphics::DGP_SCREEN)) -+ { -+ UT_RGBColor r; -+ UT_parseColor(pszFieldColor, r); -+ _setColorHL(r); -+ } -+ else if (pszBGColor && strcmp(pszFieldColor,"transparent") != 0) -+ { -+ UT_RGBColor r; -+ UT_parseColor(pszBGColor, r); -+ _setColorHL(r); -+ } -+ -+ -+ const gchar* pszType = NULL; -+ const gchar* pszParam = NULL; -+ -+ if(pSpanAP) -+ { -+ pSpanAP->getAttribute("type", pszType); -+ pSpanAP->getAttribute("param", pszParam); -+ } -+ else -+ { -+ pBlockAP->getAttribute("type",pszType); -+ pBlockAP->getAttribute("param", pszParam); -+ } -+ -+ if(pszParam) -+ m_pParameter = pszParam; -+ -+ // i leave this in because it might be obscuring a larger bug -+ //UT_ASSERT(pszType); -+ if (!pszType) return; -+ -+ int i; -+ if(pszType != NULL) -+ { -+ for( i = 0; fp_FieldFmts[i].m_Tag != NULL; i++ ) -+ { -+ if (0 == strcmp(pszType, fp_FieldFmts[i].m_Tag)) -+ { -+ m_iFieldType = fp_FieldFmts[i].m_Num; -+ break; -+ } -+ } -+ if( fp_FieldFmts[i].m_Tag == NULL ) -+ { -+ // probably new type of field -+ // UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ } -+ } -+ -+ xxx_UT_DEBUGMSG(("FieldRun: Lookup Properties field type %d \n",m_iFieldType)); -+ if(m_iFieldType == FPFIELD_list_label) -+ { -+ _setFont(pLayout->findFont(pSpanAP,pBlockAP,pSectionAP,pG, true)); -+ } -+ else -+ { -+ _setFont(pLayout->findFont(pSpanAP,pBlockAP,pSectionAP, pG)); -+ } -+ -+ _setAscent(pG->getFontAscent(_getFont())); -+ _setDescent(pG->getFontDescent(_getFont())); -+ _setHeight(pG->getFontHeight(_getFont())); -+ -+ const gchar * pszPosition = PP_evalProperty("text-position",pSpanAP,pBlockAP,pSectionAP, pDoc, true); -+ -+ if (0 == strcmp(pszPosition, "superscript")) -+ { -+ m_fPosition = TEXT_POSITION_SUPERSCRIPT; -+ } -+ else if (0 == strcmp(pszPosition, "subscript")) -+ { -+ m_fPosition = TEXT_POSITION_SUBSCRIPT; -+ } -+ else -+ { -+ m_fPosition = TEXT_POSITION_NORMAL; -+ } -+// -+// Lookup Decoration properties for this run -+// -+ const gchar *pszDecor = PP_evalProperty("text-decoration",pSpanAP,pBlockAP,pSectionAP, getBlock()->getDocument(), true); -+ _setLineWidth(getToplineThickness()); -+ _setDecorations(0); -+ gchar* p; -+ if (!(p = g_strdup(pszDecor))) -+ { -+ // TODO outofmem -+ } -+ UT_ASSERT(p || !pszDecor); -+ gchar* q = strtok(p, " "); -+ -+ while (q) -+ { -+ if (0 == strcmp(q, "underline")) -+ { -+ _orDecorations(TEXT_DECOR_UNDERLINE); -+ } -+ else if (0 == strcmp(q, "overline")) -+ { -+ _orDecorations(TEXT_DECOR_OVERLINE); -+ } -+ else if (0 == strcmp(q, "line-through")) -+ { -+ _orDecorations(TEXT_DECOR_LINETHROUGH); -+ } -+ else if (0 == strcmp(q, "topline")) -+ { -+ _orDecorations(TEXT_DECOR_TOPLINE); -+ } -+ else if (0 == strcmp(q, "bottomline")) -+ { -+ _orDecorations(TEXT_DECOR_BOTTOMLINE); -+ } -+ q = strtok(NULL, " "); -+ } -+ -+ g_free(p); -+} -+ -+ -+fp_FieldsEnum fp_FieldRun::getFieldType(void) const -+{ -+ return m_iFieldType; -+} -+ -+bool fp_FieldRun::canBreakAfter(void) const -+{ -+ return true; -+} -+ -+bool fp_FieldRun::canBreakBefore(void) const -+{ -+ return true; -+} -+ -+bool fp_FieldRun::_letPointPass(void) const -+{ -+ return true; -+} -+ -+bool fp_FieldRun::isSuperscript(void) const -+{ -+ return (m_fPosition == TEXT_POSITION_SUPERSCRIPT); -+} -+ -+bool fp_FieldRun::isSubscript(void) const -+{ -+ return (m_fPosition == TEXT_POSITION_SUBSCRIPT); -+} -+ -+bool fp_FieldRun::hasLayoutProperties(void) const -+{ -+ return true; -+} -+ -+void fp_FieldRun::mapXYToPosition(UT_sint32 x, UT_sint32 /*y*/, PT_DocPosition& pos, bool& bBOL, bool& bEOL, bool &isTOC) -+{ -+ // If X is left of the middle, return offset to the left, -+ // otherwise the offset to the right. -+ if (x < (getWidth() / 2)) -+ pos = getBlock()->getPosition() + getBlockOffset(); -+ else -+ pos = getBlock()->getPosition() + getBlockOffset() + getLength(); -+ -+ bBOL = false; -+ if(getNextRun() == NULL) -+ { -+ bEOL = true; -+ } -+ if(getNextRun()->getType() == FPRUN_ENDOFPARAGRAPH) -+ { -+ bEOL = true; -+ } -+} -+ -+void fp_FieldRun::findPointCoords(UT_uint32 iOffset, UT_sint32& x, -+ UT_sint32& y, UT_sint32& x2, -+ UT_sint32& y2, UT_sint32& height, bool& bDirection) -+{ -+ xxx_UT_DEBUGMSG(("findPointCoords: FieldRun offset %d \n",iOffset)); -+ UT_sint32 xoff; -+ UT_sint32 yoff; -+ -+ UT_ASSERT(getLine()); -+ -+ // TODO is this really needed ??? -+ // should not be, since lookupProperties is called on -+ // formatting changes - Tomas -+ // lookupProperties(); -+ -+ getLine()->getOffsets(this, xoff, yoff); -+ xxx_UT_DEBUGMSG(("findPointCoords: FieldRun orig yoff %d \n",yoff)); -+// -+// The footnote code is to handle discontinuities in offset from embedded -+// footnotes in blocks. -+// -+ bool bFootnote = false; -+ if (iOffset == (getBlockOffset() + getLength())) -+ { -+ xoff += getWidth(); -+ } -+ else if(iOffset > (getBlockOffset() + getLength())) -+ { -+ bFootnote = true; -+ xoff += getWidth(); -+ } -+ -+ if (!bFootnote && (m_fPosition == TEXT_POSITION_SUPERSCRIPT)) -+ { -+ yoff -= getAscent() * 1/2; -+ } -+ else if (!bFootnote && (m_fPosition == TEXT_POSITION_SUBSCRIPT)) -+ { -+ yoff += getDescent() /* * 3/2 */; -+ } -+ xxx_UT_DEBUGMSG(("findPointCoords: FieldRun yoff %d \n",yoff)); -+ x = xoff; -+ y = yoff; -+ if(!bFootnote) -+ { -+ height = getHeight(); -+ } -+ else -+ { -+// -+// We're actually just before the next run and in the insertion point will be -+// in the next run so make the insertion point reflect this. -+// -+ if(getNextRun() && getNextRun()->hasLayoutProperties() ) -+ { -+ height = getNextRun()->getHeight(); -+ UT_sint32 xx,xx2,yy2,hheight; -+ bool bbDirection; -+ getNextRun()->findPointCoords(iOffset+1,xx,y,xx2,yy2, hheight, -+ bbDirection); -+ height = hheight; -+ -+ } -+ else -+ { -+ height = getHeight(); -+ } -+ } -+ x2 = x; -+ y2 = y; -+ bDirection = (getVisDirection() != UT_BIDI_LTR); -+} -+ -+bool fp_FieldRun::calculateValue(void) -+{ -+ // -+ // Code for the Piece Table Fields Calculation -+ // Get size of the field from the following runs -+ // -+ // return getField()->update(); -+ // UT_ASSERT(getField()); -+ -+/* UT_sint32 count = 0; -+ fp_Run* pNext = getNextRun(); -+ while(pNext != NULL && pNext->getField() != NULL ) -+ { -+ if(getField() == NULL) -+ { -+ getField() = pNext->getField(); -+ } -+ pNext = getNextRun(); -+ count++; -+ } -+ if(count == 0) -+ { -+ setWidth(0); -+ _setHeight(0); -+ } -+ else -+ { -+ pNext = getPrevRun(); -+ setWidth(pNext->getWidth()); -+ _setHeight(pNext->getHeight()); -+ } -+ if(getField() != NULL) -+ getField()->update(); -+*/ -+ return true; -+} -+ -+void fp_FieldRun::_clearScreen(bool /* bFullLineHeightRect */) -+{ -+ // UT_ASSERT(!isDirty()); -+ -+ UT_ASSERT(getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)); -+ UT_sint32 xoff = 0, yoff = 0; -+ -+ // need to clear full height of line, in case we had a selection -+ getLine()->getScreenOffsets(this, xoff, yoff); -+ UT_sint32 iLineHeight = getLine()->getHeight(); -+ Fill(getGraphics(), xoff, yoff, getWidth(), iLineHeight); -+} -+ -+void fp_FieldRun::_defaultDraw(dg_DrawArgs* pDA) -+{ -+ GR_Graphics * pG = pDA->pG; -+ -+ // TODO is this really needed -+ // should not be, since lookupProperties is called on -+ // formatting changes - Tomas -+ // lookupProperties(); -+ UT_sint32 xoff = 0, yoff = 0; -+ -+ GR_Painter painter(pG); -+ -+ // need screen locations of this run -+ -+ getLine()->getScreenOffsets(this, xoff, yoff); -+ -+ UT_sint32 iYdraw = pDA->yoff - getAscent()-1; -+ -+ if (m_fPosition == TEXT_POSITION_SUPERSCRIPT) -+ { -+ iYdraw -= getAscent() * 1/2; -+ } -+ else if (m_fPosition == TEXT_POSITION_SUBSCRIPT) -+ { -+ iYdraw += getDescent(); // * 3/2 -+ } -+ -+ //if (pG->queryProperties(GR_Graphics::DGP_SCREEN)) -+ { -+ UT_uint32 iRunBase = getBlock()->getPosition() + getBlockOffset(); -+ -+// -+// Sevior was here -+// UT_sint32 iFillTop = iYdraw; -+ UT_sint32 iFillTop = iYdraw+1; -+ UT_sint32 iFillHeight = getAscent() + getDescent(); -+ -+ FV_View* pView = _getView(); -+ UT_uint32 iSelAnchor = pView->getSelectionAnchor(); -+ UT_uint32 iPoint = pView->getPoint(); -+ -+ UT_uint32 iSel1 = UT_MIN(iSelAnchor, iPoint); -+ UT_uint32 iSel2 = UT_MAX(iSelAnchor, iPoint); -+ -+ UT_ASSERT(iSel1 <= iSel2); -+ bool bIsInTOC = getBlock()->isContainedByTOC(); -+ if ( -+ isInSelectedTOC() || (!bIsInTOC && ( -+ /* pView->getFocus()!=AV_FOCUS_NONE && */ -+ (iSel1 <= iRunBase) -+ && (iSel2 > iRunBase))) -+ ) -+ { -+ UT_RGBColor color(_getView()->getColorSelBackground()); -+ pG->setColor(_getView()->getColorSelForeground()); -+ painter.fillRect(color, pDA->xoff, iFillTop, getWidth(), iFillHeight); -+ -+ } -+ else -+ { -+ Fill(getGraphics(),pDA->xoff, iFillTop, getWidth(), iFillHeight); -+ pG->setColor(_getColorFG()); -+ } -+ } -+ -+ pG->setFont(_getFont()); -+ -+ -+ UT_uint32 len = UT_UCS4_strlen(m_sFieldValue); -+ UT_return_if_fail(len); -+ -+ painter.drawChars(m_sFieldValue, 0, len, pDA->xoff,iYdraw, NULL); -+// -+// Draw underline/overline/strikethough -+// -+ UT_sint32 yTopOfRun = pDA->yoff - getAscent()-1; // Hack to remove -+ //character dirt -+ UT_DEBUGMSG(("xoff infield before drawdecors %d \n",pDA->xoff)); -+ drawDecors( pDA->xoff, yTopOfRun,pG); -+ -+} -+ -+// BEGIN DOM work on some new fields -+ -+fp_FieldCharCountRun::fp_FieldCharCountRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldCharCountRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue; -+ -+ FV_View *pView = _getView(); -+ if(!pView) -+ { -+ szFieldValue ="?"; -+ } -+ else -+ { -+ FV_DocCount cnt = pView->countWords(); -+ UT_UTF8String_sprintf(szFieldValue, "%d", cnt.ch_sp); -+ } -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue.utf8_str())); -+ -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+fp_FieldNonBlankCharCountRun::fp_FieldNonBlankCharCountRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldNonBlankCharCountRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue ("?"); -+ -+ FV_View *pView = _getView(); -+ if(pView) -+ { -+ FV_DocCount cnt = pView->countWords(); -+ UT_UTF8String_sprintf(szFieldValue, "%d", cnt.ch_no); -+ } -+ -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue.utf8_str())); -+ -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+fp_FieldLineCountRun::fp_FieldLineCountRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldLineCountRun::calculateValue(void) -+{ -+ FV_View *pView = _getView(); -+ UT_UTF8String szFieldValue ("?"); -+ -+ if(pView) -+ { -+ FV_DocCount cnt = pView->countWords(); -+ UT_UTF8String_sprintf(szFieldValue, "%d", cnt.line); -+ } -+ -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue.utf8_str())); -+ -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+fp_FieldParaCountRun::fp_FieldParaCountRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+ -+bool fp_FieldParaCountRun::calculateValue(void) -+{ -+ FV_View *pView = _getView(); -+ UT_UTF8String szFieldValue ("?"); -+ if(pView) -+ { -+ FV_DocCount cnt = pView->countWords(); -+ UT_UTF8String_sprintf(szFieldValue, "%d", cnt.para); -+ } -+ -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue.utf8_str())); -+ -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+fp_FieldWordCountRun::fp_FieldWordCountRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldWordCountRun::calculateValue(void) -+{ -+ FV_View *pView = _getView(); -+ UT_UTF8String szFieldValue ("?"); -+ if(pView) -+ { -+ FV_DocCount cnt = pView->countWords(); -+ UT_UTF8String_sprintf(szFieldValue, "%d", cnt.word); -+ } -+ -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue.utf8_str())); -+ -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+// mm/dd/yy notation -+fp_FieldMMDDYYRun::fp_FieldMMDDYYRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldMMDDYYRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%m/%d/%y", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+// dd/mm/yy time -+fp_FieldDDMMYYRun::fp_FieldDDMMYYRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldDDMMYYRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%d/%m/%y", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+// Month Day, Year -+fp_FieldMonthDayYearRun::fp_FieldMonthDayYearRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldMonthDayYearRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%B %d, %Y", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldMthDayYearRun::fp_FieldMthDayYearRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldMthDayYearRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%b %d, %Y", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldDefaultDateRun::fp_FieldDefaultDateRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldDefaultDateRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%c", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldDefaultDateNoTimeRun::fp_FieldDefaultDateNoTimeRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldDefaultDateNoTimeRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%x", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldWkdayRun::fp_FieldWkdayRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldWkdayRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%A", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(g_strdup(szFieldValue))); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldDOYRun::fp_FieldDOYRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldDOYRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%j", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldMilTimeRun::fp_FieldMilTimeRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldMilTimeRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%H:%M:%S", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldAMPMRun::fp_FieldAMPMRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldAMPMRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%p", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldTimeEpochRun::fp_FieldTimeEpochRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldTimeEpochRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue; -+ -+ time_t tim = time(NULL); -+ UT_UTF8String_sprintf(szFieldValue, "%ld", static_cast(tim)); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue.utf8_str())); -+ -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+fp_FieldDateTimeCustomRun::fp_FieldDateTimeCustomRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldDateTimeCustomRun::calculateValue(void) -+{ -+ fd_Field * fld = getField(); -+ if (fld) { -+ const gchar * param = fld->getParameter (); -+ -+ if (!param) // sensible fallback if no param specified -+ param = "%x %X"; -+ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, param, pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+ } -+ -+ return false; -+} -+ -+fp_FieldTimeZoneRun::fp_FieldTimeZoneRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldTimeZoneRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%Z", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldBuildIdRun::fp_FieldBuildIdRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldBuildIdRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue(XAP_App::s_szBuild_ID); -+ if (getField()) -+ getField()->setValue(static_cast(XAP_App::s_szBuild_ID)); -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+fp_FieldBuildVersionRun::fp_FieldBuildVersionRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldBuildVersionRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue(XAP_App::s_szBuild_Version); -+ if (getField()) -+ getField()->setValue(static_cast(XAP_App::s_szBuild_Version)); -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+fp_FieldBuildOptionsRun::fp_FieldBuildOptionsRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldBuildOptionsRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue(XAP_App::s_szBuild_Options); -+ if (getField()) -+ getField()->setValue(static_cast(XAP_App::s_szBuild_Options)); -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+fp_FieldBuildTargetRun::fp_FieldBuildTargetRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldBuildTargetRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue(XAP_App::s_szBuild_Target); -+ if (getField()) -+ getField()->setValue(static_cast(XAP_App::s_szBuild_Target)); -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+fp_FieldBuildCompileDateRun::fp_FieldBuildCompileDateRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldBuildCompileDateRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue(XAP_App::s_szBuild_CompileDate); -+ if (getField()) -+ getField()->setValue(static_cast(XAP_App::s_szBuild_CompileDate)); -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+fp_FieldBuildCompileTimeRun::fp_FieldBuildCompileTimeRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldBuildCompileTimeRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue(XAP_App::s_szBuild_CompileTime); -+ if (getField()) -+ getField()->setValue(static_cast(XAP_App::s_szBuild_CompileTime)); -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+ -+// Refers to an footnote in the main body of the text. -+fp_FieldFootnoteRefRun::fp_FieldFootnoteRefRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+ const PP_AttrProp * pp = getSpanAP(); -+ const gchar * footid; -+ bool bRes = pp->getAttribute("footnote-id", footid); -+ -+ UT_ASSERT(bRes); -+ m_iPID = atol(footid); -+ -+ // see bug 9793 -+ _setDirection(pBL->getDominantDirection()); -+} -+ -+ -+bool fp_FieldFootnoteRefRun::calculateValue(void) -+{ -+ const PP_AttrProp * pp = getSpanAP(); -+ if(pp == NULL) -+ { -+ return false; -+ } -+ const gchar * footid = NULL; -+ bool bRes = pp->getAttribute("footnote-id", footid); -+ -+ UT_ASSERT(bRes); -+ if(!bRes) -+ { -+ return false; -+ } -+ FV_View * pView = _getView(); -+ UT_uint32 iPID = atoi(footid); -+ UT_sint32 footnoteNo = pView->getLayout()->getFootnoteVal(iPID); -+ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ UT_String sFieldValue; -+ FootnoteType iFootType = pView->getLayout()->getFootnoteType(); -+ pView->getLayout()->getStringFromFootnoteVal(sFieldValue,footnoteNo,iFootType); -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, sFieldValue.c_str()); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+bool fp_FieldFootnoteRefRun::canBreakBefore(void) const -+{ -+ return false; -+} -+ -+fp_FieldFootnoteAnchorRun::fp_FieldFootnoteAnchorRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+ const PP_AttrProp * pp = getSpanAP(); -+ const gchar * footid; -+ bool bRes = pp->getAttribute("footnote-id", footid); -+ -+ UT_ASSERT(bRes); -+ m_iPID = atol(footid); -+ -+ // see bug 9793 -+ _setDirection(pBL->getDominantDirection()); -+} -+ -+// Appears in the FootnoteContainer, one per footnote. -+bool fp_FieldFootnoteAnchorRun::calculateValue(void) -+{ -+ const PP_AttrProp * pp = getSpanAP(); -+ const gchar * footid = NULL; -+ bool bRes = pp->getAttribute("footnote-id", footid); -+ -+ UT_ASSERT(bRes); -+ if(footid == NULL) -+ { -+ return false; -+ } -+ UT_uint32 iPID = atoi(footid); -+ FV_View * pView = _getView(); -+ UT_sint32 footnoteNo = pView->getLayout()->getFootnoteVal(iPID); -+ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ FootnoteType iFootType = pView->getLayout()->getFootnoteType(); -+ -+ UT_String sFieldValue; -+ pView->getLayout()->getStringFromFootnoteVal(sFieldValue,footnoteNo,iFootType); -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, sFieldValue.c_str()); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+ -+fp_FieldEndnoteAnchorRun::fp_FieldEndnoteAnchorRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+ const PP_AttrProp * pp = getSpanAP(); -+ const gchar * footid; -+ bool bRes = pp->getAttribute("endnote-id", footid); -+ -+ UT_ASSERT(bRes); -+ m_iPID = atoi(footid); -+ -+ // see bug 9793 -+ _setDirection(pBL->getDominantDirection()); -+} -+ -+// Appears in the EndnoteSection, one per endnote. -+bool fp_FieldEndnoteAnchorRun::calculateValue(void) -+{ -+ -+ const PP_AttrProp * pp = getSpanAP(); -+ const gchar * footid = NULL; -+ bool bRes = pp->getAttribute("endnote-id", footid); -+ -+ UT_ASSERT(bRes); -+ if(footid == NULL) -+ { -+ return false; -+ } -+ UT_uint32 iPID = atoi(footid); -+ FV_View * pView = _getView(); -+ UT_sint32 endnoteNo = pView->getLayout()->getEndnoteVal(iPID); -+ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ FootnoteType iEndType = pView->getLayout()->getEndnoteType(); -+ -+ UT_String sFieldValue; -+ pView->getLayout()->getStringFromFootnoteVal(sFieldValue,endnoteNo,iEndType); -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, sFieldValue.c_str()); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+ -+fp_FieldEndnoteRefRun::fp_FieldEndnoteRefRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+ const PP_AttrProp * pp = getSpanAP(); -+ const gchar * footid; -+ bool bRes = pp->getAttribute("endnote-id", footid); -+ -+ UT_ASSERT(bRes); -+ m_iPID = atoi(footid); -+ -+ // see bug 9793 -+ _setDirection(pBL->getDominantDirection()); -+} -+ -+// Appears in the EndnoteSection, one per endnote. -+bool fp_FieldEndnoteRefRun::calculateValue(void) -+{ -+ -+ const PP_AttrProp * pp = getSpanAP(); -+ const gchar * footid = NULL; -+ bool bRes = pp->getAttribute("endnote-id", footid); -+ -+ UT_ASSERT(bRes); -+ if(footid == NULL) -+ { -+ return false; -+ } -+ UT_uint32 iPID = atoi(footid); -+ FV_View * pView = _getView(); -+ UT_sint32 endnoteNo = pView->getLayout()->getEndnoteVal(iPID); -+ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ FootnoteType iEndType = pView->getLayout()->getEndnoteType(); -+ -+ UT_String sFieldValue; -+ pView->getLayout()->getStringFromFootnoteVal(sFieldValue,endnoteNo,iEndType); -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, sFieldValue.c_str()); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+bool fp_FieldEndnoteRefRun::canBreakBefore(void) const -+{ -+ return false; -+} -+ -+fp_FieldTimeRun::fp_FieldTimeRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldTimeRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%X", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldDateRun::fp_FieldDateRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldDateRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ time_t tim = time(NULL); -+ struct tm *pTime = localtime(&tim); -+ -+ strftime(szFieldValue, FPFIELD_MAX_LENGTH, "%A %B %d, %Y", pTime); -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldFileNameRun::fp_FieldFileNameRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldFileNameRun::calculateValue(void) -+{ -+ UT_UCSChar sz_ucs_FieldValue[FPFIELD_MAX_LENGTH + 1]; -+ sz_ucs_FieldValue[0] = 0; -+ -+ char szFieldValue[FPFIELD_MAX_LENGTH + 1]; -+ -+ PD_Document * pDoc = getBlock()->getDocument(); -+ UT_ASSERT(pDoc); -+ -+ //copy in the name or some wierd char instead -+ const char * name = pDoc->getFilename(); -+ if (!name) -+ name = "*"; -+ -+ strcpy (szFieldValue, name); -+ -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue)); -+ -+ UT_UCS4_strcpy_char(sz_ucs_FieldValue, szFieldValue); -+ -+ return _setValue(sz_ucs_FieldValue); -+} -+ -+fp_FieldPageNumberRun::fp_FieldPageNumberRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldPageNumberRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue ("?"); -+ -+ if (getLine() && getLine()->getContainer() && getLine()->getContainer()->getPage()) -+ { -+ fp_Page* pPage = getLine()->getContainer()->getPage(); -+ FL_DocLayout* pDL = pPage->getDocLayout(); -+ fl_DocSectionLayout * pDSL = static_cast(pPage->getOwningSection()); -+ UT_sint32 iPageNum = 0; -+ UT_uint32 iNumPages = pDL->countPages(); -+ for (UT_uint32 i=0; igetNthPage(i); -+ -+ if (pPg == pPage) -+ { -+ iPageNum = i + 1; -+ break; -+ } -+ } -+ while(pDSL && !pDSL->arePageNumbersRestarted()) -+ { -+ pDSL = pDSL->getPrevDocSection(); -+ } -+ UT_sint32 icnt = 0; -+ fp_Page * pFirstPage = NULL; -+ if(pDSL && pDSL->arePageNumbersRestarted()) -+ { -+ fp_Container * pCon = pDSL->getFirstContainer(); -+ if(pCon) -+ { -+ bool bFound = false; -+ pFirstPage = pCon->getPage(); -+ while(pFirstPage && !bFound) -+ { -+ if(pDSL == static_cast(pFirstPage->getOwningSection())) -+ { -+ bFound = true; -+ break; -+ } -+ pFirstPage = pFirstPage->getNext(); -+ } -+ if(bFound) -+ { -+ while(pFirstPage && (pFirstPage != pPage)) -+ { -+ icnt++; -+ pFirstPage = pFirstPage->getNext(); -+ } -+ UT_ASSERT(pFirstPage); -+ iPageNum = pDSL->getRestartedPageNumber() + icnt; -+ } -+ } -+ } -+#if 0 -+ // FIXME:jskov Cannot assert here since the field might get -+ // updated while the page is still being populated (and thus not in -+ // the doc's page list). Surely the field should not get updated -+ // until the page is fully populated? -+ UT_ASSERT(iPageNum > 0); -+#endif -+ -+ UT_UTF8String_sprintf(szFieldValue, "%d", iPageNum); -+ } -+ -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue.utf8_str())); -+ -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+//////////////////////////////////////////////////////////////////////////// -+/////////////////////////////////////////////////////////////////////////// -+ -+fp_FieldPageReferenceRun::fp_FieldPageReferenceRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) -+ : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldPageReferenceRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue ("?"); -+ -+ if(!_getParameter()) -+ return false; -+ -+ FV_View * pView = _getView(); -+ // on import the field value can be requested before the View exists -+ // so we cannot assert here -+ //UT_ASSERT(pView); -+ if(!pView) -+ return false; -+ -+ fp_Run* pRun = NULL; -+ fl_BlockLayout * pBlock; -+ fl_SectionLayout * pSection = pView->getLayout()->getFirstSection(); -+ UT_ASSERT(pSection); -+ bool bFound = false; -+ -+ while (pSection) -+ { -+ pBlock = static_cast(pSection->getFirstLayout()); -+ -+ while (pBlock) -+ { -+ pRun = pBlock->getFirstRun(); -+ while (pRun) -+ { -+ xxx_UT_DEBUGMSG(("pRun 0x%x, type %d\n", pRun, pRun->getType())); -+ if(pRun->getType() == FPRUN_BOOKMARK) -+ { -+ fp_BookmarkRun * pB = static_cast(pRun); -+ if(pB->isStartOfBookmark() && !strcmp(_getParameter(),pB->getName())) -+ { -+ bFound = true; -+ break; -+ } -+ } -+ pRun = pRun->getNextRun(); -+ } -+ if(bFound) -+ break; -+ -+ pBlock = static_cast(pBlock->getNext()); -+ } -+ if(bFound) -+ break; -+ pSection = static_cast(pSection->getNext()); -+ } -+ -+ if( pRun -+ && pRun->getLine() -+ && pRun->getLine()->getContainer() -+ && pRun->getLine()->getContainer()->getPage()) -+ { -+ fp_Page* pPage = pRun->getLine()->getContainer()->getPage(); -+ FL_DocLayout* pDL = pPage->getDocLayout(); -+ -+ UT_sint32 iPageNum = 0; -+ UT_uint32 iNumPages = pDL->countPages(); -+ for (UT_uint32 i=0; igetNthPage(i); -+ -+ if (pPg == pPage) -+ { -+ iPageNum = i + 1; -+ break; -+ } -+ } -+ UT_UTF8String_sprintf(szFieldValue, "%d", iPageNum); -+ } -+ else -+ { -+ const XAP_StringSet * pSS = XAP_App::getApp()->getStringSet(); -+ UT_String Msg1; -+ pSS->getValue(AP_STRING_ID_FIELD_Error, XAP_App::getApp()->getDefaultEncoding(), Msg1); -+ -+ UT_String Msg2; -+ pSS->getValue(AP_STRING_ID_MSG_BookmarkNotFound, XAP_App::getApp()->getDefaultEncoding(), Msg2); -+ UT_String format; -+ -+ UT_String_sprintf(format, "{%s: %s}", Msg1.c_str(), Msg2.c_str()); -+ UT_UTF8String_sprintf(szFieldValue, format.c_str(), _getParameter()); -+ } -+ -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue.utf8_str())); -+ -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+ -+/////////////////////////////////////////////////////////////////////////// -+ -+fp_FieldPageCountRun::fp_FieldPageCountRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldPageCountRun::calculateValue(void) -+{ -+ UT_UTF8String szFieldValue ("?"); -+ -+ if (getLine() && getLine()->getContainer() && getLine()->getContainer()->getPage()) -+ { -+ -+ fp_Page* pPage = getLine()->getContainer()->getPage(); -+ FL_DocLayout* pDL = pPage->getDocLayout(); -+ -+ UT_UTF8String_sprintf(szFieldValue, "%d", pDL->countPages()); -+ } -+ -+ if (getField()) -+ getField()->setValue(static_cast(szFieldValue.utf8_str())); -+ -+ return _setValue(szFieldValue.ucs4_str().ucs4_str()); -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+fp_FieldMailMergeRun::fp_FieldMailMergeRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) -+ : fp_FieldRun(pBL, iOffsetFirst, iLen) -+{ -+} -+ -+bool fp_FieldMailMergeRun::calculateValue(void) -+{ -+ fd_Field * fld = getField(); -+ if (fld) { -+ const gchar * param = fld->getParameter (); -+ -+ if (!param) -+ return false; -+ -+ UT_UTF8String value ; -+ -+ PD_Document * pDoc = getBlock()->getDocument(); -+ UT_ASSERT(pDoc); -+ -+ if (!pDoc->mailMergeFieldExists(param)) -+ { -+ // we'll take this branch if there's no mapping, we'll display -+ // the field name instead -+ value = "<"; -+ value += param; -+ value += ">"; -+ } -+ else -+ { -+ value = pDoc->getMailMergeField(param); -+ } -+ -+ fld->setValue(static_cast(value.utf8_str())); -+ -+ return _setValue(value.ucs4_str().ucs4_str()); -+ } -+ -+ return false; -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+fp_FieldMetaRun::fp_FieldMetaRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen, const char * which) -+ : fp_FieldRun(pBL, iOffsetFirst, iLen), m_which(which) -+{ -+} -+ -+bool fp_FieldMetaRun::calculateValue(void) -+{ -+ PD_Document * pDoc = getBlock()->getDocument(); -+ UT_ASSERT(pDoc); -+ -+ UT_UTF8String value ; -+ if (!pDoc->getMetaDataProp(m_which, value) || !value.size()) -+ value = " "; -+ -+ if (getField()) -+ getField()->setValue(static_cast(value.utf8_str())); -+ -+ return _setValue(value.ucs4_str().ucs4_str()); -+} -+ -+fp_FieldMetaTitleRun::fp_FieldMetaTitleRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_TITLE) -+{ -+} -+ -+fp_FieldMetaCreatorRun::fp_FieldMetaCreatorRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_CREATOR) -+{ -+} -+ -+fp_FieldMetaSubjectRun::fp_FieldMetaSubjectRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_SUBJECT) -+{ -+} -+ -+fp_FieldMetaPublisherRun::fp_FieldMetaPublisherRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_PUBLISHER) -+{ -+} -+ -+fp_FieldMetaDateRun::fp_FieldMetaDateRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_DATE) -+{ -+} -+ -+fp_FieldMetaTypeRun::fp_FieldMetaTypeRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_TYPE) -+{ -+} -+ -+fp_FieldMetaLanguageRun::fp_FieldMetaLanguageRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_LANGUAGE) -+{ -+} -+ -+fp_FieldMetaRightsRun::fp_FieldMetaRightsRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_RIGHTS) -+{ -+} -+ -+fp_FieldMetaKeywordsRun::fp_FieldMetaKeywordsRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_KEYWORDS) -+{ -+} -+ -+fp_FieldMetaContributorRun::fp_FieldMetaContributorRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_CONTRIBUTOR) -+{ -+} -+ -+fp_FieldMetaCoverageRun::fp_FieldMetaCoverageRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_COVERAGE) -+{ -+} -+ -+fp_FieldMetaDescriptionRun::fp_FieldMetaDescriptionRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_FieldMetaRun(pBL, iOffsetFirst, iLen, PD_META_KEY_DESCRIPTION) -+{ -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+fp_ForcedColumnBreakRun::fp_ForcedColumnBreakRun(fl_BlockLayout* pBL,UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_Run(pBL, iOffsetFirst, iLen, FPRUN_FORCEDCOLUMNBREAK) -+{ -+ lookupProperties(); -+} -+ -+void fp_ForcedColumnBreakRun::_lookupProperties(const PP_AttrProp * /*pSpanAP*/, -+ const PP_AttrProp * /*pBlockAP*/, -+ const PP_AttrProp * /*pSectionAP*/, -+ GR_Graphics *) -+{ -+ fd_Field * fd = NULL; -+ -+ getBlock()->getField(getBlockOffset(),fd); -+ _setField(fd); -+ -+ _inheritProperties(); -+ _setWidth(1); -+} -+ -+bool fp_ForcedColumnBreakRun::canBreakAfter(void) const -+{ -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ -+ return false; -+} -+ -+bool fp_ForcedColumnBreakRun::canBreakBefore(void) const -+{ -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ -+ return false; -+} -+ -+bool fp_ForcedColumnBreakRun::_letPointPass(void) const -+{ -+ return false; -+} -+ -+void fp_ForcedColumnBreakRun::mapXYToPosition(UT_sint32 /* x */, UT_sint32 /*y*/, PT_DocPosition& pos, bool& bBOL, bool& bEOL, bool &isTOC) -+{ -+ pos = getBlock()->getPosition() + getBlockOffset(); -+ bBOL = false; -+ bEOL = false; -+} -+ -+void fp_ForcedColumnBreakRun::findPointCoords(UT_uint32 iOffset, UT_sint32& x, UT_sint32& y, UT_sint32& x2, UT_sint32& y2, UT_sint32& height, bool& bDirection) -+{ -+ //UT_DEBUGMSG(("fintPointCoords: ForcedColumnBreakRun\n")); -+ UT_ASSERT(getBlockOffset() == iOffset || getBlockOffset()+1 == iOffset); -+ -+ UT_sint32 xoff, yoff; -+ -+ fp_Run* pPropRun = _findPrevPropertyRun(); -+ -+ if (pPropRun) -+ { -+ if(FPRUN_TEXT == pPropRun->getType()) -+ { -+ pPropRun->findPointCoords(iOffset, x, y, x2, y2, height, bDirection); -+ } -+ else -+ { -+ height = getHeight(); -+ getLine()->getOffsets(this, xoff, yoff); -+ x = xoff; -+ y = yoff; -+ } -+ } -+ else -+ { -+ height = getHeight(); -+ getLine()->getOffsets(this, xoff, yoff); -+ x = xoff; -+ y = yoff; -+ } -+ -+ x2 = x; -+ y2 = y; -+} -+ -+void fp_ForcedColumnBreakRun::_clearScreen(bool /* bFullLineHeightRect */) -+{ -+ // UT_ASSERT(!isDirty()); -+ UT_ASSERT(getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)); -+ -+ UT_sint32 xoff = 0, yoff = 0; -+ getLine()->getScreenOffsets(this, xoff, yoff); -+ UT_sint32 iWidth = getLine()->getMaxWidth() - getLine()->calculateWidthOfLine(); -+ Fill(getGraphics(),xoff,yoff,iWidth,getLine()->getHeight()); -+} -+ -+void fp_ForcedColumnBreakRun::_draw(dg_DrawArgs* pDA) -+{ -+ GR_Graphics * pG = pDA->pG; -+ if (!(pG->queryProperties(GR_Graphics::DGP_SCREEN))){ -+ return; -+ } -+ -+ FV_View* pView = _getView(); -+ UT_ASSERT(pView); -+ if(!pView->getShowPara()){ -+ return; -+ } -+ -+ UT_sint32 iLineWidth = getLine()->getMaxWidth(); -+ -+ UT_UCSChar *pColumnBreak; -+ UT_UCS4_cloneString_char(&pColumnBreak,"Column Break"); -+ _drawTextLine(pDA->xoff,pDA->yoff+getLine()->getAscent(),iLineWidth,getLine()->getHeight(),pColumnBreak); -+ FREEP(pColumnBreak); -+} -+ -+////////////////////////////////////////////////////////////////// -+////////////////////////////////////////////////////////////////// -+ -+fp_ForcedPageBreakRun::fp_ForcedPageBreakRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_Run(pBL, iOffsetFirst, iLen, FPRUN_FORCEDPAGEBREAK) -+{ -+ lookupProperties(); -+} -+ -+void fp_ForcedPageBreakRun::_lookupProperties(const PP_AttrProp * /*pSpanAP*/, -+ const PP_AttrProp * /*pBlockAP*/, -+ const PP_AttrProp * /*pSectionAP*/, -+ GR_Graphics *) -+{ -+ fd_Field * fd = NULL; -+ -+ getBlock()->getField(getBlockOffset(),fd); -+ _setField(fd); -+ -+ _inheritProperties(); -+ _setWidth(1); -+} -+ -+bool fp_ForcedPageBreakRun::canBreakAfter(void) const -+{ -+ return false; -+} -+ -+bool fp_ForcedPageBreakRun::canBreakBefore(void) const -+{ -+ return false; -+} -+ -+bool fp_ForcedPageBreakRun::_letPointPass(void) const -+{ -+ return false; -+} -+ -+void fp_ForcedPageBreakRun::mapXYToPosition(UT_sint32 /* x */, UT_sint32 /*y*/, PT_DocPosition& pos, bool& bBOL, bool& bEOL, bool &isTOC) -+{ -+ pos = getBlock()->getPosition() + getBlockOffset(); -+ bBOL = false; -+ bEOL = false; -+} -+ -+void fp_ForcedPageBreakRun::findPointCoords(UT_uint32 iOffset, UT_sint32& x, UT_sint32& y, UT_sint32& x2, UT_sint32& y2, UT_sint32& height, bool& bDirection) -+{ -+ //UT_DEBUGMSG(("fintPointCoords: ForcedPageBreakRun\n")); -+ UT_ASSERT(getBlockOffset() == iOffset || getBlockOffset()+1 == iOffset); -+ -+ UT_sint32 xoff, yoff; -+ -+ fp_Run* pPropRun = _findPrevPropertyRun(); -+ -+ if (pPropRun) -+ { -+ height = pPropRun->getHeight(); -+ if(FPRUN_TEXT == pPropRun->getType()) -+ { -+ pPropRun->findPointCoords(iOffset, x, y, x2, y2, height, bDirection); -+ } -+ else -+ { -+ height = getHeight(); -+ getLine()->getOffsets(this, xoff, yoff); -+ x = xoff; -+ y = yoff; -+ } -+ } -+ else -+ { -+ height = getHeight(); -+ getLine()->getOffsets(this, xoff, yoff); -+ x = xoff; -+ y = yoff; -+ } -+ -+ if (iOffset == getBlockOffset()+1) -+ { -+ FV_View* pView = _getView(); -+ if (pView->getShowPara()) -+ { -+ x += getWidth(); -+ } -+ } -+ -+ x2 = x; -+ y2 = y; -+} -+ -+void fp_ForcedPageBreakRun::_clearScreen(bool /* bFullLineHeightRect */) -+{ -+ // UT_ASSERT(!isDirty()); -+ UT_ASSERT(getGraphics()->queryProperties(GR_Graphics::DGP_SCREEN)); -+ -+ UT_sint32 xoff = 0, yoff = 0; -+ getLine()->getScreenOffsets(this, xoff, yoff); -+ UT_sint32 iWidth = getLine()->getMaxWidth() - getLine()->calculateWidthOfLine(); -+ Fill(getGraphics(),xoff,yoff,iWidth,getLine()->getHeight()); -+} -+ -+void fp_ForcedPageBreakRun::_draw(dg_DrawArgs* pDA) -+{ -+ GR_Graphics * pG = pDA->pG; -+ -+ if (!(pG->queryProperties(GR_Graphics::DGP_SCREEN))){ -+ return; -+ } -+ -+ FV_View* pView = _getView(); -+ UT_ASSERT(pView); -+ if(!pView->getShowPara()){ -+ return; -+ } -+ -+ UT_sint32 iLineWidth = getLine()->getMaxWidth(); -+ -+ UT_UCSChar *pPageBreak; -+ UT_UCS4_cloneString_char(&pPageBreak,"Page Break"); -+ -+ _drawTextLine(pDA->xoff,pDA->yoff+getLine()->getAscent(),iLineWidth,getLine()->getHeight(),pPageBreak); -+ FREEP(pPageBreak); -+} -+ -+// translates logical position in a run into visual position -+// (will also translate correctly visual -> logical) -+UT_uint32 fp_Run::getVisPosition(UT_uint32 iLogPos) -+{ -+ if(getVisDirection() == UT_BIDI_RTL) //rtl needs translation -+ { -+ return (getLength() - iLogPos - 1); -+ } -+ else return (iLogPos); -+} -+ -+//translates a visual position in a span of length iLen to logical pos -+//or vice versa -+UT_uint32 fp_Run::getVisPosition(UT_uint32 iLogPos, UT_uint32 iLen) -+{ -+ if(getVisDirection() == UT_BIDI_RTL) //rtl needs translation -+ { -+ return (iLen - iLogPos - 1); -+ } -+ else return (iLogPos); -+} -+ -+//returns the logical offset of the first visual character -+UT_uint32 fp_Run::getOffsetFirstVis() -+{ -+ if(getVisDirection() == UT_BIDI_RTL) //rtl, requires translation -+ { -+ return(getBlockOffset() + getLength() - 1); -+ } -+ else return (getBlockOffset()); -+} -+ -+//translates visual offset to logical one, can be also used for translation -+//in the other direction -+UT_uint32 fp_Run::getOffsetLog(UT_uint32 iVisOff) -+{ -+ if(getVisDirection() == UT_BIDI_RTL) //rtl needs translation -+ { -+ return(getBlockOffset() + getLength() - iVisOff + getBlockOffset() - 1); -+ } -+ else return (iVisOff); -+} -+ -+fp_Run * fp_Run::getNextVisual() -+{ -+ if(!getLine()) -+ return NULL; -+ -+ UT_uint32 iIndxVis = getLine()->getVisIndx(this); -+ -+ return getLine()->getRunAtVisPos(iIndxVis + 1); -+} -+ -+fp_Run * fp_Run::getPrevVisual() -+{ -+ if(!getLine()) -+ return NULL; -+ -+ UT_uint32 iIndxVis = getLine()->getVisIndx(this); -+ -+ if(!iIndxVis) -+ return NULL; -+ -+ return getLine()->getRunAtVisPos(iIndxVis - 1); -+} -+ -+void fp_Run::setDirection(UT_BidiCharType iDir) -+{ -+ xxx_UT_DEBUGMSG(("fp_Run::SetDirection, getDirection() %d, iDir %d, run type %d\n", getDirection(), iDir, getType())); -+ UT_BidiCharType iDirection = iDir != UT_BIDI_UNSET ? iDir : UT_BIDI_WS; -+ if(getDirection() != iDirection) -+ { -+ UT_BidiCharType origDirection = getDirection(); -+ _setDirection(iDirection); -+ clearScreen(); -+ /* -+ if this run belongs to a line we have to notify the line that -+ that it now contains a run of this direction, if it does not belong -+ to a line this will be taken care of by the fp_Line:: member function -+ used to add the run to the line (generally, we set it here if this -+ is a run that is being typed in and it gets set in the member -+ functions when the run is loaded from a document on the disk.) -+ */ -+ -+ if(getLine()) -+ getLine()->changeDirectionUsed(origDirection,getDirection(),true); -+ } -+} -+ -+// returns the direction with which the run is displayed, -+UT_BidiCharType fp_Run::getVisDirection() -+{ -+#ifndef NO_BIDI_SUPPORT -+ FV_View * pView = _getView(); -+ if(pView && pView->getBidiOrder() != FV_Order_Visual) -+ { -+ if(pView->getBidiOrder() == FV_Order_Logical_LTR) -+ return UT_BIDI_LTR; -+ else -+ return UT_BIDI_RTL; -+ } -+ else if(m_iVisDirection == UT_BIDI_UNSET) -+ { -+ if(m_pLine) -+ { -+ m_pLine->_createMapOfRuns(); -+ UT_ASSERT(m_iVisDirection != UT_BIDI_UNSET); -+ return m_iVisDirection; -+ } -+ else if(getBlock()) -+ return getBlock()->getDominantDirection(); -+ else -+ { -+ bool b; -+ XAP_App::getApp()->getPrefsValueBool(static_cast(AP_PREF_KEY_DefaultDirectionRtl), &b); -+ if(b) -+ return UT_BIDI_RTL; -+ else -+ return UT_BIDI_LTR; -+ } -+ } -+ else -+ return m_iVisDirection; -+#else -+ return UT_BIDI_LTR; -+#endif -+} -+ -+void fp_Run::setVisDirection(UT_BidiCharType iDir) -+{ -+ if( iDir != m_iVisDirection -+ && m_iVisDirection != UT_BIDI_UNSET -+ /*&& m_eRefreshDrawBuffer == GRSR_BufferClean*/) -+ { -+ // the text in the buffer is in the wrong order, schedule it -+ // for refresh -+ m_eRefreshDrawBuffer = GRSR_Unknown; -+ } -+ -+ m_iVisDirection = iDir; -+} -+ -+#if 0 -+void fp_Run::setDirectionProperty(UT_BidiCharType dir) -+{ -+ const gchar * prop[] = {NULL, NULL, 0}; -+ const gchar direction[] = "dir"; -+ const gchar rtl[] = "rtl"; -+ const gchar ltr[] = "ltr"; -+ UT_String other; -+ -+ prop[0] = static_cast(&direction); -+ -+ switch(dir) -+ { -+ case UT_BIDI_LTR: prop[1] = static_cast(<r); break; -+ case UT_BIDI_RTL: prop[1] = static_cast(&rtl); break; -+ default: -+ { -+ // for anything other we will print the UT_BidiCharType value -+ // this will allow us to coallesce runs of same type without -+ // having to list here tons of possible strings -+ // (we could do this for rtl and ltr as well, but "rtl" and "ltr" -+ // are much more informative.) -+ UT_String_sprintf(other,"fbt%d",static_cast(dir)); -+ prop[1] = static_cast(other.c_str()); break; -+ } -+ }; -+ -+ UT_uint32 offset = getBlock()->getPosition() + getBlockOffset(); -+ getBlock()->getDocument()->changeSpanFmt(PTC_AddFmt,offset,offset + getLength(),NULL,prop); -+ UT_DEBUGMSG(("fp_Run::setDirectionProperty: offset=%d, len=%d, dir=\"%s\"\n", offset,getLength(),prop[1])); -+} -+#endif -+ -+/*! -+ The following function allows us to respond to deletion of part of -+ a run in a smart way; this is just default implementation, and -+ there is nothing smart about it, derrived classes should provide -+ their own implementation where it makes sense (see fp_TextRun) -+ -+ \param offset: run offset at which deletion starts -+ \param iLen: length of the deleted section, can reach past the -+ end of the run -+*/ -+void fp_Run::updateOnDelete(UT_uint32 offset, UT_uint32 iLenToDelete) -+{ -+ // do not try to delete past the end of the run ... -+ UT_return_if_fail(offset < m_iLen); -+ -+ UT_uint32 iLen = UT_MIN(iLenToDelete, m_iLen - offset); -+ -+ // do not try to delete nothing ... -+ if(iLen == 0) -+ return; -+ -+ setLength(m_iLen - iLen, true); -+} -+ -+// house keeping -+#undef FPRUN_PROPS_MINI_DUMP -diff -urNad abiword-2.6.2~/abiword/src/text/fmt/xp/fv_View_cmd.cpp abiword-2.6.2/abiword/src/text/fmt/xp/fv_View_cmd.cpp ---- abiword-2.6.2~/abiword/src/text/fmt/xp/fv_View_cmd.cpp 2008-04-17 13:12:32.000000000 +0200 -+++ abiword-2.6.2/abiword/src/text/fmt/xp/fv_View_cmd.cpp 2008-04-17 21:45:40.000000000 +0200 -@@ -4099,10 +4099,10 @@ - while (pRun && pRun->getBlockOffset()+ pRun->getLength() < iRelPos) - pRun= pRun->getNextRun(); - -- UT_ASSERT(pRun); -+ UT_return_if_fail(pRun); - pRun->getPrevRun(); - -- UT_ASSERT(pRun); -+ UT_return_if_fail(pRun); - #if 0 - if(pRun->getType()== FPRUN_FMTMARK || pRun->getType()== FPRUN_HYPERLINK || pRun->getType()== FPRUN_BOOKMARK) - pRun = pRun->getNextRun(); -@@ -4111,9 +4111,7 @@ - #endif - fp_HyperlinkRun * pH = pRun->getHyperlink(); - -- UT_ASSERT(pH); -- if(!pH) -- return; -+ UT_return_if_fail(pH); - - const gchar * pTarget = pH->getTarget(); - -@@ -4140,9 +4138,7 @@ - void FV_View::cmdHyperlinkJump(PT_DocPosition pos) - { - fp_HyperlinkRun * pH = static_cast(getHyperLinkRun(pos)); -- UT_ASSERT(pH); -- if(!pH) -- return; -+ UT_return_if_fail(pH); - - const gchar * pTarget = pH->getTarget(); - -@@ -5857,9 +5853,12 @@ - // locate the squiggle - PT_DocPosition pos = getPoint(); - fl_BlockLayout* pBL = _findBlockAtPosition(pos); -- UT_ASSERT(pBL); -+ UT_return_if_fail(pBL); - fl_PartOfBlock* pPOB = pBL->getSpellSquiggles()->get(pos - pBL->getPosition()); -- UT_ASSERT(pPOB); -+ if(!pPOB) // this can happen with very rapid right-clicks -+ { -+ return; -+ } - - // grab a copy of the word - UT_GrowBuf pgb(1024); -@@ -5896,9 +5895,12 @@ - // locate the squiggle - PT_DocPosition pos = getPoint(); - fl_BlockLayout* pBL = _findBlockAtPosition(pos); -- UT_ASSERT(pBL); -+ UT_return_if_fail(pBL); - fl_PartOfBlock* pPOB = pBL->getSpellSquiggles()->get(pos - pBL->getPosition()); -- UT_ASSERT(pPOB); -+ if(!pPOB) // this can happen with very rapid right-clicks -+ { -+ return; -+ } - - // grab a copy of the word - UT_GrowBuf pgb(1024); -@@ -5991,9 +5993,7 @@ - } - } - pShadow = pHFCon->getShadow(); -- UT_ASSERT(pShadow); -- if(!pShadow) -- return; -+ UT_return_if_fail(pShadow); - - m_pDoc->beginUserAtomicGlob(); - -diff -urNad abiword-2.6.2~/abiword/src/text/fmt/xp/fv_View_cmd.cpp.orig abiword-2.6.2/abiword/src/text/fmt/xp/fv_View_cmd.cpp.orig ---- abiword-2.6.2~/abiword/src/text/fmt/xp/fv_View_cmd.cpp.orig 1970-01-01 01:00:00.000000000 +0100 -+++ abiword-2.6.2/abiword/src/text/fmt/xp/fv_View_cmd.cpp.orig 2008-04-17 21:45:40.000000000 +0200 -@@ -0,0 +1,6313 @@ -+/* AbiWord -+ * Copyright (C) 1998-2000 AbiSource, Inc. -+ * Copyright (c) 2001,2002 Tomas Frydrych -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include "ut_assert.h" -+#include "ut_debugmsg.h" -+#include "ut_go_file.h" -+#include "ut_growbuf.h" -+#include "ut_misc.h" -+#include "ut_string.h" -+#include "ut_bytebuf.h" -+#include "ut_timer.h" -+#include "ut_Language.h" -+#include "ut_uuid.h" -+ -+#include "xav_View.h" -+#include "fl_DocLayout.h" -+#include "fl_BlockLayout.h" -+#include "fl_Squiggles.h" -+#include "fl_SectionLayout.h" -+#include "fl_AutoNum.h" -+#include "fp_Page.h" -+#include "fp_PageSize.h" -+#include "fp_Column.h" -+#include "fp_Line.h" -+#include "fp_Run.h" -+#include "fp_TextRun.h" -+#include "fg_Graphic.h" -+#include "fg_GraphicRaster.h" -+#include "pd_Document.h" -+#include "pd_Style.h" -+#include "pp_Property.h" -+#include "pp_AttrProp.h" -+#include "gr_Graphics.h" -+#include "gr_DrawArgs.h" -+#include "ie_types.h" -+#include "xap_App.h" -+#include "xap_Frame.h" -+#include "xap_Clipboard.h" -+#include "ap_TopRuler.h" -+#include "ap_LeftRuler.h" -+#include "ap_Prefs.h" -+#include "ap_Strings.h" -+#include "fd_Field.h" -+#include "pf_Frag_Strux.h" -+ -+#ifdef ENABLE_SPELL -+#include "spell_manager.h" -+#if 1 -+// todo: work around to remove the INPUTWORDLEN restriction for pspell -+#include "ispell_def.h" -+#endif -+#endif -+ -+#include "ut_rand.h" -+#include "fp_TableContainer.h" -+#include "fl_FootnoteLayout.h" -+#include "fl_ContainerLayout.h" -+#include "fl_TOCLayout.h" -+#include "pp_Revision.h" -+ -+#include "ap_Dialog_SplitCells.h" -+#include "ev_Mouse.h" -+#include "fv_View.h" -+ -+// NB -- irrespective of this size, the piecetable will store -+// at max BOOKMARK_NAME_LIMIT of chars as defined in pf_Frag_Bookmark.h -+#define BOOKMARK_NAME_SIZE 30 -+#define CHECK_WINDOW_SIZE if(getWindowHeight() < 20) return; -+ -+/****************************************************************/ -+ -+void FV_View::cmdUnselectSelection(void) -+{ -+ _clearSelection(); -+} -+ -+ -+/*! -+ Move point a number of character positions -+ \param bForward True if moving forward -+ \param count Number of char positions to move -+ -+ \note Cursor movement while there's a selection has the effect of -+ clearing the selection. And only that. See bug 993. -+*/ -+void FV_View::cmdCharMotion(bool bForward, UT_uint32 count) -+{ -+ if (!isSelectionEmpty()) -+ { -+ _moveToSelectionEnd(bForward); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return; -+ } -+ -+ PT_DocPosition iPoint = getPoint(); -+ if (!_charMotion(bForward, count)) -+ { -+ if(bForward) -+ { -+// -+// Reached end of document. -+// -+ UT_DEBUGMSG(("SEVIOR: Reached end of document \n")); -+ m_bPointEOL = true; -+ } -+ else -+ { -+ if(m_bInsertAtTablePending) -+ { -+ m_iInsPoint = iPoint; -+ } -+ else -+ { -+ _setPoint(iPoint); -+ } -+ } -+ -+ bool bOK = true; -+ while(bOK && !isPointLegal() && (getPoint() > 2)) -+ { -+ bOK = _charMotion(false,1); -+ } -+ } -+ else -+ { -+ PT_DocPosition iPoint1 = getPoint(); -+ if ( iPoint1 == iPoint ) -+ { -+ if(!_charMotion(bForward, count)) -+ { -+ _setPoint(iPoint); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return; -+ } -+ if(!isPointLegal()) -+ { -+ _setPoint(iPoint); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return; -+ } -+ } -+ } -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+} -+ -+ -+/*! -+ * Split the merged cells located at the current point in the way specified -+ * by iSplitType -+ */ -+bool FV_View::cmdSplitCells(AP_CellSplitType iSplitType) -+{ -+ PL_StruxDocHandle cellSDH,tableSDH,curSDH,endTableSDH; -+ PL_StruxDocHandle prevCellSDH1,prevCellSDH2; -+ PT_DocPosition posTable,posCell,posFirstInsert,posEndTable; -+ posFirstInsert = 0; -+ UT_sint32 iLeft,iRight,iTop,iBot; -+ UT_sint32 jLeft,jRight,jTop,jBot; -+ PT_DocPosition posCol = getPoint(); -+ if(!isInTable(posCol)) -+ { -+ return false; -+ } -+ getCellParams(posCol, &iLeft, &iRight,&iTop,&iBot); -+ UT_String sCellProps; -+ getCellFormat(posCol,sCellProps); -+// -+// Find the Row and column of the cell at the current point. The strategy -+// will be insert a new cell with the same (row/col depending on the split) -+// and to adjust the rest of the table past this point. -+// -+ UT_sint32 rowSpan = iBot - iTop; -+ UT_sint32 colSpan = iRight - iLeft; -+ bool bRes = m_pDoc->getStruxOfTypeFromPosition(posCol,PTX_SectionCell,&cellSDH); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posCol,PTX_SectionTable,&tableSDH); -+ UT_return_val_if_fail(bRes, false); -+ -+ posTable = m_pDoc->getStruxPosition(tableSDH) + 1; -+ posCell = m_pDoc->getStruxPosition(cellSDH); -+ endTableSDH = m_pDoc->getEndTableStruxFromTableSDH(tableSDH); -+ posEndTable = m_pDoc->getStruxPosition(endTableSDH); -+// -+// Got all we need, now set things up to do the insert nicely -+// -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ if (!isSelectionEmpty()) -+ { -+ _clearSelection(); -+ } -+ m_pDoc->setDontImmediatelyLayout(true); -+// -+// Now trigger a rebuild of the whole table by sending a changeStrux to the table strux -+// with a bogus line-type property. We'll restore it later. -+// -+ const char * pszTable[3] = {NULL,NULL,NULL}; -+ pszTable[0] = "list-tag"; -+ const char * szListTag = NULL; -+ UT_String sListTag; -+ UT_sint32 iListTag; -+ m_pDoc->getPropertyFromSDH(tableSDH,isShowRevisions(),getRevisionLevel(),pszTable[0],&szListTag); -+ if(szListTag == NULL || *szListTag == '\0') -+ { -+ iListTag = 0; -+ } -+ else -+ { -+ iListTag = atoi(szListTag); -+ iListTag -= 1; -+ } -+ UT_String_sprintf(sListTag,"%d",iListTag); -+ pszTable[1] = sListTag.c_str(); -+ UT_DEBUGMSG(("SEVIOR: Doing Table strux change of %s %s \n",pszTable[0],pszTable[1])); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posTable,posTable,NULL,pszTable,PTX_SectionTable); -+ UT_sint32 splitLeft,splitRight,splitTop,splitBot; -+ UT_sint32 newLeft,newRight,newTop,newBot; -+ UT_sint32 numRows = 0; -+ UT_sint32 numCols = 0; -+ bool bDoSplitSolidHori = false; -+ bool bDoSplitSolidVert = false; -+// -+// OK now insert the cell and do the update -+// -+ m_pDoc-> getRowsColsFromTableSDH(tableSDH, isShowRevisions(), getRevisionLevel(), &numRows, &numCols); -+ -+ if(iSplitType <= hori_right) -+ { -+// -+// This is similar to "insert column" -+// -+ if(iSplitType == hori_left) -+ { -+ splitLeft = iLeft; -+ splitRight = iLeft+1; -+ } -+ else if(iSplitType == hori_mid) -+ { -+ splitLeft = iLeft; -+ if(colSpan == 1) -+ { -+ bDoSplitSolidHori = true; -+ splitRight = iLeft+1; -+ } -+ else -+ { -+ splitRight = iLeft + colSpan/2; -+ } -+ } -+ else if(iSplitType == hori_right) -+ { -+ splitLeft = iLeft; -+ splitRight = iRight -1; -+ } -+ splitTop = iTop; -+ splitBot = iBot; -+ newTop = iTop; -+ newBot = iBot; -+ if(!bDoSplitSolidHori) -+ { -+ newLeft = splitRight; -+ newRight = iRight; -+ } -+ else -+ { -+ newLeft = splitRight; -+ newRight = newLeft+1; -+ } -+ -+ } -+ else -+ { -+ if(iSplitType == vert_above) -+ { -+ newTop = iTop; -+ newBot = iTop +1; -+ } -+ else if(iSplitType == vert_mid) -+ { -+ newTop = iTop; -+ if(rowSpan == 1) -+ { -+ bDoSplitSolidVert = true; -+ newBot = newTop+1; -+ } -+ else -+ { -+ newBot = iTop + rowSpan/2; -+ } -+ } -+ else if(iSplitType == vert_below) -+ { -+ newTop = iTop; -+ newBot = iBot -1; -+ } -+// -+// we need to get the location of where to place this cell. -+// -+ splitLeft = iLeft; -+ splitRight = iRight; -+ newLeft = iLeft; -+ newRight = iRight; -+ if(!bDoSplitSolidVert) -+ { -+ splitTop = newBot; -+ splitBot = iBot; -+ } -+ else -+ { -+ newTop = iTop; -+ newBot = newTop+1; -+ splitTop = newBot; -+ splitBot = splitTop+1; -+ } -+// -+// OK now we have to find the place to insert this. It should be the cell -+// immediately after (splitTop,splitLeft) -+// -+//(except if it's a splitSolidVert in which case it should be placed as the -+// next next on the row in the first cell before (splitleft,splittop) -+// -+ if(bDoSplitSolidVert) -+ { -+// -+// OK start with cellSDH and scan until we either reach the end of the table -+// or we find a cell past where splitcell should be. Then we insert the cell -+// at where cell just after splitcell is. -+// -+ bool bStop = false; -+ curSDH = cellSDH; -+ while(!bStop) -+ { -+ posCell = m_pDoc->getStruxPosition(curSDH)+1; -+ bRes = getCellParams(posCell,&jLeft,&jRight,&jTop,&jBot); -+ UT_ASSERT(bRes); -+ if(jTop >= splitTop) -+ { -+// -+// Found it! -+// -+ bStop = true; -+ posCell = m_pDoc->getStruxPosition(curSDH); -+ break; -+ } -+ bRes = m_pDoc->getNextStruxOfType(curSDH,PTX_SectionCell,&curSDH); -+ if(!bRes) -+ { -+ bStop = true; -+ posCell = m_pDoc->getStruxPosition(endTableSDH); -+ break; -+ } -+ posCell = m_pDoc->getStruxPosition(curSDH); -+ if(posCell > posEndTable) -+ { -+ bStop = true; -+ posCell = m_pDoc->getStruxPosition(endTableSDH); -+ break; -+ } -+ } -+ } -+ else -+ { -+ jTop = splitTop; -+ jBot = jTop+1; -+ jLeft = splitRight; -+ if(jLeft >= numCols) -+ { -+ jLeft = 0; -+ jTop += 1; -+ jBot +=1; -+ } -+ jRight = jLeft+1; -+ if(jTop >= numRows) -+ { -+// -+// Place right before endTable Strux -+// -+ if(endTableSDH == NULL) -+ { -+ // -+ // Disaster! the table structure in the piecetable is screwed. -+ // we're totally stuffed now. -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ return false; -+ } -+ posCell = m_pDoc->getStruxPosition(endTableSDH); -+ } -+ else -+ { -+// -+// now we have to loop until we find a cell precisely at jLeft,jTop -+// -+ bool bFound = false; -+ while(!bFound) -+ { -+ curSDH = m_pDoc-> getCellSDHFromRowCol(tableSDH,isShowRevisions(), getRevisionLevel(), jTop,jLeft); -+ if(curSDH == NULL) -+ { -+ endTableSDH = m_pDoc->getEndTableStruxFromTableSDH(tableSDH); -+ if(endTableSDH == NULL) -+ { -+ // -+ // Disaster! the table structure in the piecetable is screwed. -+ // we're totally stuffed now. -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ return false; -+ } -+ posCell = m_pDoc->getStruxPosition(endTableSDH); -+ bFound = true; -+ } -+ UT_sint32 kLeft,kRight,kTop,kBot; -+ PT_DocPosition posTmp = m_pDoc->getStruxPosition(curSDH)+1; -+ getCellParams(posTmp,&kLeft,&kRight,&kTop,&kBot); -+ if((kLeft == jLeft) && (kTop == jTop)) -+ { -+ bFound = true; -+ posCell = m_pDoc->getStruxPosition(curSDH); -+ } -+ else -+ { -+ jLeft++; -+ jRight++; -+ if(jLeft >= numCols) -+ { -+ jLeft = 0; -+ jTop++; -+ jRight =1; -+ jBot++; -+ } -+ if(jTop >= numRows) -+ { -+ endTableSDH = m_pDoc->getEndTableStruxFromTableSDH(tableSDH); -+ if(endTableSDH == NULL) -+ { -+ // -+ // Disaster! the table structure in the piecetable is screwed. -+ // we're totally stuffed now. -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ return false; -+ } -+ posCell = m_pDoc->getStruxPosition(endTableSDH); -+ bFound = true; -+ } -+ } -+ } -+ } -+ } -+ } -+// -+// OK build the table properties -+// -+ UT_String sRowTop = "top-attach"; -+ UT_String sRowBot = "bot-attach"; -+ UT_String sColLeft = "left-attach"; -+ UT_String sColRight = "right-attach"; -+ UT_String sTop,sBot,sLeft,sRight; -+ UT_String_sprintf(sTop,"%d",splitTop); -+ UT_String_sprintf(sBot,"%d",splitBot); -+ UT_String_sprintf(sLeft,"%d",splitLeft); -+ UT_String_sprintf(sRight,"%d",splitRight); -+ UT_String_setProperty(sCellProps,sRowTop,sTop); -+ UT_String_setProperty(sCellProps,sRowBot,sBot); -+ UT_String_setProperty(sCellProps,sColLeft,sLeft); -+ UT_String_setProperty(sCellProps,sColRight,sRight); -+ UT_DEBUGMSG(("Cells props for new cell:\n %s \n",sCellProps.c_str())); -+// -+// Insert the cell -+// -+ const gchar * atts[4] = {"props",NULL,NULL,NULL}; -+ atts[1] = sCellProps.c_str(); -+ bRes = m_pDoc->insertStrux(posCell,PTX_SectionCell,atts,NULL); -+ bRes = m_pDoc->insertStrux(posCell+1,PTX_Block); -+ posFirstInsert = posCell + 2; -+// -+// Save the cell SDH for later.. -+// -+ m_pDoc->getStruxOfTypeFromPosition(posCell+1,PTX_SectionCell,&prevCellSDH1); -+ -+ bRes = m_pDoc->insertStrux(posCell+2,PTX_EndCell); -+ -+// Changes the props of the new cell -+ UT_String_sprintf(sTop,"%d",newTop); -+ UT_String_sprintf(sBot,"%d",newBot); -+ UT_String_sprintf(sLeft,"%d",newLeft); -+ UT_String_sprintf(sRight,"%d",newRight); -+ UT_String_setProperty(sCellProps,sRowTop,sTop); -+ UT_String_setProperty(sCellProps,sRowBot,sBot); -+ UT_String_setProperty(sCellProps,sColLeft,sLeft); -+ UT_String_setProperty(sCellProps,sColRight,sRight); -+ posCell = m_pDoc->getStruxPosition(cellSDH)+1; -+ UT_DEBUGMSG(("New Cells props for old cell:\n %s \n",sCellProps.c_str())); -+ atts[1] = sCellProps.c_str(); -+ bool bres = m_pDoc->changeStruxFmt(PTC_AddFmt,posCell,posCell,atts,NULL,PTX_SectionCell); -+ m_pDoc->getStruxOfTypeFromPosition(posCell,PTX_SectionCell,&prevCellSDH2); if(bDoSplitSolidHori) -+ { -+// -+// OK now we have to adjust all the cells with left or right >= splitleft -+// If left of a given cell is < splitLeft it is not adjusted but the right -+// of the cell if it's > splitleft is incremented. In this way our new cell -+// span two columns -+// -+ UT_sint32 myleft,myright,mytop,mybot; -+// -+// start at the first cell and scan through the table adjusting each cell. -+// -+ bres = m_pDoc->getStruxOfTypeFromPosition(posTable+1,PTX_SectionCell,&cellSDH); -+ UT_ASSERT(bres); -+ bool bStop= false; -+ while(!bStop) -+ { -+ posCell = m_pDoc->getStruxPosition(cellSDH)+1; -+ bres = getCellParams(posCell,&myleft,&myright,&mytop,&mybot); -+ UT_ASSERT(bres); -+ bool bChange =false; -+ if((cellSDH == prevCellSDH1) || (cellSDH == prevCellSDH2)) -+ { -+// -+// Igore me! -+// -+ bChange = false; -+ } -+ else -+ { -+ if(myright> splitLeft) -+ { -+ myright++; -+ bChange = true; -+ } -+ if(myleft>splitLeft) -+ { -+ myleft++; -+ bChange = true; -+ } -+ if(bChange) -+ { -+// Changes the props of the cell -+ UT_String_sprintf(sTop,"%d",mytop); -+ UT_String_sprintf(sBot,"%d",mybot); -+ UT_String_sprintf(sLeft,"%d",myleft); -+ UT_String_sprintf(sRight,"%d",myright); -+ UT_String_setProperty(sCellProps,sRowTop,sTop); -+ UT_String_setProperty(sCellProps,sRowBot,sBot); -+ UT_String_setProperty(sCellProps,sColLeft,sLeft); -+ UT_String_setProperty(sCellProps,sColRight,sRight); -+ atts[1] = sCellProps.c_str(); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posCell,posCell,atts,NULL,PTX_SectionCell); -+ } -+ } -+ bRes = m_pDoc->getNextStruxOfType(cellSDH,PTX_SectionCell,&cellSDH); -+ if(!bRes) -+ { -+ bStop = true; -+ break; -+ } -+ posCell = m_pDoc->getStruxPosition(cellSDH); -+ if(posCell > posEndTable) -+ { -+ bStop = true; -+ break; -+ } -+ } -+ } -+ if(bDoSplitSolidVert) -+ { -+// -+// OK now we have to adjust all the cells with top or bot >= newTop -+// If top of a given cell is < newTop it is not adjusted but the bot -+// of the cell if it's > newTop is incremented. In this way our new cell -+// spans two rows -+// -+ UT_sint32 myleft,myright,mytop,mybot; -+// -+// start at the first cell and scan through the table adjusting each cell. -+// -+ m_pDoc->getStruxOfTypeFromPosition(posTable+1,PTX_SectionCell,&cellSDH); -+ bool bStop= false; -+ while(!bStop) -+ { -+ posCell = m_pDoc->getStruxPosition(cellSDH) +1; -+ getCellParams(posCell,&myleft,&myright,&mytop,&mybot); -+ bool bChange =false; -+ if((cellSDH == prevCellSDH1) || (cellSDH == prevCellSDH2)) -+ { -+// -+// Igore me! -+// -+ bChange = false; -+ } -+ else -+ { -+ if(mytop>newTop) -+ { -+ mytop++; -+ bChange = true; -+ } -+ if(mybot>newTop) -+ { -+ mybot++; -+ bChange = true; -+ } -+ if(bChange) -+ { -+// Changes the props of the cell -+ UT_String_sprintf(sTop,"%d",mytop); -+ UT_String_sprintf(sBot,"%d",mybot); -+ UT_String_sprintf(sLeft,"%d",myleft); -+ UT_String_sprintf(sRight,"%d",myright); -+ UT_String_setProperty(sCellProps,sRowTop,sTop); -+ UT_String_setProperty(sCellProps,sRowBot,sBot); -+ UT_String_setProperty(sCellProps,sColLeft,sLeft); -+ UT_String_setProperty(sCellProps,sColRight,sRight); -+ atts[1] = sCellProps.c_str(); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posCell,posCell,atts,NULL,PTX_SectionCell); -+ } -+ } -+ bRes = m_pDoc->getNextStruxOfType(cellSDH,PTX_SectionCell,&cellSDH); -+ if(!bRes) -+ { -+ bStop = true; -+ break; -+ } -+ posCell = m_pDoc->getStruxPosition(cellSDH); -+ if(posCell > posEndTable) -+ { -+ bStop = true; -+ break; -+ } -+ } -+ } -+ -+// -+// Now trigger a rebuild of the whole table by sending a changeStrux to the table strux -+// with the restored line-type property it has before. -+// -+ iListTag += 1; -+ UT_String_sprintf(sListTag,"%d",iListTag); -+ pszTable[1] = sListTag.c_str(); -+ UT_DEBUGMSG(("SEVIOR: Doing Table strux change of %s %s \n",pszTable[0],pszTable[1])); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posTable,posTable,NULL,pszTable,PTX_SectionTable); -+// -+// OK finish everything off with the various parameters which allow the formatter to -+// be updated. -+// -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ -+ m_pDoc->endUserAtomicGlob(); -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+// Put the insertion point in a legal position -+// -+ setPoint(posFirstInsert); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+} -+ -+void FV_View::cmdSelectTOC(UT_sint32 x, UT_sint32 y) -+{ -+ UT_sint32 xClick=0,yClick = 0; -+ fp_Page* pPage = _getPageForXY(x,y,xClick,yClick); -+ fl_TOCLayout * pTOCL = pPage->getLastMappedTOC(); -+ UT_return_if_fail(pTOCL); -+ m_Selection.setTOCSelected(pTOCL); -+ PT_DocPosition pos = pTOCL->getPosition(); -+ m_iInsPoint = pos+1; -+ if(m_pG->getCaret()) -+ { -+ m_pG->getCaret()->disable(); -+ } -+ m_countDisable++; -+} -+ -+/*! -+ * Select the column of the table identified by the document position -+ * posOfColumn -+ */ -+bool FV_View::cmdSelectColumn(PT_DocPosition posOfColumn) -+{ -+ PL_StruxDocHandle cellSDH,tableSDH; -+ PT_DocPosition posTable,posCell; -+ UT_sint32 iLeft,iRight,iTop,iBot; -+ UT_sint32 Left,Right,Top,Bot; -+ bool bEOL = false; // added this stop compiler warning. Tomas -+ if(!isInTable(posOfColumn)) -+ { -+ return false; -+ } -+ if(!isSelectionEmpty()) -+ { -+ _clearSelection(); -+ _resetSelection(); -+ } -+ getCellParams(posOfColumn, &iLeft, &iRight,&iTop,&iBot); -+ bool bRes = m_pDoc->getStruxOfTypeFromPosition(posOfColumn,PTX_SectionCell,&cellSDH); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posOfColumn,PTX_SectionTable,&tableSDH); -+ UT_return_val_if_fail(bRes, false); -+ -+ posTable = m_pDoc->getStruxPosition(tableSDH) + 1; -+ posCell = m_pDoc->getStruxPosition(cellSDH); -+ -+// -+// Now find the number of rows and columns inthis table. -+// -+ UT_sint32 numRows = 0; -+ UT_sint32 numCols = 0; -+ m_pDoc->getRowsColsFromTableSDH(tableSDH, isShowRevisions(), getRevisionLevel(), &numRows, &numCols); -+// -+// Ok set the selection type to that of a column -+// -+ m_Selection.setMode(FV_SelectionMode_TableColumn); -+ -+ fl_BlockLayout * pBlock = NULL; -+ fp_Run * pRun = NULL; -+ UT_sint32 xCaret, yCaret; -+ UT_uint32 heightCaret; -+ UT_sint32 xCaret2, yCaret2; -+ bool bDirection; -+ _findPositionCoords(posOfColumn, bEOL, xCaret, yCaret, xCaret2, yCaret2, heightCaret, bDirection, &pBlock, &pRun); -+ UT_return_val_if_fail(pBlock,false); -+ fl_ContainerLayout * pCL = pBlock->myContainingLayout(); -+ UT_return_val_if_fail(pCL,false); -+ pCL = pCL->myContainingLayout(); -+ UT_return_val_if_fail(pCL,false); -+ UT_return_val_if_fail((pCL->getContainerType() == FL_CONTAINER_TABLE),false); -+ fl_TableLayout * pTL = static_cast(pCL); -+ m_Selection.setTableLayout(pTL); -+// -+// Now loop through the column and collect all the cells. -+// -+ UT_sint32 j = 0; -+ UT_sint32 jPrev = -1; -+ for(j=0; jgetPosition(false))); -+ fl_ContainerLayout * pCL = pBlock->myContainingLayout(); -+ UT_return_val_if_fail((pCL->getContainerType() == FL_CONTAINER_CELL),false); -+ fl_CellLayout * pCell = static_cast(pCL); -+ m_Selection.addCellToSelection(pCell); -+ jPrev = j; -+ } -+ PD_DocumentRange * pRange = getNthSelection(getNumSelections()-1); -+ _setPoint(pRange->m_pos2); -+ _drawSelection(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+} -+ -+/*! -+ * Convert a table to Text with each cell separated by commas, Tabs, -+ * or tabs and commas as follows: -+ * iSepType == 0 Use Commas -+ * iSepType == 1 Use Tabs -+ * iSepType == 2 Use Tabs and Commas -+ * We place a paragraph break at the end of of each row but otherwise we simply -+ * extract just the text from each cell. -+ */ -+bool FV_View::cmdTableToText(PT_DocPosition posSource,UT_sint32 iSepType) -+{ -+ fl_TableLayout * pTL = getTableAtPos(posSource); -+ if(pTL == NULL) -+ { -+ return false; -+ } -+ PL_StruxDocHandle tableSDH; -+ bool bRes = m_pDoc->getStruxOfTypeFromPosition(posSource,PTX_SectionTable,&tableSDH); -+ UT_return_val_if_fail(bRes, false); -+ PT_DocPosition posTable = m_pDoc->getStruxPosition(tableSDH) + 1; -+ -+// -+// Now find the number of rows and columns inthis table. -+// -+ UT_sint32 numRows = 0; -+ UT_sint32 numCols = 0; -+ m_pDoc->getRowsColsFromTableSDH(tableSDH, isShowRevisions(), getRevisionLevel(), &numRows, &numCols); -+ PT_DocPosition posInsert = pTL->getPosition(true); -+ -+ // Signal PieceTable Changes -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ setPoint(posInsert); -+ insertParagraphBreak(); -+ -+ UT_sint32 i,j =0; -+ fp_TableContainer * pTAB = static_cast(pTL->getFirstContainer()); -+ fp_CellContainer * pCCell = NULL; -+ fl_CellLayout * pCellL = NULL; -+ UT_GrowBufElement iComma = static_cast(','); -+ UT_GrowBufElement iTab = static_cast(UCS_TAB); -+ for(i=0;igetCellAtRowColumn(i,j); -+ if(pCCell == NULL) -+ { -+ continue; -+ } -+ pCellL = static_cast(pCCell->getSectionLayout()); -+ if(pCellL == NULL) -+ { -+ continue; -+ } -+ UT_GrowBuf buf; -+ buf.truncate(0); -+ pCellL->appendTextToBuf(buf); -+ if(iSepType == 0) -+ { -+ buf.append(&iComma,1); -+ } -+ else if(iSepType == 1) -+ { -+ buf.append(&iTab,1); -+ } -+ else if(iSepType == 2) -+ { -+ buf.append(&iTab,1); -+ buf.append(&iComma,1); -+ } -+ else -+ { -+ buf.append(&iTab,1); -+ buf.append(&iComma,1); -+ } -+ cmdCharInsert(reinterpret_cast(buf.getPointer(0)),buf.getLength()); -+ } -+ insertParagraphBreak(); -+ } -+ posTable = pTL->getPosition(true) + 2; -+ cmdDeleteTable(posTable, true); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+} -+ -+/*! -+ * Merge the cells located at posSource with posDestination by copying the data from -+ * source to destination. Then deleting source and expanding destination into it's location -+ * in the table. -+ */ -+bool FV_View::cmdMergeCells(PT_DocPosition posSource, PT_DocPosition posDestination) -+{ -+ UT_sint32 sLeft,sRight,sTop,sBot; -+ UT_sint32 dLeft,dRight,dTop,dBot; -+ UT_sint32 Left,Right,Top,Bot; // need these for working variables. -+ getCellParams(posSource,&sLeft,&sRight,&sTop,&sBot); -+ getCellParams(posDestination,&dLeft,&dRight,&dTop,&dBot); -+ -+ PT_DocPosition posTable,posWork; -+ PL_StruxDocHandle tableSDH; -+ bool bRes = m_pDoc->getStruxOfTypeFromPosition(posSource,PTX_SectionTable,&tableSDH); -+ UT_return_val_if_fail(bRes, false); -+ posTable = m_pDoc->getStruxPosition(tableSDH) + 1; -+ -+// -+// Now find the number of rows and columns inthis table. -+// -+ UT_sint32 numRows = 0; -+ UT_sint32 numCols = 0; -+ m_pDoc->getRowsColsFromTableSDH(tableSDH, isShowRevisions(), getRevisionLevel(), &numRows, &numCols); -+ bool bChanged = false; -+ UT_sint32 iLineType = 0; -+ -+// -+// Got all we need, now set things up to do the merge nicely -+// -+// -+// OK that's done, now do the merge -+// -+// Have to worry about merging cell spanning multiple rows and columns. We do this -+// by matching the the widths and heights of the source and destination cells. -+// -+ if((sLeft == dLeft) && (sTop == dTop)) -+ { -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ return false; -+ } -+ -+ if(sLeft == dLeft) -+ { -+// -+// Merge vertically -+// -+// might have d | | | | -+// ---------- -+// s | | -+// To solve this merge all top cells horizontally then merge this combined set vertically -+// -+// First check that top row ends at bottom row boundary. We reject attempts to merge cells -+// like this -+// d | | | | -+// ------------ -+// s | | -+ if(sRight >= dRight) -+ { -+ if(sRight < numCols -1) -+ { -+ posWork = findCellPosAt(posTable,dTop,sRight) +1; -+ getCellParams(posWork,&Left,&Right,&Top,&Bot); -+ if(Left != sRight) -+ { -+ // -+ // Right column of src cell doesn't match the row above it. Bail out. -+ // -+ // fixme: Put in a dialog to explain this to the user -+ // -+ return false; -+ } -+ } -+ // -+ // OK now merge all the cells in the destination cell together. -+ // -+ Left = dRight; -+ while(Left < sRight) -+ { -+ posWork = findCellPosAt(posTable,dTop,Left) +1; -+ getCellParams(posWork,&Left,&Right,&Top,&Bot); -+// -+// Do the merge without all the undo/update trimings -+// append onto destination -+ if(!bChanged) -+ { -+ iLineType = _changeCellParams(posTable, tableSDH); -+ } -+ bChanged = true; -+ _MergeCells(posDestination,posWork,false); -+ Left = Right; -+ } -+// -+// Now merge the merged destination into the source -+// -+ if(!bChanged) -+ { -+ iLineType = _changeCellParams(posTable, tableSDH); -+ } -+ bChanged = true; -+ posSource = findCellPosAt(posTable,sTop,sLeft) +1; -+ posDestination = findCellPosAt(posTable,dTop,dLeft) +1; -+ _MergeCells(posDestination,posSource,true); -+ } -+ else -+ { -+// -+// Here we have this scenario: -+// -+// d | | -+// ------------ -+// s | | | | -+// -+// ie destination is narrower than the source -+// -+// check that the source column lines up with the destination column. -+// -+ if(dRight < numCols -1) -+ { -+ posWork = findCellPosAt(posTable,sTop,dRight) +1; -+ getCellParams(posWork,&Left,&Right,&Top,&Bot); -+ if(Left != dRight) -+ { -+ // -+ // Right column of src cell doesn't match the row above it. Bail out. -+ // fixme: Put in a dialog to explain this to the user -+ // -+ return false; -+ } -+ } -+ // -+ // OK now merge all the cells in the src cell together. -+ // -+ Left = sRight; -+ while(Left < dRight) -+ { -+ posWork = findCellPosAt(posTable,sTop,Left) +1; -+ getCellParams(posWork,&Left,&Right,&Top,&Bot); -+// -+// Do the merge without all the undo/update trimings -+// -+ if(!bChanged) -+ { -+ iLineType = _changeCellParams(posTable, tableSDH); -+ } -+ bChanged = true; -+ _MergeCells(posSource,posWork,false); -+ Left = Right; -+ } -+// -+// Now merge the merged destination into the source -+// -+ if(!bChanged) -+ { -+ iLineType = _changeCellParams(posTable, tableSDH); -+ } -+ bChanged = true; -+ posSource = findCellPosAt(posTable,sTop,sLeft) +1; -+ posDestination = findCellPosAt(posTable,dTop,dLeft) +1; -+ _MergeCells(posDestination,posSource,true); -+ } -+ } -+ else if(sTop == dTop) -+ { -+// -+// Merge horizontally -+// -+// might have rows spanning several columns -+// d s -+// --------- -+// | | | -+// | ----- -+// | | | -+// | ----- -+// | | | -+// --------- -+// To solve this merge all cells vertically then merge this combined set horizontally -+// -+// First check that left column ends at right column boundary. -+// We reject attempts to merge cells that don't have this condition. -+// ie this: -+// d s -+// --------- -+// | | | -+// | ----- -+// | | | -+// | ----- -+// | | | -+// | ----- -+// |---| | -+// | ----- -+// -+ if(dBot >= sBot) -+ { -+ if(dBot < numRows -1) -+ { -+ posWork = findCellPosAt(posTable,dBot,sLeft) +1; -+ getCellParams(posWork,&Left,&Right,&Top,&Bot); -+ if(Top != dBot) -+ { -+ // -+ // Bot col of src cell doesn't match the column before. Bail out. -+ // -+ // fixme: Put in a dialog to explain this to the user -+ // -+ return false; -+ } -+ } -+ // -+ // OK now merge all the cells right of the src cell together. -+ // -+ Bot = sBot; -+ Top = sBot; -+ while(Top < dBot) -+ { -+ posWork = findCellPosAt(posTable,Top,sLeft) +1; -+ getCellParams(posWork,&Left,&Right,&Top,&Bot); -+// -+// Do the merge without all the undo/update trimings -+// -+ if(!bChanged) -+ { -+ iLineType = _changeCellParams(posTable, tableSDH); -+ } -+ bChanged = true; -+ _MergeCells(posSource,posWork,false); -+ UT_ASSERT(Bot > Top); -+ if(Bot <= Top) -+ { -+ break; -+ } -+ Top = Bot; -+ } -+// -+// Now merge the merged destination into the source -+// -+ if(!bChanged) -+ { -+ iLineType = _changeCellParams(posTable, tableSDH); -+ } -+ bChanged = true; -+ posSource = findCellPosAt(posTable,sTop,sLeft) +1; -+ posDestination = findCellPosAt(posTable,dTop,dLeft) +1; -+ _MergeCells(posDestination,posSource,true); -+ } -+ else -+ { -+// -+// Here we have this scenario: -+// -+// -+// might have rows spanning several columns -+// d s -+// --------- -+// | | | -+// ----- | -+// | | | -+// ----- | -+// | | | -+// --------- -+// To solve this merge all cells vertically then merge this combined set horizontally -+// -+// First check that left column ends at right column boundary. -+// We reject attempts to merge cells that don't have this condition. -+// ie this: -+// d s -+// --------- -+// | | | -+// ----| | -+// | | | -+// ----| | -+// | | | -+// | | | -+// |---| | -+// | ----- -+// -+ -+ if(sBot < numRows -1) -+ { -+ posWork = findCellPosAt(posTable,sBot,dLeft) +1; -+ getCellParams(posWork,&Left,&Right,&Top,&Bot); -+ if(Top != sBot) -+ { -+ // -+ // Right column of src cell doesn't match the row above it. Bail out. -+ // -+ // fixme: Put in a dialog to explain this to the user -+ // -+ return false; -+ } -+ } -+ // -+ // OK now merge all the cells above the src cell together. -+ // -+ Top = dBot; -+ while(Top < sBot) -+ { -+ posWork = findCellPosAt(posTable,Top,dLeft) + 1; -+ getCellParams(posWork,&Left,&Right,&Top,&Bot); -+// -+// Do the merge without all the undo/update trimings -+// -+ if(!bChanged) -+ { -+ iLineType = _changeCellParams(posTable, tableSDH); -+ } -+ bChanged = true; -+ _MergeCells(posDestination,posWork,false); -+ Top = Bot; -+ } -+// -+// Now merge the source into the merged destination -+// -+ if(!bChanged) -+ { -+ iLineType = _changeCellParams(posTable, tableSDH); -+ } -+ bChanged = true; -+ posSource = findCellPosAt(posTable,sTop,sLeft) +1; -+ posDestination = findCellPosAt(posTable,dTop,dLeft) +1; -+ _MergeCells(posDestination,posSource,true); -+ } -+ } -+ else -+ { -+// -+// Neight left or top align of the cells to be merged. -+// bali out -+ -+ return false; -+ } -+// -+// Now check if we've merged a whole row of height 2 or a whole col of width two// -+// Start with whole row. -+// -+ posDestination = findCellPosAt(posTable,dTop,dLeft) +2; -+ getCellParams(posDestination,&dLeft,&dRight,&dTop,&dBot); -+ UT_sint32 origTop = dTop; -+ if((dLeft==0) && (dRight== numCols)) -+ { -+// -+// Yep one whole row merged. -+// -+// Look for the number of rows spanned now -+// -+ if(dBot > (dTop+1)) -+ { -+// -+// Yep we have problem, we'll fix it. Subtract this number from all the cells -+// top and Bottom attach -+// -+ UT_sint32 diff = dBot - dTop -1; -+ PL_StruxDocHandle sdhCell = NULL; -+ PL_StruxDocHandle sdhNextCell = NULL; -+ PL_StruxDocHandle sdhEndTable = NULL; -+ PT_DocPosition posEndTable = 0; -+ PT_DocPosition posCell = 0; -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posDestination,PTX_SectionCell,&sdhCell); -+ UT_return_val_if_fail(bRes,false); -+ sdhEndTable = m_pDoc->getEndTableStruxFromTableSDH(tableSDH); -+ UT_return_val_if_fail(sdhEndTable,false); -+ posEndTable = m_pDoc->getStruxPosition(sdhEndTable); -+ bool bKeepGoing = true; -+ while(bKeepGoing) -+ { -+ posCell = m_pDoc->getStruxPosition(sdhCell)+1; -+ getCellParams(posCell,&dLeft,&dRight,&dTop,&dBot); -+ dBot -= diff; -+ UT_sint32 row = dTop; -+ if(dTop != origTop) -+ { -+ dTop -= diff; -+ } -+ _changeCellTo(posTable,row,dLeft,dLeft,dRight,dTop,dBot); -+ -+ bRes = m_pDoc->getNextStruxOfType(sdhCell,PTX_SectionCell,&sdhNextCell); -+ PT_DocPosition posNextCell = 0; -+ if(bRes) -+ { -+ posNextCell = m_pDoc->getStruxPosition(sdhNextCell); -+ if(posNextCell > posEndTable) -+ { -+ posNextCell = 0; -+ bKeepGoing = false; -+ break; -+ } -+ } -+ else -+ { -+ bKeepGoing = false; -+ break; -+ } -+ sdhCell = sdhNextCell; -+ } -+ -+ } -+ } -+// -+// Look for a whole merged column -+// -+ if((dTop==0) && (dBot == numRows)) -+ { -+// -+// Yep one whole col merged. -+// -+// Look for the number of cols spanned now -+// -+ if(dRight > (dLeft+1)) -+ { -+// -+// Yep we have problem, we'll fix it. Subtract this number from all the cells -+// Right attach from this cell and left and right for all cells to the right -+// of it -+// This is a bit tricky -+// because we don't want to subtract the difference twice so we'll make a -+// vector of unique cell sdh's and only do our thing one those that aren't in -+// it -+// -+ UT_sint32 diff = dRight - dLeft -1; -+ UT_sint32 origLeft = dLeft; -+ UT_sint32 origRight = dRight; -+ PL_StruxDocHandle sdhCell = NULL; -+ PT_DocPosition posCell = 0; -+ UT_GenericVector vecCells; -+ posCell = findCellPosAt(posTable, dTop, dLeft)+1; -+ m_pDoc->getStruxOfTypeFromPosition(posCell,PTX_SectionCell,&sdhCell); -+ vecCells.addItem(sdhCell); -+ getCellParams(posCell,&dLeft,&dRight,&dTop,&dBot); -+ dRight -= diff; -+ _changeCellTo(posTable,dTop,dLeft,dLeft,dRight,dTop,dBot); -+ UT_sint32 row,col=0; -+ for (col = 0; col < numCols; col++) -+ { -+ for(row =0; row < numRows;row++) -+ { -+ posCell = findCellPosAt(posTable, row, col)+1; -+ m_pDoc->getStruxOfTypeFromPosition(posCell,PTX_SectionCell,&sdhCell); -+ if((sdhCell==NULL) || (vecCells.findItem(sdhCell) >= 0)) -+ { -+ continue; -+ } -+ getCellParams(posCell,&dLeft,&dRight,&dTop,&dBot); -+ bool bDoIt = false; -+ if(dLeft > origLeft) -+ { -+ dLeft -= diff; -+ bDoIt = true; -+ } -+ if(dRight >= origRight) -+ { -+ dRight -= diff; -+ bDoIt = true; -+ } -+ if(bDoIt) -+ { -+ vecCells.addItem(sdhCell); -+ _changeCellTo(posTable,row,col,dLeft,dRight,dTop,dBot); -+ } -+ } -+ } -+ } -+ } -+// -+// Now trigger a rebuild of the whole table by sending a changeStrux to the table strux -+// with the restored line-type property it has before. -+// -+ iLineType += 1; -+ _restoreCellParams(posTable,iLineType); -+ setPoint(posDestination); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+} -+ -+ -+/*! -+ * Mve the caret to the next or previous cell in a table. If at either end -+ * insert a new row. -+ */ -+bool FV_View::cmdAdvanceNextPrevCell(bool bGoNext) -+{ -+ if(!isInTable()) -+ { -+ return false; -+ } -+ PL_StruxDocHandle sdhCell = NULL; -+ PL_StruxDocHandle sdhNextPrevCell = NULL; -+ PL_StruxDocHandle sdhTable = NULL; -+ PL_StruxDocHandle sdhEndTable = NULL; -+ PT_DocPosition posTable = 0; -+ PT_DocPosition posEndTable = 0; -+ bool bRes = m_pDoc->getStruxOfTypeFromPosition(getPoint(),PTX_SectionTable,&sdhTable); -+ UT_return_val_if_fail(bRes,false); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(getPoint(),PTX_SectionCell,&sdhCell); -+ UT_return_val_if_fail(bRes,false); -+ if(bGoNext) -+ { -+ sdhEndTable = m_pDoc->getEndTableStruxFromTableSDH(sdhTable); -+ UT_return_val_if_fail(sdhEndTable,false); -+ posEndTable = m_pDoc->getStruxPosition(sdhEndTable); -+ bRes = m_pDoc->getNextStruxOfType(sdhCell,PTX_SectionCell,&sdhNextPrevCell); -+ PT_DocPosition posNextCell = 0; -+ if(bRes) -+ { -+ posNextCell = m_pDoc->getStruxPosition(sdhNextPrevCell); -+ if(posNextCell > posEndTable) -+ { -+ posNextCell = 0; -+ } -+ } -+ if(posNextCell == 0) -+ { -+ cmdInsertRow(getPoint(),false); -+ return true; -+ } -+ setPoint(posNextCell+2); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ return true; -+ } -+ bRes = m_pDoc->getPrevStruxOfType(sdhCell,PTX_SectionCell,&sdhNextPrevCell); -+ PT_DocPosition posPrevCell = 0; -+ if(bRes) -+ { -+ posPrevCell = m_pDoc->getStruxPosition(sdhNextPrevCell); -+ if(posPrevCell < posTable) -+ { -+ cmdInsertRow(getPoint(),true); -+ return true; -+ } -+ setPoint(posPrevCell+2); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ return true; -+ } -+ if(posPrevCell == 0) -+ { -+ cmdInsertRow(getPoint(),true); -+ return true; -+ } -+ -+ return false; -+} -+ -+bool FV_View::cmdTextToTable(bool bIgnoreSpaces) -+{ -+ if(isSelectionEmpty()) -+ { -+ return false; -+ } -+ if(isInHdrFtr(getPoint())) -+ { -+ return false; -+ } -+ if(getSelectionMode() != FV_SelectionMode_Single) -+ { -+ return false; -+ } -+ UT_GenericVector vecBlocks; -+ getBlocksInSelection(&vecBlocks); -+ fl_BlockLayout * pBL = vecBlocks.getNthItem(0); -+ if(pBL == NULL) -+ { -+ return false; -+ } -+ UT_GrowBuf * pBuf = new UT_GrowBuf(1024); -+ UT_uint32 numCols = 0; -+ PT_DocPosition posStart = pBL->getPosition(false); -+ PT_DocPosition begPos = posStart; -+ PT_DocPosition endPos = posStart; -+ pBL->getBlockBuf(pBuf); -+ UT_UTF8String sWords; -+ bool bGetNext = true; -+ while(bGetNext) -+ { -+ bGetNext = pBL->getNextTableElement(pBuf,posStart,begPos,endPos, sWords, bIgnoreSpaces); -+ if(begPos != 0) -+ { -+ numCols++; -+ posStart = endPos+1; -+ } -+ } -+ if(numCols == 0) -+ { -+ return false; -+ } -+ UT_uint32 numRows = vecBlocks.getItemCount(); -+ if(numRows == 0) -+ { -+ return false; -+ } -+ pBL = vecBlocks.getNthItem(numRows-1); -+ PT_DocPosition posTableStart = pBL->getPosition(true) + pBL->getLength(); -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ _clearSelection(); -+ setPoint(posTableStart); -+ UT_Error e = UT_OK; -+// -+// OK let's create that table now! -+// -+// -+// insert a block to terminate the text before this. -+// -+ PT_DocPosition pointBreak = getPoint(); -+ PT_DocPosition pointTable = 0; -+ e = m_pDoc->insertStrux(getPoint(),PTX_Block); -+// -+// Insert the table strux at the same spot. This will make the table link correctly in the -+// middle of the broken text. -+// -+// Handle special case of not putting a table immediately after a section break -+// -+ PL_StruxDocHandle secSDH = NULL; -+ bool bres = m_pDoc->getStruxOfTypeFromPosition(pointBreak-1,PTX_Section,&secSDH); -+ PT_DocPosition secPos = m_pDoc->getStruxPosition(secSDH); -+ UT_DEBUGMSG(("SEVIOR: SecPos %d pointBreak %d \n",secPos,pointBreak)); -+ secSDH = NULL; -+ bres = m_pDoc->getStruxOfTypeFromPosition(pointBreak,PTX_SectionCell,&secSDH); -+ if(secSDH != NULL) -+ { -+ PT_DocPosition secPos = m_pDoc->getStruxPosition(secSDH); -+ UT_DEBUGMSG(("SEVIOR: Cell Pos %d pointBreak %d \n",secPos,pointBreak)); -+ } -+ setPoint(pointBreak); -+ e |= static_cast(m_pDoc->insertStrux(getPoint(),PTX_SectionTable,NULL,NULL)); -+// -+// stuff for cell insertion. -+// -+ UT_uint32 i,j; -+ const gchar * attrs[3] = {"style","Normal",NULL}; -+ const gchar * props[9] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -+ UT_String sRowTop = "top-attach"; -+ UT_String sRowBot = "bot-attach"; -+ UT_String sColLeft = "left-attach"; -+ UT_String sColRight = "right-attach"; -+ UT_String sTop,sBot,sLeft,sRight; -+ for(i=0;i(m_pDoc->insertStrux(getPoint(),PTX_SectionCell,NULL,props)); -+ pointBreak = getPoint(); -+ e |= static_cast(m_pDoc->insertStrux(getPoint(),PTX_Block,attrs,NULL)); -+ UT_DEBUGMSG(("SEVIOR: 4 cur point %d \n",getPoint())); -+ if(getPoint() == pointBreak) -+ { -+ setPoint(pointBreak+1); -+ } -+ if(i == 0 && j==0) -+ { -+ pointTable = getPoint(); -+ } -+ e |= static_cast(m_pDoc->insertStrux(getPoint(),PTX_EndCell)); -+ } -+ } -+ e |= static_cast(m_pDoc->insertStrux(getPoint(),PTX_EndTable)); -+// -+// Done! Now fill it. -+// -+ posTableStart +=3; -+ PL_StruxDocHandle sdhTable = NULL; -+ PL_StruxDocHandle sdhCell = NULL; -+ bool b =m_pDoc->getStruxOfTypeFromPosition(posTableStart,PTX_SectionTable,&sdhTable); -+ UT_return_val_if_fail(b,false); -+ PT_DocPosition posCell = posTableStart; -+ delete pBuf; -+ for(i =0; i< numRows;i++) -+ { -+ pBL = vecBlocks.getNthItem(i); -+ pBuf = new UT_GrowBuf(1024); -+ pBL->getBlockBuf(pBuf); -+ posStart = pBL->getPosition(false); -+ bool bEnd = false; -+ for( j = 0; !bEnd && j < numCols; j++) -+ { -+ sdhCell = m_pDoc->getCellSDHFromRowCol(sdhTable,isShowRevisions(),PD_MAX_REVISION,i,j); -+ posCell = m_pDoc->getStruxPosition(sdhCell)+1; // Points at block -+ sWords.clear(); -+ bEnd = !pBL->getNextTableElement(pBuf,posStart, begPos, endPos, sWords, bIgnoreSpaces); -+ if(begPos == endPos) -+ { -+ posStart = endPos+1; -+ continue; -+ } -+ if(((j < numCols-1) && (begPos > 0)) || ((j == numCols-1) && (endPos - pBL->getPosition(false)) >= pBuf->getLength())) -+ { -+ copyToLocal(begPos, endPos); -+ _pasteFromLocalTo(posCell+1); -+ posStart = endPos+1; -+ } -+ else if((j==numCols-1) && (begPos > 0)) -+ { -+ copyToLocal(begPos, endPos); -+ _pasteFromLocalTo(posCell+1); -+ posStart = endPos+1; -+ break; -+ } -+ } -+ delete pBuf; -+ } -+ pBL = vecBlocks.getNthItem(0); -+ begPos = pBL->getPosition(); -+ pBL = vecBlocks.getNthItem(numRows-1); -+ endPos = pBL->getPosition(true) + pBL->getLength(); -+ UT_uint32 iRealDeleteCount; -+ -+ m_pDoc->deleteSpan(begPos,endPos,NULL,iRealDeleteCount); -+ -+ -+ // Signal PieceTable Changes have finished -+ while(m_iPieceTableState > 0) -+ _restorePieceTableState(); -+ -+ _restorePieceTableState(); -+ m_pDoc->clearDoingPaste(); -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ -+ _generalUpdate(); -+ -+ m_pDoc->endUserAtomicGlob(); -+ -+ -+ setPoint(posTableStart); -+ PT_DocPosition posEOD; -+ bool bRes; -+ bRes = getEditableBounds(true, posEOD); -+ while(!isPointLegal() && getPoint() < posEOD) -+ { -+ setPoint(getPoint()+1); -+ } -+ while(!isPointLegal() && (getPoint() > 2)) -+ { -+ setPoint(getPoint()-1); -+ } -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+// -+// We're done! -+// -+ return true; -+} -+/*! -+ * Make a table columns autosizing by removing all the column properties. -+ */ -+bool FV_View::cmdAutoSizeCols(void) -+{ -+// -+// Got all we need, now set things up to do the delete nicely -+// -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ const char * pszTable[3] = {NULL,NULL,NULL}; -+ pszTable[0] = "table-column-props"; -+ pszTable[1] = "1"; -+ m_pDoc->changeStruxFmt(PTC_RemoveFmt,getPoint(),getPoint(),NULL,pszTable,PTX_SectionTable); -+ pszTable[0] = "table-column-leftpos"; -+ m_pDoc->changeStruxFmt(PTC_RemoveFmt,getPoint(),getPoint(),NULL,pszTable,PTX_SectionTable); -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+} -+ -+ -+/*! -+ * Make a table Rows autosizing by removing all the row properties. -+ */ -+bool FV_View::cmdAutoSizeRows(void) -+{ -+// -+// Got all we need, now set things up to do the delete nicely -+// -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ const char * pszTable[3] = {NULL,NULL,NULL}; -+ pszTable[0] = "table-row-heights"; -+ pszTable[1] = "1"; -+ pszTable[2] = NULL; -+ m_pDoc->changeStruxFmt(PTC_RemoveFmt,getPoint(),getPoint(),NULL,pszTable,PTX_SectionTable); -+ pszTable[0] = "table-column-leftpos"; -+ m_pDoc->changeStruxFmt(PTC_RemoveFmt,getPoint(),getPoint(),NULL,pszTable,PTX_SectionTable); -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+} -+ -+ -+/*! -+ * Make a table Rows autosizing by removing all the row and col properties. -+ */ -+bool FV_View::cmdAutoFitTable(void) -+{ -+// -+// Got all we need, now set things up to do the delete nicely -+// -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ const char * pszTable[7] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -+ pszTable[0] = "table-row-heights"; -+ pszTable[1] = "1"; -+ pszTable[2] = "table-column-leftpos"; -+ pszTable[3] = "1"; -+ pszTable[4] = "table-column-props"; -+ pszTable[5] = "1"; -+ -+ m_pDoc->changeStruxFmt(PTC_RemoveFmt,getPoint(),getPoint(),NULL,pszTable,PTX_SectionTable); -+ pszTable[0] = "homogeneous"; -+ pszTable[1] = "1"; -+ pszTable[2] = NULL; -+ pszTable[3] = NULL; -+ -+ m_pDoc->changeStruxFmt(PTC_AddFmt,getPoint(),getPoint(),NULL,pszTable,PTX_SectionTable); -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+} -+ -+ -+ -+/*! -+ * Insert a column containing the position posCol, insert the column before the -+ * current column. -+ */ -+bool FV_View::cmdInsertCol(PT_DocPosition posCol, bool bBefore) -+{ -+ PL_StruxDocHandle cellSDH,tableSDH,endTableSDH,endCellSDH,prevCellSDH; -+ PT_DocPosition posTable,posCell,posEndCell,posPrevCell,posFirstInsert; -+ UT_sint32 numColsForInsertion = getNumColumnsInSelection(); -+ if(numColsForInsertion == 0) -+ { -+ return false; -+ } -+ posFirstInsert = 0; -+ UT_sint32 iLeft,iRight,iTop,iBot; -+ getCellParams(posCol, &iLeft, &iRight,&iTop,&iBot); -+ UT_sint32 iColInsertAt =0; -+ -+ bool bRes = m_pDoc->getStruxOfTypeFromPosition(posCol,PTX_SectionCell,&cellSDH); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posCol,PTX_SectionTable,&tableSDH); -+ UT_return_val_if_fail(bRes, false); -+ -+ posTable = m_pDoc->getStruxPosition(tableSDH) + 1; -+// -+// Now find the number of rows and columns in this table. -+// -+ UT_sint32 numRows = 0; -+ UT_sint32 numCols = 0; -+ UT_sint32 i = 0; -+ m_pDoc-> getRowsColsFromTableSDH(tableSDH, isShowRevisions(), getRevisionLevel(), &numRows, &numCols); -+ if(!bBefore) -+ { -+ for(i=0;i iColInsertAt) -+ { -+ iColInsertAt = jRight -1; -+ } -+ } -+ } -+ else -+ { -+ iColInsertAt = 99999999; -+ for(i=0;idisableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ if (!isSelectionEmpty()) -+ { -+ _clearSelection(); -+ } -+ m_pDoc->setDontImmediatelyLayout(true); -+// -+// Now trigger a rebuild of the whole table by sending a changeStrux to the table strux -+// with a bogus line-type property. We'll restore it later. -+// -+ const char * pszTable[3] = {NULL,NULL,NULL}; -+ pszTable[0] = "list-tag"; -+ const char * szListTag = NULL; -+ UT_String sListTag; -+ UT_sint32 iListTag; -+ m_pDoc->getPropertyFromSDH(tableSDH,isShowRevisions(),getRevisionLevel(),pszTable[0],&szListTag); -+ if(szListTag == NULL || *szListTag == '\0') -+ { -+ iListTag = 0; -+ } -+ else -+ { -+ iListTag = atoi(szListTag); -+ iListTag -= 1; -+ } -+ UT_String_sprintf(sListTag,"%d",iListTag); -+ pszTable[1] = sListTag.c_str(); -+ UT_DEBUGMSG((" Doing Table strux change of %s %s \n",pszTable[0],pszTable[1])); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posTable,posTable,NULL,pszTable,PTX_SectionTable); -+// -+// OK loop through all the rows in this column and insert the entries in the specified -+// column if the cell spans just the width of the column.. -+// -+ UT_sint32 oldTop = -1; -+ UT_sint32 ii = 0; -+ for(ii=0; ii= numCols) -+ { -+ posCell = findCellPosAt(posTable,i,numCols-1); -+ } -+ else -+ { -+ posCell = findCellPosAt(posTable,i,iColInsertAt); -+ } -+ UT_ASSERT(posCell > 0); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posCell+1,PTX_SectionCell,&cellSDH); -+ UT_sint32 Left,Right,Top,Bot; -+ getCellParams(posCell+1,&Left,&Right,&Top,&Bot); -+ UT_DEBUGMSG(("SEVIOR: Before Insert column left %d right %d top %d bot %d \n",Left,Right,Top,Bot)); -+ const gchar * props[9] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -+ UT_String sRowTop = "top-attach"; -+ UT_String sRowBot = "bot-attach"; -+ UT_String sColLeft = "left-attach"; -+ UT_String sColRight = "right-attach"; -+ UT_String sTop,sBot,sLeft,sRight; -+ UT_String_sprintf(sTop,"%d",i); -+ UT_String_sprintf(sBot,"%d",i+1); -+ props[0] = sRowTop.c_str(); -+ props[1] = sTop.c_str(); -+ props[2] = sRowBot.c_str(); -+ props[3] = sBot.c_str(); -+ bool bBBefore = false; -+ bool bAfter = false; -+ if(((Bot - Top) > 1) && (oldTop != Top)) -+ { -+ oldTop = Top; -+ } -+ if((Bot - Top) == 1) -+ { -+ if(bBefore) -+ { -+ if(iColInsertAt > 0) -+ { -+ PT_DocPosition posCellLeft = findCellPosAt(posTable,i,iColInsertAt-1); -+ UT_sint32 jLeft,jRight,jTop,jBot; -+ getCellParams(posCellLeft+1,&jLeft,&jRight,&jTop,&jBot); -+ UT_String_sprintf(sLeft,"%d",jRight); -+ UT_String_sprintf(sRight,"%d",jRight+1); -+ } -+ else -+ { -+ UT_String_sprintf(sLeft,"%d",0); -+ UT_String_sprintf(sRight,"%d",1); -+ } -+ props[4] = sColLeft.c_str(); -+ props[5] = sLeft.c_str(); -+ props[6] = sColRight.c_str(); -+ props[7] = sRight.c_str(); -+ bRes = m_pDoc->insertStrux(posCell,PTX_SectionCell,NULL,props); -+ bRes = m_pDoc->insertStrux(posCell+1,PTX_Block); -+ if(i == 0) -+ { -+ posFirstInsert = posCell + 2; -+ } -+ bRes = m_pDoc->insertStrux(posCell+2,PTX_EndCell); -+ } -+ else -+ { -+// -+// iColInsertAt gives the cell just to the right of the requested cell. -+// We need to insert just before this point - unless this is the last column -+// on the row in which case we need to insert after the endCell strux. -+// -+ PT_DocPosition posCellLeft = 0; -+ posCellLeft = findCellPosAt(posTable,i,iColInsertAt); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posCellLeft+1,PTX_SectionCell,&cellSDH); -+ endCellSDH = m_pDoc->getEndCellStruxFromCellSDH(cellSDH); -+ posEndCell = m_pDoc->getStruxPosition(endCellSDH); -+ posCellLeft = posEndCell+1; -+ UT_sint32 jLeft,jRight,jTop,jBot; -+ getCellParams(posCellLeft+1,&jLeft,&jRight,&jTop,&jBot); -+ UT_String_sprintf(sLeft,"%d",iColInsertAt+1); -+ UT_String_sprintf(sRight,"%d",iColInsertAt+2); -+ props[4] = sColLeft.c_str(); -+ props[5] = sLeft.c_str(); -+ props[6] = sColRight.c_str(); -+ props[7] = sRight.c_str(); -+ UT_DEBUGMSG(("SEVIOR: Inserting cell strux %s %s %s %s %s %s %s %s \n",props[0],props[1],props[2],props[3],props[4],props[5],props[6],props[7])); -+ bRes = m_pDoc->insertStrux(posCellLeft,PTX_SectionCell,NULL,props); -+ bRes = m_pDoc->insertStrux(posCellLeft+1,PTX_Block); -+ if(i == 0) -+ { -+ posFirstInsert = posCellLeft + 2; -+ } -+ -+ bRes = m_pDoc->insertStrux(posCellLeft+2,PTX_EndCell); -+ -+ } -+ } -+ else -+ { -+// -+// OK we have to work to find the right place to insert the cell. -+// -+ UT_sint32 jLeft,jRight,jTop,jBot; -+ if(bBefore) -+ { -+// -+// find first cell on this row with left coordinate == or greater than -+// iInsertColAt. -+// -+ UT_sint32 j =0; -+ UT_sint32 k = i; -+ for(k=i; k < numRows && !bBBefore; k++) -+ { -+ if( k == i) -+ { -+ j = iColInsertAt; -+ } -+ else -+ { -+ j = 0; -+ } -+ while(j < numCols && !bBBefore) -+ { -+ posCell = findCellPosAt(posCol,k,j); -+ getCellParams(posCell+1,&jLeft,&jRight,&jTop,&jBot); -+ if(jTop == i) -+ { -+ bBBefore = true; -+ UT_String_sprintf(sLeft,"%d",iColInsertAt); -+ UT_String_sprintf(sRight,"%d",iColInsertAt+1); -+ props[4] = sColLeft.c_str(); -+ props[5] = sLeft.c_str(); -+ props[6] = sColRight.c_str(); -+ props[7] = sRight.c_str(); -+// -+// Insert at Previous cell it will push that cell to one position later. -+// -+ bRes = m_pDoc->insertStrux(posCell,PTX_SectionCell,NULL,props); -+ bRes = m_pDoc->insertStrux(posCell+1,PTX_Block); -+ if(i == 0) -+ { -+ posFirstInsert = posCell + 2; -+ } -+ bRes = m_pDoc->insertStrux(posCell+2,PTX_EndCell); -+ } -+ j++; -+ } -+ } -+ UT_ASSERT(bBBefore); -+ } -+// -+// Insert column after this column -+// -+ else -+ { -+// -+// OK we have to work to find the right place to insert the cell. -+// -+ UT_sint32 jLeft,jRight,jTop,jBot; -+// -+// Now look after this cell for a column to place this. -+// -+ bAfter = false; -+ bBBefore = false; -+ UT_sint32 j=0; -+ UT_sint32 k =i; -+ for(k=i; k < numRows && !bAfter; k++) -+ { -+ if(k == i) -+ { -+ j = iColInsertAt; -+ } -+ else -+ { -+ j = 0; -+ } -+ while((j< numCols) && !bAfter) -+ { -+ posCell = findCellPosAt(posCol,k,j); -+ getCellParams(posCell+1,&jLeft,&jRight,&jTop,&jBot); -+ if(jTop == i) -+ { -+ bAfter = true; -+// -+// iColInsertAt gives the cell just to the right of the requested cell. -+// We need to insert just before this point - unless this is the last column -+// on the row in which case we need to insert after the endCell strux. -+// -+ PT_DocPosition posCellLeft = 0; -+ posCellLeft = findCellPosAt(posTable,k,j); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posCellLeft+1,PTX_SectionCell,&cellSDH); -+ if(jLeft <= iColInsertAt) -+ { -+ endCellSDH = m_pDoc->getEndCellStruxFromCellSDH(cellSDH); -+ posEndCell = m_pDoc->getStruxPosition(endCellSDH); -+ posCellLeft = posEndCell+1; -+ } -+ endCellSDH = m_pDoc->getEndCellStruxFromCellSDH(cellSDH); -+ posEndCell = m_pDoc->getStruxPosition(endCellSDH); -+ UT_String_sprintf(sLeft,"%d",iColInsertAt+1); -+ UT_String_sprintf(sRight,"%d",iColInsertAt+2); -+ props[4] = sColLeft.c_str(); -+ props[5] = sLeft.c_str(); -+ props[6] = sColRight.c_str(); -+ props[7] = sRight.c_str(); -+ bRes = m_pDoc->insertStrux(posCellLeft,PTX_SectionCell,NULL,props); -+ bRes = m_pDoc->insertStrux(posCellLeft+1,PTX_Block); -+ if(i == 0) -+ { -+ posFirstInsert = posCellLeft + 2; -+ } -+ bRes = m_pDoc->insertStrux(posCellLeft+2,PTX_EndCell); -+ } -+ j++; -+ } -+ } -+ UT_ASSERT(bAfter); -+ } -+ } -+ } -+// -+// OK now increment the cell container attach points for the cells after the inserted cells -+// -+ bRes = m_pDoc->getNextStruxOfType(tableSDH,PTX_EndTable,&endTableSDH); -+ if(!bRes) -+ { -+ // -+ // Disaster! the table structure in the piecetable is screwed. -+ // we're totally stuffed now. -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ } -+ UT_sint32 iCurInsertAt = iColInsertAt; -+ PT_DocPosition posEndTable = m_pDoc->getStruxPosition(endTableSDH); -+ bool bEnd = false; -+ UT_sint32 iCurLeft,iCurRight,iCurTop,iCurBot,iNewLeft,iNewRight; -+ UT_sint32 iPrevLeft,iPrevRight,iPrevTop,iPrevBot; -+ cellSDH = tableSDH; -+ bool bFirst = true; -+ PT_DocPosition iLastChangedPos = 0; -+ if(bBefore && iCurInsertAt > 0) -+ { -+ iCurInsertAt--; -+ } -+ while(!bEnd) -+ { -+ bRes = m_pDoc->getNextStruxOfType(cellSDH,PTX_SectionCell,&cellSDH); -+ if(!bRes) -+ { -+ bEnd = true; -+ break; -+ } -+ endCellSDH = m_pDoc->getEndCellStruxFromCellSDH(cellSDH); -+ posEndCell = m_pDoc->getStruxPosition(endCellSDH); -+ if(posEndCell+1 > posEndTable) -+ { -+ bEnd = true; -+ break; -+ } -+ if(posEndCell+1 == posEndTable) -+ { -+ bEnd = true; -+ } -+ posCell = m_pDoc->getStruxPosition(cellSDH); -+ getCellParams(posCell+1, &iCurLeft, &iCurRight,&iCurTop,&iCurBot); -+// -+// OK after inserting, we simply increment all left/right attaches greater -+// than the iCurInsertAt by the number of columns we insert. -+// Or if there are two cells on the row with -+// same left attach, increment the second one. -+// -+// -+ bool bChange = false; -+ iNewLeft = iCurLeft; -+ iNewRight = iCurRight; -+ if(!bFirst) -+ { -+ bRes = m_pDoc->getPrevStruxOfType(cellSDH,PTX_SectionCell,&prevCellSDH); -+ posPrevCell = m_pDoc->getStruxPosition(prevCellSDH); -+ getCellParams(posPrevCell+1, &iPrevLeft, &iPrevRight,&iPrevTop,&iPrevBot); -+ if(iPrevLeft == iCurLeft && (iPrevTop == iCurTop) && (iLastChangedPos != posCell)) -+ { -+ iLastChangedPos = posCell; -+ bChange = true; -+ iNewLeft+= 1; -+ iNewRight+= 1; -+ } -+ } -+ if(!bChange) -+ { -+ if((iCurLeft > iCurInsertAt +1) && (iLastChangedPos != posCell)) -+ { -+ iLastChangedPos = posCell; -+ bChange = true; -+ iNewLeft+=1; -+ iNewRight+=1; -+ } -+ } -+ UT_DEBUGMSG(("SEVIOR: Looking at cell left %d right %d top %d bot %d bChange %d \n",iCurLeft,iCurRight,iCurTop,iCurBot,bChange)); -+ if(bChange) -+ { -+ UT_DEBUGMSG(("SEVIOR: changing cell to left %d right %d top %d bot %d \n",iNewLeft,iNewRight,iCurTop,iCurBot)); -+ const char * props[9] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -+ UT_String sLeft,sRight,sTop,sBot; -+ props[0] = "left-attach"; -+ UT_String_sprintf(sLeft,"%d",iNewLeft); -+ props[1] = sLeft.c_str(); -+ props[2] = "right-attach"; -+ UT_String_sprintf(sRight,"%d",iNewRight); -+ props[3] = sRight.c_str(); -+ props[4] = "top-attach"; -+ UT_String_sprintf(sTop,"%d",iCurTop); -+ props[5] = sTop.c_str(); -+ props[6] = "bot-attach"; -+ UT_String_sprintf(sBot,"%d",iCurBot); -+ props[7] = sBot.c_str(); -+ UT_DEBUGMSG(("SEVIOR: Changing cell strux %s %s %s %s %s %s %s %s \n",props[0],props[1],props[2],props[3],props[4],props[5],props[6],props[7])); -+ bRes = m_pDoc->changeStruxFmt(PTC_AddFmt,posCell+1,posCell+1,NULL,props,PTX_SectionCell); -+ } -+ bFirst= false; -+ } -+// -+// End of multiple column insert. -+// -+ } -+// -+// Now trigger a rebuild of the whole table by sending a changeStrux to the table strux -+// with the restored line-type property it has before. -+// -+ iListTag += 1; -+ UT_String_sprintf(sListTag,"%d",iListTag); -+ pszTable[1] = sListTag.c_str(); -+ UT_DEBUGMSG(("SEVIOR: Doing Table strux change of %s %s \n",pszTable[0],pszTable[1])); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posTable,posTable,NULL,pszTable,PTX_SectionTable); -+// -+// OK finish everything off with the various parameters which allow the formatter to -+// be updated. -+// -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+// Put the insertion point in a legal position -+// -+ setPoint(posFirstInsert); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+} -+ -+/*! -+ * posRow is the position of the start of the selection in the table. -+ * insert rows into the table. -+ */ -+bool FV_View::cmdInsertRow(PT_DocPosition posRow, bool bBefore) -+{ -+ PL_StruxDocHandle cellSDH,tableSDH,endTableSDH,endCellSDH; -+ PT_DocPosition posTable,posCell,posEndCell; -+ UT_sint32 numRowsForInsertion = getNumRowsInSelection(); -+ if(numRowsForInsertion == 0) -+ { -+ if(isSelectionEmpty() && isInTable(posRow)) -+ { -+ numRowsForInsertion = 1; -+ } -+ else -+ { -+ return false; -+ } -+ } -+ -+ if (!isSelectionEmpty()) -+ { -+ _clearSelection(); -+ } -+ -+ UT_sint32 iLeft,iRight,iTop,iBot; -+ getCellParams(posRow, &iLeft, &iRight,&iTop,&iBot); -+ -+ bool bRes = m_pDoc->getStruxOfTypeFromPosition(posRow,PTX_SectionCell,&cellSDH); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posRow,PTX_SectionTable,&tableSDH); -+ UT_return_val_if_fail(bRes, false); -+ -+ posTable = m_pDoc->getStruxPosition(tableSDH) + 1; -+ -+ // -+ // Now find the number of rows and columns inthis table. This is easiest to -+ // get from the table container -+ // -+ fl_BlockLayout * pBL = m_pLayout->findBlockAtPosition(posRow); -+ fp_Run * pRun; -+ UT_sint32 xPoint,yPoint,xPoint2,yPoint2,iPointHeight; -+ bool bDirection; -+ pRun = pBL->findPointCoords(posRow, false, xPoint, -+ yPoint, xPoint2, yPoint2, -+ iPointHeight, bDirection); -+ -+ UT_return_val_if_fail(pRun, false); -+ -+ fp_Line * pLine = pRun->getLine(); -+ UT_return_val_if_fail(pLine, false); -+ -+ fp_Container * pCon = pLine->getContainer(); -+ UT_return_val_if_fail(pCon, false); -+ -+ fp_TableContainer * pTab = static_cast(pCon->getContainer()); -+ UT_return_val_if_fail(pTab, false); -+ -+ UT_sint32 numCols = pTab->getNumCols(); -+ UT_sint32 numRows = pTab->getNumRows(); -+ -+ // -+ // Got all we need, now set things up to do the delete nicely -+ // -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ m_pDoc->setDontImmediatelyLayout(true); -+ -+ // -+ // Now trigger a rebuild of the whole table by sending a changeStrux to the table strux -+ // with a bogus line-type property. We'll restore it later. -+ // -+ const char * pszTable[3] = {NULL,NULL,NULL}; -+ pszTable[0] = "list-tag"; -+ const char * szListTag = NULL; -+ UT_String sListTag; -+ UT_sint32 iListTag; -+ m_pDoc->getPropertyFromSDH(tableSDH,isShowRevisions(),getRevisionLevel(),pszTable[0],&szListTag); -+ if(szListTag == NULL || *szListTag == '\0') -+ { -+ iListTag = 0; -+ } -+ else -+ { -+ iListTag = atoi(szListTag); -+ iListTag -= 1; -+ } -+ UT_String_sprintf(sListTag,"%d",iListTag); -+ pszTable[1] = sListTag.c_str(); -+ UT_DEBUGMSG(("Sevior: Doing Table strux change of %s %s \n",pszTable[0],pszTable[1])); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posTable,posTable,NULL,pszTable,PTX_SectionTable); -+ -+ // -+ // OK find the position to insert the row. -+ // Have to handle the case of a cell spanning multiple rows. -+ // -+ // scan the piecetable and find either the first cell that has an attach above the current -+ // row (bBefore or the cell witht he largest bottom attach that has a top attach on the row -+ // for before -+ // -+ UT_sint32 prevTop = 100000; -+ if(bBefore) -+ { -+ UT_sint32 Left,Right,Top,Bot; -+ for(UT_sint32 i = 0; i < numCols; i++) -+ { -+ posCell = findCellPosAt(posTable,iTop,i); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posCell+1,PTX_SectionCell,&cellSDH); -+ getCellParams(posCell+1,&Left,&Right,&Top,&Bot); -+ UT_DEBUGMSG(("Sevior: Cell position left %d right %d top %d bot %d \n",Left,Right,Top,Bot)); -+ if(Top < prevTop) -+ { -+ prevTop = Top; -+ } -+ } -+// -+// We insert at this position -+// -+ posCell = findCellPosAt(posTable,prevTop,0); -+ } -+ else -+ { -+ UT_sint32 prevBot = -1; -+ for(UT_sint32 i = 0; i < numCols; i++) -+ { -+ posCell = findCellPosAt(posTable,iTop,i); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posCell+1,PTX_SectionCell,&cellSDH); -+ UT_sint32 Left,Right,Top,Bot; -+ getCellParams(posCell+1,&Left,&Right,&Top,&Bot); -+ UT_DEBUGMSG(("Sevior: Cell position left %d right %d top %d bot %d \n",Left,Right,Top,Bot)); -+ if(Bot > prevBot) -+ { -+ prevBot = Bot; -+ } -+ } -+// -+// We insert at poscell position -+// -+ if(prevBot > numRows -1) -+ { -+// -+// After Last row so just before the end of table -+// -+ prevTop = numRows; -+ endTableSDH = m_pDoc->getEndTableStruxFromTableSDH(tableSDH); -+ if(!endTableSDH) -+ { -+ // -+ // Disaster! the table structure in the piecetable is screwed. -+ // we're totally stuffed now. -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ } -+ posCell = m_pDoc->getStruxPosition(endTableSDH); -+ } -+ else -+ { -+ prevTop = prevBot; -+ posCell = findCellPosAt(posTable,prevBot,0); -+ } -+ UT_DEBUGMSG(("SEVIOR: Inserting after row %d \n",prevTop)); -+ } -+// -+// Got position and top row pos -+// Now insert a row. -+// -+ PT_DocPosition posInsert = 0; -+ UT_sint32 i =0; -+ UT_sint32 j = 0; -+ for(j=0; j< numRowsForInsertion; j++) -+ { -+ for(i=0; i < numCols; i++) -+ { -+ const gchar * props[9] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -+ UT_String sRowTop = "top-attach"; -+ UT_String sRowBot = "bot-attach"; -+ UT_String sColLeft = "left-attach"; -+ UT_String sColRight = "right-attach"; -+ UT_String sTop,sBot,sLeft,sRight; -+ UT_String_sprintf(sTop,"%d",prevTop); -+ UT_String_sprintf(sBot,"%d",prevTop+1); -+ UT_String_sprintf(sLeft,"%d",i); -+ UT_String_sprintf(sRight,"%d",i+1); -+ props[0] = sRowTop.c_str(); -+ props[1] = sTop.c_str(); -+ props[2] = sRowBot.c_str(); -+ props[3] = sBot.c_str(); -+ props[4] = sColLeft.c_str(); -+ props[5] = sLeft.c_str(); -+ props[6] = sColRight.c_str(); -+ props[7] = sRight.c_str(); -+ bRes = m_pDoc->insertStrux(posCell,PTX_SectionCell,NULL,props); -+ bRes = m_pDoc->insertStrux(posCell+1,PTX_Block); -+ if(i == 0) -+ { -+ posInsert = posCell+2; -+ } -+ bRes = m_pDoc->insertStrux(posCell+2,PTX_EndCell); -+ posCell += 3; -+ } -+ prevTop++; -+ } -+// -+// OK! now starting immediately after this insert loop through the table adding 1 to top and bottom -+// -+ endTableSDH = m_pDoc->getEndTableStruxFromTableSDH(tableSDH); -+ if(!bRes) -+ { -+ // -+ // Disaster! the table structure in the piecetable is screwed. -+ // we're totally stuffed now. -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ } -+ PT_DocPosition posEndTable = m_pDoc->getStruxPosition(endTableSDH); -+ bool bEnd = false; -+ UT_sint32 iCurLeft,iCurRight,iCurTop,iCurBot; -+// -+// -2 gives the last cell inserted. -+// -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posCell-2,PTX_SectionCell,&cellSDH); -+ while(!bEnd) -+ { -+ bRes = m_pDoc->getNextStruxOfType(cellSDH,PTX_SectionCell,&cellSDH); -+ if(!bRes) -+ { -+ bEnd = true; -+ break; -+ } -+ endCellSDH = m_pDoc->getEndCellStruxFromCellSDH(cellSDH); -+ posEndCell = m_pDoc->getStruxPosition(endCellSDH); -+ if(posEndCell+1 > posEndTable) -+ { -+ bEnd = true; -+ break; -+ } -+ if(posEndCell+1 == posEndTable) -+ { -+ bEnd = true; -+ } -+ posCell = m_pDoc->getStruxPosition(cellSDH); -+ getCellParams(posCell+1, &iCurLeft, &iCurRight,&iCurTop,&iCurBot); -+ iCurTop+=numRowsForInsertion; -+ iCurBot+=numRowsForInsertion; -+ UT_DEBUGMSG(("SEVIOR: changing cell to left %d right %d top %d bot %d \n",iCurLeft,iCurRight,iCurTop,iCurBot)); -+ const char * props[9] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -+ UT_String sLeft,sRight,sTop,sBot; -+ props[0] = "left-attach"; -+ UT_String_sprintf(sLeft,"%d",iCurLeft); -+ props[1] = sLeft.c_str(); -+ props[2] = "right-attach"; -+ UT_String_sprintf(sRight,"%d",iCurRight); -+ props[3] = sRight.c_str(); -+ props[4] = "top-attach"; -+ UT_String_sprintf(sTop,"%d",iCurTop); -+ props[5] = sTop.c_str(); -+ props[6] = "bot-attach"; -+ UT_String_sprintf(sBot,"%d",iCurBot); -+ props[7] = sBot.c_str(); -+ UT_DEBUGMSG(("SEVIOR: Changing cell strux %s %s %s %s %s %s %s %s \n",props[0],props[1],props[2],props[3],props[4],props[5],props[6],props[7])); -+ bRes = m_pDoc->changeStruxFmt(PTC_AddFmt,posCell+1,posCell+1,NULL,props,PTX_SectionCell); -+ } -+ // -+ // Now trigger a rebuild of the whole table by sending a changeStrux to the table strux -+ // with the restored line-type property it has before. -+ // -+ iListTag += 1; -+ UT_String_sprintf(sListTag,"%d",iListTag); -+ pszTable[1] = sListTag.c_str(); -+ UT_DEBUGMSG(("SEVIOR: Doing Table strux change of %s %s \n",pszTable[0],pszTable[1])); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posTable,posTable,NULL,pszTable,PTX_SectionTable); -+ -+ // -+ // OK finish everything off with the various parameters which allow the formatter to -+ // be updated. -+ // -+ setPoint(posInsert); -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+} -+ -+/*! -+ * Delete the column containing the position posCol -+ */ -+bool FV_View::cmdDeleteCol(PT_DocPosition posCol) -+{ -+ PL_StruxDocHandle cellSDH,tableSDH,endTableSDH,endCellSDH; -+ PT_DocPosition posTable,posCell; -+ UT_sint32 iLeft,iRight,iTop,iBot; -+ getCellParams(posCol, &iLeft, &iRight,&iTop,&iBot); -+ -+ bool bRes = m_pDoc->getStruxOfTypeFromPosition(posCol,PTX_SectionCell,&cellSDH); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posCol,PTX_SectionTable,&tableSDH); -+ UT_return_val_if_fail(bRes, false); -+ -+ posTable = m_pDoc->getStruxPosition(tableSDH) + 1; -+// -+// Now find the number of rows and columns inthis table. This is easiest to -+// get from the table container -+// -+ fl_BlockLayout * pBL = m_pLayout->findBlockAtPosition(posCol); -+ fp_Run * pRun; -+ UT_sint32 xPoint,yPoint,xPoint2,yPoint2,iPointHeight; -+ bool bDirection; -+ pRun = pBL->findPointCoords(posCol, false, xPoint, -+ yPoint, xPoint2, yPoint2, -+ iPointHeight, bDirection); -+ -+ UT_return_val_if_fail(pRun, false); -+ -+ fp_Line * pLine = pRun->getLine(); -+ UT_return_val_if_fail(pLine, false); -+ -+ fp_Container * pCon = pLine->getContainer(); -+ UT_return_val_if_fail(pCon, false); -+ -+ fp_TableContainer * pTab = static_cast(pCon->getContainer()); -+ UT_return_val_if_fail(pTab, false); -+ -+ UT_sint32 numRows = pTab->getNumRows(); -+// -+// If we delete the last column we're actually deleteing the table. So let's -+// do it. -+// -+ if(pTab->getNumCols() ==1) -+ { -+ cmdDeleteTable(posCol); -+ return true; -+ } -+// -+// Got all we need, now set things up to do the delete nicely -+// -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ if (!isSelectionEmpty() && !m_FrameEdit.isActive()) -+ { -+ m_pDoc->beginUserAtomicGlob(); -+ PP_AttrProp AttrProp_Before; -+ _deleteSelection(&AttrProp_Before); -+ m_pDoc->endUserAtomicGlob(); -+ } -+ else if(m_FrameEdit.isActive()) -+ { -+ m_FrameEdit.setPointInside(); -+ } -+ m_pDoc->setDontImmediatelyLayout(true); -+// -+// Now trigger a rebuild of the whole table by sending a changeStrux to the table strux -+// with a bogus line-type property. We'll restore it later. -+// -+ const char * pszTable[3] = {NULL,NULL,NULL}; -+ pszTable[0] = "list-tag"; -+ const char * szListTag = NULL; -+ UT_String sListTag; -+ UT_sint32 iListTag; -+ m_pDoc->getPropertyFromSDH(tableSDH,isShowRevisions(),getRevisionLevel(),pszTable[0],&szListTag); -+ if(szListTag == NULL || *szListTag == '\0') -+ { -+ iListTag = 0; -+ } -+ else -+ { -+ iListTag = atoi(szListTag); -+ iListTag -= 1; -+ } -+ UT_String_sprintf(sListTag,"%d",iListTag); -+ pszTable[1] = sListTag.c_str(); -+ UT_DEBUGMSG(("SEVIOR: Doing Table strux change of %s %s \n",pszTable[0],pszTable[1])); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posTable,posTable,NULL,pszTable,PTX_SectionTable); -+// -+// OK loop through all the rows in this column and delete the entries in the specified -+// column if the cell spans just the width of the column.. -+// -+ UT_sint32 i =0; -+ for(i=0; i iLeft -+// do this by running through the linked list of SectionCell fragments in the piecetable -+// -+// We stop when the position of the endCell strux is just before the position of -+// the endTable strux. So lets's get that now. -+// -+ bRes = m_pDoc->getNextStruxOfType(tableSDH,PTX_EndTable,&endTableSDH); -+ if(!bRes) -+ { -+ // -+ // Disaster! the table structure in the piecetable is screwed. -+ // we're totally stuffed now. -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ } -+ PT_DocPosition posEndTable = m_pDoc->getStruxPosition(endTableSDH); -+ PT_DocPosition posEndCell; -+ bool bEnd = false; -+ UT_sint32 iCurLeft,iCurRight,iCurTop,iCurBot,iNewLeft,iNewRight; -+ cellSDH = tableSDH; -+ while(!bEnd) -+ { -+ bRes = m_pDoc->getNextStruxOfType(cellSDH,PTX_SectionCell,&cellSDH); -+ if(!bRes) -+ { -+ bEnd = true; -+ break; -+ } -+ posCell = m_pDoc->getStruxPosition(cellSDH); -+ getCellParams(posCell+1, &iCurLeft, &iCurRight,&iCurTop,&iCurBot); -+ UT_DEBUGMSG(("SEVIOR: Looking at cell left %d right %d top %d bot %d \n",iCurLeft,iCurRight,iCurTop,iCurBot)); -+ bool bChange = false; -+ iNewLeft = iCurLeft; -+ iNewRight = iCurRight; -+ if(iCurLeft > iLeft) -+ { -+ bChange = true; -+ iNewLeft--; -+ } -+ if(iCurRight > iLeft) -+ { -+ bChange = true; -+ iNewRight--; -+ } -+ if(bChange) -+ { -+ UT_DEBUGMSG(("SEVIOR: changing cell to left %d right %d top %d bot %d \n",iNewLeft,iNewRight,iCurTop,iCurBot)); -+ const char * props[9] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -+ UT_String sLeft,sRight,sTop,sBot; -+ props[0] = "left-attach"; -+ UT_String_sprintf(sLeft,"%d",iNewLeft); -+ props[1] = sLeft.c_str(); -+ props[2] = "right-attach"; -+ UT_String_sprintf(sRight,"%d",iNewRight); -+ props[3] = sRight.c_str(); -+ props[4] = "top-attach"; -+ UT_String_sprintf(sTop,"%d",iCurTop); -+ props[5] = sTop.c_str(); -+ props[6] = "bot-attach"; -+ UT_String_sprintf(sBot,"%d",iCurBot); -+ props[7] = sBot.c_str(); -+ bRes = m_pDoc->changeStruxFmt(PTC_AddFmt,posCell+1,posCell+1,NULL,props,PTX_SectionCell); -+ } -+ endCellSDH = m_pDoc->getEndCellStruxFromCellSDH(cellSDH); -+ posEndCell = m_pDoc->getStruxPosition(endCellSDH); -+ if(posEndCell+1 >= posEndTable) -+ { -+ bEnd = true; -+ } -+ } -+// -+// Now trigger a rebuild of the whole table by sending a changeStrux to the table strux -+// with the restored line-type property it has before. -+// -+ iListTag += 1; -+ UT_String_sprintf(sListTag,"%d",iListTag); -+ pszTable[1] = sListTag.c_str(); -+ UT_DEBUGMSG(("SEVIOR: Doing Table strux change of %s %s \n",pszTable[0],pszTable[1])); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posTable,posTable,NULL,pszTable,PTX_SectionTable); -+// -+// OK finish everything off with the various parameters which allow the formatter to -+// be updated. -+// -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ _fixInsertionPointCoords(); -+ -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+} -+ -+ -+/*! -+ * Delete the table containing the position posRow -+ */ -+bool FV_View::cmdDeleteTable(PT_DocPosition posTable, bool bDontNotify) -+{ -+ PL_StruxDocHandle tableSDH,endTableSDH; -+ PT_DocPosition posStartTable,posEndTable; -+ bool bRes = m_pDoc->getStruxOfTypeFromPosition(posTable,PTX_SectionTable,&tableSDH); -+ if(!bRes) -+ { -+ return false; -+ } -+ posStartTable = m_pDoc->getStruxPosition(tableSDH); -+ endTableSDH = m_pDoc->getEndTableStruxFromTableSDH(tableSDH); -+ posEndTable = m_pDoc->getStruxPosition(endTableSDH)+1; -+// -+// Got all we need, now set things up to do the delete nicely -+// -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ if (!isSelectionEmpty()) -+ { -+ _clearSelection(); -+ _resetSelection(); -+ } -+ m_pDoc->setDontImmediatelyLayout(true); -+// -+// OK do the delete -+// -+ UT_uint32 iRealDeleteCount; -+ // if(m_pDoc->isFrameAtPos(posStartTable-1)) -+ // posStartTable--; -+ m_pDoc->deleteSpan( posStartTable, posEndTable, NULL,iRealDeleteCount,true); -+// -+// OK finish everything off with the various parameters which allow the formatter to -+// be updated. -+// -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ setPoint(getPoint()); -+ // -+ // This method could be called from text to tablein which case -+ // we don't want to do this. -+ // -+ if(!bDontNotify) -+ { -+ notifyListeners(AV_CHG_ALL); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ } -+ return true; -+} -+ -+/*! -+ * Delete the row containing the position posRow -+ */ -+bool FV_View::cmdDeleteRow(PT_DocPosition posRow) -+{ -+ PL_StruxDocHandle cellSDH,tableSDH,endTableSDH,endCellSDH; -+ PT_DocPosition posTable,posCell; -+ UT_sint32 iLeft,iRight,iTop,iBot; -+ getCellParams(posRow, &iLeft, &iRight,&iTop,&iBot); -+ -+ bool bRes = m_pDoc->getStruxOfTypeFromPosition(posRow,PTX_SectionCell,&cellSDH); -+ bRes = m_pDoc->getStruxOfTypeFromPosition(posRow,PTX_SectionTable,&tableSDH); -+ UT_return_val_if_fail(bRes, false); -+ -+ posTable = m_pDoc->getStruxPosition(tableSDH) + 1; -+// -+// Now find the number of rows and columns inthis table. This is easiest to -+// get from the table container -+// -+ fl_TableLayout * pTabL = getTableAtPos(posRow); -+ if(pTabL == NULL) -+ { -+ pTabL = getTableAtPos(posRow+1); -+ if(pTabL == NULL) -+ { -+ pTabL = getTableAtPos(posRow+2); -+ UT_return_val_if_fail(pTabL, false); -+ } -+ } -+ fp_TableContainer * pTab = static_cast(pTabL->getFirstContainer()); -+ UT_return_val_if_fail(pTab, false); -+ UT_sint32 numCols = pTab->getNumCols(); -+// -+// If we delete the last row we're actually deleting the table, so do that -+// instead. -+// -+ UT_sint32 nRows = getNumRowsInSelection(); -+ if(pTab->getNumRows() == 1 || (nRows == pTab->getNumRows())) -+ { -+ cmdDeleteTable(posRow); -+ return true; -+ } -+// -+// Got all we need, now set things up to do the delete nicely -+// -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ UT_sint32 numRows = getNumRowsInSelection(); -+ if (!isSelectionEmpty() && !m_FrameEdit.isActive()) -+ { -+ m_pDoc->beginUserAtomicGlob(); -+ PP_AttrProp AttrProp_Before; -+ _deleteSelection(&AttrProp_Before); -+ m_pDoc->endUserAtomicGlob(); -+ } -+ else if(m_FrameEdit.isActive()) -+ { -+ m_FrameEdit.setPointInside(); -+ } -+ m_pDoc->setDontImmediatelyLayout(true); -+// -+// Now trigger a rebuild of the whole table by sending a changeStrux to the table strux -+// with a bogus line-type property. We'll restore it later. -+// -+ const char * pszTable[3] = {NULL,NULL,NULL}; -+ pszTable[0] = "list-tag"; -+ const char * szListTag = NULL; -+ UT_String sListTag; -+ UT_sint32 iListTag; -+ m_pDoc->getPropertyFromSDH(tableSDH,isShowRevisions(),getRevisionLevel(),pszTable[0],&szListTag); -+ if(szListTag == NULL || *szListTag == '\0') -+ { -+ iListTag = 0; -+ } -+ else -+ { -+ iListTag = atoi(szListTag); -+ iListTag -= 1; -+ } -+ UT_String_sprintf(sListTag,"%d",iListTag); -+ pszTable[1] = sListTag.c_str(); -+ UT_DEBUGMSG(("SEVIOR: Doing Table strux change of %s %s \n",pszTable[0],pszTable[1])); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posTable,posTable,NULL,pszTable,PTX_SectionTable); -+// -+// OK loop through all the rows in this column and delete the entries in the specified -+// column if the cell spans just the width of the column.. -+// -+ UT_sint32 i =0; -+ UT_sint32 j = 0; -+ for(j=numRows-1; j>=0; j--) -+ { -+ for(i=numCols-1; i >=0; i--) -+ { -+ PT_DocPosition posCell = findCellPosAt(posTable,iTop+j,i); -+ UT_sint32 Left,Right,Top,Bot; -+ getCellParams(posCell+1,&Left,&Right,&Top,&Bot); -+ UT_DEBUGMSG(("SEVIOR: Before delete left %d right %d top %d bot %d \n",Left,Right,Top,Bot)); -+ if((Bot - Top) == 1) -+ { -+ _deleteCellAt(posTable,iTop+j, i); -+ } -+ } -+ } -+// -+// OK now subtract numRows from all the row coordinates in the table with iTop,iBot > iTop -+// do this by running through the linked list of SectionCell fragments in the piecetable -+// -+// We stop when the position of the endCell strux is just before the position of -+// the endTable strux. So lets's get that now. -+// -+ endTableSDH = m_pDoc->getEndTableStruxFromTableSDH(tableSDH); -+ if(!bRes || (endTableSDH == NULL)) -+ { -+ // -+ // Disaster! the table structure in the piecetable is screwed. -+ // we're totally stuffed now. -+ UT_ASSERT(UT_SHOULD_NOT_HAPPEN); -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ m_pDoc->endUserAtomicGlob(); -+ return false;; -+ } -+ PT_DocPosition posEndTable = m_pDoc->getStruxPosition(endTableSDH); -+ PT_DocPosition posEndCell; -+ bool bEnd = false; -+ UT_sint32 iCurLeft,iCurRight,iCurTop,iCurBot,iNewTop,iNewBot; -+ cellSDH = tableSDH; -+ while(!bEnd) -+ { -+ bRes = m_pDoc->getNextStruxOfType(cellSDH,PTX_SectionCell,&cellSDH); -+ if(!bRes) -+ { -+ bEnd = true; -+ break; -+ } -+ posCell = m_pDoc->getStruxPosition(cellSDH); -+ getCellParams(posCell+1, &iCurLeft, &iCurRight,&iCurTop,&iCurBot); -+ UT_DEBUGMSG(("SEVIOR: Looking at cell left %d right %d top %d bot %d \n",iCurLeft,iCurRight,iCurTop,iCurBot)); -+ bool bChange = false; -+ iNewTop = iCurTop; -+ iNewBot = iCurBot; -+ if(iCurTop > iTop) -+ { -+ bChange = true; -+ iNewTop -= numRows; -+ } -+ if(iCurBot > iTop) -+ { -+ bChange = true; -+ iNewBot -= numRows; -+ } -+ if(bChange) -+ { -+ UT_DEBUGMSG(("SEVIOR: changing cell to left %d right %d top %d bot %d \n",iCurLeft,iCurRight,iNewTop,iNewBot)); -+ const char * props[9] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -+ UT_String sLeft,sRight,sTop,sBot; -+ props[0] = "left-attach"; -+ UT_String_sprintf(sLeft,"%d",iCurLeft); -+ props[1] = sLeft.c_str(); -+ props[2] = "right-attach"; -+ UT_String_sprintf(sRight,"%d",iCurRight); -+ props[3] = sRight.c_str(); -+ props[4] = "top-attach"; -+ UT_String_sprintf(sTop,"%d",iNewTop); -+ props[5] = sTop.c_str(); -+ props[6] = "bot-attach"; -+ UT_String_sprintf(sBot,"%d",iNewBot); -+ props[7] = sBot.c_str(); -+ bRes = m_pDoc->changeStruxFmt(PTC_AddFmt,posCell+1,posCell+1,NULL,props,PTX_SectionCell); -+ } -+ endCellSDH = m_pDoc->getEndCellStruxFromCellSDH(cellSDH); -+ posEndCell = m_pDoc->getStruxPosition(endCellSDH); -+ if(posEndCell+1 >= posEndTable) -+ { -+ bEnd = true; -+ } -+ } -+// -+// Now trigger a rebuild of the whole table by sending a changeStrux to the table strux -+// with the restored line-type property it has before. -+// -+ iListTag += 1; -+ UT_String_sprintf(sListTag,"%d",iListTag); -+ pszTable[1] = sListTag.c_str(); -+ UT_DEBUGMSG(("SEVIOR: Doing Table strux change of %s %s \n",pszTable[0],pszTable[1])); -+ m_pDoc->changeStruxFmt(PTC_AddFmt,posTable,posTable,NULL,pszTable,PTX_SectionTable); -+// -+// OK finish everything off with the various parameters which allow the formatter to -+// be updated. -+// -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ _fixInsertionPointCoords(); -+ -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+} -+ -+ -+/*! -+ * Delete the cell at the specified position -+ */ -+bool FV_View::cmdDeleteCell(PT_DocPosition cellPos) -+{ -+#if 1 -+ UT_ASSERT(UT_NOT_IMPLEMENTED); -+ return true ; -+#else -+ PL_StruxDocHandle cellSDH; -+ const char * pszLeftAttach =NULL; -+ const char * pszTopAttach = NULL; -+ UT_sint32 iLeft =-999; -+ UT_sint32 iTop = -999; -+ bool bRes = m_pDoc->getStruxOfTypeFromPosition(cellPos,PTX_SectionCell,&cellSDH); -+ if(!bRes) -+ { -+ return false; -+ } -+ m_pDoc->getPropertyFromSDH(cellSDH,"left-attach",&pszLeftAttach); -+ m_pDoc->getPropertyFromSDH(cellSDH,"top-attach",&pszTopAttach); -+ if(pszLeftAttach && *pszLeftAttach) -+ { -+ iLeft = atoi(pszLeftAttach); -+ } -+ if(pszTopAttach && *pszTopAttach) -+ { -+ iTop = atoi(pszTopAttach); -+ } -+// -+// Got all we need, now set things up to do the delete nicely -+// -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ if (!isSelectionEmpty() && !m_FrameEdit.isActive()) -+ { -+ m_pDoc->beginUserAtomicGlob(); -+ PP_AttrProp AttrProp_Before; -+ _deleteSelection(&AttrProp_Before); -+ m_pDoc->endUserAtomicGlob(); -+ } -+ else if(m_FrameEdit.isActive()) -+ { -+ m_FrameEdit.setPointInside(); -+ } -+ m_pDoc->setDontImmediatelyLayout(true); -+// -+// delete the cell. -+// -+ _deleteCellAt(cellPos,iTop, iLeft); -+// -+// OK do all the piecetable finished changing business -+// -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ _fixInsertionPointCoords(); -+ -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION); -+ return true; -+#endif -+} -+ -+ -+/*! -+ * Insert a table of the number of rows and columns given. -+ */ -+UT_Error FV_View::cmdInsertTable(UT_sint32 numRows, UT_sint32 numCols, const gchar * pPropsArray[]) -+{ -+ // TODO -- why does this function return UT_Error? If bool is -+ // sufficient, it should return bool, and if not, than the -+ // UT_Error & bool operations below are probably not safe -+ UT_Error e = UT_OK; -+ if(numRows == 0 || numCols==0) -+ { -+ return 0; -+ } -+ if(isInTable(getPoint()-1) && isInTable() && isHdrFtrEdit()) -+ { -+ return 0; -+ } -+ if(isInTable(getPoint()) && !isSelectionEmpty() && isHdrFtrEdit()) -+ { -+ return 0; -+ } -+ -+// -+// Do all the stuff we need to make this go smoothly and to undo in a single step. -+// -+ // Signal PieceTable Changes -+ _saveAndNotifyPieceTableChange(); -+ -+ // Turn off list updates -+ -+ m_pDoc->disableListUpdates(); -+ m_pDoc->beginUserAtomicGlob(); -+ if (!isSelectionEmpty() && !m_FrameEdit.isActive()) -+ { -+ m_pDoc->setDontImmediatelyLayout(true); -+ m_pDoc->beginUserAtomicGlob(); -+ PP_AttrProp AttrProp_Before; -+ _deleteSelection(&AttrProp_Before); -+ m_pDoc->endUserAtomicGlob(); -+ } -+ else if(m_FrameEdit.isActive()) -+ { -+ m_FrameEdit.setPointInside(); -+ } -+ else -+ { -+ m_pDoc->setDontImmediatelyLayout(true); -+ } -+ if(getHyperLinkRun(getPoint()) != NULL) -+ { -+ -+ // Signal PieceTable Changes have finished -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ _restorePieceTableState(); -+ return 0; -+ } -+// -+// Handle corner case of point at endTOC -+// -+ if(m_pDoc->isTOCAtPos(getPoint()-1)) -+ { -+ setPoint(getPoint()-1); -+ } -+// -+// insert a block to terminate the text before this. -+// -+ PT_DocPosition pointBreak = getPoint(); -+ PT_DocPosition pointTable = 0; -+ // -+ // Don't do this if there is a block at pointBreak already. -+ // -+ bool bInsert = false; -+ if((!m_pDoc->isBlockAtPos(getPoint()) && !m_pDoc->isTableAtPos(getPoint()) && !(m_pDoc->isEndFrameAtPos(getPoint()) && m_pDoc->isBlockAtPos(getPoint()-1) )) || m_pDoc->isTOCAtPos(getPoint()-2) ) -+ { -+ e = m_pDoc->insertStrux(getPoint(),PTX_Block); -+ bInsert = true; -+ } -+ bool bPointBreak = false; -+ if(!bInsert && !m_pDoc->isTableAtPos(getPoint()) && !m_pDoc->isEndFootnoteAtPos(getPoint()-2) && !m_pDoc->isEndFootnoteAtPos(getPoint()-1) && !m_pDoc->isBlockAtPos(getPoint())) -+ { -+ pointBreak--; -+ bPointBreak = true; -+ } -+ if(!bPointBreak && m_pDoc->isBlockAtPos(getPoint())) -+ { -+ PT_DocPosition posEnd = 0; -+ getEditableBounds(true,posEnd); -+ if((posEnd == getPoint())) -+ { -+ pointBreak--; -+ bPointBreak = true; -+ } -+ else if(m_pDoc->isSectionAtPos(getPoint()-1) || m_pDoc->isEndTableAtPos(getPoint()-1) || m_pDoc->isEndFrameAtPos(getPoint() - 1)) -+ { -+ pointBreak--; -+ bPointBreak = true; -+ } -+ else if(m_pDoc->isSectionAtPos(getPoint()-2)) -+ { -+ pointBreak--; -+ bPointBreak = true; -+ } -+ if(m_pDoc->isEndFootnoteAtPos(pointBreak)) -+ { -+ pointBreak++; -+ bPointBreak = false; -+ } -+ if(bPointBreak && !m_pDoc->isBlockAtPos(pointBreak)) -+ { -+ pointBreak++; -+ bPointBreak = false; -+ } -+ -+ } -+// -+// Insert the table strux at the same spot. This will make the table link correctly in the -+// middle of the broken text. -+// -+// Handle special case of not putting a table immediately after a section break -+// -+ PL_StruxDocHandle secSDH = NULL; -+ bool bres = m_pDoc->getStruxOfTypeFromPosition(pointBreak-1,PTX_Section,&secSDH); -+ PT_DocPosition secPos = m_pDoc->getStruxPosition(secSDH); -+ UT_DEBUGMSG(("SEVIOR: SecPos %d pointBreak %d \n",secPos,pointBreak)); -+ secSDH = NULL; -+ bres = m_pDoc->getStruxOfTypeFromPosition(pointBreak,PTX_SectionCell,&secSDH); -+ if(secSDH != NULL) -+ { -+ PT_DocPosition secPos = m_pDoc->getStruxPosition(secSDH); -+ UT_DEBUGMSG(("SEVIOR: Cell Pos %d pointBreak %d \n",secPos,pointBreak)); } -+// -+// Handle special case of not putting a table immediately after an end text box -+// -+ if(m_pDoc->isEndFrameAtPos(pointBreak-1)) -+ { -+ pointBreak--; -+ } -+ // -+ // Handle special case of not putting a table in a TOC -+ // -+ if(m_pDoc->isTOCAtPos(pointBreak-1)) -+ { -+ pointBreak++; -+ } -+ -+ setPoint(pointBreak); -+ e |= static_cast(m_pDoc->insertStrux(getPoint(),PTX_SectionTable,NULL,pPropsArray)); -+// -+// stuff for cell insertion. -+// -+ UT_sint32 i,j; -+ const gchar * attrs[3] = {"style","Normal",NULL}; -+ const gchar * props[9] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -+ UT_String sRowTop = "top-attach"; -+ UT_String sRowBot = "bot-attach"; -+ UT_String sColLeft = "left-attach"; -+ UT_String sColRight = "right-attach"; -+ UT_String sTop,sBot,sLeft,sRight; -+ for(i=0;i(m_pDoc->insertStrux(getPoint(),PTX_SectionCell,NULL,props)); -+ pointBreak = getPoint(); -+ e |= static_cast(m_pDoc->insertStrux(getPoint(),PTX_Block,attrs,NULL)); -+ UT_DEBUGMSG(("SEVIOR: 4 cur point %d \n",getPoint())); -+ if(getPoint() == pointBreak) -+ { -+ setPoint(pointBreak+1); -+ } -+ if(i == 0 && j==0) -+ { -+ pointTable = getPoint(); -+ } -+ e |= static_cast(m_pDoc->insertStrux(getPoint(),PTX_EndCell)); -+ } -+ } -+ e |= static_cast(m_pDoc->insertStrux(getPoint(),PTX_EndTable)); -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ -+ m_pDoc->endUserAtomicGlob(); -+ setPoint(pointTable); -+ _fixInsertionPointCoords(); -+ m_pG->getCaret()->setBlink(false); -+ focusChange(AV_FOCUS_HERE); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ AV_View::notifyListeners (AV_CHG_ALL); -+ return e; -+} -+ -+bool FV_View::cmdCharInsert(const UT_UCSChar * text, UT_uint32 count, bool bForce) -+{ -+ // -+ // Look if we should insert a pargraph before the table -+ // -+ if(m_bInsertAtTablePending && (count==1) && (text[0] != UCS_FF) && (text[0] != UCS_VTAB)) -+ { -+ -+ m_pDoc->beginUserAtomicGlob(); -+ -+ // Prevent access to Piecetable for things like spellchecks until -+ // paragraphs have stablized -+ // -+ _saveAndNotifyPieceTableChange(); -+ m_pDoc->disableListUpdates(); -+ PT_DocPosition pos = m_iPosAtTable; -+ m_pDoc->insertStrux( m_iPosAtTable,PTX_Block); -+ m_bInsertAtTablePending = false; -+ -+ // Signal piceTable is stable again -+ _restorePieceTableState(); -+ -+ // Signal piceTable is stable again -+ // Signal PieceTable Changes have finished -+ _generalUpdate(); -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ setPoint(pos+1); -+ m_iPosAtTable = 0; -+ _generalUpdate(); -+ bool res = _charInsert(text, count, bForce); -+ m_pDoc->endUserAtomicGlob(); -+ return res; -+ } -+ // the code below inserts a direction marker before a space if the automatic insertion of such -+ // markers is indicated by user's preferences and if the current keyboard language direction is -+ // inconsistent with the dominant direction of the paragraph (this makes phone numbers and similar -+ // to work in rtl languages more intuitively) -+ -+ // we only do this for space ... (certain other chars can be handled in ap_EditMethods.cpp -+ // because they do not need knowledge of block direction) -+ fl_BlockLayout * pBlock = NULL; -+ if(count == 1 && text[0] == UCS_SPACE) -+ { -+ bool bLang = false, bMarker = false; -+ -+ XAP_App::getApp()->getPrefsValueBool(static_cast(XAP_PREF_KEY_ChangeLanguageWithKeyboard), -+ &bLang); -+ -+ const UT_LangRecord * pLR = NULL; -+ -+ if(bLang) -+ { -+ pLR = XAP_App::getApp()->getKbdLanguage(); -+ -+ XAP_App::getApp()->getPrefsValueBool(static_cast(XAP_PREF_KEY_DirMarkerAfterClosingParenthesis), &bMarker); -+ } -+ -+ if(bMarker && pLR) -+ { -+ pBlock = m_pLayout->findBlockAtPosition(getPoint()); -+ -+ if(!pBlock) -+ goto normal_insert; -+ -+ { -+ UT_BidiCharType iDomDir = pBlock->getDominantDirection(); -+ -+ UT_UCS4Char data[2]; -+ data[1] = *text; -+ -+ if(pLR->m_eDir == UTLANG_RTL && iDomDir != UT_BIDI_RTL) -+ { -+ data[0] = UCS_RLM; -+ } -+ else if(pLR->m_eDir == UTLANG_LTR && iDomDir != UT_BIDI_LTR) -+ { -+ data[0] = UCS_LRM; -+ } -+ else -+ { -+ goto normal_insert; -+ } -+ -+ return _charInsert(&data[0],2,bForce); -+ } -+ } -+ } -+ else if(count == 1 && text[0] == UCS_FF) -+ { -+ m_pDoc->beginUserAtomicGlob(); -+ bool b = _charInsert(text, count, bForce); -+ if(b) -+ { -+ insertParagraphBreak(); -+ } -+ m_pDoc->endUserAtomicGlob(); -+ return b; -+ } -+ else if(count == 1 && text[0] == UCS_VTAB) -+ { -+ m_pDoc->beginUserAtomicGlob(); -+ bool b = _charInsert(text, count, bForce); -+ if(b) -+ { -+ insertParagraphBreak(); -+ } -+ m_pDoc->endUserAtomicGlob(); -+ return b; -+ } -+ normal_insert: -+ return _charInsert(text, count, bForce); -+} -+ -+bool FV_View::cmdStartList(const gchar * style) -+{ -+ m_pDoc->beginUserAtomicGlob(); -+ fl_BlockLayout * pBlock = getCurrentBlock(); -+ pBlock->StartList( style); -+ m_pDoc->endUserAtomicGlob(); -+ -+ return true; -+} -+ -+ -+bool FV_View::cmdStopList(void) -+{ -+ -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ m_pDoc->beginUserAtomicGlob(); -+ fl_BlockLayout * pBlock = getCurrentBlock(); -+ m_pDoc->StopList(pBlock->getStruxDocHandle()); -+ m_pDoc->endUserAtomicGlob(); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ return true; -+} -+ -+ -+void FV_View::cmdCharDelete(bool bForward, UT_uint32 count) -+{ -+ const gchar * properties[] = { "font-family", NULL, 0}; -+ const gchar ** props_in = NULL; -+ const gchar * currentfont; -+ bool bisList = false; -+ fl_BlockLayout * curBlock = NULL; -+ fl_BlockLayout * nBlock = NULL; -+ UT_uint32 iRealDeleteCount = 0; -+ -+ -+ if (!isSelectionEmpty() && !m_FrameEdit.isActive()) -+ { -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ m_pDoc->disableListUpdates(); -+ -+ _deleteSelection(); -+ _generalUpdate(); -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ } -+ else if(m_FrameEdit.isActive()) -+ { -+ deleteFrame(); -+ } -+ else -+ { -+ // -+ // Look to see if there is a tab - list label deal with these together -+ // -+ if((bForward == false) && (count == 1)) -+ { -+ UT_sint32 myCount= 0; -+ if(isTabListBehindPoint(myCount) == true) -+ { -+ curBlock = _findBlockAtPosition(getPoint()); -+ nBlock = _findBlockAtPosition(getPoint()-myCount); -+ if(nBlock == curBlock) -+ { -+ count = myCount; -+ bisList = true; -+ } -+ } -+ } -+ if((bForward == true) && (count == 1)) -+ { -+ if(isTabListAheadPoint() == true) -+ { -+// -+// Check we're at the start of a block -+// -+ if(getPoint() == getCurrentBlock()->getPosition()) -+ { -+ bisList = true; -+ count = 2; -+ } -+ } -+ -+ } -+// -+// Code to deal with deleting a footnote reference that embeds a footnote Layout. -+// -+ if(bForward) -+ { -+ if(!isInFootnote() && isInFootnote(getPoint() + count)) -+ { -+ fl_FootnoteLayout * pFL = getClosestFootnote(getPoint() + count +1); -+ count += pFL->getLength(); -+ } -+ if(!isInEndnote() && isInEndnote(getPoint() + count)) -+ { -+ fl_EndnoteLayout * pEL = getClosestEndnote(getPoint() + count +1); -+ count += pEL->getLength(); -+ } -+ if(m_pDoc->isTOCAtPos(getPoint())) -+ { -+ if(m_pDoc->isTOCAtPos(getPoint()-1)) -+ { -+ m_iInsPoint--; -+ } -+ count++; -+ -+ } -+ } -+ else -+ { -+ if(!isInFootnote(getPoint()) && isInFootnote(getPoint() - count)) -+ { -+ fl_FootnoteLayout * pFL = getClosestFootnote(getPoint()); -+ count += pFL->getLength(); -+ } -+ else if(isInFootnote(getPoint())) -+ { -+ if(!isInFootnote(getPoint() - count)) -+ { -+ return; -+ } -+ else if(!isInFootnote(getPoint() -2)) -+ { -+// -+// Don't delete the paragraph strux in footnote -+// -+ return; -+ } -+ else if(!isInFootnote(getPoint() -3)) -+ { -+// -+// Don't delete the paragraph strux in footnote -+// -+ return; -+ } -+ } -+ else if(!isInEndnote() && isInEndnote(getPoint() - count)) -+ { -+ fl_EndnoteLayout * pEL = getClosestEndnote(getPoint()); -+ count += pEL->getLength(); -+ } -+ else if(isInEndnote(getPoint())) -+ { -+ if(!isInEndnote(getPoint() - count)) -+ { -+ return; -+ } -+ else if(!isInEndnote(getPoint() -2)) -+ { -+// -+// Don't delete the paragraph strux in endnote -+// -+ return; -+ } -+ else if(!isInEndnote(getPoint() -3)) -+ { -+// -+// Don't delete the paragraph strux in endnote -+// -+ return; -+ } -+ -+ } -+ if(m_pDoc->isTOCAtPos(getPoint()-2)) -+ { -+ count +=2; -+ } -+ } -+ -+ // Code that deals with deleting runs that do not like to be deleted ... This handles runs -+ // that return true for deleteFollowingIfAtInsPoint(). Runs in this category are typically -+ // not visible on screen, such as hyperlinks and bookmarks, and are deleted through the main -+ // menu. Such runs must not be deleted inadvertedly when pressing delete/backpace. Just to -+ // exaplain why: for example, in Word bookmarks inadvertedly disappear when the bookmarked -+ // text is edited; this is extremely annoying if such bookmarks are referenced from page -+ // reference and similar fields, particularly if the document is long and contains many such -+ // fields -- imagine printing a 200+ page document, only to discover that on page 178 you -+ // have 'error: bookmark not found' where a page number should have been -- we want to -+ // minimise this happening and will only delete such runs when (a) the user explicitely asks -+ // to, or (b) they are inside a selection. -+ if(!curBlock) -+ curBlock = _findBlockAtPosition(getPoint()); -+ -+ if(bForward && count == 1) -+ { -+ UT_return_if_fail( curBlock ); -+ -+ fp_Run * pRun = curBlock->findRunAtOffset(getPoint() - curBlock->getPosition()); -+ -+ UT_return_if_fail( pRun ); -+ -+ fp_Run * pPrevRun = NULL; -+ UT_uint32 iLength = 0; -+ while(pRun && (pRun->deleteFollowingIfAtInsPoint() && (getPoint() == curBlock->getPosition() + pRun->getBlockOffset()))) -+ { -+ pPrevRun = pRun; -+ iLength += pRun->getLength(); -+ pRun = pRun->getNextRun(); -+ } -+ -+ _setPoint(m_iInsPoint + iLength); -+ -+ } -+ else if(!bForward && count == 1) -+ { -+ UT_return_if_fail( curBlock ); -+ -+ fp_Run * pRun = curBlock->findRunAtOffset(getPoint() - curBlock->getPosition()); -+ -+ UT_return_if_fail( pRun ); -+ -+ // back one further -+ pRun = pRun->getPrevRun(); -+ -+ fp_Run * pPrevRun = NULL; -+ UT_uint32 iLength = 0; -+ while(pRun && (pRun->deleteFollowingIfAtInsPoint() && (getPoint() == curBlock->getPosition() + pRun->getBlockOffset())) ) -+ { -+ pPrevRun = pRun; -+ iLength += pRun->getLength(); -+ pRun = pRun->getPrevRun(); -+ } -+ -+ _setPoint(m_iInsPoint - iLength); -+ -+ } -+ -+ // deal with character clusters, such as base char + vowel + tone mark in Thai -+ UT_uint32 pos1 = getPoint(); -+ if(!bForward) -+ { -+ UT_ASSERT_HARMLESS( pos1 > count ); -+ pos1 -= count; -+ } -+ -+ _adjustDeletePosition(pos1, count); -+ -+ if(bForward) -+ _setPoint(pos1); -+ else -+ _setPoint(pos1 + count); -+ -+ -+ // Code to deal with font boundary problem. -+ // TODO: This should really be fixed by someone who understands -+ // how this code works! In the meantime save current font to be -+ // restored after character is deleted. -+ -+ getCharFormat(&props_in); -+ currentfont = UT_getAttribute("font-family",props_in); -+ properties[1] = currentfont; -+ xxx_UT_DEBUGMSG(("deleteSpan - 1: Inital pos %d count %d \n",getPoint(),count)); -+ -+ UT_uint32 amt = count; -+ UT_uint32 posCur = getPoint(); -+ UT_uint32 nposCur = getPoint(); -+ bool fontFlag = false; -+ -+ if (!bForward) -+ { -+ -+ if (!_charMotion(bForward,count, false)) -+ { -+ UT_ASSERT(getPoint() <= posCur); -+ xxx_UT_DEBUGMSG(("SEVIOR: posCur %d getPoint() %d \n",posCur,getPoint())); -+ amt = posCur - getPoint(); -+ } -+ -+ posCur = getPoint(); -+ // Code to deal with change of font boundaries: -+ if((posCur == nposCur) && (posCur > 0)) -+ { -+ fontFlag = true; -+ posCur--; -+ } -+ } -+ else -+ { -+ PT_DocPosition posEOD; -+ bool bRes; -+ -+ bRes = getEditableBounds(true, posEOD); -+ UT_ASSERT(bRes); -+ UT_ASSERT(posCur <= posEOD); -+ -+ if (posEOD < (posCur+amt)) -+ { -+ amt = posEOD - posCur; -+ } -+ } -+ -+ if(!curBlock) -+ curBlock = _findBlockAtPosition(getPoint()); -+ -+// -+// Code to check for a delete over a frame boundary. -+// -+ if(isInFrame(posCur) && !isInFrame(posCur+amt)) -+ { -+ fl_FrameLayout * pFL = getFrameLayout(posCur+amt); -+ if(pFL != NULL) -+ { -+ // -+ // Delete to edge of text box -+ // -+ PT_DocPosition posFrame = pFL->getPosition(true); -+ amt = posFrame + pFL->getLength() - posCur; -+ } -+ return; -+ } -+ if(!isInFrame(posCur) && isInFrame(posCur+amt) && (amt > 1)) -+ { -+ fl_FrameLayout * pFL = getFrameLayout(posCur+amt); -+ if(pFL != NULL) -+ { -+ // -+ // delete to start of text box -+ // -+ PT_DocPosition posFrame = pFL->getPosition(true); -+ amt = posCur + amt + 1 - posFrame; -+ } -+ } -+// -+// isInFrame will return true if we're right at the frame strux or right -+// at the EndFrame strux. If we delete either we're screwed. Handle -+// the cases. -+// -+// Later we want to be clever about moving the frame into a valid position -+// in the new merged block. Just fix the crash for now. -+// -+ if(m_pDoc->isFrameAtPos(posCur) && isInFrame(posCur+amt) ) -+ { -+ return; -+ } -+ -+ if(m_pDoc->isEndFrameAtPos(posCur)) -+ { -+ return; -+ } -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ if (amt > 0) -+ { -+ m_pDoc->disableListUpdates(); -+ -+ nBlock = _findBlockAtPosition(getPoint()); -+ fl_AutoNum * pAuto = nBlock->getAutoNum(); -+ if(pAuto != NULL ) -+ { -+ PL_StruxDocHandle sdh = nBlock->getStruxDocHandle(); -+ if((bisList == true) && (pAuto->getFirstItem() == sdh || pAuto->getLastItem() == sdh)) -+ { -+ m_pDoc->StopList(sdh); -+ PT_DocPosition listPoint,posEOD; -+ getEditableBounds(true, posEOD); -+ listPoint = getPoint(); -+ fl_AutoNum * pAuto = nBlock->getAutoNum(); -+ if(pAuto != NULL) -+ { -+ if(listPoint + 2 <= posEOD) -+ _setPoint(listPoint+2); -+ else -+ _setPoint(posEOD); -+ } -+ } -+ else if(bisList == true) -+ { -+ -+ m_pDoc->deleteSpan(posCur, posCur+amt,NULL, iRealDeleteCount); -+ nBlock->remItemFromList(); -+ } -+ else -+ { -+ m_pDoc->deleteSpan(posCur, posCur+amt,NULL, iRealDeleteCount); -+ } -+ } -+ else -+ { -+ UT_DEBUGMSG(("deleteSpan - 2: posCur %d amt %d \n",posCur,amt)); -+ m_pDoc->deleteSpan(posCur, posCur+amt,NULL, iRealDeleteCount); -+ } -+ -+ if(fontFlag) -+ { -+ _makePointLegal(); -+ setCharFormat(properties); -+ } -+ } -+// -+// Dont leave a List field - tab on a line. -+// -+ if(isTabListAheadPoint()) -+ { -+ UT_uint32 iRealDeleteCount2; -+ -+ m_pDoc->deleteSpan(getPoint(), getPoint()+2,NULL,iRealDeleteCount2); -+ iRealDeleteCount += iRealDeleteCount2; -+ } -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ -+ _generalUpdate(); -+ g_free(props_in); -+ -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ -+ //special handling is required for delete in revisions mode -+ //where we have to move the insertion point -+ // only if we are deleting forward; if deleting backwards, the -+ // code above already moved the insertion point -+ // -+ // Tomas, Oct 28, 2003 -+ // do this if we deleted fewer than count characters -+ if(bForward && isMarkRevisions() && (iRealDeleteCount < count)) -+ { -+ UT_ASSERT( iRealDeleteCount <= count ); -+ _charMotion(bForward,count - iRealDeleteCount); -+ } -+ } -+ -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _setPoint(getPoint()); -+ notifyListeners(AV_CHG_MOTION | AV_CHG_ALL); -+ -+} -+ -+ -+void FV_View::cmdScroll(AV_ScrollCmd cmd, UT_uint32 iPos) -+{ -+#define HACK_LINE_HEIGHT 20 // TODO Fix this!! -+ -+ UT_sint32 lineHeight = iPos; -+ UT_sint32 docHeight = 0; -+ bool bVertical = false; -+ bool bHorizontal = false; -+ -+ docHeight = m_pLayout->getHeight(); -+ -+ if (lineHeight == 0) -+ lineHeight = m_pG->tlu(HACK_LINE_HEIGHT); -+ -+ UT_sint32 yoff = m_yScrollOffset; -+ UT_sint32 xoff = m_xScrollOffset; -+ -+ switch(cmd) -+ { -+ case AV_SCROLLCMD_PAGEDOWN: -+ yoff += getWindowHeight(); -+ bVertical = true; -+ break; -+ case AV_SCROLLCMD_PAGEUP: -+ yoff -= getWindowHeight(); -+ bVertical = true; -+ break; -+ case AV_SCROLLCMD_PAGELEFT: -+ xoff -= getWindowWidth(); -+ bHorizontal = true; -+ break; -+ case AV_SCROLLCMD_PAGERIGHT: -+ xoff += getWindowWidth(); -+ bHorizontal = true; -+ break; -+ case AV_SCROLLCMD_LINEDOWN: -+ yoff += lineHeight; -+ bVertical = true; -+ break; -+ case AV_SCROLLCMD_LINEUP: -+ yoff -= lineHeight; -+ bVertical = true; -+ break; -+ case AV_SCROLLCMD_LINELEFT: -+ xoff -= lineHeight; -+ bHorizontal = true; -+ break; -+ case AV_SCROLLCMD_LINERIGHT: -+ xoff += lineHeight; -+ bHorizontal = true; -+ break; -+ case AV_SCROLLCMD_TOTOP: -+ yoff = 0; -+ bVertical = true; -+ break; -+ case AV_SCROLLCMD_TOPOSITION: -+ UT_ASSERT(UT_NOT_IMPLEMENTED); -+ break; -+ case AV_SCROLLCMD_TOBOTTOM: -+ fp_Page* pPage = m_pLayout->getFirstPage(); -+ UT_sint32 iDocHeight = getPageViewTopMargin(); -+ while (pPage) -+ { -+ iDocHeight += pPage->getHeight() + getPageViewSep(); -+ pPage = pPage->getNext(); -+ } -+ yoff = iDocHeight; -+ bVertical = true; -+ break; -+ } -+ -+ if (yoff < 0) -+ yoff = 0; -+ -+ bool bRedrawPoint = true; -+ -+ if (bVertical && (yoff != m_yScrollOffset)) -+ { -+ sendVerticalScrollEvent(yoff); -+ if ((cmd != AV_SCROLLCMD_PAGEUP -+ && cmd != AV_SCROLLCMD_PAGEDOWN)) -+ bRedrawPoint = false; -+// UT_ASSERT(m_yScrollOffset == m_pG->getPrevYOffset()); -+ } -+ -+ if (xoff < 0) -+ xoff = 0; -+ -+ if (bHorizontal && (xoff != m_xScrollOffset)) -+ { -+ sendHorizontalScrollEvent(xoff); -+ bRedrawPoint = false; -+ } -+ -+ if (bRedrawPoint) -+ _fixInsertionPointCoords(); -+ -+} -+ -+ -+void FV_View::cmdSelect(PT_DocPosition dpBeg, PT_DocPosition dpEnd) -+{ -+ -+ if (!isSelectionEmpty()) -+ { -+ _clearSelection(); -+ } -+ _setPoint(dpBeg); -+ _setSelectionAnchor(); -+ m_Selection.setSelectionLeftAnchor(dpBeg); -+ if(dpBeg < dpEnd - 2) -+ { -+ if(m_pDoc->isTableAtPos(dpEnd) && m_pDoc->isEndTableAtPos(dpEnd-1)) -+ { -+ dpEnd--; -+ } -+ if(m_pDoc->isCellAtPos(dpEnd)) -+ { -+ dpEnd--; -+ } -+ } -+ m_Selection.setSelectionRightAnchor(dpEnd); -+ _setPoint (dpEnd); -+ UT_ASSERT(!isSelectionEmpty()); -+ -+ if (dpBeg == dpEnd) -+ { -+ return; -+ } -+ _drawSelection(); -+ notifyListeners(AV_CHG_EMPTYSEL); -+} -+ -+#define IS_SELECTALL(a, b) ((a) == FV_DOCPOS_BOD && (b) == FV_DOCPOS_EOD) -+ -+void FV_View::cmdSelect(UT_sint32 xPos, UT_sint32 yPos, FV_DocPos dpBeg, FV_DocPos dpEnd) -+{ -+ UT_DEBUGMSG(("Double click on mouse \n")); -+ -+ warpInsPtToXY(xPos, yPos,true); -+ PT_DocPosition iPosLeft = _getDocPos(dpBeg, false); -+ PT_DocPosition iPosRight = _getDocPos(dpEnd, false); -+ if(iPosLeft > iPosRight) -+ { -+ return; -+ } -+ if(!isInFrame(iPosLeft) && isInFrame(iPosRight)) -+ { -+ fl_FrameLayout * pFL = getFrameLayout(iPosRight); -+ iPosRight =pFL->getPosition(true)-1; -+ } -+ if(isInFrame(iPosLeft) && !isInFrame(iPosRight)) -+ { -+ fl_FrameLayout * pFL = getFrameLayout(iPosLeft); -+ iPosRight =pFL->getPosition(true) + pFL->getLength() -1; -+ } -+ if(iPosLeft == iPosRight) return; -+// -+// Code to select a paragraph break on selectLine if on first line of a Block. -+// -+ bool bRedraw = false; -+ if((dpBeg == FV_DOCPOS_BOL) || (dpBeg == FV_DOCPOS_BOP) || (dpBeg == FV_DOCPOS_BOD)) -+ { -+ fl_BlockLayout * pBlock = _findBlockAtPosition(iPosLeft); -+ if(pBlock) -+ { -+ UT_sint32 x, y, x2, y2, h; -+ bool b; -+ fp_Run* pRun = pBlock->findPointCoords(m_iInsPoint, false, x, y, x2, y2, h, b); -+ if(pRun) -+ { -+ fp_Line * pLine = pRun->getLine(); -+ if(pLine == static_cast(pBlock->getFirstContainer())) -+ { -+ PT_DocPosition iPosNew = pBlock->getPosition() -1; -+ if(iPosNew < iPosLeft) -+ { -+ iPosLeft = iPosNew; -+ } -+ bRedraw = true; // Need to trick a global redraw in -+ // header/footer -+ } -+ } -+ } -+ } -+ cmdSelect (iPosLeft, iPosRight); -+ if(bRedraw && isHdrFtrEdit()) -+ { -+ cmdSelect (iPosLeft+1, iPosRight); -+ } -+} -+ -+void FV_View::cmdHyperlinkJump(UT_sint32 xPos, UT_sint32 yPos) -+{ -+ _clearSelection(); -+ warpInsPtToXY(xPos, yPos,true); -+ -+ fl_BlockLayout * pBlock = getCurrentBlock(); -+ PT_DocPosition iRelPos = getPoint() - pBlock->getPosition(false); -+ -+ fp_Run *pRun = pBlock->getFirstRun(); -+ while (pRun && pRun->getBlockOffset()+ pRun->getLength() < iRelPos) -+ pRun= pRun->getNextRun(); -+ -+ UT_ASSERT(pRun); -+ pRun->getPrevRun(); -+ -+ UT_ASSERT(pRun); -+#if 0 -+ if(pRun->getType()== FPRUN_FMTMARK || pRun->getType()== FPRUN_HYPERLINK || pRun->getType()== FPRUN_BOOKMARK) -+ pRun = pRun->getNextRun(); -+ -+ UT_ASSERT(pRun); -+#endif -+ fp_HyperlinkRun * pH = pRun->getHyperlink(); -+ -+ UT_ASSERT(pH); -+ if(!pH) -+ return; -+ -+ const gchar * pTarget = pH->getTarget(); -+ -+ if(*pTarget == '#') -+ pTarget++; -+ -+ UT_uint32 iTargetLen = strlen(pTarget); -+ UT_UCSChar * pTargetU = new UT_UCSChar[iTargetLen+1]; -+ -+ UT_ASSERT(pTargetU); -+ -+ UT_UCSChar * pJump = pTargetU; -+ -+ for (UT_uint32 i = 0; i < iTargetLen; i++) -+ *pTargetU++ = (UT_UCSChar) *pTarget++; -+ *pTargetU = 0; -+ -+ gotoTarget(AP_JUMPTARGET_BOOKMARK, pJump); -+ -+ delete [] pJump; -+} -+ -+ -+void FV_View::cmdHyperlinkJump(PT_DocPosition pos) -+{ -+ fp_HyperlinkRun * pH = static_cast(getHyperLinkRun(pos)); -+ UT_ASSERT(pH); -+ if(!pH) -+ return; -+ -+ const gchar * pTarget = pH->getTarget(); -+ -+ if(*pTarget == '#') -+ pTarget++; -+ -+ UT_uint32 iTargetLen = strlen(pTarget); -+ UT_UCSChar * pTargetU = new UT_UCSChar[iTargetLen+1]; -+ -+ UT_ASSERT(pTargetU); -+ -+ UT_UCSChar * pJump = pTargetU; -+ -+ for (UT_uint32 i = 0; i < iTargetLen; i++) -+ *pTargetU++ = (UT_UCSChar) *pTarget++; -+ *pTargetU = 0; -+ -+ gotoTarget(AP_JUMPTARGET_BOOKMARK, pJump); -+ -+ delete [] pJump; -+} -+ -+void FV_View::cmdHyperlinkCopyLocation(PT_DocPosition pos) -+{ -+ fp_HyperlinkRun * pH = static_cast(getHyperLinkRun(pos)); -+ if(!pH) -+ return; -+ -+ const gchar * pTarget = pH->getTarget(); -+ -+ if(!pTarget || !*pTarget || !strcmp(pTarget,"#")) -+ return; -+ -+ //skip over internal anchors -+ if(*pTarget == '#') -+ pTarget++; -+ -+ //copy the target to the clipboard -+ copyTextToClipboard(pTarget, true); -+} -+ -+ -+void FV_View::cmdUndo(UT_uint32 count) -+{ -+ if (!isSelectionEmpty()) -+ _clearSelection(); -+ -+ // Signal PieceTable Change -+ m_pDoc->notifyPieceTableChangeStart(); -+ -+ // Turn off list updates -+ m_pDoc->disableListUpdates(); -+ -+// Don't update tables until finished -+ -+ m_pDoc->setDontImmediatelyLayout(true); -+ -+ // Remember the current position, We might need it later. -+ rememberCurrentPosition(); -+ UT_DEBUGMSG(("SEVIOR: undoing %d operations \n",count)); -+ m_pDoc->undoCmd(count); -+ allowChangeInsPoint(); -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+// -+// Now do a general update to make everything look good again. -+// -+ _generalUpdate(); -+ -+ notifyListeners(AV_CHG_DIRTY); -+ -+// Look to see if we need the saved insertion point after the undo -+// if(needSavedPosition()) -+// { -+// -+// We do, so restore insertion point to that value. -+// _setPoint(getSavedPosition()); -+// clearSavedPosition(); -+// } -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ -+ // Signal PieceTable Changes have finished -+ m_pDoc->notifyPieceTableChangeEnd(); -+ m_iPieceTableState = 0; -+ // Move insertion point out of field run if it is in one -+ // -+ _charMotion(true, 0); -+// -+// Do a complete update coz who knows what happened in the undo! -+// -+ notifyListeners(AV_CHG_ALL); -+ PT_DocPosition posEnd = 0; -+ PT_DocPosition posBOD = 0; -+ getEditableBounds(true, posEnd); -+ getEditableBounds(true, posBOD); -+ bool bOK = true; -+ while(bOK && !isPointLegal() && (getPoint() < posEnd)) -+ { -+ bOK = _charMotion(true,1); -+ } -+ -+ bOK = true; -+ while(bOK && !isPointLegal() && (getPoint() > posBOD)) -+ { -+ bOK = _charMotion(false,1); -+ } -+ setCursorToContext(); -+ -+ -+ _updateInsertionPoint(); -+} -+ -+void FV_View::cmdRedo(UT_uint32 count) -+{ -+ if (!isSelectionEmpty()) -+ _clearSelection(); -+ -+ // Signal PieceTable Change -+ m_pDoc->notifyPieceTableChangeStart(); -+ -+ // Turn off list updates -+ m_pDoc->disableListUpdates(); -+ m_pDoc->setDontImmediatelyLayout(true); -+ -+ // Remember the current position, We might need it later. -+ rememberCurrentPosition(); -+ -+ m_pDoc->redoCmd(count); -+ allowChangeInsPoint(); -+ -+// Look to see if we need the saved insertion point after the undo -+// if(needSavedPosition()) -+// { -+// -+// We do, so restore insertion point to that value. -+// -+// _setPoint(getSavedPosition()); -+// clearSavedPosition(); -+// } -+ m_pDoc->setDontImmediatelyLayout(false); -+ -+ // Signal PieceTable Changes have finished -+ m_pDoc->notifyPieceTableChangeEnd(); -+ m_iPieceTableState = 0; -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ -+ _generalUpdate(); -+ -+// -+// Do a complete update coz who knows what happened in the undo! -+// -+ PT_DocPosition posEnd = 0; -+ getEditableBounds(true, posEnd); -+ bool bOK = true; -+ bool bMoved = false; -+ while(bOK && !isPointLegal() && (getPoint() < posEnd)) -+ { -+ bOK = _charMotion(true,1); -+ bMoved = true; -+ } -+ if(getPoint() > posEnd) -+ { -+ setPoint(posEnd); -+ bMoved = true; -+ } -+ -+ bOK = true; -+ while(bOK && !isPointLegal() && (getPoint() > 2)) -+ { -+ bOK = _charMotion(false,1); -+ bMoved = true; -+ } -+ if(!bMoved && (getPoint() != posEnd)) -+ { -+ bOK = _charMotion(true,1); -+ bOK = _charMotion(false,1); -+ } -+ -+ setCursorToContext(); -+ _updateInsertionPoint(); -+ notifyListeners(AV_CHG_ALL); -+} -+ -+UT_Error FV_View::cmdSave(void) -+{ -+ // transfer any persistent properties into the doc -+ const gchar ** ppProps = getViewPersistentProps(); -+ m_pDoc->setProperties(ppProps); -+ -+ UT_Error tmpVar; -+ tmpVar = m_pDoc->save(); -+ if (!tmpVar) -+ { -+ notifyListeners(AV_CHG_SAVE); -+ } -+ return tmpVar; -+} -+ -+UT_Error FV_View::cmdSaveAs(const char * szFilename, int ieft, bool cpy) -+{ -+ // transfer any persistent properties into the doc -+ const gchar ** ppProps = getViewPersistentProps(); -+ m_pDoc->setProperties(ppProps); -+ -+ UT_Error tmpVar; -+ tmpVar = static_cast(m_pDoc)->saveAs(szFilename, ieft, cpy); -+ if (!tmpVar && cpy) -+ { -+ notifyListeners(AV_CHG_SAVE); -+ } -+ return tmpVar; -+} -+ -+UT_Error FV_View::cmdSaveAs(const char * szFilename, int ieft) -+{ -+ return cmdSaveAs(szFilename, ieft, true); -+} -+ -+ -+void FV_View::cmdCut(void) -+{ -+ if (isSelectionEmpty()) -+ { -+ // clipboard does nothing if there is no selection -+ return; -+ } -+ if(m_Selection.getSelectionMode() == FV_SelectionMode_TableColumn) -+ { -+ PD_DocumentRange * pDR = m_Selection.getNthSelection(0); -+ PT_DocPosition pos = 0; -+ if(pDR) -+ { -+ pos = pDR->m_pos1 +1; -+ } -+ else -+ { -+ pos = getSelectionAnchor(); -+ if(pos > getPoint()) -+ { -+ pos = getPoint(); -+ } -+ } -+ _clearSelection(); -+ cmdDeleteCol(pos); -+ return; -+ } -+ if(m_Selection.getSelectionMode() == FV_SelectionMode_TableRow) -+ { -+ PD_DocumentRange * pDR = m_Selection.getNthSelection(0); -+ PT_DocPosition pos = 0; -+ if(pDR) -+ { -+ pos = pDR->m_pos1 +1; -+ } -+ else -+ { -+ pos = getSelectionAnchor(); -+ if(pos > getPoint()) -+ { -+ pos = getPoint(); -+ } -+ } -+ _clearSelection(); -+ cmdDeleteRow(pos); -+ return; -+ } -+ // Signal PieceTable Change -+ m_pDoc->notifyPieceTableChangeStart(); -+ -+ // -+ // Disable list updates until after we've finished -+ // -+ m_pDoc->disableListUpdates(); -+ cmdCopy(true); -+ _deleteSelection(); -+ -+ // Signal PieceTable Changes have finished -+ m_pDoc->notifyPieceTableChangeEnd(); -+ m_iPieceTableState = 0; -+ _generalUpdate(); -+ -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ -+ _setPoint(getPoint()); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_ALL); -+ -+} -+ -+// bToClipboard is true if you want to copy to the CLIPBOARD -+// selection on UNIX, as opposed to some PRIMARY selection -+void FV_View::cmdCopy(bool bToClipboard) -+{ -+ if (isSelectionEmpty()) -+ { -+ // clipboard does nothing if there is no selection -+ return; -+ } -+ -+ PD_DocumentRange dr; -+ getDocumentRangeOfCurrentSelection(&dr); -+ m_pApp->copyToClipboard(&dr, bToClipboard); -+ notifyListeners(AV_CHG_CLIPBOARD); -+} -+ -+void FV_View::cmdPaste(bool bHonorFormatting) -+{ -+// -+// Look to see if should paste a table column or row -+// -+ if((m_Selection.getPrevSelectionMode() == FV_SelectionMode_TableColumn) -+ || (m_Selection.getPrevSelectionMode() == FV_SelectionMode_TableRow)) -+ { -+ if(isInTable()) -+ { -+ fl_TableLayout * pTab = getTableAtPos(getPoint()); -+ if(pTab && pTab == m_Selection.getTableLayout()) -+ { -+ m_Selection.pasteRowOrCol(); -+ return; -+ } -+ } -+ } -+ -+ // set UAG markers around everything that the actual paste does -+ // so that undo/redo will treat it as one step. -+ -+ m_pDoc->beginUserAtomicGlob(); -+ -+ // Signal PieceTable Change -+ m_pDoc->notifyPieceTableChangeStart(); -+ -+ // -+ // Disable list updates until after we've finished -+ // -+ m_pDoc->disableListUpdates(); -+ m_pDoc->setDoingPaste(); -+ setCursorWait(); -+ m_pDoc->setDontImmediatelyLayout(true); -+ _doPaste(true, bHonorFormatting); -+ // restore updates and clean up dirty lists -+ m_pDoc->enableListUpdates(); -+ m_pDoc->updateDirtyLists(); -+ clearCursorWait(); -+ -+ // Signal PieceTable Changes have finished -+ m_pDoc->notifyPieceTableChangeEnd(); -+ m_iPieceTableState = 0; -+ -+ m_pDoc->clearDoingPaste(); -+ m_pDoc->endUserAtomicGlob(); -+ m_iPieceTableState = 0; -+ // Move insertion point out of field run if it is in one -+ // -+ _charMotion(true, 0); -+ _makePointLegal(); -+// -+// Do a complete update coz who knows what happened in the paste! -+// -+ -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_ALL); -+} -+ -+void FV_View::cmdPasteSelectionAt(UT_sint32 xPos, UT_sint32 yPos) -+{ -+ // this is intended for the X11 middle mouse paste trick. -+ // -+ // if this view has the selection, we need to remember it -+ // before we warp to the given (x,y) -- or else there won't -+ // be a selection to paste when get there. this is sort of -+ // back door hack and should probably be re-thought. -+ -+ // set UAG markers around everything that the actual paste does -+ // so that undo/redo will treat it as one step. -+ -+ m_pDoc->beginUserAtomicGlob(); -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ if (!isSelectionEmpty()) -+ m_pApp->cacheCurrentSelection(this); -+ cmdCopy(false); -+ warpInsPtToXY(xPos,yPos,true); -+ _doPaste(false, true); -+ m_pApp->cacheCurrentSelection(NULL); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _fixInsertionPointCoords(); -+ _ensureInsertionPointOnScreen(); -+ -+ m_pDoc->endUserAtomicGlob(); -+ m_prevMouseContext = EV_EMC_TEXT; -+ notifyListeners(AV_CHG_ALL); -+} -+ -+UT_Error FV_View::cmdDeleteBookmark(const char* szName) -+{ -+ return _deleteBookmark(szName, true); -+} -+ -+UT_Error FV_View::cmdDeleteHyperlink() -+{ -+ PT_DocPosition pos = getPoint(); -+ UT_DEBUGMSG(("fv_View::cmdDeleteHyperlink: pos %d\n", pos)); -+ UT_Error err= _deleteHyperlink(pos,true); -+ m_prevMouseContext = EV_EMC_TEXT; -+ setCursorToContext(); -+ notifyListeners(AV_CHG_ALL); -+ return err; -+} -+ -+ -+UT_Error FV_View::cmdHyperlinkStatusBar(UT_sint32 xPos, UT_sint32 yPos) -+{ -+ UT_sint32 xClick, yClick; -+ fp_Page* pPage = _getPageForXY(xPos, yPos, xClick, yClick); -+ -+ PT_DocPosition pos; -+ bool bBOL = false; -+ bool bEOL = false; -+ bool isTOC = false; -+ pPage->mapXYToPosition(xClick, yClick, pos, bBOL, bEOL,isTOC); -+ -+ // now get the run at the position and the hyperlink run -+ fp_HyperlinkRun * pH1 = 0; -+ -+ fl_BlockLayout *pBlock = _findBlockAtPosition(pos); -+ PT_DocPosition curPos = pos - pBlock->getPosition(false); -+ -+ fp_Run * pRun = pBlock->getFirstRun(); -+ -+ //find the run at pos1 -+ while(pRun && pRun->getBlockOffset() <= curPos) -+ pRun = pRun->getNextRun(); -+ -+ // this sometimes happens, not sure why -+ //UT_ASSERT(pRun); -+ if(!pRun) -+ return false; -+ -+ // now we have the run immediately after the run in question, so -+ // we step back -+ pRun = pRun->getPrevRun(); -+ UT_ASSERT(pRun); -+ if(!pRun) -+ return false; -+ -+ xxx_UT_DEBUGMSG(("fv_View::cmdHyperlinkStatusBar: run 0x%x, type %d\n", pRun,pRun->getType())); -+ pH1 = pRun->getHyperlink(); -+ -+ // this happens after a deletion of a hyperlink -+ // the mouse processing is in the state of belief -+ // that the processing has not finished yet -- this is not specific -+ // to hyperlinks, it happens with anything on the context menu, except -+ // it goes unobserved since the cursor does not change -+ //UT_ASSERT(pH1); -+ if(!pH1) -+ return false; -+ xxx_UT_DEBUGMSG(("fv_View::cmdHyperlinkStatusBar: msg [%s]\n",pH1->getTarget())); -+ XAP_Frame * pFrame = static_cast (getParentData()); -+ UT_UTF8String url = pH1->getTarget(); -+ url.decodeURL(); -+ pFrame->setStatusMessage(url.utf8_str()); -+ return true; -+} -+ -+ -+UT_Error FV_View::cmdInsertHyperlink(const char * szName) -+{ -+ bool bRet; -+ -+ PT_DocPosition posStart = getPoint(); -+ PT_DocPosition posEnd = posStart; -+ PT_DocPosition iPointOrig = posStart; -+ PT_DocPosition iAnchorOrig = m_Selection.getSelectionAnchor(); -+ -+ if (!isSelectionEmpty()) -+ { -+ if (m_Selection.getSelectionAnchor() < posStart) -+ { -+ posStart = m_Selection.getSelectionAnchor(); -+ } -+ else -+ { -+ posEnd = m_Selection.getSelectionAnchor(); -+ } -+ -+ } -+ else -+ { -+ //No selection -+ XAP_Frame * pFrame = static_cast(getParentData()); -+ UT_ASSERT((pFrame)); -+ -+ pFrame->showMessageBox(AP_STRING_ID_MSG_HyperlinkNoSelection, XAP_Dialog_MessageBox::b_O, XAP_Dialog_MessageBox::a_OK); -+ return false; -+ } -+ -+ bool relLink = false; -+ if (!UT_go_path_is_uri(szName)) -+ relLink = m_pDoc->isBookmarkRelativeLink(szName); -+ // TODO: After strings freeze is lifted, we should -+ // TODO: display a message if relLink is true but -+ // TODO: szName does not stat. -+ -+ if(!UT_go_path_is_uri(szName) && m_pDoc->isBookmarkUnique(szName) && !relLink) -+ { -+ //No bookmark of that name in document, tell user. -+ XAP_Frame * pFrame = static_cast(getParentData()); -+ UT_ASSERT((pFrame)); -+ -+ pFrame->showMessageBox(AP_STRING_ID_MSG_HyperlinkNoBookmark, -+ XAP_Dialog_MessageBox::b_O, -+ XAP_Dialog_MessageBox::a_OK, -+ szName); -+ } -+ -+ // Hack for bug 2940 -+ if (posStart == 1) posStart++; -+ -+ // the selection has to be within a single block -+ // we could implement hyperlinks spaning arbitrary part of the document -+ // but then we could not use in the output and -+ // I see no obvious need for hyperlinks to span more than a single block -+ fl_BlockLayout * pBl1 = _findBlockAtPosition(posStart); -+ fl_BlockLayout * pBl2 = _findBlockAtPosition(posEnd); -+// -+// Handle corner case of selection from outside the left column -+// -+ if(isInFootnote(posStart)) -+ { -+ if((pBl1 != NULL) && (pBl1->getPosition(true) == posStart)) -+ { -+ if(posEnd > posStart+1) -+ { -+ posStart++; -+ } -+ } -+ } -+ if(isInEndnote(posStart)) -+ { -+ if((pBl1 != NULL) && (pBl1->getPosition(true) == posStart)) -+ { -+ if(posEnd > posStart+1) -+ { -+ posStart++; -+ } -+ } -+ } -+ if(pBl1 != pBl2) -+ { -+ XAP_Frame * pFrame = static_cast(getParentData()); -+ UT_ASSERT((pFrame)); -+ -+ pFrame->showMessageBox(AP_STRING_ID_MSG_HyperlinkCrossesBoundaries, XAP_Dialog_MessageBox::b_O, XAP_Dialog_MessageBox::a_OK); -+ -+ return false; -+ } -+ if(isTOCSelected()) -+ { -+// -+// Fixme place message box here -+// -+ return false; -+ -+ } -+ // Silently fail (TODO: pop up message) if we try to nest hyperlinks. -+ if (_getHyperlinkInRange(posStart, posEnd) != NULL) -+ return false; -+// -+// Under sum1 induced conditions posEnd could give the same block pointer -+// despite being past the end of the block. This extra fail-safe code -+// prevents this. -+// -+ if((pBl1->getPosition() + pBl1->getLength() -1) < posEnd) -+ { -+ return false; -+ } -+ gchar * pAttr[4]; -+ -+ UT_uint32 target_len = strlen(szName); -+ gchar * target = new gchar[ target_len+ 2]; -+ -+ if(UT_go_path_is_uri(szName) || relLink) -+ { -+ strncpy(target, static_cast(szName), target_len + 1); -+ } -+ else -+ { -+ target[0] = '#'; -+ strncpy(target + 1, static_cast(szName), target_len + 1); -+ } -+ -+ gchar target_l[] = "xlink:href"; -+ pAttr [0] = &target_l[0]; -+ pAttr [1] = &target[0]; -+ pAttr [2] = 0; -+ pAttr [3] = 0; -+ -+ UT_DEBUGMSG(("fv_View::cmdInsertHyperlink: target \"%s\"\n", target)); -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ // we first insert the end run, so that we can use it as a stop -+ // after inserting the start run when marking the runs in between -+ // as a hyperlink -+ bRet = m_pDoc->insertObject(posEnd, PTO_Hyperlink, NULL, NULL); -+ -+ if(bRet) -+ { -+ const gchar ** pAttrs = const_cast(pAttr); -+ const gchar ** pProps = 0; -+ bRet = m_pDoc->insertObject(posStart, PTO_Hyperlink, pAttrs, pProps); -+ } -+ -+ if(bRet) -+ { -+ // because we have inserted two objects around the selection -+ // boundaries the original insetion point and selection anchor -+ // are now shifted, so we need to fix them -+ setPoint(iPointOrig+1); -+ m_Selection.setSelectionAnchor(iAnchorOrig + 1); -+ } -+ -+ delete [] target; -+ -+ // Signal piceTable is stable again -+ _restorePieceTableState(); -+ -+ _generalUpdate(); -+ -+ return bRet; -+ -+} -+ -+/******************************************************************/ -+UT_Error FV_View::cmdInsertBookmark(const char * szName) -+{ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ bool bRet; -+ -+ PT_DocPosition posStart = getPoint(); -+ PT_DocPosition posEnd = posStart; -+ -+ if (!isSelectionEmpty()) -+ { -+ if (m_Selection.getSelectionAnchor() < posStart) -+ { -+ posStart = m_Selection.getSelectionAnchor(); -+ } -+ else -+ { -+ posEnd = m_Selection.getSelectionAnchor(); -+ } -+ } -+ -+ // we cannot bookmark lesser position than 2, because the bookmark object has to be located -+ // withing a block; this was the cause of bug 7128 -+ // (we might consider one day to allow the bookmark object before the first block strux, but the -+ // complications this would cause are possibly not worth it) -+ if(posStart < 2) -+ posStart = 2; -+ -+ posEnd++; -+ -+ fl_BlockLayout * pBL1 =_findBlockAtPosition(posStart); -+ fl_BlockLayout * pBL2 =_findBlockAtPosition(posEnd); -+// -+// Handle corner case of selection from outside the left column -+// -+ if((pBL1!= NULL) && isInFootnote(posStart) && (pBL1->getPosition(true) == posStart)) -+ { -+ if(posEnd > posStart+1) -+ { -+ posStart++; -+ } -+ } -+ if((pBL1 != NULL) && isInEndnote(posStart) && (pBL1->getPosition(true) == posStart)) -+ { -+ if(posEnd > posStart+1) -+ { -+ posStart++; -+ } -+ } -+ if(pBL1 != pBL2) -+ { -+// -+// Fixme put message boxes here -+// -+ _restorePieceTableState(); -+ return false; -+ } -+ if(isTOCSelected()) -+ { -+// -+// Fixme put message boxes here -+// -+ _restorePieceTableState(); -+ return false; -+ } -+ PT_DocPosition posNext = 0; -+ if(pBL1->getNext()) -+ { -+ posNext = pBL1->getNext()->getPosition(true); -+ } -+ else -+ { -+ posNext = pBL1->getPosition(true) + pBL1->getLength(); -+ } -+ if((posStart <= pBL1->getPosition(true)) || (posEnd > posNext)) -+ { -+ _restorePieceTableState(); -+ return false; -+ } -+ -+ if(!m_pDoc->isBookmarkUnique(static_cast(szName))) -+ { -+ //bookmark already exists -- remove it and then reinsert -+ UT_DEBUGMSG(("fv_View::cmdInsertBookmark: bookmark \"%s\" exists - removing\n", szName)); -+ _deleteBookmark(static_cast(szName), false, &posStart, &posEnd); -+ } -+ -+ gchar * pAttr[6]; -+ -+ gchar name_l [] = "name"; -+ gchar type_l [] = "type"; -+ gchar name[BOOKMARK_NAME_SIZE + 1]; -+ strncpy(name, static_cast(szName), BOOKMARK_NAME_SIZE); -+ name[BOOKMARK_NAME_SIZE] = 0; -+ -+ gchar type[] = "start"; -+ pAttr [0] = &name_l[0]; -+ pAttr [1] = &name[0]; -+ pAttr [2] = &type_l[0]; -+ pAttr [3] = &type[0]; -+ pAttr [4] = 0; -+ pAttr [5] = 0; -+ -+ UT_DEBUGMSG(("fv_View::cmdInsertBookmark: szName \"%s\"\n", szName)); -+ -+ const gchar ** pAttrs = const_cast(pAttr); -+ const gchar ** pProps = 0; -+ bRet = m_pDoc->insertObject(posStart, PTO_Bookmark, pAttrs, pProps); -+ -+ if(bRet) -+ { -+ strncpy(type,static_cast("end"), 3); -+ type[3] = 0; -+ bRet = m_pDoc->insertObject(posEnd, PTO_Bookmark, pAttrs, pProps); -+ } -+ -+ -+ // Signal piceTable is stable again -+ _restorePieceTableState(); -+ _generalUpdate(); -+ -+ return bRet; -+ -+} -+ -+ -+/*****************************************************************/ -+ -+ -+UT_Error FV_View::cmdInsertTOC(void) -+{ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ m_pDoc->beginUserAtomicGlob(); -+ bool bRet = false; // was not initialised; since ret value is -+ // UT_Error, false should correspond to OK. Tomas -+ -+ -+ if (!isSelectionEmpty()) -+ { -+ _deleteSelection(); -+ _generalUpdate(); -+ fl_BlockLayout * pBL = _findBlockAtPosition(getPoint()); -+ if(pBL != NULL) -+ { -+ fl_ContainerLayout * pCL = pBL->myContainingLayout(); -+ if(pCL->getContainerType() != FL_CONTAINER_DOCSECTION) -+ { -+ m_pDoc->endUserAtomicGlob(); -+ -+ // Signal piceTable is stable again -+ _restorePieceTableState(); -+ _generalUpdate(); -+ notifyListeners(AV_CHG_MOTION | AV_CHG_ALL); -+ return bRet; -+ } -+ } -+ else -+ { -+ m_pDoc->endUserAtomicGlob(); -+ -+ // Signal piceTable is stable again -+ _restorePieceTableState(); -+ _generalUpdate(); -+ notifyListeners(AV_CHG_MOTION | AV_CHG_ALL); -+ return bRet; -+ } -+ } -+// -+// Check if there is a hyperlink here -+// -+ if(getHyperLinkRun(getPoint()) != NULL) -+ { -+ return false; -+ } -+ if(!isPointLegal()) -+ { -+ _charMotion(true,1); -+ } -+ PT_DocPosition posEnd = 0; -+ getEditableBounds(true, posEnd); -+ if(getPoint() >= posEnd && !isPointLegal()) -+ { -+ _charMotion(false,1); -+ } -+// -+// Close off the current block -+// -+ insertParagraphBreak(); -+// -+// insert just before this block to make the TOC gets inserted just BEFORE -+// the Block we just created. -+// -+// we want this sort of structure in the PT -+// -+// | -+// | -+// Point is here after insert TOC-------------------------| -+// -+ fl_BlockLayout * pBL = getCurrentBlock(); -+ PT_DocPosition pos = pBL->getPosition(true); -+ if((pBL->getNext() == NULL) || (pBL->getPrev() == NULL)) -+ { -+ insertParagraphBreak(); -+ pBL = getCurrentBlock(); -+ pos = pBL->getPosition(true); -+ } -+ if(pBL != NULL) -+ { -+ fl_ContainerLayout * pCL = pBL->myContainingLayout(); -+ if(pCL->getContainerType() != FL_CONTAINER_DOCSECTION) -+ { -+ // Signal piceTable is stable again -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ notifyListeners(AV_CHG_MOTION | AV_CHG_ALL); -+ return bRet; -+ } -+ } -+ else -+ { -+ -+ // Signal piceTable is stable again -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ notifyListeners(AV_CHG_MOTION | AV_CHG_ALL); -+ return bRet; -+ } -+ m_pDoc->insertStrux(pos,PTX_SectionTOC); -+ pos++; -+ m_pDoc->insertStrux(pos,PTX_EndTOC); -+ setPoint(pos+1); -+ insertParaBreakIfNeededAtPos(getPoint()); -+ // -+ // Now move the point forward until we're in a legal position -+ // -+ _makePointLegal(); -+ // Signal piceTable is stable again -+ _restorePieceTableState(); -+ _generalUpdate(); -+ m_pDoc->endUserAtomicGlob(); -+ notifyListeners(AV_CHG_MOTION | AV_CHG_ALL); -+ -+ return bRet; -+ -+} -+ -+ -+/*****************************************************************/ -+UT_Error FV_View::cmdInsertField(const char* szName, const gchar ** extra_attrs, const gchar ** extra_props) -+{ -+ bool bResult = true; -+ -+/* -+ currently unused -+ fl_BlockLayout* pBL = _findBlockAtPosition(getPoint()); -+*/ -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ _insertField(szName, extra_attrs,extra_props); -+ -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ _generalUpdate(); -+ -+ _fixInsertionPointCoords(); -+ if (!_ensureInsertionPointOnScreen()) -+ { -+// -+// Handle End of Paragraph case -+// -+ PT_DocPosition posEOD; -+ getEditableBounds(true, posEOD); -+ if(getPoint() == posEOD) -+ { -+ m_bPointEOL = true; -+ } -+ _fixInsertionPointCoords(); -+ } -+ return bResult; -+} -+ -+UT_Error FV_View::cmdInsertGraphic(FG_Graphic* pFG) -+{ -+ bool bDidGlob = false; -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ if (!isSelectionEmpty() && !m_FrameEdit.isActive()) -+ { -+ bDidGlob = true; -+ m_pDoc->beginUserAtomicGlob(); -+ _deleteSelection(); -+ } -+ else if(m_FrameEdit.isActive()) -+ { -+ m_FrameEdit.setPointInside(); -+ } -+ /* -+ Create a unique identifier for the data item. -+ */ -+ UT_UUID *uuid = m_pDoc->getNewUUID(); -+ UT_return_val_if_fail(uuid != NULL, UT_ERROR); -+ UT_UTF8String s; -+ uuid->toString(s); -+ -+ UT_Error errorCode = _insertGraphic(pFG, s.utf8_str()); -+ if(m_FrameEdit.isActive()) -+ { -+ m_FrameEdit.setMode(FV_FrameEdit_NOT_ACTIVE); -+ } -+ -+ _restorePieceTableState(); -+ -+ _generalUpdate(); -+ if (bDidGlob) -+ m_pDoc->endUserAtomicGlob(); -+ _updateInsertionPoint(); -+ -+ return errorCode; -+} -+ -+UT_Error FV_View::cmdInsertPositionedGraphic(FG_Graphic* pFG) -+{ -+ fl_BlockLayout * pBlock = NULL; -+ fp_Run * pRun = NULL; -+ UT_sint32 xCaret, yCaret; -+ UT_uint32 heightCaret; -+ UT_sint32 xCaret2, yCaret2; -+ bool bDirection; -+ bool bEOL = false; -+ _findPositionCoords(getPoint(), bEOL, xCaret, yCaret, xCaret2, yCaret2, heightCaret, bDirection, &pBlock, &pRun); -+ UT_return_val_if_fail(pBlock,UT_ERROR); -+ return cmdInsertPositionedGraphic(pFG,xCaret,yCaret); -+ -+} -+ -+ -+UT_Error FV_View::cmdInsertPositionedGraphic(FG_Graphic* pFG,UT_sint32 mouseX, UT_sint32 mouseY) -+{ -+ m_pDoc->beginUserAtomicGlob(); -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ if (!isSelectionEmpty()) -+ { -+ _clearSelection(); -+ } -+ -+ /* -+ Create a unique identifier for the data item. -+ */ -+ UT_UUID *uuid = m_pDoc->getNewUUID(); -+ UT_return_val_if_fail(uuid != NULL, UT_ERROR); -+ UT_UTF8String s; -+ uuid->toString(s); -+ // -+ // Find a document position close to the requested position -+ // -+ PT_DocPosition pos = getDocPositionFromXY(mouseX,mouseY); -+ fl_BlockLayout * pBlock = getBlockAtPosition(pos); -+ fp_Run * pRun = NULL; -+ bool bEOL,bDir; -+ bEOL = false; -+ UT_sint32 x1,y1,x2,y2,iHeight; -+ if(pBlock) -+ { -+ pRun = pBlock->findPointCoords(pos,bEOL,x1,y1,x2,y2,iHeight,bDir); -+ } -+ fp_Line * pLine = pRun->getLine(); -+ if(pLine == NULL) -+ { -+ return false; -+ } -+ -+ // Also get max width, height -+ -+ fl_DocSectionLayout * pDSL = pBlock->getDocSectionLayout(); -+ double maxW = static_cast(pDSL->getActualColumnWidth())*0.5/UT_LAYOUT_RESOLUTION; -+ double maxH = static_cast(pDSL->getActualColumnHeight())*0.5/ UT_LAYOUT_RESOLUTION; -+ // -+ // OK calculate all the properties of this image -+ // -+ UT_String sWidth; -+ UT_String sHeight; -+ double ratw = 1.0; -+ double rath = 1.0; -+ double rat = 1.0; -+ double dw = static_cast(pFG->getWidth()); -+ double dh = static_cast(pFG->getHeight()); -+ -+ if(dw > maxW/2.) -+ { -+ ratw = maxW/dw; -+ } -+ if(dh > maxH/2.) -+ { -+ rath = maxH/dh; -+ } -+ if(ratw < rath) -+ { -+ rat = ratw; -+ } -+ else -+ { -+ rat = rath; -+ } -+ // This preserves the aspect ratio and limits the size of the images -+ dw = dw*rat; -+ dh = dh*rat; -+ sWidth = UT_formatDimensionedValue(dw,"in", NULL); -+ sHeight = UT_formatDimensionedValue(dh,"in", NULL); -+// -+// Create a dataid for the object -+// -+ -+ const char * dataID = pFG->createDataItem(m_pDoc,s.utf8_str()); -+ UT_String sFrameProps; -+ UT_String sProp; -+ UT_String sVal; -+ sProp = "frame-type"; -+ sVal = "image"; -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+// -+// Turn off the borders. -+// -+ sProp = "top-style"; -+ sVal = "none"; -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+ sProp = "right-style"; -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+ sProp = "left-style"; -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+ sProp = "bot-style"; -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+// -+// Set width/Height -+// -+ sProp = "frame-width"; -+ sVal = sWidth; -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+ sProp = "frame-height"; -+ sVal = sHeight; -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+ double xpos = 0.0; -+ double ypos= 0.0; -+ -+ sProp = "position-to"; -+ sVal = "column-above-text"; -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+ if(isInHdrFtr(pos)) -+ { -+ clearHdrFtrEdit(); -+ warpInsPtToXY(0,0,false); -+ pos = getPoint(); -+ } -+ -+// -+// Now calculate the Y offset to the Column -+// -+ fp_Column * pCol = static_cast(pLine->getColumn()); -+ ypos = static_cast(mouseY)/static_cast(UT_LAYOUT_RESOLUTION); -+ sProp = "frame-col-ypos"; -+ sVal = UT_formatDimensionedValue(ypos,"in", NULL); -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+ sProp = "wrap-mode"; -+ sVal = "wrapped-both"; -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+ UT_sint32 iWidth = static_cast(dw*UT_LAYOUT_RESOLUTION); -+ UT_sint32 iposx = mouseX - pCol->getX() - iWidth/2; -+ UT_sint32 iColW = static_cast(maxW*2.*UT_LAYOUT_RESOLUTION); -+ if((iposx + iWidth) > (pCol->getX() + iColW)) -+ { -+ iposx = iColW - iWidth - pCol->getX(); -+ } -+ if(iposx < pCol->getX()) -+ { -+ iposx = 0; -+ } -+ -+ UT_DEBUGMSG(("iposx %d pCol->getX() %d \n",iposx,pCol->getX())); -+ xpos = static_cast(iposx)/static_cast(UT_LAYOUT_RESOLUTION); -+ -+ sProp = "frame-col-xpos"; -+ sVal = UT_formatDimensionedValue(xpos,"in", NULL); -+ UT_DEBUGMSG((" %s %s \n",sProp.c_str(),sVal.c_str())); -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+// -+// Wrapped Mode -+// -+ sProp = "wrap-mode"; -+ sVal = "wrapped-both"; -+ UT_String_setProperty(sFrameProps,sProp,sVal); -+// -+// Now define the Frame attributes strux -+// -+ const gchar * attributes[5] = {PT_STRUX_IMAGE_DATAID, -+ NULL,"props",NULL,NULL}; -+ attributes[1] = dataID; -+ attributes[3] = sFrameProps.c_str(); -+// -+// This should place the the frame strux immediately after the block containing -+// position posXY. -+// It returns the Frag_Strux of the new frame. -+// -+ fl_BlockLayout * pBL = pBlock; -+ if((pBL == NULL) || (pRun == NULL)) -+ { -+ return UT_ERROR; -+ } -+ fl_BlockLayout * pPrevBL = pBL; -+ while(pBL && ((pBL->myContainingLayout()->getContainerType() == FL_CONTAINER_ENDNOTE) || (pBL->myContainingLayout()->getContainerType() == FL_CONTAINER_FOOTNOTE) || (pBL->myContainingLayout()->getContainerType() == FL_CONTAINER_TOC)|| (pBL->myContainingLayout()->getContainerType() == FL_CONTAINER_FRAME))) -+ { -+ UT_DEBUGMSG(("Skipping Block %x \n",pBL)); -+ pPrevBL = pBL; -+ pBL = pBL->getPrevBlockInDocument(); -+ } -+ if(pBL == NULL) -+ { -+ pBL = pPrevBL; -+ } -+ UT_ASSERT((pBL->myContainingLayout()->getContainerType() != FL_CONTAINER_HDRFTR) -+ && (pBL->myContainingLayout()->getContainerType() != FL_CONTAINER_SHADOW)); -+ pos = pBL->getPosition(); -+ pf_Frag_Strux * pfFrame = NULL; -+ m_pDoc->insertStrux(pos,PTX_SectionFrame,attributes,NULL,&pfFrame); -+ PT_DocPosition posFrame = pfFrame->getPos(); -+ m_pDoc->insertStrux(posFrame+1,PTX_EndFrame); -+ insertParaBreakIfNeededAtPos(posFrame+2); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ m_pDoc->endUserAtomicGlob(); -+ _generalUpdate(); -+ if(!isPointLegal()) -+ { -+ _makePointLegal(); -+ } -+ _ensureInsertionPointOnScreen(); -+ notifyListeners(AV_CHG_MOTION | AV_CHG_ALL); -+ return UT_OK; -+} -+ -+/*! -+ * This method inserts a MathML object and it's Latex representation -+ * at the current insertion point. -+ * It leaves the Object selected so it can be altered as needed. -+ */ -+bool FV_View::cmdInsertLatexMath(UT_UTF8String & sLatex, -+ UT_UTF8String & sMath) -+{ -+ // -+ // First create the Data Items -+ // -+ UT_UTF8String sMathName; -+ UT_UTF8String sLatexName; -+ sMathName = "MathLatex"; -+ sLatexName = "LatexMath"; -+ UT_uint32 uid = m_pDoc->getUID(UT_UniqueId::Image); -+ UT_UTF8String sUID; -+ UT_UTF8String_sprintf(sUID,"%d",uid); -+ sMathName += sUID; -+ sLatexName += sUID; -+ // -+ // Insert these into the Piece Table -+ // -+ UT_ByteBuf mathBuf; -+ UT_ByteBuf latexBuf; -+ mathBuf.ins(0,reinterpret_cast(sMath.utf8_str()),static_cast(sMath.size())); -+ latexBuf.ins(0,reinterpret_cast(sLatex.utf8_str()),static_cast(sLatex.size())); -+ m_pDoc->createDataItem(sMathName.utf8_str(),false,&mathBuf,NULL,NULL); -+ m_pDoc->createDataItem(sLatexName.utf8_str(),false,&latexBuf,NULL,NULL); -+ // OK Insert the MathML Object -+ const gchar * atts[9]={"dataid",NULL,"latexid",NULL,"props",NULL,NULL,NULL,NULL}; -+ atts[1] = static_cast(sMathName.utf8_str()); -+ atts[3] = static_cast(sLatexName.utf8_str()); -+ const gchar *cur_style = NULL; -+ getStyle(&cur_style); -+ if((cur_style != NULL) && (*cur_style) && (strcmp(cur_style,"None") != 0)) -+ { -+ atts[6] = PT_STYLE_ATTRIBUTE_NAME; -+ atts[7] = cur_style; -+ } -+ -+ bool bDidGlob = false; -+ const gchar ** props = NULL; -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ PT_DocPosition pos = getPoint(); -+ if (!isSelectionEmpty()) -+ { -+ getCharFormat(&props,false,pos); -+ bDidGlob = true; -+ m_pDoc->beginUserAtomicGlob(); -+ _deleteSelection(); -+ } -+ else -+ { -+ getCharFormat(&props,false,pos); -+ } -+ pos = getPoint(); -+ UT_UTF8String sNewProps; -+ UT_UTF8String sProp; -+ UT_UTF8String sVal; -+ UT_sint32 i = 0; -+ if(props) -+ { -+ while(props[i] != NULL) -+ { -+ sProp = props[i]; -+ sVal = props[i+1]; -+ UT_UTF8String_setProperty(sNewProps,sProp,sVal); -+ i +=2; -+ } -+ g_free(props); -+ } -+ atts[5] = sNewProps.utf8_str(); -+ m_pDoc->insertObject(pos,PTO_Math,atts,NULL); -+ -+ if (bDidGlob) -+ m_pDoc->endUserAtomicGlob(); -+ -+ _generalUpdate(); -+ _restorePieceTableState(); -+ cmdSelect(pos,pos+1); -+ return true; -+} -+ -+/*! -+ * This method inserts a MathML object at the point presented. -+ * It assumes that a data item with a name of the supplied filename has -+ * already been inserted. -+ */ -+bool FV_View::cmdInsertMathML(const char * szUID,PT_DocPosition pos) -+{ -+ UT_DEBUGMSG(("Insert Math Object at %d name %s \n",pos,szUID)); -+ const gchar * atts[5]={"dataid",NULL,NULL,NULL,NULL}; -+ atts[1] = szUID; -+ const gchar *cur_style = NULL; -+ getStyle(&cur_style); -+ if((cur_style != NULL) && (*cur_style) && (strcmp(cur_style,"None") != 0)) -+ { -+ atts[2] = PT_STYLE_ATTRIBUTE_NAME; -+ atts[3] = cur_style; -+ } -+ bool bDidGlob = false; -+ const gchar ** props = NULL; -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ if (!isSelectionEmpty()) -+ { -+ bDidGlob = true; -+ m_pDoc->beginUserAtomicGlob(); -+ _deleteSelection(); -+ } -+ _makePointLegal(); -+ getCharFormat(&props,false,getPoint()); -+ m_pDoc->insertObject(getPoint(),PTO_Math,atts,props); -+ -+ if (bDidGlob) -+ m_pDoc->endUserAtomicGlob(); -+ -+ _generalUpdate(); -+ -+ _restorePieceTableState(); -+ _updateInsertionPoint(); -+ return true; -+} -+ -+ -+/*! -+ * This method inserts a Embed object at the point presented. -+ * The calling routine should pass in a pointer to bytebuf that represents the -+ * object. -+ * Also needed are strings for the Mime-type and the type of Embeded object. -+ * -+ * eg for a GNOME-Office chart we'll have MIME-TYPE "application/chart+xml" -+ * and sProps="embed-type: GOChart"; -+ */ -+bool FV_View::cmdInsertEmbed(UT_ByteBuf * pBuf,PT_DocPosition pos,const char * szMime,const char * szProps) -+{ -+ -+ const gchar * atts[7]={"dataid",NULL,"props",NULL,NULL,NULL,NULL}; -+ bool bRepeat = true; -+ UT_UTF8String sUID; -+ UT_uint32 uid = 0; -+ while(bRepeat) -+ { -+ uid = m_pDoc->getUID(UT_UniqueId::Image); -+ UT_UTF8String_sprintf(sUID,"%d",uid); -+ // -+ // Make sure data item is unique! -+ // -+ bRepeat = m_pDoc->getDataItemDataByName(sUID.utf8_str(),NULL,NULL,NULL); -+ } -+ atts[1] = sUID.utf8_str(); -+ const gchar *cur_style = NULL; -+ const char * mimetypeGOChart = g_strdup(szMime); -+ UT_String sBuf(reinterpret_cast(pBuf->getPointer(0)),pBuf->getLength()); -+ UT_DEBUGMSG(("Chart text is... \n %s \n",sBuf.c_str())); -+ bool result = m_pDoc->createDataItem(sUID.utf8_str(),false,pBuf,mimetypeGOChart, NULL); -+ if(!result) -+ { -+ return result; -+ } -+ getStyle(&cur_style); -+ if((cur_style != NULL) && (*cur_style) && (strcmp(cur_style,"None") != 0)) -+ { -+ atts[4] = PT_STYLE_ATTRIBUTE_NAME; -+ atts[5] = cur_style; -+ } -+ bool bDidGlob = false; -+ const gchar ** props = NULL; -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ if (!isSelectionEmpty()) -+ { -+ bDidGlob = true; -+ m_pDoc->beginUserAtomicGlob(); -+ _deleteSelection(); -+ // Reevaluate pos after deleting the selection -+ pos = getPoint(); -+ } -+ getCharFormat(&props,false,pos); -+ UT_UTF8String sFullProps; -+ UT_UTF8String sProp,sVal; -+ UT_UTF8String sProps; -+ UT_sint32 i = 0; -+ if(props) -+ { -+ for(i=0;props[i] != NULL;i+=2) -+ { -+ sProp = props[i]; -+ sVal = props[i+1]; -+ UT_UTF8String_setProperty(sFullProps,sProp,sVal); -+ } -+ g_free(props); -+ } -+ sProps = szProps; -+ UT_DEBUGMSG(("Supplied props %s \n",sProps.utf8_str())); -+ UT_UTF8String_addPropertyString(sFullProps,sProps); -+ UT_DEBUGMSG(("Property String at Update Object is %s \n",sFullProps.utf8_str())); -+ atts[3]=sFullProps.utf8_str(); -+ m_pDoc->insertObject(pos,PTO_Embed,atts,NULL); -+ if (bDidGlob) -+ m_pDoc->endUserAtomicGlob(); -+ -+ _generalUpdate(); -+ -+ _restorePieceTableState(); -+ _updateInsertionPoint(); -+ cmdSelect(pos,pos+1); -+ return true; -+} -+ -+/*! -+ * This method updates the Embedded object currently selected with a new -+ * object defined with the supplied bytebuffer, as well as strings to represent -+ * the MIME/Type and Object type. -+ * -+ * eg for a GNOME-Office chart we'll have MIME-TYPE "application/chart+xml" -+ * and sProps="embed-type: GOChart"; -+ */ -+bool FV_View::cmdUpdateEmbed(UT_ByteBuf * pBuf, const char * szMime, const char * szProps) -+{ -+ if (isSelectionEmpty()) -+ { -+ return false; -+ } -+ PT_DocPosition pos1 = getPoint(); -+ PT_DocPosition pos2 = getSelectionAnchor(); -+ PT_DocPosition posTemp = 0; -+ if(pos2 < pos1) -+ { -+ posTemp = pos2; -+ pos2 = pos1; -+ pos1 = posTemp; -+ } -+ fl_BlockLayout * pBL = getCurrentBlock(); -+ if(!pBL) -+ return false; -+ fp_Run * pRun; -+ UT_sint32 xPoint,yPoint,xPoint2,yPoint2,iPointHeight; -+ bool bDirection; -+ pRun = pBL->findPointCoords(pos1, false, xPoint, -+ yPoint, xPoint2, yPoint2, -+ iPointHeight, bDirection); -+ if(pRun && (pRun->getType() != FPRUN_EMBED) ) -+ { -+ pos1 = pos2; -+ } -+ pRun = pBL->findPointCoords(pos1, false, xPoint, -+ yPoint, xPoint2, yPoint2, -+ iPointHeight, bDirection); -+ if(pRun == NULL) -+ { -+ return false; -+ } -+ if(pRun->getType() != FPRUN_EMBED) -+ { -+ return false; -+ } -+ const gchar * atts[7]={"dataid",NULL,"props",NULL,NULL,NULL,NULL}; -+ bool bRepeat = true; -+ UT_UTF8String sUID; -+ UT_uint32 uid = 0; -+ while(bRepeat) -+ { -+ uid = m_pDoc->getUID(UT_UniqueId::Image); -+ UT_UTF8String_sprintf(sUID,"%d",uid); -+ // -+ // Make sure data item is unique! -+ // -+ bRepeat = m_pDoc->getDataItemDataByName(sUID.utf8_str(),NULL,NULL,NULL); -+ } -+ atts[1] = sUID.utf8_str(); -+ const char * mimetypeGOChart = g_strdup(szMime); -+ bool bres = m_pDoc->createDataItem(sUID.utf8_str(),false,pBuf,mimetypeGOChart, NULL); -+ UT_return_val_if_fail(bres,false) -+ const gchar *cur_style = NULL; -+ getStyle(&cur_style); -+ if((cur_style != NULL) && (*cur_style) && (strcmp(cur_style,"None") != 0)) -+ { -+ atts[4] = PT_STYLE_ATTRIBUTE_NAME; -+ atts[5] = cur_style; -+ } -+ const gchar ** props = NULL; -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ m_pDoc->beginUserAtomicGlob(); -+ getCharFormat(&props,false,pos1); -+ UT_UTF8String sFullProps; -+ UT_UTF8String sProp,sVal; -+ UT_UTF8String sProps; -+ sProps = szProps; -+ UT_sint32 i = 0; -+ if(props) -+ { -+ for(i=0;props[i] != NULL;i+=2) -+ { -+ sProp = props[i]; -+ sVal = props[i+1]; -+ UT_DEBUGMSG(("Update Embed Prop %s val %s \n",props[i],props[i+1])); -+ UT_UTF8String_setProperty(sFullProps,sProp,sVal); -+ } -+ g_free(props); -+ } -+ UT_DEBUGMSG(("Supplied props %s \n",sProps.utf8_str())); -+ UT_UTF8String_addPropertyString(sFullProps,sProps); -+ atts[3]=sFullProps.utf8_str(); -+ UT_DEBUGMSG(("Property String at Update Object is %s \n",atts[3])); -+ _deleteSelection(); -+ m_pDoc->insertObject(pos1,PTO_Embed,atts,NULL); -+ m_pDoc->endUserAtomicGlob(); -+ -+ _generalUpdate(); -+ _restorePieceTableState(); -+ _updateInsertionPoint(); -+ cmdSelect(pos1,pos1+1); -+ return true; -+} -+ -+/*! -+ * This method updates the Embedded object in pRun with a new -+ * object defined with the supplied bytebuffer, as well as strings to represent -+ * the MIME/Type and Object type. -+ * -+ * eg for a GNOME-Office chart we'll have MIME-TYPE "application/chart+xml" -+ * and sProps="embed-type: GOChart"; -+ */ -+bool FV_View::cmdUpdateEmbed(fp_Run * pRun, UT_ByteBuf * pBuf, const char * szMime, const char * szProps) -+{ -+ if(pRun == NULL || pRun->getType() != FPRUN_EMBED) -+ { -+ return false; -+ } -+ PT_DocPosition pos; -+ bool flag; -+ pRun->mapXYToPosition(0, 0, pos, flag, flag, flag); -+ cmdSelect (pos, pos+1); -+ const gchar * atts[7]={"dataid",NULL,"props",NULL,NULL,NULL,NULL}; -+ bool bRepeat = true; -+ UT_UTF8String sUID; -+ UT_uint32 uid = 0; -+ while(bRepeat) -+ { -+ uid = m_pDoc->getUID(UT_UniqueId::Image); -+ UT_UTF8String_sprintf(sUID,"%d",uid); -+ // -+ // Make sure data item is unique! -+ // -+ bRepeat = m_pDoc->getDataItemDataByName(sUID.utf8_str(),NULL,NULL,NULL); -+ } -+ atts[1] = sUID.utf8_str(); -+ const char * mimetypeGOChart = g_strdup(szMime); -+ bool bres = m_pDoc->createDataItem(sUID.utf8_str(),false,pBuf,mimetypeGOChart, NULL); -+ UT_return_val_if_fail(bres,false) -+ const gchar *cur_style = NULL; -+ getStyle(&cur_style); -+ if((cur_style != NULL) && (*cur_style) && (strcmp(cur_style,"None") != 0)) -+ { -+ atts[4] = PT_STYLE_ATTRIBUTE_NAME; -+ atts[5] = cur_style; -+ } -+ const gchar ** props = NULL; -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ m_pDoc->beginUserAtomicGlob(); -+ getCharFormat(&props,false,pos); -+ UT_UTF8String sFullProps; -+ UT_UTF8String sProp,sVal; -+ UT_UTF8String sProps; -+ sProps = szProps; -+ UT_sint32 i = 0; -+ if(props) -+ { -+ for(i=0;props[i] != NULL;i+=2) -+ { -+ sProp = props[i]; -+ // Filter out size properties -+ if (sProp == "width" || sProp == "height" || sProp == "descent" -+ || sProp == "ascent") -+ sVal=NULL; -+ else -+ sVal = props[i+1]; -+ UT_DEBUGMSG(("Update Embed Prop %s val %s \n",props[i],props[i+1])); -+ UT_UTF8String_setProperty(sFullProps,sProp,sVal); -+ } -+ g_free(props); -+ } -+ UT_DEBUGMSG(("Supplied props %s \n",sProps.utf8_str())); -+ UT_UTF8String_addPropertyString(sFullProps,sProps); -+ atts[3]=sFullProps.utf8_str(); -+ UT_DEBUGMSG(("Property String at Update Object is %s \n",atts[3])); -+ m_pDoc->changeSpanFmt(PTC_AddFmt, pos, pos+1, atts, NULL); -+ m_pDoc->endUserAtomicGlob(); -+ -+ _generalUpdate(); -+ _restorePieceTableState(); -+ _updateInsertionPoint(); -+ cmdSelect(pos,pos+1); -+ return true; -+} -+ -+/*! -+ * This method deletes the Embedded object in pRun. -+ */ -+bool FV_View::cmdDeleteEmbed(fp_Run * pRun) -+{ -+ if(pRun == NULL || pRun->getType() != FPRUN_EMBED) -+ { -+ return false; -+ } -+ PT_DocPosition pos; -+ bool flag; -+ pRun->mapXYToPosition(0, 0, pos, flag, flag, flag); -+ cmdSelect (pos, pos+1); -+ _saveAndNotifyPieceTableChange(); -+ m_pDoc->beginUserAtomicGlob(); -+ _deleteSelection(); -+ m_pDoc->endUserAtomicGlob(); -+ -+ _generalUpdate(); -+ _restorePieceTableState(); -+ _updateInsertionPoint(); -+ cmdSelect(pos,pos); -+ return true; -+} -+ -+/*! -+ * This method inserts an image at the strux of type iStruxType at the -+ * point given by ipos. -+ * This is useful for speficifying images as backgrounds to pages and cells. -+ */ -+UT_Error FV_View::cmdInsertGraphicAtStrux(FG_Graphic* pFG, PT_DocPosition iPos, PTStruxType iStruxType) -+{ -+ bool bDidGlob = false; -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ /* -+ Create a unique identifier for the data item. -+ */ -+ UT_UUID *uuid = m_pDoc->getNewUUID(); -+ UT_return_val_if_fail(uuid != NULL, UT_ERROR); -+ UT_UTF8String s; -+ uuid->toString(s); -+ -+ UT_Error errorCode = pFG->insertAtStrux(m_pDoc, -+ m_pG->getDeviceResolution(), -+ iPos, -+ iStruxType, s.utf8_str()); -+ -+ _restorePieceTableState(); -+ -+ _generalUpdate(); -+ if (bDidGlob) -+ m_pDoc->endUserAtomicGlob(); -+ _updateInsertionPoint(); -+ -+ return errorCode; -+} -+ -+#ifdef ENABLE_SPELL -+void FV_View::cmdContextSuggest(UT_uint32 ndx, fl_BlockLayout * ppBL, -+ fl_PartOfBlock * ppPOB) -+{ -+ // locate the squiggle -+ PT_DocPosition pos = getPoint(); -+ fl_BlockLayout* pBL; -+ fl_PartOfBlock* pPOB; -+ -+ if (!ppBL) -+ pBL = _findBlockAtPosition(pos); -+ else -+ pBL = ppBL; -+ UT_ASSERT(pBL); -+ -+ if (!ppPOB) -+ pPOB = pBL->getSpellSquiggles()->get(pos - pBL->getPosition()); -+ else -+ pPOB = ppPOB; -+ UT_ASSERT(pPOB); -+ -+ // grab the suggestion -+ UT_UCSChar * replace = _lookupSuggestion(pBL, pPOB, ndx); -+ -+ if (!replace) -+ return; -+ -+ // make the change -+ UT_ASSERT(isSelectionEmpty()); -+ -+ moveInsPtTo(static_cast(pBL->getPosition() + pPOB->getOffset())); -+ extSelHorizontal(true, pPOB->getPTLength()); -+ -+ UT_UCSChar * selection; -+ getSelectionText(selection); -+ getDictForSelection ()->correctWord (selection, UT_UCS4_strlen (selection), -+ replace, UT_UCS4_strlen (replace)); -+ cmdCharInsert(replace, UT_UCS4_strlen(replace)); -+ FREEP(selection); -+ FREEP(replace); -+} -+ -+void FV_View::cmdContextIgnoreAll(void) -+{ -+ // locate the squiggle -+ PT_DocPosition pos = getPoint(); -+ fl_BlockLayout* pBL = _findBlockAtPosition(pos); -+ UT_ASSERT(pBL); -+ fl_PartOfBlock* pPOB = pBL->getSpellSquiggles()->get(pos - pBL->getPosition()); -+ UT_ASSERT(pPOB); -+ -+ // grab a copy of the word -+ UT_GrowBuf pgb(1024); -+ bool bRes = pBL->getBlockBuf(&pgb); -+ UT_ASSERT(bRes); -+ -+ const UT_UCSChar * pBuf; -+ UT_sint32 iLength, iPTLength, iBlockPos; -+ -+ fl_BlockSpellIterator BSI(pBL, pPOB->getOffset()); -+ BSI.nextWordForSpellChecking(pBuf, iLength, iBlockPos, iPTLength); -+ -+ // make the change -+ getDictForSelection ()->ignoreWord ((const UT_UCSChar *)pBuf, (size_t)iLength); -+ { -+ // remove the squiggles, too -+ fl_DocSectionLayout * pSL = m_pLayout->getFirstSection(); -+ if(pSL) -+ { -+ fl_BlockLayout* b = pSL->getNextBlockInDocument(); -+ while (b) -+ { -+ // TODO: just check and remove matching squiggles -+ // for now, destructively recheck the whole thing -+ m_pLayout->queueBlockForBackgroundCheck(FL_DocLayout::bgcrSpelling, b); -+ b = static_cast(b->getNextBlockInDocument()); -+ } -+ } -+ } -+} -+ -+void FV_View::cmdContextAdd(void) -+{ -+ // locate the squiggle -+ PT_DocPosition pos = getPoint(); -+ fl_BlockLayout* pBL = _findBlockAtPosition(pos); -+ UT_return_if_fail(pBL); -+ fl_PartOfBlock* pPOB = pBL->getSpellSquiggles()->get(pos - pBL->getPosition()); -+ if(!pPOB) // this can happen with very rapid right-clicks -+ { -+ return; -+ } -+ -+ // grab a copy of the word -+ UT_GrowBuf pgb(1024); -+ bool bRes = pBL->getBlockBuf(&pgb); -+ UT_ASSERT(bRes); -+ -+ const UT_UCSChar * pBuf; -+ UT_sint32 iLength, iPTLength, iBlockPos; -+ -+ fl_BlockSpellIterator BSI(pBL, pPOB->getOffset()); -+ BSI.nextWordForSpellChecking(pBuf, iLength, iBlockPos, iPTLength); -+ -+ // make the change -+ if (getDictForSelection ()->addToCustomDict (pBuf, iLength)) -+ { -+ // remove the squiggles, too -+ fl_DocSectionLayout * pSL = m_pLayout->getFirstSection(); -+ if(pSL) -+ { -+ fl_BlockLayout* b = pSL->getNextBlockInDocument(); -+ while (b) -+ { -+ // TODO: just check and remove matching squiggles -+ // for now, destructively recheck the whole thing -+ if(b->getContainerType() == FL_CONTAINER_BLOCK) -+ { -+ m_pLayout->queueBlockForBackgroundCheck(FL_DocLayout::bgcrSpelling, b); -+ b = static_cast(b->getNextBlockInDocument()); -+ } -+ else -+ { -+ b = static_cast(b->getNext()); -+ } -+ } -+ } -+ } -+} -+#endif -+ -+ -+/*! -+ * Remove all the Headers or footers from the section owning the current Page. -+\param bool isHeader remove the header if true, the footer if false. -+*/ -+void FV_View::cmdRemoveHdrFtr( bool isHeader) -+{ -+// -+// Branch to Header/Footer sections. -+// -+ fp_ShadowContainer * pHFCon = NULL; -+ fl_HdrFtrShadow * pShadow = NULL; -+ fl_HdrFtrSectionLayout * pHdrFtr = NULL; -+ -+ if(isHeader) -+ { -+ fp_Page * pPage = getCurrentPage(); -+ pHFCon = pPage->getHdrFtrP(FL_HDRFTR_HEADER); -+ if(pHFCon == NULL) -+ { -+ return; -+ } -+// -+// Now see if we are in the header to be removed. If so, jump out. -+// -+ if (!isSelectionEmpty()) -+ _clearSelection(); -+ if(isHdrFtrEdit()) -+ { -+ clearHdrFtrEdit(); -+ _setPoint(pPage->getFirstLastPos(true)); -+ } -+ } -+ else -+ { -+ fp_Page * pPage = getCurrentPage(); -+ pHFCon = pPage->getHdrFtrP(FL_HDRFTR_FOOTER); -+ if(pHFCon == NULL) -+ { -+ return; -+ } -+// -+// Now see if we are in the Footer to be removed. If so, jump out. -+// -+ if (!isSelectionEmpty()) -+ _clearSelection(); -+ if(isHdrFtrEdit()) -+ { -+ clearHdrFtrEdit(); -+ _setPoint(pPage->getFirstLastPos(false)); -+ } -+ } -+ pShadow = pHFCon->getShadow(); -+ UT_ASSERT(pShadow); -+ if(!pShadow) -+ return; -+ -+ m_pDoc->beginUserAtomicGlob(); -+ -+ _saveAndNotifyPieceTableChange(); -+// -+// Save current document position. -+// -+ PT_DocPosition curPoint = getPoint(); -+// -+// Get the hdrftrSectionLayout -+// Get it's position. -+// Find the last run in the Section and get it's position. -+// -+// Need code here to remove all the header/footers. -+// -+ pHdrFtr = pShadow->getHdrFtrSectionLayout(); -+ fl_DocSectionLayout * pDSL = pHdrFtr->getDocSectionLayout(); -+// -+// Repeat this code 4 times to remove all the DocSection Layouts. -+// -+ setCursorWait(); -+ if(isHeader) -+ { -+ pHdrFtr = pDSL->getHeader(); -+ if(pHdrFtr) -+ { -+ _removeThisHdrFtr(pHdrFtr); -+ } -+ pHdrFtr = pDSL->getHeaderEven(); -+ if(pHdrFtr) -+ { -+ _removeThisHdrFtr(pHdrFtr); -+ } -+ pHdrFtr = pDSL->getHeaderFirst(); -+ if(pHdrFtr) -+ { -+ _removeThisHdrFtr(pHdrFtr); -+ } -+ pHdrFtr = pDSL->getHeaderLast(); -+ if(pHdrFtr) -+ { -+ _removeThisHdrFtr(pHdrFtr); -+ } -+ } -+ else -+ { -+ pHdrFtr = pDSL->getFooter(); -+ if(pHdrFtr) -+ { -+ _removeThisHdrFtr(pHdrFtr); -+ } -+ pHdrFtr = pDSL->getFooterEven(); -+ if(pHdrFtr) -+ { -+ _removeThisHdrFtr(pHdrFtr); -+ } -+ pHdrFtr = pDSL->getFooterFirst(); -+ if(pHdrFtr) -+ { -+ _removeThisHdrFtr(pHdrFtr); -+ } -+ pHdrFtr = pDSL->getFooterLast(); -+ if(pHdrFtr) -+ { -+ _removeThisHdrFtr(pHdrFtr); -+ } -+ } -+// -+// After erarsing the cursor, Restore to the point before all this mess started. -+// -+ _setPoint(curPoint); -+ -+ // Signal PieceTable Changes have finished -+ _restorePieceTableState(); -+ -+ _generalUpdate(); -+ updateScreen (); // fix 1803, force screen update/redraw -+ -+ _updateInsertionPoint(); -+ m_pDoc->endUserAtomicGlob(); -+ clearCursorWait(); -+ notifyListeners (AV_CHG_HDRFTR | AV_CHG_FMTSECTION); -+} -+ -+/*! -+ * Start edit header mode. If there is no header one will be inserted. -+ * otherwise start editing the header on the current page. -+ */ -+void FV_View::cmdEditHeader(void) -+{ -+ _cmdEditHdrFtr(FL_HDRFTR_HEADER); -+ notifyListeners (AV_CHG_HDRFTR | AV_CHG_FMTSECTION); -+} -+ -+/*! -+ * Start edit footer mode. If there is no footer one will be inserted. -+ * otherwise start editing the footer on the current page. -+ */ -+void FV_View::cmdEditFooter(void) -+{ -+ _cmdEditHdrFtr(FL_HDRFTR_FOOTER); -+ notifyListeners (AV_CHG_HDRFTR | AV_CHG_FMTSECTION); -+} -+ -+void FV_View::cmdAcceptRejectRevision(bool bReject, UT_sint32 xPos, UT_sint32 yPos) -+{ -+ UT_DEBUGMSG(( "FV_View::cmdAcceptRejectRevision [bReject=%d]\n",bReject )); -+ -+ PT_DocPosition iStart, iEnd; -+ fl_BlockLayout * pBlock = NULL; -+ fp_Run *pRun = NULL; -+ -+ // Signal PieceTable Change -+ _saveAndNotifyPieceTableChange(); -+ -+ if(isSelectionEmpty()) -+ { -+ if(xPos || yPos) // if given 0,0 use current position -+ { -+ warpInsPtToXY(xPos, yPos,true); -+ } -+ -+ pBlock = getCurrentBlock(); -+ PT_DocPosition iRelPos = getPoint() - pBlock->getPosition(false); -+ -+ pRun = pBlock->getFirstRun(); -+ while (pRun && pRun->getNextRun() && pRun->getBlockOffset()+ pRun->getLength() <= iRelPos) -+ pRun= pRun->getNextRun(); -+ -+ UT_return_if_fail(pRun); -+ -+ iStart = pBlock->getPosition(false) + pRun->getBlockOffset(); -+ iEnd = pBlock->getPosition(false) + pRun->getBlockOffset() + pRun->getLength(); -+ -+ } -+ else -+ { -+ iStart = getPoint(); -+ iEnd = getSelectionAnchor(); -+ } -+ -+ // remove the selection, since things will get inserted, deleted, etc. -+ _clearSelection(); -+ -+ m_pDoc->acceptRejectRevision(bReject,iStart,iEnd,m_iViewRevision); -+ _restorePieceTableState(); -+ _generalUpdate(); -+} -+ -+void FV_View::cmdSetRevisionLevel(UT_uint32 i) -+{ -+ UT_return_if_fail( i <= PD_MAX_REVISION ); -+ // first set the same level in Doc; we do this unconditionally, -+ // this way the doc will always save the level the user last used -+ // NB: the doc id and the view id can be differnt if the user -+ // changed it in some other view -+ m_pDoc->setShowRevisionId(i); -+ -+ if(m_iViewRevision != i) -+ { -+ m_iViewRevision = i; -+ -+ // need to rebuild the doc to reflect the new level ... -+ m_pLayout->rebuildFromHere(static_cast(m_pLayout->getFirstSection())); -+ -+ // we have to force redraw here, see bug 10486 -+ draw(NULL); -+ } -+} -+ -+/*! -+ finds the next/previous revision and sets selection to it -+ TODO the selection will not cross block boundaries; it probably should -+ -+ \param bNext: if true the search is carried out in forward direction -+ \return returns true on succes -+*/ -+bool FV_View::cmdFindRevision(bool bNext, UT_sint32 xPos, UT_sint32 yPos) -+{ -+ if(xPos || yPos) -+ { -+ // this is the case we were called from context menu ... -+ warpInsPtToXY(xPos, yPos,true); -+ } -+ -+ if(!isSelectionEmpty()) -+ { -+ _moveToSelectionEnd(bNext); -+ } -+ -+ fl_BlockLayout * pBL = getCurrentBlock(); -+ -+ if(!pBL) -+ return false; -+ -+ fl_DocSectionLayout * pSL = pBL->getDocSectionLayout(); -+ -+ if(!pSL) -+ return false; -+ -+ fp_Run * pRun; -+ UT_sint32 xPoint,yPoint,xPoint2,yPoint2,iPointHeight; -+ bool bDirection; -+ -+ pRun = pBL->findPointCoords(getPoint(), false, xPoint, -+ yPoint, xPoint2, yPoint2, -+ iPointHeight, bDirection); -+ -+ if(!pRun) -+ return false; -+ -+ if(bNext) -+ { -+ pRun = pRun->getNextRun(); -+ -+ while(pSL) -+ { -+ while(pBL) -+ { -+ while(pRun) -+ { -+ if(pRun->containsRevisions() && !pRun->isHidden()) -+ { -+ goto move_point; -+ } -+ -+ pRun = pRun->getNextRun(); -+ } -+ -+ pBL = pBL->getNextBlockInDocument(); -+ } -+ -+ pSL = pSL->getNextDocSection(); -+ } -+ } -+ else -+ { -+ pRun = pRun->getPrevRun(); -+ -+ while(pSL) -+ { -+ while(pBL) -+ { -+ while(pRun) -+ { -+ if(pRun->containsRevisions() && !pRun->isHidden()) -+ { -+ goto move_point; -+ } -+ -+ pRun = pRun->getPrevRun(); -+ } -+ -+ pBL = pBL->getPrevBlockInDocument(); -+ } -+ -+ pSL = pSL->getPrevDocSection(); -+ } -+ } -+ -+ return false; -+ -+ move_point: -+ UT_return_val_if_fail(pRun && pBL, false); -+ -+ // we want to span the selection not only over this run, but also -+ // all subesequent runs that contain the same revions -+ // TODO: probably should do this across block/section boundaries -+ fp_Run * pRun2 = bNext ? pRun->getNextRun() : pRun->getPrevRun(); -+ fp_Run * pOldRun2 = pRun; -+ -+ PP_RevisionAttr * pR1 = pRun->getRevisions(); -+ -+ while(pRun2) -+ { -+ if(pRun2->containsRevisions() && !pRun2->isHidden()) -+ { -+ // test the two runs, if their revions are the same -+ // include this one as well -+ PP_RevisionAttr * pR2 = pRun2->getRevisions(); -+ -+ if(!(*pR1 == *pR2)) -+ break; -+ } -+ else -+ { -+ break; -+ } -+ -+ pOldRun2 = pRun2; -+ pRun2 = bNext ? pRun2->getNextRun() : pRun2->getPrevRun(); -+ } -+ -+ // backtrack (we want pRun2 to be the last run in the selection -+ pRun2 = pOldRun2; -+ UT_return_val_if_fail(pRun2, false); -+ -+ PT_DocPosition dpos1, dpos2; -+ -+ if(bNext) -+ { -+ dpos1 = pBL->getPosition() + pRun->getBlockOffset(); -+ dpos2 = pRun2->getBlock()->getPosition() + pRun2->getBlockOffset() + pRun2->getLength(); -+ } -+ else -+ { -+ dpos1 = pRun2->getBlock()->getPosition() + pRun2->getBlockOffset(); -+ dpos2 = pBL->getPosition() + pRun->getBlockOffset() + pRun->getLength(); -+ } -+ -+ cmdSelect(dpos1, dpos2); -+ -+ return true; -+} -diff -urNad abiword-2.6.2~/abiword/src/wp/impexp/xp/ie_TOC.cpp abiword-2.6.2/abiword/src/wp/impexp/xp/ie_TOC.cpp ---- abiword-2.6.2~/abiword/src/wp/impexp/xp/ie_TOC.cpp 2008-04-17 13:12:33.000000000 +0200 -+++ abiword-2.6.2/abiword/src/wp/impexp/xp/ie_TOC.cpp 2008-04-17 21:45:40.000000000 +0200 -@@ -149,6 +149,11 @@ - - switch (pcrx->getStruxType()) - { -+ case PTX_SectionTOC: -+ { -+ mTOC->mDocHasTOC = true; -+ return true; -+ } - case PTX_Block: - { - const PP_AttrProp * pAP = NULL; -@@ -202,7 +207,7 @@ - /*******************************************************************************/ - - IE_TOCHelper::IE_TOCHelper(PD_Document * pDoc) -- : mHasTOC(false), mDoc(pDoc) -+ : mHasTOC(false), mDocHasTOC(false), mDoc(pDoc) - { - TOC_Listener listener(pDoc,this); - -@@ -219,6 +224,11 @@ - return mHasTOC; - } - -+bool IE_TOCHelper::docHasTOC() const -+{ -+ return mDocHasTOC; -+} -+ - bool IE_TOCHelper::_tocNameLevelHelper(const UT_UTF8String & style_name, - const char * base_name) const - { -diff -urNad abiword-2.6.2~/abiword/src/wp/impexp/xp/ie_TOC.h abiword-2.6.2/abiword/src/wp/impexp/xp/ie_TOC.h ---- abiword-2.6.2~/abiword/src/wp/impexp/xp/ie_TOC.h 2008-04-17 13:12:33.000000000 +0200 -+++ abiword-2.6.2/abiword/src/wp/impexp/xp/ie_TOC.h 2008-04-17 21:45:40.000000000 +0200 -@@ -15,7 +15,8 @@ - IE_TOCHelper(PD_Document * doc); - ~IE_TOCHelper(); - -- bool hasTOC() const; -+ bool hasTOC() const; // true if there are any "headings" in the document -+ bool docHasTOC() const; // true if the doc has 1 or more tables of contents - - bool isTOCStyle(const UT_UTF8String & styleName, int * out_level = NULL) const; - bool isTOCStyle(const char * styleName, int * out_level = NULL) const; -@@ -41,6 +42,7 @@ - UT_GenericVector mTOCLevels; - - bool mHasTOC; -+ bool mDocHasTOC; - PD_Document *mDoc; - }; - -diff -urNad abiword-2.6.2~/abiword/src/wp/impexp/xp/ie_exp_HTML.cpp abiword-2.6.2/abiword/src/wp/impexp/xp/ie_exp_HTML.cpp ---- abiword-2.6.2~/abiword/src/wp/impexp/xp/ie_exp_HTML.cpp 2008-04-17 13:12:33.000000000 +0200 -+++ abiword-2.6.2/abiword/src/wp/impexp/xp/ie_exp_HTML.cpp 2008-04-17 21:45:40.000000000 +0200 -@@ -2301,7 +2301,7 @@ - tagPending = true; - bClassAsTag = true; - -- if (m_toc) { -+ if (m_toc->docHasTOC()) { - m_utf8_1 = UT_UTF8String_sprintf("h1 id=\"AbiTOC%d__\"", m_heading_count); - m_heading_count++; - } -@@ -2319,7 +2319,7 @@ - tagPending = true; - bClassAsTag = true; - -- if (m_toc) { -+ if (m_toc->docHasTOC()) { - m_utf8_1 = UT_UTF8String_sprintf("h2 id=\"AbiTOC%d__\"", m_heading_count); - m_heading_count++; - } -@@ -2337,7 +2337,7 @@ - tagPending = true; - bClassAsTag = true; - -- if (m_toc) { -+ if (m_toc->docHasTOC()) { - m_utf8_1 = UT_UTF8String_sprintf("h3 id=\"AbiTOC%d__\"", m_heading_count); - m_heading_count++; - } -@@ -2398,7 +2398,7 @@ - tagPending = true; - bClassAsTag = true; - -- if (m_toc) { -+ if (m_toc->docHasTOC()) { - m_utf8_1 = UT_UTF8String_sprintf("h1 id=\"AbiTOC%d__\"", m_heading_count); - m_heading_count++; - } else { -@@ -2412,7 +2412,7 @@ - tagPending = true; - bClassAsTag = true; - -- if (m_toc) { -+ if (m_toc->docHasTOC()) { - m_utf8_1 = UT_UTF8String_sprintf("h2 id=\"AbiTOC%d__\"", m_heading_count); - m_heading_count++; - } else { -@@ -2426,7 +2426,7 @@ - tagPending = true; - bClassAsTag = true; - -- if (m_toc) { -+ if (m_toc->docHasTOC()) { - m_utf8_1 = UT_UTF8String_sprintf("h3 id=\"AbiTOC%d__\"", m_heading_count); - m_heading_count++; - } else { -@@ -2455,7 +2455,7 @@ - tagID = TT_P; - tagPending = true; - -- if (m_toc && m_toc->isTOCStyle(szValue)) { -+ if (m_toc->docHasTOC() && m_toc->isTOCStyle(szValue)) { - m_utf8_1 = UT_UTF8String_sprintf("p id=\"AbiTOC%d__\"", m_heading_count); - m_heading_count++; - } else { -@@ -2468,7 +2468,7 @@ - tagID = TT_P; - tagPending = true; - -- if (m_toc && m_toc->isTOCStyle(szValue)) { -+ if (m_toc->docHasTOC() && m_toc->isTOCStyle(szValue)) { - m_utf8_1 = UT_UTF8String_sprintf("p id=\"AbiTOC%d__\"", m_heading_count); - m_heading_count++; - } else { -@@ -6132,7 +6132,9 @@ - UT_UTF8String selector("*."); - if (m_class_name.byteLength ()) - { -- selector += m_class_name; -+ UT_UTF8String tmp = m_class_name; -+ tmp.escapeXML(); -+ selector += tmp.utf8_str(); - } - else - { -diff -urNad abiword-2.6.2~/abiword/src/wp/impexp/xp/ie_exp_HTML.cpp.orig abiword-2.6.2/abiword/src/wp/impexp/xp/ie_exp_HTML.cpp.orig ---- abiword-2.6.2~/abiword/src/wp/impexp/xp/ie_exp_HTML.cpp.orig 1970-01-01 01:00:00.000000000 +0100 -+++ abiword-2.6.2/abiword/src/wp/impexp/xp/ie_exp_HTML.cpp.orig 2008-04-17 21:45:40.000000000 +0200 -@@ -0,0 +1,7145 @@ -+/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ -+ -+/* AbiWord -+ * Copyright (C) 2007 Hubert Figuiere -+ * Copyright (C) 2003-2005 Mark Gilbert -+ * Copyright (C) 2002,2004 Francis James Franklin -+ * Copyright (C) 2001-2002 AbiSource, Inc. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "ut_locale.h" -+#include "ut_debugmsg.h" -+#include "ut_assert.h" -+#include "ut_exception.h" -+#include "ut_string.h" -+#include "ut_bytebuf.h" -+#include "ut_base64.h" -+#include "ut_hash.h" -+#include "ut_units.h" -+#include "ut_wctomb.h" -+#include "ut_path.h" -+#include "ut_math.h" -+#include "ut_misc.h" -+#include "ut_string_class.h" -+#include "ut_png.h" -+ -+#include "xap_App.h" -+#include "xap_EncodingManager.h" -+ -+#include "pt_Types.h" -+#include "pl_Listener.h" -+#include "pd_Document.h" -+#include "pd_Style.h" -+#include "pp_AttrProp.h" -+#include "pp_Property.h" -+#include "pp_PropertyMap.h" -+#include "px_ChangeRecord.h" -+#include "px_CR_Object.h" -+#include "px_CR_Span.h" -+#include "px_CR_Strux.h" -+#include "ut_mbtowc.h" -+#include "xap_Frame.h" -+#include "xav_View.h" -+#include "gr_Graphics.h" -+ -+#include "fd_Field.h" -+ -+#include "fl_AutoNum.h" -+ -+#include "ie_types.h" -+#include "ie_TOC.h" -+#include "ie_impexp_HTML.h" -+#include "ie_exp_HTML.h" -+#include "ap_Strings.h" -+ -+#ifdef HTML_DIALOG_OPTIONS -+#include "xap_Dialog_Id.h" -+#include "xap_DialogFactory.h" -+#endif -+ -+#ifdef HTML_TABLES_SUPPORTED -+#include "ie_Table.h" -+#endif -+ -+#define MYEOL "\n" -+#define MAX_LINE_LEN 200 -+ -+/*****************************************************************/ -+/*****************************************************************/ -+ -+IE_Exp_HTML_Sniffer::IE_Exp_HTML_Sniffer () -+#ifdef HTML_NAMED_CONSTRUCTORS -+ : IE_ExpSniffer(IE_IMPEXPNAME_XHTML, true) -+#endif -+{ -+ // -+} -+ -+bool IE_Exp_HTML_Sniffer::recognizeSuffix (const char * szSuffix) -+{ -+ return (!g_ascii_strcasecmp (szSuffix, ".xhtml") || -+ !(g_ascii_strcasecmp (szSuffix, ".html")) || -+ !(g_ascii_strcasecmp (szSuffix, ".htm"))); -+} -+ -+UT_Error IE_Exp_HTML_Sniffer::constructExporter (PD_Document * pDocument, -+ IE_Exp ** ppie) -+{ -+ IE_Exp_HTML * p = new IE_Exp_HTML(pDocument); -+ *ppie = p; -+ return UT_OK; -+} -+ -+bool IE_Exp_HTML_Sniffer::getDlgLabels (const char ** pszDesc, -+ const char ** pszSuffixList, -+ IEFileType * ft) -+{ -+ *pszDesc = "HTML/XHTML (.html)"; -+ *pszSuffixList = "*.html"; -+ *ft = getFileType (); -+ return true; -+} -+ -+UT_Confidence_t IE_Exp_HTML_Sniffer::supportsMIME (const char * szMimeType) -+{ -+ if(!strcmp(szMimeType, IE_MIMETYPE_XHTML) || -+ !strcmp(szMimeType, "application/xhtml") || -+ !strcmp(szMimeType, "text/html")) -+ return UT_CONFIDENCE_PERFECT; -+ return UT_CONFIDENCE_ZILCH; -+} -+ -+#ifdef HTML_ENABLE_HTML4 -+ -+// HTML 4 -+ -+IE_Exp_HTML4_Sniffer::IE_Exp_HTML4_Sniffer () -+#ifdef HTML_NAMED_CONSTRUCTORS -+ : IE_ExpSniffer(IE_IMPEXPNAME_HTML, true) -+#endif -+{ -+ // -+} -+ -+bool IE_Exp_HTML4_Sniffer::recognizeSuffix (const char * szSuffix) -+{ -+ return (!(g_ascii_strcasecmp (szSuffix, ".html")) || !(g_ascii_strcasecmp (szSuffix, ".htm"))); -+} -+ -+UT_Error IE_Exp_HTML4_Sniffer::constructExporter (PD_Document * pDocument, -+ IE_Exp ** ppie) -+{ -+ IE_Exp_HTML * p = new IE_Exp_HTML(pDocument); -+ if (p) p->set_HTML4 (); -+ *ppie = p; -+ return UT_OK; -+} -+ -+bool IE_Exp_HTML4_Sniffer::getDlgLabels (const char ** pszDesc, -+ const char ** pszSuffixList, -+ IEFileType * ft) -+{ -+ *pszDesc = "HTML 4.0 (.html, .htm)"; -+ *pszSuffixList = "*.html; *.htm"; -+ *ft = getFileType (); -+ return true; -+} -+ -+UT_Confidence_t IE_Exp_HTML4_Sniffer::supportsMIME (const char * szMimeType) -+{ -+ if(!strcmp(szMimeType, "text/html")) -+ return UT_CONFIDENCE_PERFECT; -+ return UT_CONFIDENCE_ZILCH; -+} -+ -+#endif /* HTML_ENABLE_HTML4 */ -+ -+#ifdef HTML_ENABLE_PHTML -+ -+// XHTML w/ PHP instructions for AbiWord Web Docs -+ -+IE_Exp_PHTML_Sniffer::IE_Exp_PHTML_Sniffer () -+#ifdef HTML_NAMED_CONSTRUCTORS -+ : IE_ExpSniffer(IE_IMPEXPNAME_PHTML, false) -+#endif -+{ -+ // -+} -+ -+bool IE_Exp_PHTML_Sniffer::recognizeSuffix (const char * szSuffix) -+{ -+ return (!(g_ascii_strcasecmp (szSuffix, ".phtml"))); -+} -+ -+UT_Error IE_Exp_PHTML_Sniffer::constructExporter (PD_Document * pDocument, -+ IE_Exp ** ppie) -+{ -+ IE_Exp_HTML * p = new IE_Exp_HTML(pDocument); -+ if (p) p->set_PHTML (); -+ *ppie = p; -+ return UT_OK; -+} -+ -+bool IE_Exp_PHTML_Sniffer::getDlgLabels(const char ** pszDesc, -+ const char ** pszSuffixList, -+ IEFileType * ft) -+{ -+ *pszDesc = "XHTML+PHP (.phtml)"; -+ *pszSuffixList = "*.phtml"; -+ *ft = getFileType(); -+ return true; -+} -+ -+#endif /* HTML_ENABLE_PHTML */ -+ -+#ifdef HTML_ENABLE_MHTML -+ -+// Multipart HTML: http://www.rfc-editor.org/rfc/rfc2557.txt -+ -+IE_Exp_MHTML_Sniffer::IE_Exp_MHTML_Sniffer () -+#ifdef HTML_NAMED_CONSTRUCTORS -+ : IE_ExpSniffer(IE_IMPEXPNAME_MHTML, true) -+#endif -+{ -+ // -+} -+ -+bool IE_Exp_MHTML_Sniffer::recognizeSuffix (const char * szSuffix) -+{ -+ return (!(g_ascii_strcasecmp (szSuffix, ".mht"))); -+} -+ -+UT_Error IE_Exp_MHTML_Sniffer::constructExporter (PD_Document * pDocument, -+ IE_Exp ** ppie) -+{ -+ IE_Exp_HTML * p = new IE_Exp_HTML(pDocument); -+ if (p) p->set_MHTML (); -+ *ppie = p; -+ return UT_OK; -+} -+ -+bool IE_Exp_MHTML_Sniffer::getDlgLabels(const char ** pszDesc, -+ const char ** pszSuffixList, -+ IEFileType * ft) -+{ -+ *pszDesc = "Multipart HTML (.mht)"; -+ *pszSuffixList = "*.mht"; -+ *ft = getFileType(); -+ return true; -+} -+ -+#endif /* HTML_ENABLE_MHTML */ -+ -+/*****************************************************************/ -+/*****************************************************************/ -+ -+/* TODO: is there a better way to do this? -+ */ -+static UT_UTF8String s_string_to_url (const UT_String & str) -+{ -+ UT_UTF8String url; -+ -+ static const char hex[16] = { -+ '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' -+ }; -+ char buf[4]; -+ buf[0] = '%'; -+ buf[3] = 0; -+ -+ const char * ptr = str.c_str (); -+ while (*ptr) -+ { -+ bool isValidPunctuation = false; -+ switch (*ptr) -+ { -+ case '-': // TODO: any others? -+ case '_': -+ case '.': -+ isValidPunctuation = true; -+ break; -+ default: -+ break; -+ } -+ unsigned char u = (unsigned char) *ptr; -+ if (!isalnum (static_cast(u)) && !isValidPunctuation) -+ { -+ buf[1] = hex[(u >> 4) & 0x0f]; -+ buf[2] = hex[ u & 0x0f]; -+ url += buf; -+ } -+ else -+ { -+ buf[2] = (char) *ptr; -+ url += (buf + 2); -+ } -+ ptr++; -+ } -+ return url; -+} -+ -+static UT_UTF8String s_string_to_url (const UT_UTF8String & str) -+{ -+ UT_String s(str.utf8_str()); -+ return s_string_to_url(s); -+} -+ -+static const char * s_prop_list[] = { -+ "background-color", "transparent", -+ "color", "", -+ "font-family", "", -+ "font-size", "medium", -+ "font-style", "normal", -+ "font-variant", "normal", -+ "font-weight", "normal", -+ "height", "auto", -+ "margin-bottom", "0pt", -+ "margin-left", "0pt", -+ "margin-right", "0pt", -+ "margin-top", "0pt", -+ "orphans", "2", -+ "text-align", "", -+ "text-decoration", "none", -+ "text-indent", "0in", -+ "vertical-align", "baseline", -+ "widows", "2", -+ "width", "auto", -+ 0, 0 -+}; -+static const UT_uint32 s_PropListLen = G_N_ELEMENTS(s_prop_list) - 2; /* don't include the zeros */ -+ -+/*! This function returns true if the given property is a valid CSS -+ property. It is based on the list in pp_Property.cpp, and, as such, -+ is quite brittle. -+ -+ prop_default may be zero on return, indicating that the default is not fixed -+*/ -+static bool is_CSS (const char * prop_name, const char ** prop_default = 0) -+{ -+ if ( prop_name == 0) return false; -+ if (*prop_name == 0) return false; -+ -+ bool bCSS = false; -+ -+ for (UT_uint32 i = 0; i < s_PropListLen; i += 2) -+ if (!strcmp (prop_name, s_prop_list[i])) -+ { -+ if (prop_default) *prop_default = s_prop_list[i+1]; -+ bCSS = true; -+ break; -+ } -+ return bCSS; -+} -+ -+/*! This function copies a string to a new string, removing all the white -+ space in the process. -+*/ -+static char * s_removeWhiteSpace (const char * text, UT_UTF8String & utf8str, -+ bool bLowerCase = true) -+{ -+ utf8str = ""; -+ -+ if (text) -+ { -+ char buf[2]; // ick! [TODO ??] -+ buf[1] = 0; -+ const char * ptr = text; -+ while (*ptr) -+ { -+ if (isspace ((int) ((unsigned char) *ptr))) -+ { -+ buf[0] = '_'; -+ } -+ else -+ { -+ buf[0] = *ptr; -+ } -+ utf8str += buf; -+ ptr++; -+ } -+ -+ if(bLowerCase) -+ utf8str.lowerCase(); -+ } -+ return 0; -+} -+ -+/*****************************************************************/ -+/*****************************************************************/ -+ -+#define IS_TRANSPARENT_COLOR(c) (!strcmp(c, "transparent")) -+ -+#define BT_NORMAL 1 -+#define BT_HEADING1 2 -+#define BT_HEADING2 3 -+#define BT_HEADING3 4 -+#define BT_BLOCKTEXT 5 -+#define BT_PLAINTEXT 6 -+#define BT_NUMBEREDLIST 7 -+#define BT_BULLETLIST 8 -+ -+class s_HTML_Listener; -+class s_HTML_HdrFtr_Listener; -+ -+bool m_bSecondPass = false; -+bool m_bInAFENote = false; -+ -+class s_StyleTree : public PL_Listener -+{ -+private: -+ PD_Document * m_pDocument; // root element of tree only (atm, anyway) -+ -+ s_StyleTree * m_parent; -+ s_StyleTree ** m_list; -+ -+ UT_uint32 m_count; -+ UT_uint32 m_max; -+ -+ bool m_bInUse; -+ -+ UT_UTF8String m_style_name; -+ UT_UTF8String m_class_name; -+ UT_UTF8String m_class_list; -+ -+ PD_Style * m_style; -+ -+ typedef std::map map_type; -+ map_type m_map; -+ -+ s_StyleTree (s_StyleTree * parent, const char * name, PD_Style * style); -+public: -+ s_StyleTree (PD_Document * pDocument); -+ ~s_StyleTree (); -+ -+private: -+ bool add (const char * style_name, PD_Style * style); -+public: -+ bool add (const char * style_name, PD_Document * pDoc); -+ -+private: -+ void inUse (); -+public: -+ const s_StyleTree * findAndUse (const char * style_name); -+ -+ const s_StyleTree * find (const char * style_name) const; -+ const s_StyleTree * find (PD_Style * style) const; -+ -+ bool descends (const char * style_name) const; -+ -+ void print (s_HTML_Listener * listener) const; -+ -+ const s_StyleTree * operator[] (UT_uint32 i) const -+ { -+ return (i < m_count) ? m_list[i] : 0; -+ } -+ UT_uint32 count () const { return m_count; } -+ -+ const UT_UTF8String & style_name () const { return m_style_name; } -+ const UT_UTF8String & class_name () const { return m_class_name; } -+ const UT_UTF8String & class_list () const { return m_class_list; } -+ -+ const std::string & lookup (const std::string & prop_name) const; -+ -+private: -+ void styleCheck (PT_AttrPropIndex api); -+public: -+ /* implementation of PL_Listener -+ */ -+ bool populate (PL_StruxFmtHandle sfh, -+ const PX_ChangeRecord * pcr); -+ -+ bool populateStrux (PL_StruxDocHandle sdh, -+ const PX_ChangeRecord * pcr, -+ PL_StruxFmtHandle * psfh); -+ -+ bool change (PL_StruxFmtHandle sfh, -+ const PX_ChangeRecord * pcr); -+ -+ bool insertStrux (PL_StruxFmtHandle sfh, -+ const PX_ChangeRecord * pcr, -+ PL_StruxDocHandle sdh, -+ PL_ListenerId lid, -+ void (*pfnBindHandles) (PL_StruxDocHandle sdhNew, -+ PL_ListenerId lid, -+ PL_StruxFmtHandle sfhNew)); -+ -+ bool signal (UT_uint32 iSignal); -+}; -+ -+class s_HTML_Listener : public PL_Listener -+{ -+ friend class s_HTML_HdrFtr_Listener; -+public: -+ s_HTML_Listener (PD_Document * pDocument, IE_Exp_HTML * pie, bool bClipBoard, -+ bool bTemplateBody, const XAP_Exp_HTMLOptions * exp_opt, -+ s_StyleTree * style_tree, -+ UT_UTF8String & linkCSS, -+ UT_UTF8String & title); -+ -+ ~s_HTML_Listener (); -+ -+ bool populate (PL_StruxFmtHandle sfh, -+ const PX_ChangeRecord * pcr); -+ -+ bool populateStrux (PL_StruxDocHandle sdh, -+ const PX_ChangeRecord * pcr, -+ PL_StruxFmtHandle * psfh); -+ -+ //bool startOfDocument (); // Unused -+ bool endOfDocument (); -+ -+ bool change (PL_StruxFmtHandle sfh, -+ const PX_ChangeRecord * pcr); -+ -+ bool insertStrux (PL_StruxFmtHandle sfh, -+ const PX_ChangeRecord * pcr, -+ PL_StruxDocHandle sdh, -+ PL_ListenerId lid, -+ void (*pfnBindHandles) (PL_StruxDocHandle sdhNew, -+ PL_ListenerId lid, -+ PL_StruxFmtHandle sfhNew)); -+ -+ bool signal (UT_uint32 iSignal); -+ void startEmbeddedStrux(void); -+ -+private: -+ void _outputBegin (PT_AttrPropIndex api); -+ void _outputEnd (); -+ bool _openStyleSheet (UT_UTF8String & css_path); -+ void _closeStyleSheet (); -+ void _outputStyles (const PP_AttrProp * pAP); -+ void _openSection (PT_AttrPropIndex api, UT_uint16 iSectionSpecialType); -+ void _closeSection (void); -+ -+ void _openTag (PT_AttrPropIndex api, PL_StruxDocHandle sdh); -+ void _closeTag (void); -+ void _closeSpan (void); -+ void _openSpan (PT_AttrPropIndex api); -+ -+ void _popUnendedStructures(void); -+ -+#ifdef HTML_TABLES_SUPPORTED -+ void _openTable (PT_AttrPropIndex api); -+ void _closeTable (); -+ void _openRow (PT_AttrPropIndex api); -+ void _openCell (PT_AttrPropIndex api); -+ void _closeCell (); -+#endif -+ -+ void _openTextBox (PT_AttrPropIndex api); -+ void _openPosImage (PT_AttrPropIndex api); -+ void _closeTextBox (); -+ -+ void _outputData (const UT_UCSChar * p, UT_uint32 length); -+ bool _inherits (const char * style, const char * from); -+ void _storeStyles (void); -+ void _populateHeaderStyle (); -+ void _populateFooterStyle (); -+ -+ void _writeImage (const UT_ByteBuf * pByteBuf, -+ const UT_UTF8String & imagedir, const UT_UTF8String & filename); -+ void _writeImageBase64 (const UT_ByteBuf * pByteBuf); -+ void _handleImage (PT_AttrPropIndex api); -+ void _handleImage (const PP_AttrProp * pAP, const char * szDataID, bool isPositioned); -+ void _handlePendingImages (); -+ void _handleField (const PX_ChangeRecord_Object * pcro, PT_AttrPropIndex api); -+ void _handleHyperlink (PT_AttrPropIndex api); -+ void _handleBookmark (PT_AttrPropIndex api); -+ void _handleMath (PT_AttrPropIndex api); -+ void _handleEmbedded (PT_AttrPropIndex api); -+ -+#ifdef HTML_META_SUPPORTED -+ void _handleMetaTag (const char * key, UT_UTF8String & value); -+ void _handleMeta (); -+#endif -+ -+ void _doEndnotes (); -+ void _doFootnotes (); -+ void _emitTOC (PT_AttrPropIndex api); -+ -+ PD_Document * m_pDocument; -+ PT_AttrPropIndex m_apiLastSpan; -+ IE_Exp_HTML * m_pie; -+ bool m_bClipBoard; -+ bool m_bTemplateBody; -+ const XAP_Exp_HTMLOptions * m_exp_opt; -+ s_StyleTree * m_style_tree; -+ -+ inline bool get_HTML4 () const { return m_exp_opt->bIs4; } -+ inline bool get_PHTML () const { return m_exp_opt->bIsAbiWebDoc; } -+ inline bool get_Declare_XML () const { return m_exp_opt->bDeclareXML && !m_exp_opt->bIs4; } -+ inline bool get_Allow_AWML () const { return m_exp_opt->bAllowAWML && !m_exp_opt->bIs4; } -+ inline bool get_Embed_CSS () const { return m_exp_opt->bEmbedCSS; } -+ inline bool get_Link_CSS () const { return m_exp_opt->bLinkCSS; } -+ inline bool get_Abs_Units () const { return m_exp_opt->bAbsUnits; } -+ inline bool get_Scale_Units () const { return m_exp_opt->bScaleUnits; } -+ inline UT_uint32 get_Compact () const { return m_exp_opt->iCompact; } -+ inline bool get_Embed_Images () const { return m_exp_opt->bEmbedImages; } -+ inline bool get_Multipart () const { return m_exp_opt->bMultipart; } -+ inline bool get_Class_Only() const { return m_exp_opt->bClassOnly; } -+ -+ bool m_bInSection; -+ bool m_bInFrame; -+ bool m_bInTextBox; // Necessary? Possibly not. Convenient and safe? Yes. -+ bool m_bInTOC; -+ bool m_bInBlock; -+ bool m_bInSpan; -+ bool m_bNextIsSpace; -+ bool m_bWroteText; -+ bool m_bFirstWrite; -+ bool m_bQuotedPrintable; -+ bool m_bHaveHeader; -+ bool m_bHaveFooter; -+ -+#ifdef HTML_TABLES_SUPPORTED -+ ie_Table m_TableHelper; -+#endif -+ -+ // Need to look up proper type, and place to stick #defines... -+ -+ UT_uint32 m_iBlockType; // BT_* -+ UT_uint32 m_iListDepth; // 0 corresponds to not in a list -+ UT_NumberStack m_utsListType; -+ UT_uint32 m_iImgCnt; -+ UT_Wctomb m_wmctomb; -+ -+ enum WhiteSpace -+ { -+ ws_None = 0, -+ ws_Pre = 1, -+ ws_Post = 2, -+ ws_Both = 3 -+ }; -+ -+ /* low-level; these may use m_utf8_0 but not m_utf8_1 -+ * WARNING: Use of purely tag-operative methods (tagOpen,tagClose,etc..) may circumvent -+ * important checks and preparations done in strux-operative methods (_open*,_close*,etc...) -+ * and thus these should only be used by likewise low-level code. -+ */ -+ void tagRaw (UT_UTF8String & content); -+ UT_uint32 tagIndent (); -+ void tagNewIndent (UT_UTF8String & utf8, UT_uint32 depth); -+ void tagNewIndent (UT_uint32 extra = 0); -+ void tagOpenClose (const UT_UTF8String & content, bool suppress, -+ WhiteSpace ws = ws_Both); -+ void tagOpen (UT_uint32 tagID, const UT_UTF8String & content, -+ WhiteSpace ws = ws_Both); -+ void tagClose (UT_uint32 tagID, const UT_UTF8String & content, -+ WhiteSpace ws = ws_Both); -+ void tagClose (UT_uint32 tagID); -+ void tagOpenBroken (const UT_UTF8String & content, -+ WhiteSpace ws = ws_Pre); -+ void tagCloseBroken (const UT_UTF8String & content, bool suppress, -+ WhiteSpace ws = ws_Post); -+ UT_uint32 tagTop (); -+ void tagPop (); -+ void tagPI (const char * target, const UT_UTF8String & content); -+ void tagComment (const UT_UTF8String & content); -+ void tagCommentOpen (); -+ void tagCommentClose (); -+ void styleIndent (); -+ -+public: -+ void styleOpen (const UT_UTF8String & rule); -+ void styleClose (); -+ void styleNameValue (const char * name, const UT_UTF8String & value); -+ void setHaveHeader(); -+ void setHaveFooter(); -+private: -+ void styleText (const UT_UTF8String & content); -+ void textTrusted (const UT_UTF8String & text); -+ void textUntrusted (const char * text); -+ -+ void multiHeader (const UT_UTF8String & title); -+ void multiBoundary (bool end = false); -+ void multiField (const char * name, const UT_UTF8String & value); -+ void multiBreak (); -+ -+ UT_uint32 listDepth (); -+ UT_uint32 listType (); -+ void listPush (UT_uint32 type, const char * ClassName); -+ void listPop (); -+ void listPopToDepth (UT_uint32 depth); -+ -+ bool compareStyle (const char * key, const char * value); -+ void _fillColWidthsVector(); -+ void _setCellWidthInches(void); -+ -+ void addFootnote(PD_DocumentRange * pDocRange); -+ void addEndnote(PD_DocumentRange * pDocRange); -+ UT_uint32 getNumFootnotes(void); -+ UT_uint32 getNumEndnotes(void); -+ -+ /* temporary strings; use with extreme caution -+ */ -+ UT_UTF8String m_utf8_0; // low-level -+ UT_UTF8String m_utf8_1; // intermediate -+ -+ UT_UTF8String m_utf8_span; // span tag-string cache -+ UT_UTF8String m_utf8_style; // current block style -+ -+ const s_StyleTree * m_StyleTreeInline; // current inline style tree, if any -+ const s_StyleTree * m_StyleTreeBlock; // current block style tree, if any -+ const s_StyleTree * m_StyleTreeBody; // document default style tree, if any -+ -+ const PP_AttrProp * m_pAPStyles; -+ -+ UT_UTF8String m_utf8_css_path; // Multipart HTML: cache for content location -+ -+ UT_NumberStack m_tagStack; -+ -+ UT_uint32 m_styleIndent; -+ -+ GsfOutput * m_fdCSS; -+ -+ UT_GenericStringMap m_SavedURLs; -+ -+ bool m_bIgnoreTillEnd; -+ bool m_bIgnoreTillNextSection; -+ PT_DocPosition m_iEmbedStartPos; -+ -+ double m_dPageWidthInches; -+ double m_dSecLeftMarginInches; -+ double m_dSecRightMarginInches; -+ double m_dSecTopMarginInches; -+ double m_dSecBottomMarginInches; -+ double m_dCellWidthInches; -+ UT_GenericVector m_vecDWidths; -+ UT_UTF8String & m_sLinkCSS; -+ UT_UTF8String & m_sTitle; -+ -+ UT_uint32 m_iOutputLen; -+ bool m_bCellHasData; -+ UT_GenericVector m_vecFootnotes; -+ UT_GenericVector m_vecEndnotes; -+ -+ IE_TOCHelper * m_toc; -+ int m_heading_count; -+}; -+ -+class s_HTML_HdrFtr_Listener : public PL_Listener -+{ -+ friend class s_HTML_Listener; -+public: -+ s_HTML_HdrFtr_Listener (PD_Document * pDocument, IE_Exp_HTML * pie, PL_Listener * pHTML_Listener); -+ -+ ~s_HTML_HdrFtr_Listener (); -+ -+ bool populate (PL_StruxFmtHandle sfh, -+ const PX_ChangeRecord * pcr); -+ -+ bool populateStrux (PL_StruxDocHandle sdh, -+ const PX_ChangeRecord * pcr, -+ PL_StruxFmtHandle * psfh); -+ -+ //See note in _writeDocument -+ //bool startOfDocument (); -+ bool endOfDocument (); -+ -+ bool change (PL_StruxFmtHandle sfh, -+ const PX_ChangeRecord * pcr); -+ -+ bool insertStrux (PL_StruxFmtHandle sfh, -+ const PX_ChangeRecord * pcr, -+ PL_StruxDocHandle sdh, -+ PL_ListenerId lid, -+ void (*pfnBindHandles) (PL_StruxDocHandle sdhNew, -+ PL_ListenerId lid, -+ PL_StruxFmtHandle sfhNew)); -+ -+ bool signal (UT_uint32 iSignal); -+ void doHdrFtr(bool bHeader); -+private: -+ PD_DocumentRange * m_pHdrDocRange; -+ PD_DocumentRange * m_pFtrDocRange; -+ PD_Document * m_pDocument; -+ PL_Listener * m_pHTML_Listener; -+}; -+ -+/*****************************************************************/ -+/*****************************************************************/ -+ -+bool s_HTML_Listener::compareStyle (const char * key, const char * value) -+{ -+ /* require both key & value to be non-empty strings -+ */ -+ if (( key == 0) || ( value == 0)) return false; -+ if ((*key == 0) || (*value == 0)) return false; -+ -+ std::string css_name(key); -+ -+ std::string css_value; -+ -+ if (m_StyleTreeInline) -+ css_value = m_StyleTreeInline->lookup (css_name); -+ if (m_StyleTreeBlock && css_value.empty()) -+ css_value = m_StyleTreeBlock->lookup (css_name); -+ if (m_StyleTreeBody && css_value.empty()) -+ css_value = m_StyleTreeBody->lookup (css_name); -+ -+ return (css_value == value); -+} -+ -+void s_HTML_Listener::tagRaw (UT_UTF8String & content) -+{ -+#ifdef HTML_ENABLE_MHTML -+ if (m_bQuotedPrintable) content.escapeMIME (); -+#endif -+ // fputs (content.utf8_str (), stdout); -+ m_pie->write (content.utf8_str (), content.byteLength ()); -+ m_iOutputLen += content.byteLength(); -+} -+ -+UT_uint32 s_HTML_Listener::tagIndent () -+{ -+ return m_tagStack.getDepth (); -+} -+ -+void s_HTML_Listener::tagNewIndent (UT_UTF8String & utf8, UT_uint32 depth) -+{ -+ UT_uint32 i; -+ -+ for (i = 0; i < (depth >> 3); i++) utf8 += "\t"; -+ for (i = 0; i < (depth & 7); i++) utf8 += " "; -+} -+ -+void s_HTML_Listener::tagNewIndent (UT_uint32 extra) -+{ -+ m_utf8_0 = ""; -+ -+ if(get_Compact()) -+ return; -+ -+ tagNewIndent (m_utf8_0, m_tagStack.getDepth () + extra); -+} -+ -+/* NOTE: We terminate each line with a \r\n sequence to make IE think -+ * that our XHTML is really HTML. This is a stupid IE bug. -+ * Sorry. -+ */ -+ -+void s_HTML_Listener::tagOpenClose (const UT_UTF8String & content, bool suppress, -+ WhiteSpace ws) -+{ -+ if (ws & ws_Pre) -+ tagNewIndent (); -+ else -+ m_utf8_0 = ""; -+ -+ m_utf8_0 += "<"; -+ m_utf8_0 += content; -+ if (suppress) -+ m_utf8_0 += ">"; -+ else -+ m_utf8_0 += " />"; -+ -+ if (ws & ws_Post && !get_Compact()) m_utf8_0 += MYEOL; -+ -+ if(get_Compact()) -+ { -+ if(m_iOutputLen + m_utf8_0.byteLength() > get_Compact()) -+ { -+ m_pie->write(MYEOL, strlen(MYEOL)); -+ m_iOutputLen = 0; -+ } -+ } -+ -+ tagRaw (m_utf8_0); -+} -+ -+void s_HTML_Listener::tagOpen (UT_uint32 tagID, const UT_UTF8String & content, -+ WhiteSpace ws) -+{ -+ if (ws & ws_Pre) -+ tagNewIndent (); -+ else -+ m_utf8_0 = ""; -+ -+ m_utf8_0 += "<"; -+ m_utf8_0 += content; -+ m_utf8_0 += ">"; -+ -+ if (ws & ws_Post && !get_Compact()) m_utf8_0 += MYEOL; -+ -+ tagRaw (m_utf8_0); -+ -+ m_tagStack.push (tagID); -+} -+ -+void s_HTML_Listener::tagClose (UT_uint32 tagID, const UT_UTF8String & content, -+ WhiteSpace ws) -+{ -+ tagClose (tagID); -+ -+ if (ws & ws_Pre) -+ tagNewIndent (); -+ else -+ m_utf8_0 = ""; -+ -+ m_utf8_0 += ""; -+ -+ if (ws & ws_Post && !get_Compact()) m_utf8_0 += MYEOL; -+ -+ if(get_Compact()) -+ { -+ if(m_iOutputLen + m_utf8_0.byteLength() > get_Compact()) -+ { -+ m_pie->write(MYEOL, strlen(MYEOL)); -+ m_iOutputLen = 0; -+ } -+ } -+ -+ tagRaw (m_utf8_0); -+} -+ -+void s_HTML_Listener::tagClose (UT_uint32 tagID) -+{ -+ UT_uint32 i = 0; -+ m_tagStack.pop ((UT_sint32*)&i); -+ -+ if (i == tagID) return; -+ -+ UT_DEBUGMSG(("WARNING: possible tag mis-match in XHTML output!\n")); -+ UT_DEBUGMSG(("WARNING: Tag requested %i, tag found %i\n", tagID, i)); -+} -+ -+/* use with *extreme* caution! (this is used by images with data-URLs) -+ */ -+void s_HTML_Listener::tagOpenBroken (const UT_UTF8String & content, -+ WhiteSpace ws) -+{ -+ if (ws & ws_Pre) -+ { -+ tagNewIndent (); -+ m_utf8_0 += "<"; -+ } -+ else -+ m_utf8_0 = "<"; -+ -+ m_utf8_0 += content; -+ -+ tagRaw (m_utf8_0); -+} -+ -+/* use with *extreme* caution! (this is used by images with data-URLs) -+ */ -+void s_HTML_Listener::tagCloseBroken (const UT_UTF8String & content, bool suppress, -+ WhiteSpace ws) -+{ -+ m_utf8_0 = content; -+ -+ if (suppress) -+ m_utf8_0 += " >"; -+ else -+ m_utf8_0 += " />"; -+ -+ if (ws & ws_Post && !get_Compact()) -+ m_utf8_0 += MYEOL; -+ -+ if(get_Compact()) -+ { -+ if(m_iOutputLen + m_utf8_0.byteLength() > get_Compact()) -+ { -+ m_pie->write(MYEOL, strlen(MYEOL)); -+ m_iOutputLen = 0; -+ } -+ } -+ -+ tagRaw (m_utf8_0); -+} -+ -+UT_uint32 s_HTML_Listener::tagTop () -+{ -+ UT_sint32 i = 0; -+ if (m_tagStack.viewTop (i)) return (UT_uint32)i; -+ return 0; -+} -+ -+void s_HTML_Listener::tagPop () -+{ -+ // Don't forget to not put tags without explicit closure in here. -+ switch (tagTop ()) -+ { -+ case TT_TD: -+ { -+ tagClose (TT_TD, "td"); -+ } -+ break; -+ case TT_TR: -+ { -+ tagClose (TT_TR, "tr"); -+ } -+ break; -+ case TT_TBODY: -+ { -+ tagClose (TT_TBODY, "tbody"); -+ } -+ break; -+ case TT_TABLE: -+ { -+ tagClose (TT_TABLE, "table"); -+ } -+ break; -+ case TT_DIV: -+ { -+ tagClose (TT_DIV, "div"); -+ } -+ break; -+ case TT_P: -+ { -+ tagClose(TT_P, "p"); -+ } -+ break; -+ case TT_H1: -+ { -+ tagClose(TT_H1, "h1"); -+ } -+ break; -+ case TT_H2: -+ { -+ tagClose(TT_H2, "h2"); -+ } -+ break; -+ case TT_H3: -+ { -+ tagClose(TT_H3, "h3"); -+ } -+ break; -+ case TT_H4: -+ { -+ tagClose(TT_H4, "h4"); -+ } -+ break; -+ case TT_SPAN: -+ { -+ tagClose (TT_SPAN, "span"); -+ } -+ break; -+ case TT_BDO: -+ { -+ tagClose (TT_BDO, "bdo"); -+ } -+ break; -+ case TT_LI: -+ { -+ tagClose (TT_LI, "li"); -+ } -+ break; -+ case TT_UL: -+ { -+ tagClose (TT_UL, "ul"); -+ } -+ break; -+ case TT_OL: -+ { -+ tagClose (TT_OL, "ol"); -+ } -+ break; -+ default: -+ { -+ UT_DEBUGMSG(("tagPop: unhandled tag closure! %d\n",tagTop())); -+ m_utf8_1 ="error - not handled"; -+ /* There has got to be a better way than this. -+ I think putting up the usual "Write error - -+ file a bug and attach this" message is preferable -+ to spitting out nonsense html. -MG */ -+ tagClose (tagTop(), m_utf8_1); // prevents hangs see 7524 -+ } -+ break; -+ } -+} -+ -+void s_HTML_Listener::tagPI (const char * target, const UT_UTF8String & content) -+{ -+ tagNewIndent (); -+ -+ m_utf8_0 += ""; -+ if(!get_Compact()) -+ m_utf8_0 += MYEOL; -+ -+ tagRaw (m_utf8_0); -+} -+ -+void s_HTML_Listener::tagComment (const UT_UTF8String & content) -+{ -+ tagNewIndent (); -+ -+ m_utf8_0 += ""; -+ if(!get_Compact()) -+ m_utf8_0 += MYEOL; -+ -+ tagRaw (m_utf8_0); -+} -+ -+void s_HTML_Listener::tagCommentOpen () -+{ -+ tagNewIndent (); -+ -+ m_utf8_0 += ""; -+ if(!get_Compact()) -+ m_utf8_0 += MYEOL; -+ -+ tagRaw (m_utf8_0); -+} -+ -+void s_HTML_Listener::styleIndent () -+{ -+ m_utf8_0 = ""; -+ -+ for (UT_uint32 i = 0; i < m_styleIndent; i++) m_utf8_0 += "\t"; -+} -+ -+void s_HTML_Listener::styleOpen (const UT_UTF8String & rule) -+{ -+ styleIndent (); -+ -+ m_utf8_0 += rule; -+ m_utf8_0 += " {"; -+ if(!get_Compact()) -+ m_utf8_0 += MYEOL; -+ -+ if (m_fdCSS) -+ gsf_output_write (m_fdCSS, m_utf8_0.byteLength (), (const guint8*)m_utf8_0.utf8_str ()); -+ else -+ tagRaw (m_utf8_0); -+ -+ m_styleIndent++; -+} -+ -+void s_HTML_Listener::styleClose () -+{ -+ if (m_styleIndent == 0) -+ { -+ UT_DEBUGMSG(("WARNING: CSS style group over-closing!\n")); -+ return; -+ } -+ m_styleIndent--; -+ -+ styleIndent (); -+ -+ m_utf8_0 += "}"; -+ if(!get_Compact()) -+ m_utf8_0 += MYEOL; -+ -+ if (m_fdCSS) -+ gsf_output_write (m_fdCSS, m_utf8_0.byteLength (), (const guint8*)m_utf8_0.utf8_str ()); -+ else -+ tagRaw (m_utf8_0); -+} -+ -+void s_HTML_Listener::styleNameValue (const char * name, const UT_UTF8String & value) -+{ -+ styleIndent (); -+ -+ m_utf8_0 += name; -+ m_utf8_0 += ":"; -+ m_utf8_0 += value; -+ m_utf8_0 += ";"; -+ if(!get_Compact()) -+ m_utf8_0 += MYEOL; -+ -+ if (m_fdCSS) -+ gsf_output_write (m_fdCSS, m_utf8_0.byteLength (), (const guint8*)m_utf8_0.utf8_str ()); -+ else -+ tagRaw (m_utf8_0); -+} -+ -+void s_HTML_Listener::styleText (const UT_UTF8String & content) -+{ -+ if (m_fdCSS) -+ gsf_output_write (m_fdCSS, content.byteLength (), (const guint8*)content.utf8_str ()); -+ else -+ { -+ m_utf8_0 = content; -+ tagRaw (m_utf8_0); -+ } -+} -+ -+void s_HTML_Listener::textTrusted (const UT_UTF8String & text) -+{ -+ if (text.byteLength ()) -+ { -+ m_utf8_0 = text; -+ tagRaw (m_utf8_0); -+ -+ m_bWroteText = true; -+ } -+} -+ -+void s_HTML_Listener::textUntrusted (const char * text) -+{ -+ if ( text == 0) return; -+ if (*text == 0) return; -+ -+ m_utf8_0 = ""; -+ -+ char buf[2]; -+ buf[1] = 0; -+ -+ const char * ptr = text; -+ while (*ptr) -+ { -+ if ((*ptr & 0x7f) == *ptr) // ASCII -+ { -+ switch (*ptr) -+ { -+ case '<': -+ m_utf8_0 += "<"; -+ break; -+ case '>': -+ m_utf8_0 += ">"; -+ break; -+ case '&': -+ m_utf8_0 += "&"; -+ break; -+ default: -+ buf[0] = *ptr; -+ m_utf8_0 += buf; -+ break; -+ } -+ } -+ /* TODO: translate non-ASCII characters -+ */ -+ ptr++; -+ } -+ if (m_utf8_0.byteLength ()) tagRaw (m_utf8_0); -+} -+ -+static const char * s_boundary = "AbiWord_multipart_boundary____________"; -+ -+void s_HTML_Listener::multiHeader (const UT_UTF8String & title) -+{ -+ m_utf8_1 = ""; -+ multiField ("From", m_utf8_1); -+ -+ multiField ("Subject", title); -+ -+ time_t tim = time (NULL); -+ struct tm * pTime = localtime (&tim); -+ char timestr[64]; -+ strftime (timestr, 63, "%a, %d %b %Y %H:%M:%S +0100", pTime); // hmm, hard-code time zone -+ timestr[63] = 0; -+ -+ m_utf8_1 = timestr; -+ multiField ("Date", m_utf8_1); -+ -+ m_utf8_1 = "1.0"; -+ multiField ("MIME-Version", m_utf8_1); -+ -+ m_utf8_1 = "multipart/related;" MYEOL "\tboundary=\""; -+ m_utf8_1 += s_boundary; -+ m_utf8_1 += "\";" MYEOL "\ttype=\""; -+ -+ if (get_HTML4 ()) -+ m_utf8_1 += IE_MIMETYPE_HTML; -+ else -+ m_utf8_1 += IE_MIMETYPE_XHTML; -+ -+ m_utf8_1 += "\""; -+ -+ multiField ("Content-Type", m_utf8_1); -+ multiBoundary (); -+ -+ if (get_HTML4 ()) -+ m_utf8_1 = IE_MIMETYPE_HTML; -+ else -+ m_utf8_1 = IE_MIMETYPE_XHTML; -+ -+ m_utf8_1 += ";charset=\"UTF-8\""; -+ -+ multiField ("Content-Type", m_utf8_1); -+ -+ m_utf8_1 = "quoted-printable"; -+ multiField ("Content-Transfer-Encoding", m_utf8_1); -+ multiBreak (); -+ -+ m_bQuotedPrintable = true; -+} -+ -+void s_HTML_Listener::multiBoundary (bool end) -+{ -+ m_utf8_0 = MYEOL "--"; -+ m_utf8_0 += s_boundary; -+ -+ if (end) -+ m_utf8_0 += "--" MYEOL; -+ else -+ m_utf8_0 += MYEOL; -+ // fputs (m_utf8_0.utf8_str (), stdout); -+ m_pie->write (m_utf8_0.utf8_str (), m_utf8_0.byteLength ()); -+ m_iOutputLen += m_utf8_0.byteLength(); -+} -+ -+void s_HTML_Listener::multiField (const char * name, const UT_UTF8String & value) -+{ -+ m_utf8_0 = name; -+ m_utf8_0 += ":"; -+ m_utf8_0 += value; -+ if(!get_Compact()) -+ m_utf8_0 += MYEOL; -+ // fputs (m_utf8_0.utf8_str (), stdout); -+ m_pie->write (m_utf8_0.utf8_str (), m_utf8_0.byteLength ()); -+ m_iOutputLen += m_utf8_0.byteLength(); -+ -+} -+ -+void s_HTML_Listener::multiBreak () -+{ -+ m_utf8_0 = MYEOL; -+ // fputs (m_utf8_0.utf8_str (), stdout); -+ m_pie->write (m_utf8_0.utf8_str (), m_utf8_0.byteLength ()); -+ m_iOutputLen += m_utf8_0.byteLength(); -+} -+ -+/* intermediate methods -+ */ -+ -+static const char * s_DTD_XHTML_AWML = "!DOCTYPE html PUBLIC \"-//ABISOURCE//DTD XHTML plus AWML 2.2//EN\" \"http://www.abisource.com/2004/xhtml-awml/xhtml-awml.mod\""; -+ -+static const char * s_DTD_XHTML = "!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\""; -+ -+static const char * s_DTD_HTML4 = "!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\""; -+ -+static const char * s_Delimiter = -+"======================================================="; -+ -+static const char * s_Header[2] = { -+ "Created by AbiWord, a free, Open Source wordprocessor. ", -+ "For more information visit http://www.abisource.com. " -+}; -+ -+static const char * s_HeaderCompact = "Created by Abiword, www.abisource.com"; -+ -+void s_HTML_Listener::_outputBegin (PT_AttrPropIndex api) -+{ -+ if (m_bTemplateBody) -+ { -+ m_bFirstWrite = false; -+ return; -+ } -+ -+ if(m_sTitle.byteLength() == 0) -+ { -+#ifdef HTML_META_SUPPORTED -+ m_pDocument->getMetaDataProp (PD_META_KEY_TITLE, m_sTitle); -+ -+ if (m_sTitle.byteLength () == 0 && m_pie->getFileName () != NULL) -+ m_sTitle = UT_basename(m_pie->getFileName ()); -+#else -+ m_sTitle = UT_basename(m_pie->getFileName ()); -+#endif -+ } -+ -+ if (get_Multipart ()) multiHeader (m_sTitle); -+ -+ /* print XML header -+ */ -+ if (!get_HTML4 ()) -+ { -+ if (get_Declare_XML ()) -+ { -+ m_utf8_1 = "version=\"1.0\" encoding=\"UTF-8\""; -+ tagPI ("xml", m_utf8_1); -+ } -+ if (get_Allow_AWML ()) -+ m_utf8_1 = s_DTD_XHTML_AWML; -+ else -+ m_utf8_1 = s_DTD_XHTML; -+ tagOpenClose (m_utf8_1, true); -+ } -+ else -+ { -+ m_utf8_1 = s_DTD_HTML4; -+ tagOpenClose (m_utf8_1, true); -+ } -+ -+ /* open root element, i.e. ; namespace it if XHTML -+ */ -+ m_utf8_1 = "html"; -+ if (!get_HTML4 ()) -+ { -+ m_utf8_1 += " xmlns=\"http://www.w3.org/1999/xhtml\""; -+ if (get_Allow_AWML ()) m_utf8_1 += " xmlns:awml=\"http://www.abisource.com/2004/xhtml-awml/\""; -+ } -+ tagOpen (TT_HTML, m_utf8_1); -+ -+ /* start section of HTML document -+ */ -+ m_utf8_1 = "head"; -+ tagOpen (TT_HEAD, m_utf8_1); -+ -+ /* print header comment -+ * we insert them that let, because IE6 expect to find root within -+ * 6 lines. -+ */ -+ if(get_Compact()) -+ { -+ m_utf8_1 = s_HeaderCompact; -+ tagComment (m_utf8_1); -+ } -+ else -+ { -+ const UT_UTF8String delimiter(s_Delimiter); -+ tagComment (delimiter); -+ for (UT_uint32 hdri = 0; hdri < G_N_ELEMENTS(s_Header); hdri++) -+ { -+ m_utf8_1 = s_Header[hdri]; -+ tagComment (m_utf8_1); -+ } -+ tagComment (delimiter); -+ } -+ -+ /* we add a meta tag describing the document's charset as UTF-8 -+ * even with XHTML because Safari and Camino fail to recognize -+ * charset. This still validate W3C. -+ */ -+ m_utf8_1 = "meta http-equiv=\"content-type\" content=\"text/html;charset=UTF-8\""; -+ tagOpenClose (m_utf8_1, get_HTML4 ()); -+ -+ /* set page's title in browser -+ */ -+ m_utf8_1 = "title"; -+ tagOpen (TT_TITLE, m_utf8_1, ws_Pre); -+ -+#ifdef HTML_META_SUPPORTED -+ textTrusted (m_sTitle.escapeXML ()); // TODO: back-port this method? -+#else -+ textUntrusted (m_sTitle.utf8_str ()); -+#endif -+ -+ tagClose (TT_TITLE, m_utf8_1, ws_Post); -+ -+#ifdef HTML_META_SUPPORTED -+ /* write out our metadata properties -+ */ -+ _handleMeta (); -+#endif -+ -+ if (!get_PHTML ()) -+ { -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = m_pDocument->getAttrProp (api, &pAP); -+ -+ if (bHaveProp && pAP) -+ { -+ _outputStyles (pAP); -+ if (!get_Embed_CSS ()) m_pAPStyles = pAP; -+ } -+ } -+ -+ if (get_PHTML ()) -+ { -+ m_utf8_1 = MYEOL " include($_SERVER['DOCUMENT_ROOT'].'/x-header.php');" MYEOL " "; -+ tagPI ("php", m_utf8_1); -+ } -+ -+ /* end section of HTML document -+ */ -+ m_utf8_1 = "head"; -+ tagClose (TT_HEAD, m_utf8_1); -+ -+ /* start section of HTML document -+ */ -+ m_utf8_1 = "body"; -+ tagOpen (TT_BODY, m_utf8_1); -+ -+ if (get_PHTML ()) -+ { -+ m_utf8_1 = MYEOL " include($_SERVER['DOCUMENT_ROOT'].'/x-page-begin.php');" MYEOL " "; -+ tagPI ("php", m_utf8_1); -+ } -+ -+ m_bFirstWrite = false; -+} -+ -+void s_HTML_Listener::_outputEnd () -+{ -+ if (m_bInBlock) _closeTag (); -+ -+ while (true) -+ { -+ UT_uint32 top = tagTop (); -+ if ((top == TT_BODY) || !top) -+ break; -+ tagPop (); -+ } -+ if (m_bTemplateBody) return; -+ -+ if (get_PHTML ()) -+ { -+ m_utf8_1 = MYEOL " include($_SERVER['DOCUMENT_ROOT'].'/x-page-end.php');" MYEOL " "; -+ tagPI ("php", m_utf8_1); -+ } -+ -+ /* end section of HTML document -+ */ -+ m_utf8_1 = "body"; -+ tagClose (TT_BODY, m_utf8_1); -+ -+ /* end section of HTML document -+ */ -+ m_utf8_1 = "html"; -+ tagClose (TT_HTML, m_utf8_1); -+ -+ if (get_Multipart ()) -+ { -+ m_bQuotedPrintable = false; -+ -+ if (m_pAPStyles) -+ { -+ _outputStyles (m_pAPStyles); -+ m_bQuotedPrintable = false; -+ } -+ _handlePendingImages (); -+ -+ multiBoundary (true); -+ } -+} -+ -+bool s_HTML_Listener::_openStyleSheet (UT_UTF8String & css_relative_path) -+{ -+ UT_UTF8String cssdir(m_pie->getFileName ()); -+ cssdir += "_files"; -+ -+ UT_go_directory_create (cssdir.utf8_str(), 0750, NULL); -+ -+ UT_UTF8String css_path = cssdir; -+ css_path += "/style.css"; -+ -+ if (m_utf8_css_path.byteLength ()) // Multipart HTML: style-sheet segment -+ { -+ multiBoundary (); -+ -+ m_utf8_1 = IE_MIMETYPE_CSS; -+ m_utf8_1 += ";charset=\"UTF-8\""; -+ -+ multiField ("Content-Type", m_utf8_1); -+ multiField ("Content-Location", m_utf8_css_path); -+ -+ m_utf8_1 = "quoted-printable"; -+ multiField ("Content-Transfer-Encoding", m_utf8_1); -+ multiBreak (); -+ -+ m_bQuotedPrintable = true; -+ } -+ else if (!get_Multipart ()) -+ { -+ m_fdCSS = UT_go_file_create (css_path.utf8_str (), NULL); -+ if (m_fdCSS == NULL) return false; -+ } -+ -+ char * base_name = UT_go_basename_from_uri (m_pie->getFileName ()); -+ if (base_name) -+ css_relative_path = base_name; -+ css_relative_path += "/styles.css"; -+ g_free(base_name); -+ -+ return true; -+} -+ -+void s_HTML_Listener::_closeStyleSheet () -+{ -+ if (m_fdCSS) { -+ gsf_output_close (m_fdCSS); -+ g_object_unref (G_OBJECT (m_fdCSS)); -+ m_fdCSS = 0; -+ } -+} -+ -+// TODO: Use the styleIndent code to clean up this output -+void s_HTML_Listener::_populateHeaderStyle() { -+ const gchar * staticCSSHeaderProps [9] = {"position: relative;","width: 100%;","height: auto;", -+ "top: 0;","bottom: auto;","right: 0;","left: 0;","}",NULL}; // Static properties for headers -+ m_utf8_1 = "#header {"; // Reinitialize the variable, now to deal with the header-identified div -+ m_utf8_1 += MYEOL; -+ for(unsigned short int propIdx = 0; propIdx < 8; propIdx += 1) -+ { -+ m_utf8_1 += staticCSSHeaderProps[propIdx]; -+ m_utf8_1 += MYEOL; -+ } -+ styleText(m_utf8_1); -+} -+// TODO: Use the styleIndent code to clean up this output -+void s_HTML_Listener::_populateFooterStyle() { -+ const gchar * staticCSSFooterProps [9] = {"position: relative;","width: 100%;","height: auto;", -+ "top: auto;","bottom: 0;","right: 0;","left: 0;","}",NULL}; // Static properties for footers -+ m_utf8_1 = "#footer {"; // Reinitialize the variable, now to deal with the footer-identified div -+ m_utf8_1 += MYEOL; -+ for(unsigned short int propIdx = 0; propIdx < 8; propIdx += 1) -+ { -+ m_utf8_1 += staticCSSFooterProps[propIdx]; -+ m_utf8_1 += MYEOL; -+ } -+ styleText(m_utf8_1); -+} -+ -+void s_HTML_Listener::_outputStyles (const PP_AttrProp * pAP) -+{ -+ // make sure any unit conversions use correct locale -+ UT_LocaleTransactor t(LC_NUMERIC, "C"); -+ -+ /* some cascading style rules -+ */ -+ const gchar * szName = 0; -+ const gchar * szValue = 0; -+ -+ if (get_Embed_CSS ()) -+ { -+ m_utf8_1 = "style type=\"text/css\""; -+ tagOpen (TT_STYLE, m_utf8_1); -+ tagCommentOpen (); -+ } -+ else if(get_Link_CSS()) -+ { -+ m_utf8_1 = "link href=\""; -+ m_utf8_1 += m_sLinkCSS; -+ m_utf8_1 += "\" rel=\"stylesheet\" type=\"text/css\""; -+ -+ tagOpenClose (m_utf8_1, get_HTML4 ()); -+ -+ // do not export style definitions ... -+ return; -+ } -+ else -+ { -+ UT_UTF8String css_path; -+ -+ if (!_openStyleSheet (css_path)) return; -+ -+ if (!get_Multipart () || (m_utf8_css_path.byteLength () == 0)) -+ { -+ m_utf8_1 = "link href=\""; -+ m_utf8_1 += css_path; -+ m_utf8_1 += "\" rel=\"stylesheet\" type=\"text/css\""; -+ -+ tagOpenClose (m_utf8_1, get_HTML4 ()); -+ -+ if (get_Multipart ()) -+ { -+ m_utf8_css_path = css_path; -+ return; -+ } -+ } -+ -+ /* first line of style sheet is an encoding declaration -+ */ -+ m_utf8_1 = "@charset \"UTF-8\";"; -+ if(!get_Compact()) -+ m_utf8_0 += MYEOL MYEOL; -+ -+ styleText (m_utf8_1); -+ } -+ -+ // stylesheet stolen from wikipedia -+ styleText("#toc,\n" -+".toc,\n" -+".mw-warning {\n" -+" border: 1px solid #aaa;\n" -+" background-color: #f9f9f9;\n" -+" padding: 5px;\n" -+" font-size: 95%;\n" -+"}\n" -+"#toc h2,\n" -+".toc h2 {\n" -+" display: inline;\n" -+" border: none;\n" -+" padding: 0;\n" -+" font-size: 100%;\n" -+" font-weight: bold;\n" -+"}\n" -+"#toc #toctitle,\n" -+".toc #toctitle,\n" -+"#toc .toctitle,\n" -+".toc .toctitle {\n" -+" text-align: center;\n" -+"}\n" -+"#toc ul,\n" -+".toc ul {\n" -+" list-style-type: none;\n" -+" list-style-image: none;\n" -+" margin-left: 0;\n" -+" padding-left: 0;\n" -+" text-align: left;\n" -+"}\n" -+"#toc ul ul,\n" -+".toc ul ul {\n" -+" margin: 0 0 0 2em;\n" -+"}\n" -+"#toc .toctoggle,\n" -+".toc .toctoggle {\n" -+" font-size: 94%;\n" -+"}"); -+ -+ /* global page styles refer to the tag -+ */ -+ PD_Style * pStyle = 0; -+ m_pDocument->getStyle ("Normal", &pStyle); -+ -+ if (pAP && pStyle) -+ { -+ /* Add normal styles to any descendent of the body for global effect -+ * -+ * (I think @ rules are supposed to precede non-@ rules) -+ */ -+ m_utf8_1 = "@media print, projection, embossed"; -+ styleOpen (m_utf8_1); -+ -+ m_utf8_1 = "body"; -+ styleOpen (m_utf8_1); -+ -+ // Set margins for paged media to match those set in AbiWord -+ // TODO: consolidate all places of awml-css21 matching into one UT/PP function -+ const gchar * marginProps [10] = {"page-margin-top","padding-top", -+ "page-margin-bottom","padding-bottom", -+ "page-margin-left","padding-left", -+ "page-margin-right","padding-right", -+ NULL, NULL}; -+ for (unsigned short int propIdx = 0; propIdx < 8; propIdx += 2) -+ { -+ szValue = PP_evalProperty (marginProps[propIdx], 0, 0, pAP, m_pDocument, true); -+ m_utf8_1 = static_cast(szValue); -+ styleNameValue (marginProps[propIdx + 1], m_utf8_1); -+ } -+ -+ styleClose (); // end of: body { } -+ styleClose (); // end of: @media print { } -+ -+ if(m_bHaveHeader) _populateHeaderStyle(); -+ if(m_bHaveFooter) _populateFooterStyle(); -+ -+ m_utf8_1 = "body"; -+ styleOpen (m_utf8_1); -+ -+ for (UT_uint32 i = 0; i < pStyle->getPropertyCount (); i++) -+ { -+ pStyle->getNthProperty (i, szName, szValue); -+ -+ if (( szName == 0) || ( szValue == 0)) continue; // paranoid? moi? -+ if ((*szName == 0) || (*szValue == 0)) continue; -+ -+ if (strstr (szName, "margin")) continue; -+ if (!is_CSS (reinterpret_cast(szName))) continue; -+ -+ if (strcmp (szName, "font-family") == 0) -+ { -+ if ((strcmp (szValue, "serif") == 0) || -+ (strcmp (szValue, "sans-serif") == 0) || -+ (strcmp (szValue, "cursive") == 0) || -+ (strcmp (szValue, "fantasy") == 0) || -+ (strcmp (szValue, "monospace") == 0)) -+ { -+ m_utf8_1 = static_cast(szValue); -+ } -+ else -+ { -+ m_utf8_1 = "'"; -+ m_utf8_1 += static_cast(szValue); -+ m_utf8_1 += "'"; -+ } -+ } -+ else if (strcmp (szName, "color") == 0) -+ { -+ if (IS_TRANSPARENT_COLOR (szValue)) continue; -+ -+ if (*szValue != '#') -+ m_utf8_1 = "#"; -+ else -+ m_utf8_1.clear(); -+ -+ m_utf8_1 += static_cast(szValue); -+ } -+ else m_utf8_1 = static_cast(szValue); -+ -+ styleNameValue (szName, m_utf8_1); -+ } -+ szValue = PP_evalProperty ("background-color", 0, 0, pAP, m_pDocument, true); -+ if(szValue && !IS_TRANSPARENT_COLOR (szValue)) -+ { -+ if (*szValue != '#') -+ m_utf8_1 = "#"; -+ else -+ m_utf8_1.clear(); -+ -+ m_utf8_1 += static_cast(szValue); -+ -+ styleNameValue ("background-color", m_utf8_1); -+ } -+ styleClose (); // end of: body { } -+ -+#ifdef HTML_TABLES_SUPPORTED -+ szValue = PP_evalProperty ("width", 0, 0, pAP, m_pDocument, true); -+ -+ m_utf8_1 = "table"; -+ styleOpen (m_utf8_1); -+ -+ if(get_Abs_Units() && szValue && *szValue) -+ { -+ double dMM = UT_convertToDimension(szValue, DIM_MM); -+ UT_UTF8String_sprintf(m_utf8_1, "%.1fmm", dMM); -+ styleNameValue ("width", m_utf8_1); -+ } -+ else if(get_Scale_Units() && szValue && *szValue) -+ { -+ m_utf8_1 = "100%"; -+ styleNameValue ("width", m_utf8_1); -+ } -+ // else do nothing, because in flow-based document width is left to box model -+ -+ styleClose (); // end of: table { } -+ -+ m_utf8_1 = "td"; -+ styleOpen (m_utf8_1); -+ -+ m_utf8_1 = "collapse"; -+ styleNameValue ("border-collapse", m_utf8_1); -+ -+ m_utf8_1 = "left"; -+ styleNameValue ("text-align", m_utf8_1); -+ -+ m_utf8_1 = "top"; -+ styleNameValue ("vertical-align", m_utf8_1); -+ -+ styleClose (); // end of: td { } -+#endif /* HTML_TABLES_SUPPORTED */ -+ } -+ -+ m_style_tree->print (this); -+ -+ if (get_Embed_CSS ()) -+ { -+ tagCommentClose (); -+ m_utf8_1 = "style"; -+ tagClose (TT_STYLE, m_utf8_1); -+ } -+ else _closeStyleSheet (); -+} -+ -+/*! -+ * This closes open section tags and starts new one for embedded struxes -+ */ -+void s_HTML_Listener::startEmbeddedStrux(void) -+{ -+ if (m_bInSection) _closeSection (); -+ -+ m_utf8_1 = "div"; -+ tagOpen (TT_DIV, m_utf8_1); -+ m_bInSection = true; -+} -+ -+void s_HTML_Listener::_openSection (PT_AttrPropIndex api, UT_uint16 iSectionSpecialType) -+{ -+ UT_LocaleTransactor t(LC_NUMERIC, "C"); -+ -+ if (m_bFirstWrite) _outputBegin (api); -+ -+ if (m_bInSection) _closeSection (); -+ -+ const PP_AttrProp* pSectionAP = NULL; -+ m_pDocument->getAttrProp(api, &pSectionAP); -+ -+ m_utf8_1 = "div"; -+ -+ switch (iSectionSpecialType) -+ { -+ case 1: -+ { -+ m_utf8_1 += " id=\"header\""; -+ m_bInSection = true; -+ break; -+ } -+ case 2: -+ { -+ m_utf8_1 += " id=\"footer\""; -+ m_bInSection = true; -+ break; -+ } -+ case 3: -+ { -+ m_utf8_1 += " id=\"main\""; -+ break; -+ } -+ default: -+ m_bInSection = true; -+ break; -+ } -+ -+ tagOpen (TT_DIV, m_utf8_1); -+ m_dPageWidthInches = m_pDocument->m_docPageSize.Width(DIM_IN); -+ -+ const char* pszLeftMargin = NULL; -+ const char* pszRightMargin = NULL; -+ const char* pszTopMargin = NULL; -+ const char* pszBottomMargin = NULL; -+ pSectionAP->getProperty("page-margin-left", (const gchar *&)pszLeftMargin); -+ pSectionAP->getProperty("page-margin-right", (const gchar *&)pszRightMargin); -+ pSectionAP->getProperty("page-margin-top", (const gchar *&)pszTopMargin); -+ pSectionAP->getProperty("page-margin-bottom", (const gchar *&)pszBottomMargin); -+ -+ if(pszLeftMargin && pszLeftMargin[0]) -+ { -+ m_dSecLeftMarginInches = UT_convertToInches(pszLeftMargin); -+ } -+ else -+ { -+ m_dSecLeftMarginInches = 1.0; -+ } -+ -+ if(pszRightMargin && pszRightMargin[0]) -+ { -+ m_dSecRightMarginInches = UT_convertToInches(pszRightMargin); -+ } -+ else -+ { -+ m_dSecRightMarginInches = 1.0; -+ } -+ -+ if(pszTopMargin && pszTopMargin[0]) -+ { -+ m_dSecTopMarginInches = UT_convertToInches(pszTopMargin); -+ } -+ else -+ { -+ m_dSecTopMarginInches = 1.0; -+ } -+ -+ if(pszBottomMargin && pszBottomMargin[0]) -+ { -+ m_dSecBottomMarginInches = UT_convertToInches(pszBottomMargin); -+ } -+ else -+ { -+ m_dSecBottomMarginInches = 1.0; -+ } -+ -+} -+ -+void s_HTML_Listener::_closeSection (void) -+{ -+ // When we start tracking list ideas and doing store-first-write-later on them, -+ // and then start supporting unified discontinuous lists, -+ // complications with questionable worthwhileness, -+ // we will no longer have to pop out for every section break even when there are identical listIds spanning multiple sections. -+ // Until then, this is necessary. -+ listPopToDepth(0); -+ -+ if (tagTop() == TT_SPAN) { -+ UT_DEBUGMSG(("_closeSection closing span\n")); -+ tagClose(TT_SPAN, "span"); -+ } -+ -+ if (m_bInBlock && (tagTop() == TT_P)) { // If only the first is true, we have a first-order tag mismatch. The alternative with not testing the latter is a second-order tag mismatch. -+ UT_DEBUGMSG(("_closeSection closing block\n")); -+ // _closeTag (); // We need to investigate the tag stack usage of this, and whether or not we really would rather specify the tag in all cases. -+ tagClose(TT_P, "p"); -+ } -+ // Need to investigate whether we can safely uncomment this without undoing heading work, or any other kind using unended structures like lists. -+ // _popUnendedStructures(); // Close lists, and possibly other stuff. Even if it theoretically can span sections, we run a high risk of corrupting the document. -+ -+ if (m_bInSection && (tagTop () == TT_DIV)) -+ { -+ m_utf8_1 = "div"; -+ UT_DEBUGMSG(("_closeSection closing div\n")); -+ tagClose (TT_DIV, m_utf8_1); -+ } -+ m_bInSection = false; -+} -+ -+/*! This function returns true if the name of the PD_Style which style is based -+ on, without whitespace, is the same as `from`, and otherwise returns false. -+*/ -+bool s_HTML_Listener::_inherits (const char * style, const char * from) -+{ -+ if ((style == 0) || (from == 0)) return false; -+ -+ bool bret = false; -+ -+ PD_Style * pStyle = 0; -+ -+ if (m_pDocument->getStyle (style, &pStyle)) -+ if (pStyle) -+ { -+ PD_Style * pBasedOn = pStyle->getBasedOn (); -+ if (pBasedOn) -+ { -+ /* The name of the style is stored in the PT_NAME_ATTRIBUTE_NAME -+ * attribute within the style -+ */ -+ const gchar * szName = 0; -+ pBasedOn->getAttribute (PT_NAME_ATTRIBUTE_NAME, szName); -+ -+ if (szName) -+ { -+ /* careful!! -+ */ -+ s_removeWhiteSpace (static_cast(szName), m_utf8_0, true); -+ -+ if (m_utf8_0.utf8_str ()) -+ bret = (strcmp (from, m_utf8_0.utf8_str ()) == 0); -+ } -+ } -+ } -+ return bret; -+} -+ -+UT_uint32 s_HTML_Listener::listDepth () -+{ -+ return static_cast(m_utsListType.getDepth ()); -+} -+ -+UT_uint32 s_HTML_Listener::listType () -+{ -+ UT_sint32 i = 0; -+ m_utsListType.viewTop (i); -+ return (UT_uint32)i; -+} -+ -+void s_HTML_Listener::listPush (UT_uint32 type, const char * ClassName) -+{ -+ if (tagTop () == TT_LI) -+ { -+ m_utf8_1 = MYEOL; -+ tagRaw (m_utf8_1); -+ } -+ -+ UT_uint32 tagID; -+ -+ if (type == BT_BULLETLIST) -+ { -+ tagID = TT_UL; -+ m_utf8_1 = "ul"; -+ } -+ else -+ { -+ tagID = TT_OL; -+ m_utf8_1 = "ol"; -+ } -+ tagOpen (tagID, m_utf8_1); -+ -+ m_utsListType.push (static_cast(type)); -+} -+ -+void s_HTML_Listener::listPop () -+{ -+ if (tagTop () == TT_SPAN) -+ { -+ // We don't just tagPop() for the sake of prettiness, apparently. -+ m_utf8_1 = "span"; -+ tagClose (TT_SPAN, m_utf8_1, ws_Post); -+ } -+#if 0 -+ // This code may come in handy if AbiWord ever supported listed frames, which is conceivable -+ if (m_bInFrame && tagTop () == TT_DIV) // Frame embedded in list, hopefully. I _really_ hope we don't have a first order section in a list. -+ { -+ if(m_bInTextBox) -+ _closeTextBox(); -+ else -+ { -+ UT_DEBUGMSG(("WARNING: Popping a frame which is not a textbox within a list item, heaven help us \n")); -+ -+ m_utf8_1 = "div"; -+ tagClose (TT_DIV, m_utf8_1); -+ } -+ } -+#endif -+ if (tagTop () == TT_LI) -+ { -+ m_utf8_1 = "li"; -+ tagClose (TT_LI, m_utf8_1); -+ } -+ -+ UT_sint32 type = 0; -+ m_utsListType.pop (&type); -+ -+ UT_uint32 tagID; -+ -+ if (type == BT_BULLETLIST) -+ { -+ tagID = TT_UL; -+ m_utf8_1 = "ul"; -+ } -+ else -+ { -+ tagID = TT_OL; -+ m_utf8_1 = "ol"; -+ } -+ tagClose (tagID, m_utf8_1); -+ -+ if (tagTop () == TT_LI) -+ { -+ m_utf8_1 = ""; -+ tagNewIndent (m_utf8_1, tagIndent () - 1); -+ tagRaw (m_utf8_1); -+ } -+} -+ -+void s_HTML_Listener::listPopToDepth (UT_uint32 depth) -+{ -+ if (listDepth () <= depth) return; -+ -+ UT_uint32 count = listDepth () - depth; -+ for (UT_uint32 i = 0; i < count; i++) listPop (); -+} -+ -+void s_HTML_Listener::_openTag (PT_AttrPropIndex api, PL_StruxDocHandle sdh) -+{ -+ if (m_bFirstWrite) _openSection (api, 0); -+ -+ if (!m_bInSection) return; -+ -+ m_StyleTreeInline = 0; -+ m_StyleTreeBlock = 0; -+ -+ if (m_bInBlock) -+ { -+ if (tagTop () == TT_A) -+ { -+ m_utf8_1 = "a"; -+ tagClose (TT_A, m_utf8_1, ws_None); -+ } -+ if (tagTop () != TT_LI) _closeTag (); -+ } -+ m_bWroteText = false; -+ -+ const gchar * szDefault = "Normal"; // TODO: should be/is a #define somewhere? -+ -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = m_pDocument->getAttrProp (api, &pAP); -+ -+ if ((!bHaveProp || (pAP == 0)) && !m_bInFrame) // [Appears to be and we're assuming it's a]

with no style attribute, and no properties either, and not a frame embedded in the list -+ { -+ listPopToDepth (0); -+ -+ m_utf8_1 = "p"; -+ tagOpen (TT_P, m_utf8_1, ws_Pre); -+ -+ m_utf8_style = szDefault; -+ -+ m_iBlockType = BT_NORMAL; -+ m_bInBlock = true; -+ return; -+ } -+ -+ UT_uint32 tagID = TT_OTHER; -+ -+ bool tagPending = false; -+ -+ const gchar * szValue = 0; -+ const gchar * szLevel = 0; -+ const gchar * szListID = 0; -+ const gchar * szStyleType = 0; -+ -+ /* This is the point at which we differentiate between different -+ * types of tags in HTML. We do a sequence of checks on the "style" -+ * and other useful attributes of the current block. First we check -+ * if we are in a block which has a named "style" or which contains -+ * list information. -+ * -+ * Weaknesses in this code include the mutability of our stored -+ * document state. I've had it happen where the representation of -+ * lists in the abiword format changes, which tends to break this -+ * code. -+ */ -+ -+ bool have_style = pAP->getAttribute (PT_STYLE_ATTRIBUTE_NAME, szValue); -+ bool have_listID = pAP->getAttribute (PT_LISTID_ATTRIBUTE_NAME, szListID); -+ bool zero_listID = true; -+ bool bClassAsTag = false; -+ -+ if (have_listID) zero_listID = (strcmp (szListID, "0") == 0); -+ -+ /* A nonzero "listid" attribute value indicates that we -+ * are in a list item, so we need to process it, HTML-style. -+ */ -+ -+ /* Specify a default style name for this list item if it -+ * doesn't already have one. -+ */ -+ if (!have_style) szValue = szDefault; -+ -+ m_utf8_style = szValue; -+ -+ m_StyleTreeBlock = m_style_tree->find (szValue); -+ -+ if (!zero_listID) -+ { -+ /* Desired list type (numbered / bullet) -+ */ -+ if (!pAP->getProperty ("list-style", szStyleType)) szStyleType = szValue; -+ -+ if (strcmp (static_cast(szStyleType), "Bullet List") == 0) -+ { -+ m_iBlockType = BT_BULLETLIST; -+ } -+ else -+ { -+ m_iBlockType = BT_NUMBEREDLIST; -+ } -+ -+ /* Find out how deeply nested this list item is. -+ */ -+ pAP->getAttribute ("level", szLevel); -+ if(szLevel) -+ { -+ m_iListDepth = atoi (static_cast(szLevel)); -+ } -+ else -+ { -+ m_iListDepth = 0; -+ } -+ /* TODO: why can m_iListDepth be zero sometimes ?? (numbered headings?) -+ * UPDATE: I don't know, but it probably shouldn't be handled this way because the definition of 0 -+ * from earlier in the code is that it means we are not in a list of any sort. -+ * For numbered headings and the like, if that's the handling of it, we may actually end up -+ * with more than one list after having 'risen to desired list depth'. -MG -+ */ -+ if (m_iListDepth == 0) m_iListDepth = 1; -+ -+ /* Rise to desired list depth if currently too deep -+ */ -+ listPopToDepth (m_iListDepth); -+ -+ /* current list & desired list have same depth but different types... -+ * pop one and add new below -+ */ -+ if ((m_iListDepth == listDepth ()) && (m_iBlockType != listType ())) -+ { -+ listPop (); -+ } -+ -+ /* If our list is getting deeper, we need to start a nested list. -+ * Assumption: list can only increase in depth by 1. -+ */ -+ if (m_iListDepth > listDepth ()) -+ { -+ listPush (m_iBlockType, szValue); -+ } -+ else if (tagTop () == TT_LI) -+ { -+ m_utf8_1 = "li"; -+ tagClose (TT_LI, m_utf8_1, ws_Post); -+ } -+ -+ tagID = TT_LI; -+ tagPending = true; -+ -+ m_utf8_1 = "li"; -+ -+ if (m_StyleTreeBlock) -+ if (m_StyleTreeBlock->class_list().byteLength ()) -+ { -+ UT_UTF8String escape; -+ m_utf8_1 += " class=\""; -+ if(get_Class_Only()) -+ { -+ escape = m_StyleTreeBlock->class_name (); -+ m_utf8_1 += escape.escapeXML(); -+ } -+ else -+ { -+ escape = m_StyleTreeBlock->class_list (); -+ m_utf8_1 += escape.escapeXML(); -+ } -+ -+ m_utf8_1 += "\""; -+ } -+ } -+ else if (have_style) -+ { -+ listPopToDepth (0); -+ -+ const s_StyleTree * tree = m_StyleTreeBlock; -+ -+ bool bAddAWMLStyle = false; -+ if (get_Allow_AWML () && !get_HTML4 ()) bAddAWMLStyle = true; -+ -+ if ((g_ascii_strcasecmp (static_cast(szValue), "Heading 1") == 0) || -+ (g_ascii_strcasecmp (static_cast(szValue), "Numbered Heading 1") == 0)) -+ { -+ m_iBlockType = BT_HEADING1; -+ tagID = TT_H1; -+ tagPending = true; -+ bClassAsTag = true; -+ -+ if (m_toc->docHasTOC()) { -+ m_utf8_1 = UT_UTF8String_sprintf("h1 id=\"AbiTOC%d__\"", m_heading_count); -+ m_heading_count++; -+ } -+ else -+ m_utf8_1 = "h1"; -+ -+ if (g_ascii_strcasecmp (static_cast(szValue), "Heading 1") == 0) -+ bAddAWMLStyle = false; -+ } -+ else if ((g_ascii_strcasecmp (static_cast(szValue), "Heading 2") == 0) || -+ (g_ascii_strcasecmp (static_cast(szValue), "Numbered Heading 2") == 0)) -+ { -+ m_iBlockType = BT_HEADING2; -+ tagID = TT_H2; -+ tagPending = true; -+ bClassAsTag = true; -+ -+ if (m_toc->docHasTOC()) { -+ m_utf8_1 = UT_UTF8String_sprintf("h2 id=\"AbiTOC%d__\"", m_heading_count); -+ m_heading_count++; -+ } -+ else -+ m_utf8_1 = "h2"; -+ -+ if (g_ascii_strcasecmp (static_cast(szValue), "Heading 2") == 0) -+ bAddAWMLStyle = false; -+ } -+ else if ((g_ascii_strcasecmp (static_cast(szValue), "Heading 3") == 0) || -+ (g_ascii_strcasecmp (static_cast(szValue), "Numbered Heading 3") == 0)) -+ { -+ m_iBlockType = BT_HEADING3; -+ tagID = TT_H3; -+ tagPending = true; -+ bClassAsTag = true; -+ -+ if (m_toc->docHasTOC()) { -+ m_utf8_1 = UT_UTF8String_sprintf("h3 id=\"AbiTOC%d__\"", m_heading_count); -+ m_heading_count++; -+ } -+ else -+ m_utf8_1 = "h3"; -+ -+ if (g_ascii_strcasecmp (static_cast(szValue), "Heading 3") == 0) -+ bAddAWMLStyle = false; -+ } -+ else if (g_ascii_strcasecmp (static_cast(szValue), "Block Text") == 0) -+ { -+ m_iBlockType = BT_BLOCKTEXT; -+ tagID = TT_BLOCKQUOTE; -+ tagPending = true; -+ bClassAsTag = true; -+ m_utf8_1 = "blockquote"; -+ bAddAWMLStyle = false; -+ } -+ else if (g_ascii_strcasecmp (static_cast(szValue), "Plain Text") == 0) -+ { -+ m_iBlockType = BT_NORMAL; -+ tagID = TT_P; -+ tagPending = true; -+ bClassAsTag = true; -+ m_utf8_1 = "p class=\"plain_text\""; -+ bAddAWMLStyle = false; -+ } -+ else if (g_ascii_strcasecmp (static_cast(szValue), "Normal") == 0) -+ { -+ m_iBlockType = BT_NORMAL; -+ tagID = TT_P; -+ tagPending = true; -+ bClassAsTag = true; -+ -+ // if class-only is specified, we want -+ // class=Normal because changing definition of -+ // unqualified

in a stylesheet tends to be -+ // rather messy; it is much easier to define -+ // P.Normal -+ if(get_Class_Only()) -+ m_utf8_1 = "p class=\"Normal\""; -+ else -+ m_utf8_1 = "p"; -+ -+ bAddAWMLStyle = false; -+ } -+ else if (tree == 0) // hmm... -+ { -+ m_iBlockType = BT_NORMAL; -+ tagID = TT_P; -+ tagPending = true; -+ m_utf8_1 = "p"; -+ } -+ else if (tree->descends ("Heading 1")) -+ { -+ m_iBlockType = BT_HEADING1; -+ tagID = TT_H1; -+ tagPending = true; -+ bClassAsTag = true; -+ -+ if (m_toc->docHasTOC()) { -+ m_utf8_1 = UT_UTF8String_sprintf("h1 id=\"AbiTOC%d__\"", m_heading_count); -+ m_heading_count++; -+ } else { -+ m_utf8_1 = "h1"; -+ } -+ } -+ else if (tree->descends ("Heading 2")) -+ { -+ m_iBlockType = BT_HEADING2; -+ tagID = TT_H2; -+ tagPending = true; -+ bClassAsTag = true; -+ -+ if (m_toc->docHasTOC()) { -+ m_utf8_1 = UT_UTF8String_sprintf("h2 id=\"AbiTOC%d__\"", m_heading_count); -+ m_heading_count++; -+ } else { -+ m_utf8_1 = "h2"; -+ } -+ } -+ else if (tree->descends ("Heading 3")) -+ { -+ m_iBlockType = BT_HEADING3; -+ tagID = TT_H3; -+ tagPending = true; -+ bClassAsTag = true; -+ -+ if (m_toc->docHasTOC()) { -+ m_utf8_1 = UT_UTF8String_sprintf("h3 id=\"AbiTOC%d__\"", m_heading_count); -+ m_heading_count++; -+ } else { -+ m_utf8_1 = "h3"; -+ } -+ } -+ else if (tree->descends ("Block Text")) -+ { -+ m_iBlockType = BT_BLOCKTEXT; -+ tagID = TT_BLOCKQUOTE; -+ tagPending = true; -+ bClassAsTag = true; -+ m_utf8_1 = "blockquote"; -+ } -+ else if (tree->descends ("Plain Text")) -+ { -+ m_iBlockType = BT_NORMAL; -+ tagID = TT_P; -+ tagPending = true; -+ bClassAsTag = true; -+ m_utf8_1 = "p class=\"plain_text\""; -+ } -+ else if (tree->descends ("Normal")) -+ { -+ m_iBlockType = BT_NORMAL; -+ tagID = TT_P; -+ tagPending = true; -+ -+ if (m_toc->docHasTOC() && m_toc->isTOCStyle(szValue)) { -+ m_utf8_1 = UT_UTF8String_sprintf("p id=\"AbiTOC%d__\"", m_heading_count); -+ m_heading_count++; -+ } else { -+ m_utf8_1 = "p"; -+ } -+ } -+ else -+ { -+ m_iBlockType = BT_NORMAL; -+ tagID = TT_P; -+ tagPending = true; -+ -+ if (m_toc->docHasTOC() && m_toc->isTOCStyle(szValue)) { -+ m_utf8_1 = UT_UTF8String_sprintf("p id=\"AbiTOC%d__\"", m_heading_count); -+ m_heading_count++; -+ } else { -+ m_utf8_1 = "p"; -+ } -+ } -+ -+ if (tree && !bClassAsTag) -+ if (tree->class_list().byteLength ()) -+ { -+ UT_UTF8String escape; -+ m_utf8_1 += " class=\""; -+ if(get_Class_Only()) -+ { -+ escape = tree->class_name (); -+ m_utf8_1 += escape.escapeXML(); -+ } -+ else -+ { -+ escape = tree->class_list (); -+ m_utf8_1 += escape.escapeXML(); -+ } -+ m_utf8_1 += "\""; -+ } -+ if (bAddAWMLStyle) -+ { -+ UT_UTF8String escape = szValue; -+ m_utf8_1 += " awml:style=\""; -+ m_utf8_1 += escape.escapeXML(); -+ m_utf8_1 += "\""; -+ } -+ } -+ else // not a list, no style -+ { -+ listPopToDepth (0); -+ -+ m_iBlockType = BT_NORMAL; -+ -+ tagID = TT_P; -+ tagPending = true; -+ -+ m_utf8_1 = "p"; -+ } -+ if (!tagPending) -+ { -+ UT_DEBUGMSG(("WARNING: unexpected!\n")); -+ return; -+ } -+ -+ const gchar * szP_DomDir = 0; -+ pAP->getProperty ("dom-dir", szP_DomDir); -+ -+ if (szP_DomDir) // any reason why this can't be used with -+ //

or
 ?? no
-+	{
-+		m_utf8_1 += " dir=\"";
-+		m_utf8_1 += szP_DomDir;
-+		m_utf8_1 += "\"";
-+	}
-+	
-+	if(get_Class_Only())
-+		goto class_only;
-+	
-+	{
-+		const gchar * szP_TextAlign = 0;
-+		const gchar * szP_MarginBottom = 0;
-+		const gchar * szP_MarginTop = 0;
-+		const gchar * szP_MarginLeft = 0;
-+		const gchar * szP_MarginRight = 0;
-+		const gchar * szP_TextIndent = 0;
-+
-+		pAP->getProperty ("text-align",    szP_TextAlign);
-+		pAP->getProperty ("margin-bottom", szP_MarginBottom);
-+		pAP->getProperty ("margin-top",    szP_MarginTop);
-+		pAP->getProperty ("margin-right",  szP_MarginRight);
-+
-+		/* NOTE: For both "margin-left" and "text-indent" for lists,
-+		 * Abi's behaviour and HTML's do not match.
-+		 * Furthermore, it seems like all blocks have a "margin-left"
-+		 * and "text-indent", even if they are zero, which adds
-+		 * significant clutter.  These are all manually taken care of
-+		 * below.  I think that the computation of these attributes
-+		 * needs to be rethought. - John
-+		 */
-+		if ((tagID != TT_LI) && (tagID != TT_TD))
-+		{
-+			if (pAP->getProperty ("margin-left", szP_MarginLeft))
-+				if (strstr (szP_MarginLeft, "0.0000"))
-+					szP_MarginLeft = 0;
-+
-+			if (pAP->getProperty ("text-indent", szP_TextIndent))
-+				if (strstr (szP_TextIndent, "0.0000"))
-+					szP_TextIndent = 0;
-+		}
-+
-+
-+		bool validProp = (szP_TextAlign || szP_MarginBottom || szP_MarginTop ||
-+						  szP_MarginLeft || szP_MarginRight || szP_TextIndent);
-+
-+		/* Assumption: never get property set with block text, plain text. Probably true...
-+		 */
-+		if ((m_iBlockType != BT_PLAINTEXT) &&
-+			(m_iBlockType != BT_BLOCKTEXT) && validProp)
-+		{
-+			m_utf8_1 += " style=\"";
-+
-+			bool first = true;
-+
-+			if (szP_TextAlign)
-+			{
-+				if (!first) m_utf8_1 += ";";
-+				m_utf8_1 += "text-align:";
-+				m_utf8_1 += szP_TextAlign;
-+				first = false;
-+			}
-+			if (szP_MarginBottom)
-+			{
-+				if (!first) m_utf8_1 += ";";
-+				m_utf8_1 += "margin-bottom:";
-+				m_utf8_1 += szP_MarginBottom;
-+				first = false;
-+			}
-+			if (szP_MarginTop)
-+			{
-+				if (!first) m_utf8_1 += ";";
-+				m_utf8_1 += "margin-top:";
-+				m_utf8_1 += szP_MarginTop;
-+				first = false;
-+			}
-+			if (szP_MarginRight)
-+			{
-+				if (!first) m_utf8_1 += ";";
-+				m_utf8_1 += "margin-right:";
-+				m_utf8_1 += szP_MarginRight;
-+				first = false;
-+			}
-+			if (szP_MarginLeft)
-+			{
-+				if (!first) m_utf8_1 += ";";
-+				m_utf8_1 += "margin-left:";
-+				m_utf8_1 += szP_MarginLeft;
-+				first = false;
-+			}
-+			if (szP_TextIndent)
-+			{
-+				if (!first) m_utf8_1 += ";";
-+				m_utf8_1 += "text-indent:";
-+				m_utf8_1 += szP_TextIndent;
-+				first = false;
-+			}
-+
-+			m_utf8_1 += "\"";
-+		}
-+	}
-+	
-+ class_only:	
-+	tagOpen (tagID, m_utf8_1, ws_Pre);
-+
-+	m_bInBlock = true;
-+}
-+
-+void s_HTML_Listener::_closeTag (void)
-+{
-+	if (!m_bInBlock) return;
-+
-+	if (m_bInSpan) _closeSpan ();
-+	
-+	if (tagTop () == TT_A)
-+	{
-+		m_utf8_1 = "a";
-+		tagClose (TT_A, m_utf8_1, ws_None);
-+	}
-+	if (m_iBlockType == BT_NORMAL)
-+	{
-+#ifdef HTML_EMPTY_PARA_LF
-+		if (!m_bWroteText) // TODO: is this really ideal?
-+		{
-+			m_utf8_1 = "br";
-+			tagOpenClose (m_utf8_1, get_HTML4 (), ws_None);
-+		}
-+#endif /* HTML_EMPTY_PARA_LF */
-+		if (tagTop () == TT_P)
-+		{
-+			m_utf8_1 = "p";
-+			tagClose (TT_P, m_utf8_1, ws_Post);
-+		}
-+	}
-+	else if (m_iBlockType == BT_HEADING1) 
-+	{
-+		if (tagTop () == TT_H1)
-+		{
-+			m_utf8_1 = "h1";
-+			tagClose (TT_H1, m_utf8_1, ws_Post);
-+		}
-+	}
-+	else if (m_iBlockType == BT_HEADING2)
-+	{
-+		if (tagTop () == TT_H2)
-+		{
-+			m_utf8_1 = "h2";
-+			tagClose (TT_H2, m_utf8_1, ws_Post);
-+		}
-+	}
-+	else if (m_iBlockType == BT_HEADING3)
-+	{
-+		if (tagTop () == TT_H3)
-+		{
-+			m_utf8_1 = "h3";
-+			tagClose (TT_H3, m_utf8_1, ws_Post);
-+		}
-+	}
-+	else if (m_iBlockType == BT_BLOCKTEXT)
-+	{
-+		if (tagTop () == TT_BLOCKQUOTE)
-+		{
-+			m_utf8_1 = "blockquote";
-+			tagClose (TT_BLOCKQUOTE, m_utf8_1, ws_Post);
-+		}
-+	}
-+	else if (m_iBlockType == BT_PLAINTEXT)
-+	{
-+		if (tagTop () == TT_PRE)
-+		{
-+			m_utf8_1 = "pre";
-+			tagClose (TT_PRE, m_utf8_1, ws_Post);
-+		}
-+	}
-+	else if (m_iBlockType == BT_NUMBEREDLIST || m_iBlockType == BT_BULLETLIST)
-+	{	
-+		/* do nothing, lists are handled differently, as they have multiple tags */ 
-+	}
-+ 	else
-+	{
-+		UT_DEBUGMSG(("(defaulting to 

)\n")); -+ -+ if (tagTop () == TT_P) -+ { -+ m_utf8_1 = "p"; -+ tagClose (TT_P, m_utf8_1, ws_Post); -+ } -+ } -+ m_bInBlock = false; -+} -+ -+void s_HTML_Listener::_openSpan (PT_AttrPropIndex api) -+{ -+ if (m_bFirstWrite) _openTag (api, 0); -+ -+ if (!m_bInBlock) return; -+ -+ m_StyleTreeInline = 0; -+ -+ // make sure any unit conversions are correct -+ UT_LocaleTransactor t(LC_NUMERIC, "C"); -+ -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = (api ? (m_pDocument->getAttrProp (api, &pAP)) : false); -+ -+ if (m_bInSpan && m_apiLastSpan == api) -+ return; -+ -+ if (!bHaveProp || (pAP == 0)) -+ { -+ if (m_bInSpan) _closeSpan (); -+ return; -+ } -+ -+ const gchar * szA_Style = 0; -+ -+ bool have_style = pAP->getAttribute (PT_STYLE_ATTRIBUTE_NAME, szA_Style); -+ if (have_style) -+ if (m_utf8_style == szA_Style) // inline style is block style; ignore -+ have_style = false; -+ -+ const s_StyleTree * tree = 0; -+ if (have_style) -+ tree = m_style_tree->find (szA_Style); -+ -+ m_StyleTreeInline = tree; -+ -+ bool first = true; -+ bool bInSpan = false; -+ -+ if (tree) -+ if (tree->class_list().byteLength ()) -+ { -+ UT_UTF8String escape; -+ m_utf8_1 = "span class=\""; -+ if(get_Class_Only()) -+ { -+ escape = tree->class_name (); -+ m_utf8_1 += escape.escapeXML(); -+ } -+ else -+ { -+ escape = tree->class_list (); -+ m_utf8_1 += escape.escapeXML(); -+ } -+ -+ m_utf8_1 += "\""; -+ bInSpan = true; -+ first = false; -+ if(get_Class_Only()) -+ goto class_only; -+ } -+ -+ { -+ const gchar * szP_FontWeight = 0; -+ const gchar * szP_FontStyle = 0; -+ const gchar * szP_FontSize = 0; -+ const gchar * szP_FontFamily = 0; -+ const gchar * szP_TextDecoration = 0; -+ const gchar * szP_TextPosition = 0; -+ const gchar * szP_Color = 0; -+ const gchar * szP_BgColor = 0; -+ const gchar * szP_Display = 0; -+ -+ pAP->getProperty ("font-weight", szP_FontWeight); -+ pAP->getProperty ("font-style", szP_FontStyle); -+ pAP->getProperty ("font-size", szP_FontSize); -+ pAP->getProperty ("font-family", szP_FontFamily); -+ pAP->getProperty ("text-decoration", szP_TextDecoration); -+ pAP->getProperty ("text-position", szP_TextPosition); -+ pAP->getProperty ("color", szP_Color); -+ pAP->getProperty ("bgcolor", szP_BgColor); -+ pAP->getProperty ("display", szP_Display); -+ -+ if(first) -+ m_utf8_1 = "span style=\""; -+ else -+ m_utf8_1 += " style=\""; -+ -+ /* TODO: this bold/italic check needs re-thought -+ */ -+ if (szP_FontWeight) -+ if (strcmp (szP_FontWeight, "bold") == 0) -+ if (!compareStyle ("font-weight", "bold")) -+ { -+ if (!first) m_utf8_1 += ";"; -+ m_utf8_1 += "font-weight:bold"; -+ first = false; -+ } -+ if (szP_FontStyle) -+ if (strcmp (szP_FontStyle, "italic") == 0) -+ if (!compareStyle ("font-style", "italic")) -+ { -+ if (!first) m_utf8_1 += ";"; -+ m_utf8_1 += "font-style:italic"; -+ first = false; -+ } -+ -+ if (szP_FontSize) -+ { -+ char buf[16]; -+ -+ { -+ sprintf (buf, "%g", UT_convertToPoints (szP_FontSize)); -+ } -+ -+ m_utf8_0 = buf; -+ m_utf8_0 += "pt"; -+ -+ if (!compareStyle ("font-size", m_utf8_0.utf8_str ())) -+ { -+ if (!first) m_utf8_1 += ";"; -+ m_utf8_1 += "font-size:"; -+ m_utf8_1 += m_utf8_0; -+ first = false; -+ } -+ } -+ if (szP_FontFamily) -+ { -+ if ((strcmp (szP_FontFamily, "serif") == 0) || -+ (strcmp (szP_FontFamily, "sans-serif") == 0) || -+ (strcmp (szP_FontFamily, "cursive") == 0) || -+ (strcmp (szP_FontFamily, "fantasy") == 0) || -+ (strcmp (szP_FontFamily, "monospace") == 0)) -+ { -+ m_utf8_0 = static_cast(szP_FontFamily); -+ } -+ else -+ { -+ m_utf8_0 = "'"; -+ m_utf8_0 += static_cast(szP_FontFamily); -+ m_utf8_0 += "'"; -+ } -+ if (!compareStyle ("font-family", m_utf8_0.utf8_str ())) -+ { -+ if (!first) m_utf8_1 += ";"; -+ m_utf8_1 += "font-family:"; -+ m_utf8_1 += m_utf8_0; -+ first = false; -+ } -+ } -+ if (szP_TextDecoration) -+ { -+ bool bUnderline = (strstr (szP_TextDecoration, "underline") != NULL); -+ bool bLineThrough = (strstr (szP_TextDecoration, "line-through") != NULL); -+ bool bOverline = (strstr (szP_TextDecoration, "overline") != NULL); -+ -+ if (bUnderline || bLineThrough || bOverline) -+ { -+ m_utf8_0 = ""; -+ if (bUnderline) m_utf8_0 += "underline"; -+ if (bLineThrough) -+ { -+ if (bUnderline) m_utf8_0 += ", "; -+ m_utf8_0 += "line-through"; -+ } -+ if (bOverline) -+ { -+ if (bUnderline || bLineThrough) m_utf8_0 += ", "; -+ m_utf8_0 += "overline"; -+ } -+ if (!compareStyle ("text-decoration", m_utf8_0.utf8_str ())) -+ { -+ if (!first) m_utf8_1 += ";"; -+ m_utf8_1 += "text-decoration:"; -+ m_utf8_1 += m_utf8_0; -+ first = false; -+ } -+ } -+ } -+ if (szP_TextPosition) -+ { -+ if (strcmp (szP_TextPosition, "superscript") == 0) -+ { -+ if (!compareStyle ("vertical-align", "super")) -+ { -+ if (!first) m_utf8_1 += ";"; -+ m_utf8_1 += "vertical-align:super"; -+ first = false; -+ } -+ } -+ else if (strcmp (szP_TextPosition, "subscript") == 0) -+ { -+ if (!compareStyle ("vertical-align", "sub")) -+ { -+ if (!first) m_utf8_1 += ";"; -+ m_utf8_1 += "vertical-align:sub"; -+ first = false; -+ } -+ } -+ } -+ if (szP_Color) -+ if (!IS_TRANSPARENT_COLOR (szP_Color)) -+ { -+ if (*szP_Color != '#') -+ m_utf8_0 = "#"; -+ else -+ m_utf8_0.clear(); -+ -+ m_utf8_0 += szP_Color; -+ -+ if (!compareStyle ("color", m_utf8_0.utf8_str ())) -+ { -+ if (!first) m_utf8_1 += ";"; -+ m_utf8_1 += "color:"; -+ m_utf8_1 += m_utf8_0; -+ first = false; -+ } -+ } -+ if (szP_BgColor) -+ if (!IS_TRANSPARENT_COLOR (szP_BgColor)) -+ { -+ if (*szP_BgColor != '#') -+ m_utf8_0 = "#"; -+ else -+ m_utf8_0.clear(); -+ -+ m_utf8_0 += szP_BgColor; -+ -+ if (!compareStyle ("background", m_utf8_0.utf8_str ())) -+ { -+ if (!first) m_utf8_1 += ";"; -+ m_utf8_1 += "background:"; -+ m_utf8_1 += m_utf8_0; -+ first = false; -+ } -+ } -+ -+ if (szP_Display) -+ { -+ if (strcmp (szP_Display, "none") == 0) -+ { -+ if (!first) m_utf8_1 += ";"; -+ m_utf8_1 += "display:none"; -+ first = false; -+ } -+ } -+ } -+ -+ class_only: -+ -+ if (first) -+ { -+ /* no style elements specified -+ */ -+ m_utf8_1 = "span"; -+ } -+ else -+ { -+ m_utf8_1 += "\""; -+ bInSpan = true; -+ } -+ -+ const gchar * szP_Lang = 0; -+ pAP->getProperty ("lang", szP_Lang); -+ -+ if (szP_Lang) -+ { -+ if (!get_HTML4 ()) { -+ // we want to emit xml:lang in addition to lang -+ m_utf8_1 += " xml:lang=\""; -+ m_utf8_1 += szP_Lang; -+ m_utf8_1 += "\""; -+ } -+ -+ m_utf8_1 += " lang=\""; -+ m_utf8_1 += szP_Lang; -+ m_utf8_1 += "\""; -+ bInSpan = true; -+ } -+ -+ if (bInSpan) -+ { -+ if (m_bInSpan) -+ { -+ _closeSpan (); -+ } -+ -+ m_utf8_span = m_utf8_1; -+ -+ tagOpen (TT_SPAN, m_utf8_span, ws_None); -+ -+ /* if the dir-override is set, or dir is 'rtl' or 'ltr', we will output -+ * the dir property; however, this property cannot be within a style -+ * sheet, so anything that needs to be added to this code and belongs -+ * within a style property must be above us; further it should be noted -+ * that there is a good chance that the html browser will not handle it -+ * correctly. For instance IE will take dir=rtl as an indication that -+ * the span should have rtl placement on a line, but it will ignore this -+ * value when printing the actual span. -+ */ -+ const gchar * szP_DirOverride = 0; -+ -+ pAP->getProperty ("dir-override", szP_DirOverride); -+ -+ if (szP_DirOverride) -+ if (/* (*szP_DirOverride == 'l') || */(*szP_DirOverride == 'r')) -+ { -+ m_utf8_1 = "bdo dir=\""; -+ m_utf8_1 += szP_DirOverride; -+ m_utf8_1 += "\""; -+ -+ tagOpen (TT_BDO, m_utf8_1, ws_None); -+ } -+ m_apiLastSpan = api; -+ m_bInSpan = true; -+ } -+ else if (m_bInSpan) _closeSpan (); -+} -+ -+void s_HTML_Listener::_closeSpan () -+{ -+ if (tagTop () == TT_A) -+ { -+ tagClose (TT_A, "a", ws_None); -+ } -+ if (tagTop () == TT_BDO) -+ { -+ tagClose (TT_BDO, "bdo", ws_None); -+ } -+ if (tagTop () == TT_SPAN) -+ { -+ tagClose (TT_SPAN, "span", ws_None); -+ } -+ m_bInSpan = false; -+} -+ -+/*! Close up all HTML-structures for which we haven't a definitive end in the piecetable, -+ * such as lists. -+ * \todo Somebody needs to check for others aside from lists, in order to preempt ugly bugs. -+ */ -+void s_HTML_Listener::_popUnendedStructures (void) -+{ -+ if(m_iListDepth) -+ listPopToDepth(0); -+} -+ -+#ifdef HTML_TABLES_SUPPORTED -+ -+void s_HTML_Listener::_fillColWidthsVector(void) -+{ -+ // make sure any unit conversions are correct -+ UT_LocaleTransactor t(LC_NUMERIC, "C"); -+ -+ // -+ // Positioned columns controls -+ // -+ const char * pszColumnProps = m_TableHelper.getTableProp("table-column-props"); -+ UT_sint32 nCols = m_TableHelper.getNumCols (); -+ UT_DEBUGMSG(("Number columns in table %d \n",nCols)); -+ if(m_vecDWidths.getItemCount() > 0) -+ { -+ UT_VECTOR_PURGEALL(double *,m_vecDWidths); -+ m_vecDWidths.clear(); -+ } -+ if(pszColumnProps && *pszColumnProps) -+ { -+ /* -+ These will be properties applied to all columns. To start with, just the -+ widths of each column are specifed. These are translated to layout units. -+ -+ The format of the string of properties is: -+ -+ table-column-props:1.2in/3.0in/1.3in/; -+ -+ So we read back in pszColumnProps -+ 1.2in/3.0in/1.3in/ -+ -+ The "/" characters will be used to delineate different column entries. -+ As new properties for each column are defined these will be delineated with "_" -+ characters. But we'll cross that bridge later. -+ */ -+ UT_DEBUGMSG(("table-column-props:%s \n",pszColumnProps)); -+ UT_String sProps = pszColumnProps; -+ UT_sint32 sizes = sProps.size(); -+ UT_sint32 i =0; -+ UT_sint32 j =0; -+ while(i < sizes) -+ { -+ for (j=i; (ji && sProps[j] == '/') -+ { -+ UT_String sSub = sProps.substr(i,(j-i)); -+ i = j + 1; -+ double * pDWidth = new double; -+ *pDWidth = UT_convertToInches(sSub.c_str()); -+ m_vecDWidths.addItem(pDWidth); -+ } -+ } -+ } -+ // -+ // automatic column widths set to total width divided by nCols -+ // -+ else -+ { -+ // double total = m_dPageWidthInches - m_dSecLeftMarginInches - m_dSecRightMarginInches; -+ UT_sint32 nCols = m_TableHelper.getNumCols (); -+ double totWidth = m_dPageWidthInches - m_dSecLeftMarginInches - m_dSecRightMarginInches; -+ double colWidth = totWidth/nCols; -+ UT_sint32 i = 0; -+ for(i =0; i< nCols; i++) -+ { -+ double * pDWidth = new double; -+ *pDWidth = colWidth; -+ m_vecDWidths.addItem(pDWidth); -+ } -+ } -+} -+ -+ -+void s_HTML_Listener::_openTable (PT_AttrPropIndex api) -+{ -+ // make sure any unit conversions are correct -+ UT_LocaleTransactor t(LC_NUMERIC, "C"); -+ -+ if (m_bFirstWrite) _openSection (api, 0); -+ -+ if (!m_bInSection) return; -+ -+ if(m_iListDepth) -+ listPopToDepth(0); // AbiWord does not support tables in LIs, neither do we. For AbiWord, an LI is a special

. See next line. -+ -+ if (m_bInBlock) _closeTag (); // HTML does not make it any more desirable to embed a table in a

than AbiWord. -+ -+ const PP_AttrProp * pAP = NULL; -+ bool bHaveProp = m_pDocument->getAttrProp (api,&pAP); -+ -+ if (!bHaveProp || (pAP == 0)) return; -+ -+ //UT_sint32 cellPadding = 0; -+ UT_UTF8String styles; -+ -+ const char * prop = m_TableHelper.getTableProp ("table-line-thickness"); -+ -+ UT_sint32 border = 0; -+ -+ if(prop && atof(prop) != 0.0) -+ border = 1; -+ -+ UT_UTF8String border_default = "1pt"; -+ if (prop) -+ { -+ double dPT = UT_convertToDimension(prop, DIM_PT); -+ border_default = UT_UTF8String_sprintf("%.2fpt", dPT); -+ } -+ -+#if 0 -+ const gchar * pszLeftOffset = 0; -+ const gchar * pszTopOffset = 0; -+ const gchar * pszRightOffset = 0; -+ const gchar * pszBottomOffset = 0; -+ -+ pSectionAP->getProperty ("cell-margin-left", pszLeftOffset); -+ pSectionAP->getProperty ("cell-margin-top", pszTopOffset); -+ pSectionAP->getProperty ("cell-margin-right", pszRightOffset); -+ pSectionAP->getProperty ("cell-margin-bottom", pszBottomOffset); -+#endif -+ const char * pszWidth = m_TableHelper.getTableProp ("width"); -+ if (get_Abs_Units()) { -+ if (pszWidth) { -+ if (styles.byteLength ()) styles += ";"; -+ styles += "width:"; -+ // use mm (inches are too big, since we want to use an int). -+ double dMM = UT_convertToDimension(pszWidth, DIM_MM); -+ UT_UTF8String t; -+ UT_UTF8String_sprintf(t, "%.1fmm", dMM); -+ styles += t; -+ } -+ } else if (get_Scale_Units()) { -+ // TEST ME! -+ if (pszWidth) { -+ if (styles.byteLength ()) styles += ";"; -+ styles += "width:"; -+ double tMM = UT_convertToDimension(pszWidth, DIM_MM); -+ double totWidth = m_dPageWidthInches - m_dSecLeftMarginInches - m_dSecRightMarginInches; -+ UT_UTF8String tws = UT_UTF8String_sprintf("%d", totWidth); -+ double pMM = UT_convertToDimension(tws.utf8_str(), DIM_MM); -+ double dPCT = tMM / pMM; -+ UT_UTF8String t; -+ UT_UTF8String_sprintf(t, "%d%%", dPCT); -+ styles += t; -+ } -+ } -+ else { -+ // this should match abi because tables always cover width by default -+ if (styles.byteLength ()) styles += ";"; -+ styles += "width:100%"; -+ } -+ -+ const char * pszBgColor = m_TableHelper.getTableProp ("bgcolor"); -+ if (pszBgColor == NULL) -+ pszBgColor = m_TableHelper.getTableProp ("background-color"); -+ if (pszBgColor) -+ { -+ if (styles.byteLength ()) styles += ";"; -+ styles += "background-color:"; -+ -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBgColor); -+ if (hash) -+ styles += hash; -+ else -+ styles += pszBgColor; -+ } -+ -+ const char * pszBorderColor = NULL; -+ -+ pszBorderColor = m_TableHelper.getTableProp ("color"); -+ if (pszBorderColor) -+ { -+ if (styles.byteLength ()) styles += ";"; -+ styles += "color:"; -+ -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBorderColor); -+ if (hash) -+ styles += hash; -+ else -+ styles += pszBorderColor; -+ } -+ -+ // more often than not border attributes are same all around, so -+ // we want to use the border shortcut -+ // 0-L, 1-R, 2-T, 3-B -+ double dB[4] = {0.0,0.0,0.0,0.0}; -+ UT_UTF8String sB[4]; -+ UT_UTF8String sC[4]; -+ UT_UTF8String sS[4]; -+ -+ pszBorderColor = m_TableHelper.getTableProp ("bot-color"); -+ if (pszBorderColor) -+ { -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBorderColor); -+ if (hash) -+ sC[3]= hash; -+ else -+ sC[3]= pszBorderColor; -+ } -+ pszBorderColor = m_TableHelper.getTableProp ("left-color"); -+ if (pszBorderColor) -+ { -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBorderColor); -+ if (hash) -+ sC[0] = hash; -+ else -+ sC[0] = pszBorderColor; -+ } -+ pszBorderColor = m_TableHelper.getTableProp ("right-color"); -+ if (pszBorderColor) -+ { -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBorderColor); -+ if (hash) -+ sC[1] = hash; -+ else -+ sC[1] = pszBorderColor; -+ } -+ pszBorderColor = m_TableHelper.getTableProp ("top-color"); -+ if (pszBorderColor) -+ { -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBorderColor); -+ if (hash) -+ sC[2] = hash; -+ else -+ sC[2] = pszBorderColor; -+ } -+ -+ const char * pszBorderStyle = NULL; -+ -+ pszBorderStyle = m_TableHelper.getTableProp ("bot-style"); -+ if (pszBorderStyle) -+ { -+ sS[3]= PP_PropertyMap::linestyle_for_CSS (pszBorderStyle); -+ } -+ pszBorderStyle = m_TableHelper.getTableProp ("left-style"); -+ if (pszBorderStyle) -+ { -+ sS[0] = PP_PropertyMap::linestyle_for_CSS (pszBorderStyle); -+ } -+ pszBorderStyle = m_TableHelper.getTableProp ("right-style"); -+ if (pszBorderStyle) -+ { -+ sS[1] = PP_PropertyMap::linestyle_for_CSS (pszBorderStyle); -+ } -+ pszBorderStyle = m_TableHelper.getTableProp ("top-style"); -+ if (pszBorderStyle) -+ { -+ sS[2] = PP_PropertyMap::linestyle_for_CSS (pszBorderStyle); -+ } -+ -+ const char * pszBorderWidth = NULL; -+ -+ pszBorderWidth = m_TableHelper.getTableProp ("bot-thickness"); -+ if (pszBorderWidth) -+ { -+ dB[3] = UT_convertToDimension(pszBorderWidth, DIM_PT); -+ sB[3] = UT_UTF8String_sprintf("%.2fpt", dB[3]); -+ } -+ else -+ sB[3] += border_default; -+ pszBorderWidth = m_TableHelper.getTableProp ("left-thickness"); -+ if (pszBorderWidth) -+ { -+ dB[0] = UT_convertToDimension(pszBorderWidth, DIM_PT); -+ sB[0] = UT_UTF8String_sprintf("%.2fpt", dB[0]); -+ } -+ else -+ sB[0] = border_default; -+ pszBorderWidth = m_TableHelper.getTableProp ("right-thickness"); -+ if (pszBorderWidth) -+ { -+ dB[1] = UT_convertToDimension(pszBorderWidth, DIM_PT); -+ sB[1] = UT_UTF8String_sprintf("%.2fpt", dB[1]); -+ } -+ else -+ sB[1] = border_default; -+ pszBorderWidth = m_TableHelper.getTableProp ("top-thickness"); -+ if (pszBorderWidth) -+ { -+ dB[2] = UT_convertToDimension(pszBorderWidth, DIM_PT); -+ sB[2] = UT_UTF8String_sprintf("%.2fpt", dB[2]); -+ } -+ else -+ sB[2] += border_default; -+ -+ // now we need to decide which attributes are to be used in the -+ // shortcut -+ UT_uint32 iBCount[4] = {0,0,0,0}; // 0 - L, 1 - R, 2 - T, 3 - B -+ UT_uint32 iCCount[4] = {0,0,0,0}; // 0 - L, 1 - R, 2 - T, 3 - B -+ UT_uint32 iSCount[4] = {0,0,0,0}; // 0 - L, 1 - R, 2 - T, 3 - B -+ UT_uint32 iBMaxIndx = 0, iCMaxIndx = 0, iSMaxIndx = 0; -+ UT_uint32 i = 0; -+ -+ for(i = 0; i < 4; ++i) -+ { -+ for(UT_sint32 j = i+1; j < 4; j++) -+ { -+ if(dB[i] == dB[j]) -+ { -+ iBCount[i]++; -+ iBCount[j]++; -+ } -+ } -+ } -+ -+ for(i = 1; i < 4; i++) -+ { -+ if(iBMaxIndx < iBCount[i]) -+ iBMaxIndx = i; -+ } -+ -+ for(i = 0; i < 4; ++i) -+ { -+ for(UT_sint32 j = i+1; j < 4; j++) -+ { -+ if(sC[i] == sC[j]) -+ { -+ iCCount[i]++; -+ iCCount[j]++; -+ } -+ } -+ } -+ -+ for(i = 1; i < 4; i++) -+ { -+ if(iCMaxIndx < iCCount[i]) -+ iCMaxIndx = i; -+ } -+ -+ for(i = 0; i < 4; ++i) -+ { -+ for(UT_sint32 j = i+1; j < 4; j++) -+ { -+ if(sS[i] == sS[j]) -+ { -+ iSCount[i]++; -+ iSCount[j]++; -+ } -+ } -+ } -+ -+ for(i = 1; i < 4; i++) -+ { -+ if(iSMaxIndx < iSCount[i]) -+ iSMaxIndx = i; -+ } -+ -+ if(styles.size() != 0) styles += ";"; -+ -+ styles += "border:"; -+ styles += sB[iBMaxIndx]; -+ -+ if(sS[iSMaxIndx].size()) -+ { -+ styles += " "; -+ styles += sS[iSMaxIndx]; -+ } -+ -+ -+ if(sC[iCMaxIndx].size()) -+ { -+ styles += " "; -+ styles += sC[iCMaxIndx]; -+ } -+ -+ if(styles.size() != 0) styles += ";"; -+ styles += "border-collapse:collapse;empty-cells:show;table-layout:fixed"; -+ // only add the border style if we didn't already add it in the "border shortcut" -+ if (!sS[iSMaxIndx].size()) styles += ";border-style:solid"; -+ -+ if(iBCount[iBMaxIndx] != 3) -+ { -+ for(i = 0; i < 4; ++i) -+ { -+ if(i == iBMaxIndx || dB[i] == dB[iBMaxIndx] || sB[i].size() == 0) -+ continue; -+ -+ switch(i) -+ { -+ case 0: styles += "border-left-width:"; break; -+ case 1: styles += "border-right-width:"; break; -+ case 2: styles += "border-top-width:"; break; -+ case 3: styles += "border-bottom-width:"; break; -+ } -+ -+ styles += sB[i]; -+ styles += ";"; -+ } -+ } -+ -+ if(iSCount[iSMaxIndx] != 3) -+ { -+ for(i = 0; i < 4; ++i) -+ { -+ if(i == iSMaxIndx || sS[i] == sS[iSMaxIndx] || sS[i].size() == 0) -+ continue; -+ -+ switch(i) -+ { -+ case 0: styles += "border-left-style:"; break; -+ case 1: styles += "border-right-style:"; break; -+ case 2: styles += "border-top-style:"; break; -+ case 3: styles += "border-bottom-style:"; break; -+ } -+ -+ styles += sS[i]; -+ styles += ";"; -+ } -+ } -+ -+ if(iCCount[iCMaxIndx] != 3) -+ { -+ for(i = 0; i < 4; ++i) -+ { -+ if(i == iCMaxIndx || sC[i] == sC[iCMaxIndx] || sC[i].size() == 0) -+ continue; -+ -+ switch(i) -+ { -+ case 0: styles += "border-left-color:"; break; -+ case 1: styles += "border-right-color:"; break; -+ case 2: styles += "border-top-color:"; break; -+ case 3: styles += "border-bottom-color:"; break; -+ } -+ -+ styles += sC[i]; -+ styles += ";"; -+ } -+ } -+ -+ const char * p = styles.utf8_str(); -+ UT_UTF8String s; -+ if(p[styles.byteLength()-1] == ';') -+ { -+ s.append(p, styles.byteLength()-1); -+ } -+ else -+ { -+ s = p; -+ } -+ -+ //m_utf8_1 = "table cellpadding=\""; -+ //m_utf8_1 += UT_UTF8String_sprintf ("%d\" border=\"%d", cellPadding, border); -+ m_utf8_1 = UT_UTF8String_sprintf ("table cellpadding=\"0\" border=\"%d\" style=\"", border); -+ m_utf8_1 += s; -+ m_utf8_1 += "\""; -+ -+ -+ unsigned int nCols = m_TableHelper.getNumCols (); -+ double totWidth = m_dPageWidthInches - m_dSecLeftMarginInches - m_dSecRightMarginInches; -+ -+ double colWidth = 100.0 / static_cast(nCols); -+ tagOpen (TT_TABLE, m_utf8_1); -+ _fillColWidthsVector(); -+ i = 0; -+ if(m_vecDWidths.getItemCount() > 0) -+ { -+ m_utf8_1 = "colgroup"; -+ tagOpen(TT_COLGROUP, m_utf8_1); -+ -+ for(i = 0; (i< nCols) && (i 0) -+ { -+ _fillColWidthsVector(); -+ _setCellWidthInches(); -+ } -+} -+ -+void s_HTML_Listener::_setCellWidthInches(void) -+{ -+ UT_sint32 left = m_TableHelper.getLeft (); -+ UT_sint32 right = m_TableHelper.getRight (); -+ double tot = 0; -+ UT_sint32 i =0; -+ -+ UT_ASSERT_HARMLESS((UT_sint32)m_vecDWidths.size() >= (right-1)); -+ -+ for(i=left; igetAttrProp (api, &pAP); -+ -+ if (bHaveProp && pAP) -+ { -+ const char * pszValue; -+ if(pAP->getProperty("height", pszValue)) -+ { -+ double dMM = UT_convertToDimension(pszValue, DIM_MM); -+ m_utf8_1 += UT_UTF8String_sprintf(";height:%.1fmm", dMM); -+ } -+ else -+ { -+ // we have a problem; need to set it to something, -+ // otherwise empty rows disappear from view -+ // ideally, we would want it set to the font size, but -+ // I do not think we can ascertain it at this stage. -+ m_utf8_1 += ";height:5mm"; -+ } -+ -+ } -+ } -+ -+ m_utf8_1 += "\""; -+ tagOpen (TT_TR, m_utf8_1); -+} -+ -+void s_HTML_Listener::_openCell (PT_AttrPropIndex api) -+{ -+ UT_LocaleTransactor t(LC_NUMERIC, "C"); -+ -+ m_bCellHasData = false; -+ -+ if (m_bFirstWrite) _openSection (api, 0); -+ -+ if (!m_bInSection) return; -+ -+ if (m_TableHelper.getNestDepth () < 1) _openTable(api); -+ -+ const PP_AttrProp * pAP = NULL; -+ bool bHaveProp = m_pDocument->getAttrProp (api, &pAP); -+ _setCellWidthInches(); -+ if (bHaveProp && pAP) -+ { -+ double dColSpacePT = 0; -+ double dRowSpacePT = 0; -+ const gchar * pszTableColSpacing = m_TableHelper.getTableProp ("table-col-spacing"); -+ const gchar * pszTableRowSpacing = m_TableHelper.getTableProp ("table-row-spacing"); -+ -+ if(pszTableColSpacing) -+ dColSpacePT = UT_convertToDimension(pszTableColSpacing, DIM_PT); -+ -+ if(pszTableRowSpacing) -+ dRowSpacePT = UT_convertToDimension(pszTableRowSpacing, DIM_PT); -+ -+ UT_UTF8String styles; -+ -+ if(dColSpacePT == dRowSpacePT) -+ { -+ styles += UT_UTF8String_sprintf("padding: %.2fpt", dColSpacePT); -+ } -+ else -+ { -+ styles += UT_UTF8String_sprintf("padding: %.2fpt %.2fpt", dRowSpacePT, dColSpacePT); -+ } -+ -+ UT_sint32 rowspan = m_TableHelper.getBot () - m_TableHelper.getTop (); -+ UT_sint32 colspan = m_TableHelper.getRight () - m_TableHelper.getLeft (); -+ -+ if (m_TableHelper.isNewRow()) // beginning of a new row -+ _openRow (api); -+ -+ const char * pszBgColor = m_TableHelper.getCellProp ("bgcolor"); -+ if (pszBgColor == NULL) -+ pszBgColor = m_TableHelper.getCellProp ("background-color"); -+ if (pszBgColor) -+ { -+ if (styles.byteLength ()) styles += ";"; -+ styles += "background-color:"; -+ -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBgColor); -+ if (hash) -+ styles += hash; -+ else -+ styles += pszBgColor; -+ } -+ -+ const char * pszBorderColor = NULL; -+ -+ pszBorderColor = m_TableHelper.getCellProp ("color"); -+ if (pszBorderColor) -+ { -+ if (styles.byteLength ()) styles += ";"; -+ styles += "color:"; -+ -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBorderColor); -+ if (hash) -+ styles += hash; -+ else -+ styles += pszBorderColor; -+ } -+ -+ // more often than not border attributes are same all around, so -+ // we want to use the border shortcut -+ // 0-L, 1-R, 2-T, 3-B -+ double dB[4] = {0.0,0.0,0.0,0.0}; -+ UT_UTF8String sB[4]; -+ UT_UTF8String sC[4]; -+ UT_UTF8String sS[4]; -+ -+ pszBorderColor = m_TableHelper.getCellProp ("bot-color"); -+ if (pszBorderColor) -+ { -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBorderColor); -+ if (hash) -+ sC[3] = hash; -+ else -+ sC[3] = pszBorderColor; -+ } -+ pszBorderColor = m_TableHelper.getCellProp ("left-color"); -+ if (pszBorderColor) -+ { -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBorderColor); -+ if (hash) -+ sC[0]= hash; -+ else -+ sC[0]= pszBorderColor; -+ } -+ pszBorderColor = m_TableHelper.getCellProp ("right-color"); -+ if (pszBorderColor) -+ { -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBorderColor); -+ if (hash) -+ sC[1] = hash; -+ else -+ sC[1] = pszBorderColor; -+ } -+ pszBorderColor = m_TableHelper.getCellProp ("top-color"); -+ if (pszBorderColor) -+ { -+ UT_HashColor color; -+ const char * hash = color.setHashIfValid (pszBorderColor); -+ if (hash) -+ sC[2] = hash; -+ else -+ sC[2] = pszBorderColor; -+ } -+ -+ const char * pszBorderStyle = NULL; -+ -+ pszBorderStyle = m_TableHelper.getCellProp ("bot-style"); -+ if (pszBorderStyle) -+ { -+ sS[3] = PP_PropertyMap::linestyle_for_CSS (pszBorderStyle); -+ } -+ pszBorderStyle = m_TableHelper.getCellProp ("left-style"); -+ if (pszBorderStyle) -+ { -+ sS[0]= PP_PropertyMap::linestyle_for_CSS (pszBorderStyle); -+ } -+ pszBorderStyle = m_TableHelper.getCellProp ("right-style"); -+ if (pszBorderStyle) -+ { -+ sS[1] = PP_PropertyMap::linestyle_for_CSS (pszBorderStyle); -+ } -+ pszBorderStyle = m_TableHelper.getCellProp ("top-style"); -+ if (pszBorderStyle) -+ { -+ sS[2] = PP_PropertyMap::linestyle_for_CSS (pszBorderStyle); -+ } -+ -+ const char * pszBorderWidth = NULL; -+ -+ pszBorderWidth = m_TableHelper.getCellProp ("bot-thickness"); -+ if (pszBorderWidth) -+ { -+ dB[3] = UT_convertToDimension(pszBorderWidth, DIM_PT); -+ sB[3] = UT_UTF8String_sprintf("%.2fpt", dB[3]); -+ } -+ pszBorderWidth = m_TableHelper.getCellProp ("left-thickness"); -+ if (pszBorderWidth) -+ { -+ dB[0] = UT_convertToDimension(pszBorderWidth, DIM_PT); -+ sB[0] = UT_UTF8String_sprintf("%.2fpt", dB[0]); -+ } -+ pszBorderWidth = m_TableHelper.getCellProp ("right-thickness"); -+ if (pszBorderWidth) -+ { -+ dB[1] = UT_convertToDimension(pszBorderWidth, DIM_PT); -+ sB[1] = UT_UTF8String_sprintf("%.2fpt", dB[1]); -+ } -+ pszBorderWidth = m_TableHelper.getCellProp ("top-thickness"); -+ if (pszBorderWidth) -+ { -+ dB[2] = UT_convertToDimension(pszBorderWidth, DIM_PT); -+ sB[2] = UT_UTF8String_sprintf("%.2fpt", dB[2]); -+ } -+ -+ // now we need to decide which attributes are to be used in the -+ // shortcut -+ UT_uint32 iBCount[4] = {0,0,0,0}; // 0 - L, 1 - R, 2 - T, 3 - B -+ UT_uint32 iCCount[4] = {0,0,0,0}; // 0 - L, 1 - R, 2 - T, 3 - B -+ UT_uint32 iSCount[4] = {0,0,0,0}; // 0 - L, 1 - R, 2 - T, 3 - B -+ UT_uint32 iBMaxIndx = 0, iCMaxIndx = 0, iSMaxIndx = 0; -+ UT_sint32 i = 0; -+ -+ for(i = 0; i < 4; ++i) -+ { -+ for(UT_sint32 j = i+1; j < 4; j++) -+ { -+ if(dB[i] == dB[j]) -+ { -+ iBCount[i]++; -+ iBCount[j]++; -+ } -+ } -+ } -+ -+ for(i = 1; i < 4; i++) -+ { -+ if(iBMaxIndx < iBCount[i]) -+ iBMaxIndx = i; -+ } -+ -+ for(i = 0; i < 4; ++i) -+ { -+ for(UT_sint32 j = i+1; j < 4; j++) -+ { -+ if(sC[i] == sC[j]) -+ { -+ iCCount[i]++; -+ iCCount[j]++; -+ } -+ } -+ } -+ -+ for(i = 1; i < 4; i++) -+ { -+ if(iCMaxIndx < iCCount[i]) -+ iCMaxIndx = i; -+ } -+ -+ for(i = 0; i < 4; ++i) -+ { -+ for(UT_sint32 j = i+1; j < 4; j++) -+ { -+ if(sS[i] == sS[j]) -+ { -+ iSCount[i]++; -+ iSCount[j]++; -+ } -+ } -+ } -+ -+ for(i = 1; i < 4; i++) -+ { -+ if(iSMaxIndx < iSCount[i]) -+ iSMaxIndx = i; -+ } -+ -+ if(styles.size() != 0) styles += ";"; -+ -+ styles += "border:"; -+ -+ if(sB[iBMaxIndx].size()) -+ { -+ styles += sB[iBMaxIndx]; -+ } -+ else -+ { -+ styles += "inherit"; -+ } -+ -+ styles += " "; -+ -+ if(sS[iSMaxIndx].size()) -+ { -+ styles += sS[iSMaxIndx]; -+ } -+ else -+ { -+ styles += "inherit"; -+ } -+ -+ styles += " "; -+ -+ if(sC[iCMaxIndx].size()) -+ { -+ styles += sC[iCMaxIndx]; -+ } -+ else -+ { -+ styles += "inherit"; -+ } -+ -+ if(styles.size() != 0) styles += ";"; -+ if(iBCount[iBMaxIndx] != 3) -+ { -+ for(i = 0; i < 4; ++i) -+ { -+ if((UT_uint32)i == iBMaxIndx || dB[i] == dB[iBMaxIndx]) -+ continue; -+ -+ switch(i) -+ { -+ case 0: styles += "border-left-width:"; break; -+ case 1: styles += "border-right-width:"; break; -+ case 2: styles += "border-top-width:"; break; -+ case 3: styles += "border-bottom-width:"; break; -+ } -+ -+ if(sB[i].size()) -+ styles += sB[i]; -+ else -+ styles += "inherit"; -+ -+ styles += ";"; -+ } -+ } -+ -+ if(iSCount[iSMaxIndx] != 3) -+ { -+ for(i = 0; i < 4; ++i) -+ { -+ if((UT_uint32)i == iSMaxIndx || sS[i] == sS[iSMaxIndx]) -+ continue; -+ -+ switch(i) -+ { -+ case 0: styles += "border-left-style:"; break; -+ case 1: styles += "border-right-style:"; break; -+ case 2: styles += "border-top-style:"; break; -+ case 3: styles += "border-bottom-style:"; break; -+ } -+ -+ if(sS[i].size()) -+ styles += sS[i]; -+ else -+ styles += "inherit"; -+ -+ styles += ";"; -+ } -+ } -+ -+ if(iCCount[iCMaxIndx] != 3) -+ { -+ for(i = 0; i < 4; ++i) -+ { -+ if((UT_uint32)i == iCMaxIndx || sC[i] == sC[iCMaxIndx]) -+ continue; -+ -+ switch(i) -+ { -+ case 0: styles += "border-left-color:"; break; -+ case 1: styles += "border-right-color:"; break; -+ case 2: styles += "border-top-color:"; break; -+ case 3: styles += "border-bottom-color:"; break; -+ } -+ -+ if(sC[i].size()) -+ styles += sC[i]; -+ else -+ styles += "inherit"; -+ -+ styles += ";"; -+ } -+ } -+ -+ const char * p = styles.utf8_str(); -+ UT_UTF8String s; -+ if(p[styles.byteLength()-1] == ';') -+ { -+ s.append(p, styles.byteLength()-1); -+ } -+ else -+ { -+ s = p; -+ } -+ -+ -+ m_utf8_1 = "td"; -+ -+ if (styles.byteLength ()) -+ { -+ m_utf8_1 += " style=\""; -+ m_utf8_1 += s; -+ m_utf8_1 += "\""; -+ } -+ -+ if (rowspan > 1) -+ { -+ m_utf8_1 += " rowspan=\""; -+ m_utf8_1 += UT_UTF8String_sprintf ("%d", rowspan); -+ m_utf8_1 += "\""; -+ } -+ if (colspan > 1) -+ { -+ m_utf8_1 += " colspan=\""; -+ m_utf8_1 += UT_UTF8String_sprintf ("%d", colspan); -+ m_utf8_1 += "\""; -+ } -+ tagOpen (TT_TD, m_utf8_1); -+ } -+} -+ -+void s_HTML_Listener::_closeCell () -+{ -+ if (m_TableHelper.getNestDepth () < 1) return; -+ -+ if(!m_bCellHasData) -+ { -+ // we need to insert a   to make sure that the cell will -+ // have its borders -+ // this is not necessary; the same effect can be achieved by -+ // setting "border-collapse:collapse;empty-cells:show" -+ UT_UTF8String s = " "; // This enables the table to be reimported in abi -+ tagRaw(s); -+ } -+ -+ /* The number of times _popUnendedStructures has to be used may be indicative of serious fundamental flows in the -+ current tag stack(s) implementation, an implementation which therefore is in dire need of an expert audit. -+ On the other hand, it may also be the necessary result of the already known shortcomings of our piecetable with -+ regard to the permission of unstruxed structures and unilateral struxes. -MG */ -+ _popUnendedStructures(); -+ -+ m_utf8_1 = "td"; -+ tagClose (TT_TD, m_utf8_1); -+} -+ -+#endif /* HTML_TABLES_SUPPORTED */ -+ -+ -+void s_HTML_Listener::_openPosImage (PT_AttrPropIndex api) -+{ -+ const PP_AttrProp * pAP = NULL; -+ bool bHaveProp = m_pDocument->getAttrProp (api, &pAP); -+ if (!bHaveProp || (pAP == 0)) return; -+ -+ const gchar * pszDataID = NULL; -+ if(pAP->getAttribute(PT_STRUX_IMAGE_DATAID, (const gchar *&)pszDataID) && pszDataID) -+ _handleImage(pAP,pszDataID,true); -+ -+} -+ -+void s_HTML_Listener::_openTextBox (PT_AttrPropIndex api) -+{ -+ const PP_AttrProp * pAP = NULL; -+ bool bHaveProp = m_pDocument->getAttrProp (api, &pAP); -+ if (!bHaveProp || (pAP == 0)) return; -+ const gchar * tempProp = 0; -+ -+ if(m_bInTextBox) -+ _closeTextBox(); // Fortunately for the html exporter, abi does not permit nested frames. -+ -+ if(m_iListDepth) -+ listPopToDepth(0); // AbiWord does not support textboxes in LIs, neither do we. -+ -+ m_bInFrame = true; -+ m_bInTextBox = true; // See comment by declaration -+ /* --- Copied from closeSection --- */ -+ // TODO: Extract me into closePseudoSection. -+ if (m_bInBlock) -+ _closeTag (); // We need to investigate the tag stack usage of this, and whether or not we really would rather specify the tag in all cases. -+ -+ // Need to investigate whether we can safely uncomment this without undoing heading work, or any other kind using unended structures like lists. -+ // _popUnendedStructures(); // Close lists, and possibly other stuff. Even if it theoretically can span sections, we run a high risk of corrupting the document. -+ -+ if (m_bInSection && (tagTop () == TT_DIV)) -+ { -+ m_utf8_1 = "div"; -+ tagClose (TT_DIV, m_utf8_1); -+ } -+ /* --- */ -+ m_utf8_1 = "div style=\""; // We represent the box with a div (block) -+ -+ // TODO: Enum frame properties (and in any case where props equal their css counterparts) separately -+ // TODO: so here (and places like here) you can just iterate through it getting the prop and setting it. -+ // TODO: Actually, you wouldn't have to limit it to where the props were identical, just have -+ // TODO: { abiprop, cssprop }. It would still require that the units used for both specs be compatible. -+ // -+ // TODO: Take care of padding as well. -+ const gchar * propNames[20] = {"bot-thickness","border-bottom-width", -+ "top-thickness","border-top-width", -+ "right-thickness","border-right-width", -+ "left-thickness","border-left-width", -+ "bot-color","border-bottom-color", -+ "top-color","border-top-color", -+ "right-color","border-right-color", -+ "left-color","border-left-color", -+ "background-color","background-color", -+ NULL,NULL}; // [AbiWord property name, CSS21 property name] -+ for(unsigned short int propIdx = 0; propIdx < 18; propIdx += 2) -+ { -+ if(pAP->getProperty(propNames[propIdx], tempProp)) // If we successfully retrieve a value (IOW, it's defined) -+ { -+ m_utf8_1 += propNames[propIdx + 1]; // Add the property name of the CSS equivalent -+ m_utf8_1 += ": "; // Don't ask (: -+ if(strstr(propNames[propIdx + 1], "color")) m_utf8_1 += "#"; // AbiWord tends to store colors as hex, which must be prefixed by # in CSS -+ m_utf8_1 += tempProp; // Add the value -+ m_utf8_1 += "; "; // Terminate the property -+ } -+ } -+ -+ //pAP->getProperty("bot-style", tempProp); // Get the bottom border style -+ //<...> -+ // We don't do this right now because we don't support multiple styles right now. -+ // See bug 7935. Until we support multiple styles, it is sufficient to set all solid. -+ m_utf8_1 += " border: solid;"; -+ -+ // This might need to be updated for textbox (and wrapped-image?) changes that -+ // occured in 2.3. -+ pAP->getProperty("wrap-mode", tempProp); // Get the wrap mode -+ if(!strcmp(tempProp, "wrapped-both")) -+ m_utf8_1 += " clear: none;"; -+ else if(!strcmp(tempProp, "wrapped-left")) -+ m_utf8_1 += " clear: right;"; -+ else if(!strcmp(tempProp, "wrapped-right")) -+ m_utf8_1 += " clear: left;"; -+ else if(!strcmp(tempProp, "above-text")) -+ m_utf8_1 += " clear: none; z-index: 999;"; -+ -+ m_utf8_1 += "\""; -+ -+ tagOpen(TT_DIV, m_utf8_1); -+ -+ return; -+} -+ -+void s_HTML_Listener::_closeTextBox () -+{ -+ // We don't need to close the block ourselves because _closeSection does it for us. -+ /* --- */ -+ // TODO: Extract me into closePseudoSection -+ // We cannot use _closeSection(), we're not actually in a section. -+ if (m_bInBlock) -+ _closeTag (); // We need to investigate the tag stack usage of this, and whether or not we really would rather specify the tag in all cases. -+ -+ // Need to investigate whether we can safely uncomment this without undoing heading work, or any other kind using unended structures like lists. -+ // _popUnendedStructures(); // Close lists, and possibly other stuff. Even if it theoretically can span sections, we run a high risk of corrupting the document. -+ -+ if ((tagTop () == TT_DIV)) -+ { -+ m_utf8_1 = "div"; -+ tagClose (TT_DIV, m_utf8_1); -+ } -+ else -+ { -+ UT_DEBUGMSG(("WARNING: Something gone awry with this textbox \n")); -+ } -+ /* --- */ -+ // Fortunately for us, abi does not permit nested frames yet. -+ m_bInFrame = false; -+ m_bInTextBox = false; -+} -+ -+void s_HTML_Listener::_outputData (const UT_UCSChar * data, UT_uint32 length) -+{ -+ if (!m_bInBlock) return; -+ -+ m_utf8_1 = ""; -+ -+ bool prev_space = false; -+ const UT_UCSChar * ucs_ptr = data; -+ for (UT_uint32 i = 0; i < length; i++) -+ { -+ bool space = false; -+ -+ switch (*ucs_ptr) -+ { -+ case UCS_FF: // page break, convert to line break -+ case UCS_LF: -+ /* LF -- representing a Forced-Line-Break -+ */ -+ if (m_utf8_1.byteLength ()) textTrusted (m_utf8_1); -+ m_utf8_1 = "br"; -+ tagOpenClose (m_utf8_1, get_HTML4 (), ws_None); -+ m_utf8_1 = ""; -+ break; -+ -+ case UCS_LDBLQUOTE: -+ m_utf8_1 += "“"; -+ m_bCellHasData = true; -+ break; -+ -+ case UCS_RDBLQUOTE: -+ m_utf8_1 += "”"; -+ m_bCellHasData = true; -+ break; -+ -+ case UCS_LQUOTE: -+ m_utf8_1 += "‘"; -+ m_bCellHasData = true; -+ break; -+ -+ case UCS_RQUOTE: -+ m_utf8_1 += "’"; -+ m_bCellHasData = true; -+ break; -+ -+ case UCS_EN_DASH: -+ m_utf8_1 += "–"; -+ m_bCellHasData = true; -+ break; -+ -+ case UCS_EM_DASH: -+ m_utf8_1 += "—"; -+ m_bCellHasData = true; -+ break; -+ -+ default: -+ if ((*ucs_ptr & 0x007f) == *ucs_ptr) // ASCII -+ { -+ m_bCellHasData = true; -+ char c = static_cast(*ucs_ptr & 0x007f); -+ -+ if (isspace (static_cast(static_cast(c)))) -+ { -+ if (prev_space || (length == 1)) -+ m_utf8_1 += " "; -+ else -+#ifdef HTML_UCS4 -+ m_utf8_1.appendUCS4 (ucs_ptr, 1); -+#else -+ m_utf8_1.append (ucs_ptr, 1); -+#endif -+ space = true; -+ } -+ else switch (c) -+ { -+ case '<': -+ m_utf8_1 += "<"; -+ break; -+ case '>': -+ m_utf8_1 += ">"; -+ break; -+ case '&': -+ m_utf8_1 += "&"; -+ break; -+ default: -+#ifdef HTML_UCS4 -+ m_utf8_1.appendUCS4 (ucs_ptr, 1); -+#else -+ m_utf8_1.append (ucs_ptr, 1); -+#endif -+ break; -+ } -+ } -+#ifdef HTML_UCS4 -+ else m_utf8_1.appendUCS4 (ucs_ptr, 1); // !ASCII, just append... ?? -+#else -+ else m_utf8_1.append (ucs_ptr, 1); // !ASCII, just append... ?? -+#endif -+ break; -+ } -+ prev_space = space; -+ ucs_ptr++; -+ } -+ if (m_utf8_1.byteLength ()) textTrusted (m_utf8_1); -+} -+ -+s_HTML_Listener::s_HTML_Listener (PD_Document * pDocument, IE_Exp_HTML * pie, bool bClipBoard, -+ bool bTemplateBody, const XAP_Exp_HTMLOptions * exp_opt, -+ s_StyleTree * style_tree, -+ UT_UTF8String & linkCSS, -+ UT_UTF8String & title) : -+ m_pDocument (pDocument), -+ m_apiLastSpan(0), -+ m_pie(pie), -+ m_bClipBoard(bClipBoard), -+ m_bTemplateBody(bTemplateBody), -+ m_exp_opt(exp_opt), -+ m_style_tree(style_tree), -+ m_bInSection(false), -+ m_bInFrame(false), -+ m_bInTextBox(false), -+ m_bInTOC(false), -+ m_bInBlock(false), -+ m_bInSpan(false), -+ m_bNextIsSpace(false), -+ m_bWroteText(false), -+ m_bFirstWrite(true), -+ m_bQuotedPrintable(false), -+ m_bHaveHeader(false), -+ m_bHaveFooter(false), -+#ifdef HTML_TABLES_SUPPORTED -+ m_TableHelper(pDocument), -+#endif /* HTML_TABLES_SUPPORTED */ -+ m_iBlockType(0), -+ m_iListDepth(0), -+ m_iImgCnt(0), -+ m_StyleTreeInline(0), -+ m_StyleTreeBlock(0), -+ m_StyleTreeBody(0), -+ m_pAPStyles(0), -+ m_styleIndent(0), -+ m_fdCSS(0), -+ m_bIgnoreTillEnd(false), -+ m_bIgnoreTillNextSection(false), -+ m_iEmbedStartPos(0), -+ m_dPageWidthInches(0.0), -+ m_dSecLeftMarginInches(0.0), -+ m_dSecRightMarginInches(0.0), -+ m_dCellWidthInches(0.0), -+ m_sLinkCSS(linkCSS), -+ m_sTitle(title), -+ m_iOutputLen(0), -+ m_bCellHasData(true), // we are not in cell to start with, set to true -+ m_toc(0), -+ m_heading_count(0) -+{ -+ m_toc = new IE_TOCHelper (m_pDocument); -+ m_StyleTreeBody = m_style_tree->find ("Normal"); -+} -+ -+s_HTML_Listener::~s_HTML_Listener() -+{ -+ UT_DEBUGMSG(("deleteing lisnter %x \n",this)); -+ _closeTag (); -+ -+ listPopToDepth (0); -+ -+ _closeSection (); -+ -+ _outputEnd (); -+ -+ UT_VECTOR_PURGEALL(double *,m_vecDWidths); -+ DELETEP(m_toc); -+} -+ -+/* dataid is the raw string with the data ID -+ * imagedir is the name of the directory in which we'll write the image -+ * filename is the name of the file to which we'll write the image -+ * url is the URL which we'll use -+ */ -+void s_HTML_Listener::_writeImage (const UT_ByteBuf * pByteBuf, -+ const UT_UTF8String & imagedir, -+ const UT_UTF8String & filename) -+{ -+ /* hmm, bit lazy this - attempt to create directory whether or not -+ * it exists already... if it does, well hey. if this fails to -+ * create a directory then fopen() will fail as well, so no biggie -+ */ -+ UT_go_directory_create(imagedir.utf8_str(), 0750, NULL); -+ -+ UT_UTF8String path(imagedir); -+ path += "/"; -+ path += filename; -+ -+ GsfOutput * out = UT_go_file_create (path.utf8_str (), NULL); -+ if (out) -+ { -+ gsf_output_write (out, pByteBuf->getLength (), (const guint8*)pByteBuf->getPointer (0)); -+ gsf_output_close (out); -+ g_object_unref (G_OBJECT (out)); -+ } -+} -+ -+void s_HTML_Listener::_writeImageBase64 (const UT_ByteBuf * pByteBuf) -+{ -+ char buffer[75]; -+ char * bufptr = 0; -+ size_t buflen; -+ size_t imglen = pByteBuf->getLength (); -+ const char * imgptr = reinterpret_cast(pByteBuf->getPointer (0)); -+ -+ buffer[0] = '\r'; -+ buffer[1] = '\n'; -+ -+ while (imglen) -+ { -+ buflen = 72; -+ bufptr = buffer + 2; -+ -+ UT_UTF8_Base64Encode (bufptr, buflen, imgptr, imglen); -+ -+ *bufptr = 0; -+ -+ m_utf8_1 = buffer; -+ textTrusted (m_utf8_1); -+ } -+} -+ -+void s_HTML_Listener::_handleEmbedded (PT_AttrPropIndex api) -+{ -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = m_pDocument->getAttrProp (api, &pAP); -+ -+ if (!bHaveProp || (pAP == 0)) return; -+ -+ const gchar * szDataID = 0; -+ pAP->getAttribute ("dataid", szDataID); -+ -+ if (szDataID == 0) return; -+ -+ UT_UTF8String imgDataID("snapshot-png-"); -+ imgDataID += szDataID; -+ -+ // Code to export the embedded object as an -+ // with an inside it, as a rendering fallback -+ // http://www.w3.org/TR/1999/REC-html401-19991224/struct/objects.html#h-13.3 -+ UT_LocaleTransactor t(LC_NUMERIC, "C"); -+ -+ const char * szName = 0; -+ const char * szMimeType = 0; -+ -+ const UT_ByteBuf * pByteBuf = 0; -+ -+ UT_uint32 k = 0; -+ while (m_pDocument->enumDataItems (k, 0, &szName, &pByteBuf, reinterpret_cast(&szMimeType))) -+ { -+ k++; -+ if (szName == 0) continue; -+ if (strcmp (szDataID, szName) == 0) break; -+ -+ szName = 0; -+ szMimeType = 0; -+ pByteBuf = 0; -+ } -+ if ((pByteBuf == 0) || (szMimeType == 0)) return; // ?? -+ -+ -+ const char * dataid = UT_basename (static_cast(szDataID)); -+ -+ const char * suffix = dataid + strlen (dataid); -+ const char * suffid = suffix; -+ const char * ptr = 0; -+ -+ /* Question: What does the DataID look like for objects pasted -+ * from the clipboard? -+ */ -+ ptr = suffix; -+ while (ptr > dataid) -+ if (*--ptr == '_') -+ { -+ suffix = ptr; -+ suffid = suffix; -+ break; -+ } -+ ptr = suffix; -+ while (ptr > dataid) -+ if (*--ptr == '.') -+ { -+ suffix = ptr; -+ // break; -+ } -+ if (dataid == suffix) return; -+ -+ char * base_name = UT_go_basename_from_uri (m_pie->getFileName ()); -+ -+ /* hmm; who knows what locale the system uses -+ */ -+ UT_UTF8String objectbasedir = "clipboard"; -+ if (base_name) -+ objectbasedir = base_name; -+ objectbasedir += "_files"; -+ UT_UTF8String objectdir = m_pie->getFileName (); -+ objectdir += "_files"; -+ -+ UT_UTF8String filename(dataid,suffix-dataid); -+ filename += suffid; -+ filename += ".obj"; -+ -+ g_free (base_name); -+ -+ UT_UTF8String url; -+ -+ url += s_string_to_url (objectbasedir); -+ url += "/"; -+ url += s_string_to_url (filename); -+ -+ if (get_Multipart ()) -+ { -+ UT_UTF8String * save_url = new UT_UTF8String(url); -+ if (save_url == 0) return; -+ -+ if (!m_SavedURLs.insert (szDataID, save_url)) // arg. failed. skip object -+ { -+ DELETEP(save_url); -+ return; -+ } -+ } -+ -+ /* szDataID is the raw string with the data ID -+ * objectdir is the name of the directory in which we'll write the object -+ * filename is the name of the file to which we'll write the object -+ * url is the URL which we'll use -+ */ -+ if (!get_Embed_Images () && !get_Multipart ()) -+ { -+ _writeImage (pByteBuf, objectdir, filename); -+ } -+ -+ m_utf8_1 = "object"; -+ -+ const gchar * szWidth = 0; -+ -+ pAP->getProperty ("width", szWidth); -+ -+ double dWidth = UT_convertToInches(szWidth); -+ double total = 0; -+ if(m_TableHelper.getNestDepth() > 0) -+ { -+ total = m_dCellWidthInches; -+ } -+ else -+ { -+ total = m_dPageWidthInches - m_dSecLeftMarginInches - m_dSecRightMarginInches; -+ } -+ double percent = 100.0*dWidth/total; -+ if(percent > 100.) -+ { -+ percent = 100.0; -+ } -+ UT_UTF8String tmp; -+ UT_DEBUGMSG(("Width of Object %s \n",szWidth ? szWidth : "(null)")); -+ -+ UT_sint32 iObjectWidth, iObjectHeight; -+ UT_PNG_getDimensions(pByteBuf, iObjectWidth, iObjectHeight); -+ UT_DEBUGMSG(("Real object dimensions: (%d x %d)\n", iObjectWidth, iObjectHeight)); -+ -+ if (szWidth) -+ { -+ m_utf8_1 += " width=\""; -+ if (get_Scale_Units()) -+ { -+ UT_sint32 iPercent = (UT_sint32)(percent + 0.5); -+ tmp = UT_UTF8String_sprintf("%d%%",iPercent); -+ } else // Abi stores the orig file, but abs or unitless must be true to dims set in abi -+ { -+ double dMM = UT_convertToDimension(szWidth, DIM_MM); -+ tmp = UT_UTF8String_sprintf("%.1fmm",dMM); -+ } -+ m_utf8_1 += tmp; -+ m_utf8_1 += "\""; -+ } -+ -+ m_utf8_1 += UT_UTF8String_sprintf(" type=\"%s\"", szMimeType); -+ -+ m_tagStack.push (TT_OBJECT); -+ if (!get_Embed_Images () || get_Multipart ()) -+ { -+ m_utf8_1 += " data=\""; -+ m_utf8_1 += url; -+ m_utf8_1 += "\""; -+ -+ tagOpenBroken (m_utf8_1, ws_None); -+ -+ m_utf8_1 = ""; -+ tagCloseBroken (m_utf8_1, true, ws_None); -+ } -+ else -+ { -+ m_utf8_1 += UT_UTF8String_sprintf(" data=\"data:%s;base64,", szMimeType); -+ tagOpenBroken (m_utf8_1, ws_None); -+ -+ _writeImageBase64 (pByteBuf); -+ -+ m_utf8_1 = "\""; -+ tagCloseBroken (m_utf8_1, true, ws_None); -+ } -+ -+ // embed an version of the object, as a rendering fallback -+ _handleImage (pAP, imgDataID.utf8_str(),false); -+ -+ m_utf8_1 = "object"; -+ tagClose(TT_OBJECT, m_utf8_1); -+} -+ -+void s_HTML_Listener::_handleImage (PT_AttrPropIndex api) -+{ -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = m_pDocument->getAttrProp (api, &pAP); -+ -+ if (!bHaveProp || (pAP == 0)) return; -+ -+ const gchar * szDataID = 0; -+ pAP->getAttribute ("dataid", szDataID); -+ -+ if (szDataID == 0) return; -+ -+ _handleImage (pAP, szDataID,false); -+} -+ -+void s_HTML_Listener::_handleImage (const PP_AttrProp * pAP, const char * szDataID, bool bIsPositioned) -+{ -+ UT_LocaleTransactor t(LC_NUMERIC, "C"); -+ -+ const char * szName = 0; -+ const char * szMimeType = 0; -+ -+ const UT_ByteBuf * pByteBuf = 0; -+ -+ UT_uint32 k = 0; -+ while (m_pDocument->enumDataItems (k, 0, &szName, &pByteBuf, reinterpret_cast(&szMimeType))) -+ { -+ k++; -+ if (szName == 0) continue; -+ if (strcmp (szDataID, szName) == 0) break; -+ -+ szName = 0; -+ szMimeType = 0; -+ pByteBuf = 0; -+ } -+ if ((pByteBuf == 0) || (szMimeType == 0)) return; // ?? -+ -+ if (strcmp (szMimeType, "image/png") != 0) -+ { -+ UT_DEBUGMSG(("Object not of MIME type image/png - ignoring...\n")); -+ return; -+ } -+ -+ const char * dataid = UT_basename (static_cast(szDataID)); -+ -+ const char * suffix = dataid + strlen (dataid); -+ const char * suffid = suffix; -+ const char * ptr = 0; -+ -+ /* Question: What does the DataID look like for images pasted -+ * from the clipboard? -+ */ -+ ptr = suffix; -+ while (ptr > dataid) -+ if (*--ptr == '_') -+ { -+ suffix = ptr; -+ suffid = suffix; -+ break; -+ } -+ ptr = suffix; -+ while (ptr > dataid) -+ if (*--ptr == '.') -+ { -+ suffix = ptr; -+ // break; -+ } -+ if (dataid == suffix) return; -+ -+ char * base_name = UT_go_basename_from_uri (m_pie->getFileName ()); -+ -+ /* hmm; who knows what locale the system uses -+ */ -+ UT_UTF8String imagebasedir = "clipboard"; -+ if (base_name) -+ imagebasedir = base_name; -+ imagebasedir += "_files"; -+ UT_UTF8String imagedir = m_pie->getFileName (); -+ imagedir += "_files"; -+ -+ UT_UTF8String filename(dataid,suffix-dataid); -+ filename += suffid; -+ filename += ".png"; -+ -+ g_free (base_name); -+ -+ UT_UTF8String url; -+ -+ url += s_string_to_url (imagebasedir); -+ url += "/"; -+ url += s_string_to_url (filename); -+ -+ if (get_Multipart ()) -+ { -+ UT_UTF8String * save_url = new UT_UTF8String(url); -+ if (save_url == 0) return; -+ -+ if (!m_SavedURLs.insert (szDataID, save_url)) // arg. failed. skip image -+ { -+ DELETEP(save_url); -+ return; -+ } -+ } -+ -+ /* szDataID is the raw string with the data ID -+ * imagedir is the name of the directory in which we'll write the image -+ * filename is the name of the file to which we'll write the image -+ * url is the URL which we'll use -+ */ -+ if (!get_Embed_Images () && !get_Multipart ()) -+ { -+ _writeImage (pByteBuf, imagedir, filename); -+ } -+ m_utf8_1 = "img"; -+ if(bIsPositioned) -+ { -+ const gchar * szXPos = NULL; -+ UT_sint32 ixPos = 0; -+ if(pAP->getProperty("xpos",szXPos)) -+ { -+ ixPos= UT_convertToLogicalUnits(szXPos); -+ } -+ else if(pAP->getProperty("frame-col-xpos",szXPos)) -+ { -+ ixPos= UT_convertToLogicalUnits(szXPos); -+ } -+ else if(pAP->getProperty("frame-page-xpos",szXPos)) -+ { -+ ixPos= UT_convertToLogicalUnits(szXPos); -+ } -+ if(ixPos > UT_convertToLogicalUnits("1.0in")) -+ { -+ m_utf8_1 += " align=\"right\" "; -+ } -+ else -+ { -+ m_utf8_1 += " align=\"left\" "; -+ } -+ } -+ const gchar * szWidth = 0; -+ if(!bIsPositioned) -+ pAP->getProperty ("width", szWidth); -+ else -+ pAP->getProperty ("frame-width", szWidth); -+ -+ double dWidth = UT_convertToInches(szWidth); -+ double total = 0; -+ if(m_TableHelper.getNestDepth() > 0) -+ { -+ total = m_dCellWidthInches; -+ } -+ else -+ { -+ total = m_dPageWidthInches - m_dSecLeftMarginInches - m_dSecRightMarginInches; -+ } -+ double percent = 100.0*dWidth/total; -+ if(percent > 100.) -+ { -+ percent = 100.0; -+ } -+ UT_UTF8String tmp, escape; -+ UT_DEBUGMSG(("Width of Image %s \n",szWidth ? szWidth : "(null)")); -+ -+ UT_sint32 iImageWidth, iImageHeight; -+ UT_PNG_getDimensions(pByteBuf, iImageWidth, iImageHeight); -+ UT_DEBUGMSG(("Real image dimensions: (%d x %d)\n", iImageWidth, iImageHeight)); -+ -+ if (szWidth) -+ { -+ m_utf8_1 += " style=\"width:"; -+ if (get_Scale_Units()) -+ { -+ UT_sint32 iPercent = (UT_sint32)(percent + 0.5); -+ tmp = UT_UTF8String_sprintf("%d%%",iPercent); -+ } else // Abi stores the orig file, but abs or unitless must be true to dims set in abi -+ { -+ double dMM = UT_convertToDimension(szWidth, DIM_MM); -+ tmp = UT_UTF8String_sprintf("%.1fmm",dMM); -+ } -+ m_utf8_1 += tmp; -+ m_utf8_1 += "\""; -+ } -+ -+ const gchar * szTitle = 0; -+ pAP->getAttribute ("title", szTitle); -+ if (szTitle) { -+ escape = szTitle; -+ m_utf8_1 += " title=\""; -+ m_utf8_1 += escape.escapeXML(); -+ m_utf8_1 += "\""; -+ escape.clear(); -+ } -+ -+ const gchar * szAlt = 0; -+ pAP->getAttribute ("alt", szAlt); -+ m_utf8_1 += " alt=\""; -+ if (szAlt) { -+ escape = szAlt; -+ m_utf8_1 += escape.escapeXML(); -+ } -+ m_utf8_1 += "\""; -+ -+ const gchar * szLang = 0; -+ pAP->getProperty ("lang", szLang); -+ if (szLang) { -+ if (!get_HTML4 ()) { -+ // we want to emit xml:lang in addition to lang -+ m_utf8_1 += " xml:lang=\""; -+ m_utf8_1 += szLang; -+ m_utf8_1 += "\""; -+ } -+ -+ m_utf8_1 += " lang=\""; -+ m_utf8_1 += szLang; -+ m_utf8_1 += "\""; -+ } -+ -+ if (!get_Embed_Images () || get_Multipart ()) -+ { -+ m_utf8_1 += " src=\""; -+ m_utf8_1 += url; -+ m_utf8_1 += "\""; -+ -+ tagOpenClose (m_utf8_1, get_HTML4 (), ws_None); -+ -+ return; -+ } -+ -+ m_utf8_1 += " src=\"data:image/png;base64,"; -+ tagOpenBroken (m_utf8_1, ws_None); -+ -+ _writeImageBase64 (pByteBuf); -+ -+ m_utf8_1 = "\""; -+ tagCloseBroken (m_utf8_1, get_HTML4 (), ws_None); -+} -+ -+void s_HTML_Listener::_handlePendingImages () -+{ -+ UT_GenericStringMap::UT_Cursor cursor (&m_SavedURLs); -+ -+ const UT_UTF8String * val = 0; -+ for (val = cursor.first (); cursor.is_valid (); val = cursor.next ()) -+ { -+ const char * dataid = cursor.key().c_str (); -+ -+ const UT_UTF8String * saved_url = val; -+ UT_UTF8String * url = const_cast(saved_url); -+ -+ const char * szName = 0; -+ const char * szMimeType = 0; -+ -+ const UT_ByteBuf * pByteBuf = 0; -+ -+ UT_uint32 k = 0; -+ while (m_pDocument->enumDataItems (k, 0, &szName, &pByteBuf, reinterpret_cast(&szMimeType))) -+ { -+ k++; -+ if (szName == 0) continue; -+ if (strcmp (dataid, szName) == 0) break; -+ -+ szName = 0; -+ szMimeType = 0; -+ pByteBuf = 0; -+ } -+ if (pByteBuf) // this should always be found, but just in case... -+ { -+ multiBoundary (); -+ -+ m_utf8_1 = "image/png"; -+ multiField ("Content-Type", m_utf8_1); -+ -+ m_utf8_1 = "base64"; -+ multiField ("Content-Transfer-Encoding", m_utf8_1); -+ -+ multiField ("Content-Location", *url); -+ -+ _writeImageBase64 (pByteBuf); -+ -+ multiBreak (); -+ } -+ DELETEP(url); -+ } -+ m_SavedURLs.clear (); -+} -+ -+void s_HTML_Listener::_handleField (const PX_ChangeRecord_Object * pcro, -+ PT_AttrPropIndex api) -+{ -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = m_pDocument->getAttrProp (api, &pAP); -+ -+ if (!bHaveProp || (pAP == 0)) return; -+ -+ const gchar * szType = 0; -+ pAP->getAttribute ("type", szType); -+ -+ if (szType == 0) return; -+ -+ fd_Field * field = pcro->getField (); -+ -+ m_pie->populateFields (); -+ -+ if (strcmp (szType, "list_label") != 0) -+ { -+ // TODO: Text styles? (maybe not) -+ // TODO: Line before footnotes? Or use the table as in embedded target idea? -+ // See also: abi bug 7612 -+ // TODO: Optional: -+ // TODO: Embedded target for footnote linking (frame adjusts on the footnotes when ref clicked). -+ -+ m_utf8_1 = "span"; -+ -+ // TODO: branch out to get the format of the refs/anchors correct. -+ if ((strcmp (szType, "footnote_anchor") == 0) || -+ (strcmp (szType, "endnote_anchor") == 0) || -+ (strcmp (szType, "footnote_ref") == 0) || -+ (strcmp (szType, "endnote_ref") == 0)) -+ { -+ const gchar * szA_Style = 0; -+ bool have_style = pAP->getAttribute (PT_STYLE_ATTRIBUTE_NAME, szA_Style); -+ if (have_style) -+ { -+ const s_StyleTree * tree = 0; -+ tree = m_style_tree->find (szA_Style); -+ if (tree) -+ { -+ if (tree->class_list().byteLength ()) -+ { -+ UT_UTF8String escape = tree->class_name (); -+ m_utf8_1 += " class=\""; -+ m_utf8_1 += escape.escapeXML(); -+ m_utf8_1 += "\""; -+ } -+ } -+ } -+ else -+ { -+ m_utf8_1 += " class=\"ABI_FIELD_"; -+ m_utf8_1 += szType; -+ m_utf8_1 += "\""; -+ } -+ const gchar * szA_Props = 0; -+ bool have_props = pAP->getAttribute (PT_PROPS_ATTRIBUTE_NAME, szA_Props); -+ if(have_props) -+ { -+ m_utf8_1 += " style=\""; -+ m_utf8_1 += szA_Props; -+ m_utf8_1 += "\""; -+ } -+ -+ gchar * szTypeCpy = new gchar[strlen(szType) + 2]; -+ strncpy(szTypeCpy, szType, strlen(szType)+1); -+ const gchar * noteToken = (gchar *)strtok((char *)szTypeCpy, "_"); -+ gchar * idAttr = new gchar[strlen(noteToken) + 4]; -+ strncpy(idAttr, noteToken, strlen(noteToken)+1); -+ const gchar * partToken = (gchar *)strtok(NULL, "_"); -+ const gchar * szID = 0; -+ const gchar * szNoteNumInit = 0; -+ UT_uint32 noteNumInit = 1; -+ -+ UT_UTF8String notePNString; -+ UT_UTF8String notePLString; -+ UT_UTF8String notePIDString; -+ -+ // Take into account document-*note-initial -+ // This block preps for getting a document-level property. -+ PT_AttrPropIndex docApi = m_pDocument->getAttrPropIndex(); -+ const PP_AttrProp * pDAP = NULL; -+ m_pDocument->getAttrProp (docApi, &pDAP); -+ if(!strcmp(noteToken, "footnote") && pDAP->getProperty("document-footnote-initial", szNoteNumInit)) -+ noteNumInit = atoi(szNoteNumInit); -+ else if(!strcmp(noteToken, "endnote") && pDAP->getProperty("document-endnote-initial", szNoteNumInit)) -+ noteNumInit = atoi(szNoteNumInit); -+ -+ UT_uint32 ID = 0; -+ if(pAP->getAttribute (strcat(idAttr, "-id"), szID) && szID) -+ ID = atoi(szID); -+ -+ UT_UTF8String_sprintf(notePIDString, " id=\"%s_%s-%d\"", noteToken, partToken, (ID + noteNumInit)); -+ m_utf8_1 += notePIDString; -+ tagOpen (TT_SPAN, m_utf8_1, ws_None); -+ m_utf8_1 = "a"; -+ -+ const char *hrefPartAtom = (strcmp(partToken, "anchor") ? "anchor" : "ref"); -+ -+ UT_UTF8String_sprintf(notePLString, " href=\"#%s_%s-%d\"", noteToken, hrefPartAtom, (ID + noteNumInit)); -+ m_utf8_1 += notePLString; -+ tagOpen (TT_A, m_utf8_1, ws_None); -+ UT_UTF8String_sprintf(notePNString, "%d", (ID + noteNumInit)); -+ m_pie->write (notePNString.utf8_str (), notePNString.byteLength ()); -+ textUntrusted (field->getValue ()); -+ m_utf8_1 = "a"; -+ tagClose (TT_A, m_utf8_1, ws_None); -+ DELETEPV(idAttr); -+ DELETEPV(szTypeCpy); -+ } -+ else -+ { -+ m_utf8_1 = "span"; -+ // TODO: Find out if we can change this back to just getting the style from the document, -+ // which is what is done with notes. -+ m_utf8_1 += " class=\"ABI_FIELD_"; -+ m_utf8_1 += szType; -+ m_utf8_1 += "\""; -+ tagOpen (TT_SPAN, m_utf8_1, ws_None); -+ textUntrusted (field->getValue ()); -+ } -+ -+ m_utf8_1 = "span"; -+ tagClose (TT_SPAN, m_utf8_1, ws_None); -+ } -+} -+ -+void s_HTML_Listener::_handleHyperlink (PT_AttrPropIndex api) -+{ -+ m_utf8_1 = "a"; -+ -+ if (tagTop () == TT_A) -+ { -+ tagClose (TT_A, m_utf8_1, ws_None); -+ } -+ -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = (api ? (m_pDocument->getAttrProp (api, &pAP)) : false); -+ -+ if (!bHaveProp || (pAP == 0)) return; -+ -+ const gchar * szHRef = 0; -+ pAP->getAttribute ("xlink:href", szHRef); -+ -+ if (szHRef) // trust this to be a valid URL?? -+ { -+ UT_UTF8String url = szHRef; -+ url.escapeURL(); -+ -+ m_utf8_1 += " href=\""; -+ m_utf8_1 += url; -+ m_utf8_1 += "\""; -+ -+ tagOpen (TT_A, m_utf8_1, ws_None); -+ } -+} -+ -+void s_HTML_Listener::_handleBookmark (PT_AttrPropIndex api) -+{ -+ m_utf8_1 = "a"; -+ -+ if (tagTop () == TT_A) -+ { -+ tagClose (TT_A, m_utf8_1, ws_None); -+ } -+ -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = (api ? (m_pDocument->getAttrProp (api, &pAP)) : false); -+ -+ if (!bHaveProp || (pAP == 0)) return; -+ -+ const gchar * szType = 0; -+ pAP->getAttribute ("type", szType); -+ -+ if (szType == 0) return; // ?? -+ -+ if (g_ascii_strcasecmp (szType, "start") == 0) -+ { -+ const gchar * szName = 0; -+ pAP->getAttribute ("name", szName); -+ -+ if (szName) -+ { -+ UT_UTF8String escape = szName; -+ escape.escapeXML(); -+ -+ m_utf8_1 += " name=\""; -+ m_utf8_1 += escape; -+ m_utf8_1 += "\""; -+ -+ if (!get_HTML4 ()) -+ { -+ m_utf8_1 += " id=\""; -+ m_utf8_1 += escape; -+ m_utf8_1 += "\""; -+ } -+ tagOpen (TT_A, m_utf8_1, ws_None); -+ } -+ } -+} -+ -+ -+void s_HTML_Listener::_handleMath (PT_AttrPropIndex api) -+{ -+ -+ m_utf8_1 = "a"; -+ if (tagTop () == TT_A) -+ { -+ tagClose (TT_A, m_utf8_1, ws_None); -+ } -+ m_utf8_1 = ""; -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = (api ? (m_pDocument->getAttrProp (api, &pAP)) : false); -+ -+ if (!bHaveProp || (pAP == 0)) return; -+ -+ const gchar * szDataID = 0; -+ bool bFound = pAP->getAttribute ("dataid", szDataID); -+ -+ if (szDataID == 0) return; // ?? -+ UT_UTF8String sMathML; -+ // -+ // OK shovel the mathml into the HTML stream -+ // -+ if (bFound && szDataID) -+ { -+ const UT_ByteBuf * pByteBuf = NULL; -+ bFound = m_pDocument->getDataItemDataByName(szDataID, -+ &pByteBuf, -+ NULL, NULL); -+ if(bFound) -+ { -+ UT_UCS4_mbtowc myWC; -+ sMathML.appendBuf( *pByteBuf, myWC); -+ tagRaw(sMathML); -+ } -+ } -+} -+ -+#ifdef HTML_META_SUPPORTED -+ -+void s_HTML_Listener::_handleMetaTag (const char * key, UT_UTF8String & value) -+{ -+ m_utf8_1 = "meta name=\""; -+ m_utf8_1 += key; -+ m_utf8_1 += "\" content=\""; -+ m_utf8_1 += value.escapeXML (); -+ m_utf8_1 += "\""; -+ -+ tagOpenClose (m_utf8_1, get_HTML4 ()); -+} -+ -+void s_HTML_Listener::_handleMeta () -+{ -+ if (!m_pie->isCopying ()) { -+ -+ UT_UTF8String metaProp; -+ -+ if (m_pDocument->getMetaDataProp (PD_META_KEY_TITLE, metaProp) && metaProp.size ()) -+ _handleMetaTag ("Title", metaProp); -+ -+ if (m_pDocument->getMetaDataProp (PD_META_KEY_CREATOR, metaProp) && metaProp.size ()) -+ _handleMetaTag ("Author", metaProp); -+ -+ if (m_pDocument->getMetaDataProp (PD_META_KEY_KEYWORDS, metaProp) && metaProp.size ()) -+ _handleMetaTag ("Keywords", metaProp); -+ -+ if (m_pDocument->getMetaDataProp (PD_META_KEY_SUBJECT, metaProp) && metaProp.size ()) -+ _handleMetaTag ("Subject", metaProp); -+ -+#if 0 -+ // now generically dump all of our data to meta stuff -+ const void * val = NULL ; -+ for ( val = cursor.first(); cursor.is_valid(); val = cursor.next () ) -+ { -+ if ( val ) -+ { -+ UT_String *stringval = static_cast(val); -+ if(stringval->size () > 0) -+ { -+ _handleMetaTag(cursor.key().c_str(), stringval->c_str())); -+ } -+ } -+#endif -+ -+ } -+} -+ -+#endif /* HTML_META_SUPPORTED */ -+ -+bool s_HTML_Listener::populate (PL_StruxFmtHandle /*sfh*/, const PX_ChangeRecord * pcr) -+{ -+ if (!m_bSecondPass || (m_bSecondPass && m_bInAFENote)) { -+ if (m_bFirstWrite && m_bClipBoard) -+ { -+ _openSection (0, 0); -+ _openTag (0, 0); -+ } -+ if(m_bIgnoreTillEnd || m_bIgnoreTillNextSection) -+ { -+ return true; -+ } -+ -+ switch (pcr->getType ()) -+ { -+ case PX_ChangeRecord::PXT_InsertSpan: -+ { -+ const PX_ChangeRecord_Span * pcrs = 0; -+ pcrs = static_cast(pcr); -+ -+ PT_AttrPropIndex api = pcr->getIndexAP (); -+ -+ _openSpan (api); -+ -+ PT_BufIndex bi = pcrs->getBufIndex (); -+ _outputData (m_pDocument->getPointer (bi), pcrs->getLength ()); -+ -+ // don't _closeSpan (); - leave open in case of identical sequences -+ -+ return true; -+ } -+ -+ case PX_ChangeRecord::PXT_InsertObject: -+ { -+ if (m_bInSpan) _closeSpan (); -+ -+ m_bWroteText = true; -+ -+ const PX_ChangeRecord_Object * pcro = 0; -+ pcro = static_cast(pcr); -+ -+ PT_AttrPropIndex api = pcr->getIndexAP (); -+ -+ switch (pcro->getObjectType ()) -+ { -+ case PTO_Image: -+ _handleImage (api); -+ return true; -+ -+ case PTO_Field: -+ _handleField (pcro, api); -+ return true; -+ -+ case PTO_Hyperlink: -+ _handleHyperlink (api); -+ return true; -+ -+ case PTO_Bookmark: -+ _handleBookmark (api); -+ return true; -+ -+ case PTO_Math: -+ _handleMath (api); -+ return true; -+ -+ case PTO_Embed: -+ _handleEmbedded (api); -+ return true; -+ -+ default: -+ UT_DEBUGMSG(("WARNING: ie_exp_HTML.cpp: unhandled object type: %d!\n", pcro->getObjectType ())); -+ UT_ASSERT_HARMLESS(UT_TODO); -+ return true; -+ } -+ } -+ -+ case PX_ChangeRecord::PXT_InsertFmtMark: -+ return true; -+ -+ default: -+ UT_DEBUGMSG(("WARNING: ie_exp_HTML.cpp: unhandled record type!\n")); -+ return true; -+ } -+ } -+ else return true; -+} -+ -+bool s_HTML_Listener::populateStrux (PL_StruxDocHandle sdh, -+ const PX_ChangeRecord * pcr, -+ PL_StruxFmtHandle * psfh) -+{ -+ UT_return_val_if_fail (pcr->getType() == PX_ChangeRecord::PXT_InsertStrux, false); -+ -+ *psfh = 0; // we don't need it. -+ -+ const PX_ChangeRecord_Strux * pcrx = static_cast(pcr); -+ -+ PT_AttrPropIndex api = pcr->getIndexAP (); -+ -+ switch (pcrx->getStruxType ()) -+ { -+ case PTX_Section: -+ { -+ m_bIgnoreTillNextSection = false; -+ -+ // TODO: It may be wise to look into the necessity of an _popUnendedStructures here. However, -+ // that may also not play nice with structures, if any, which span sections. Unended structures -+ // can theoretically do so, such as lists that attach to a extrastructural listID. However, we -+ // also (as of this writing) do not support incontiguous lists. Again, there's an ambiguity -+ // regarding how this should be handled because the behaviour of the piecetable is incompletely -+ // defined. -+ // UPDATE: We're going to put one in _closeSection for safety's sake. If it makes some output -+ // less pretty, please do file bugs and we can fix that on a case by case basis, but -+ // that's preferable to spitting out corrupt html. -+ -+ if(m_bIgnoreTillEnd) -+ { -+ return true; // Nested sections could be the sign of a severe problem, even if caused by import -+ } -+ -+ // This block prepares us for getting document-level properties (namely, the endnote-place-endsection one stored in doEndnotes) -+ PT_AttrPropIndex docApi = m_pDocument->getAttrPropIndex(); -+ const gchar * doEndnotes = NULL; -+ const PP_AttrProp * pDAP = NULL; -+ m_pDocument->getAttrProp (docApi, &pDAP); -+ -+ // If the d-e-p-e.s. prop is defined (getProp call succeeds and returns TRUE), and it is 1 (TRUE), we're supposed to spit out the endnotes every section. -+ if(pDAP->getProperty("document-endnote-place-endsection", doEndnotes) && atoi(doEndnotes)) -+ { _doEndnotes(); } // Spit out the endnotes that have accumulated for this past section. -+ -+ if (m_bInBlock) _closeTag (); // possible problem with lists?? -+ _openSection (api, 0); // Actually start the next section, which is why we're here. -+ return true; -+ } -+ -+ case PTX_Block: -+ { -+ if(m_bIgnoreTillEnd || m_bIgnoreTillNextSection) -+ { -+ return true; -+ } -+ if (m_bFirstWrite && m_bClipBoard) _openSection (0, 0); -+ _openTag (api, sdh); -+ return true; -+ } -+ -+#ifdef HTML_TABLES_SUPPORTED -+ case PTX_SectionTable: -+ { -+ if(m_bIgnoreTillEnd || m_bIgnoreTillNextSection) -+ { -+ return true; -+ } -+ if (m_bFirstWrite && m_bClipBoard) _openSection (0, 0); -+ -+ m_TableHelper.OpenTable(sdh,pcr->getIndexAP()) ; -+ _closeSpan(); -+ _closeTag(); -+ _openTable(pcr->getIndexAP()); -+ return true; -+ } -+ -+ case PTX_SectionCell: -+ { -+ if(m_bIgnoreTillEnd || m_bIgnoreTillNextSection) -+ { -+ return true; -+ } -+ if(m_TableHelper.getNestDepth() <1) -+ { -+ m_TableHelper.OpenTable(sdh,pcr->getIndexAP()) ; -+ _closeSpan(); -+ _closeTag(); -+ _openTable(pcr->getIndexAP()); -+ } -+ m_TableHelper.OpenCell(pcr->getIndexAP()) ; -+ _closeSpan(); -+ _closeTag(); -+ _openCell(pcr->getIndexAP()); -+ return true; -+ } -+ -+ case PTX_EndTable: -+ { -+ if(m_bIgnoreTillEnd || m_bIgnoreTillNextSection) -+ { -+ return true; -+ } -+ _closeTag(); -+ m_utf8_1 = "tr"; -+ tagClose (TT_TR, m_utf8_1); -+ m_TableHelper.CloseTable(); -+ _closeTable(); -+ return true; -+ } -+ -+ case PTX_EndCell: -+ { -+ if(m_bIgnoreTillEnd || m_bIgnoreTillNextSection) -+ { -+ return true; -+ } -+ _closeTag(); -+ _closeCell(); -+ if(m_TableHelper.getNestDepth() <1) -+ { -+ return true; -+ } -+ -+ m_TableHelper.CloseCell(); -+ return true; -+ } -+#endif /* HTML_TABLES_SUPPORTED */ -+ -+ case PTX_SectionFootnote: -+ case PTX_SectionEndnote: -+ { -+ // We should use strux-specific position markers, as this sets a precarious -+ // precedent for nested struxes. -+ m_iEmbedStartPos = pcrx->getPosition() + 1; -+ m_bIgnoreTillEnd = true; -+ return true; -+ } -+ case PTX_EndFootnote: -+ case PTX_EndEndnote: -+ { -+ PD_DocumentRange * pDocRange = new PD_DocumentRange(m_pDocument, m_iEmbedStartPos, pcrx->getPosition()); -+ if(pcrx->getStruxType () == PTX_EndFootnote) -+ { -+ addFootnote(pDocRange); -+ } -+ else -+ { -+ addEndnote(pDocRange); -+ } -+ m_bIgnoreTillEnd = false; -+ return true; -+ } -+ case PTX_SectionFrame: -+ { -+ // We do this individually for explicitly handled types of frame, because we don't know the consequences -+ // of doing it generally. -+ // m_bInFrame = true; // Fortunately for the html exporter, abi does not permit nested frames. -+ -+ if(m_iListDepth) -+ listPopToDepth(0); // AbiWord does not support frames in LIs, neither do we. -+ -+ if(m_bIgnoreTillEnd || m_bIgnoreTillNextSection) -+ { -+ return true; -+ } -+ // Set up to get and get the type of frame (a property thereof) -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = m_pDocument->getAttrProp (api, &pAP); -+ if (!bHaveProp || (pAP == 0)) return true; -+ const gchar * szType = 0; -+ if((pAP->getProperty ("frame-type", szType)) && szType) -+ { -+ if (!strcmp(szType, "textbox")) -+ { -+ _openTextBox(pcr->getIndexAP()); // Open a new text box -+ return true; -+ } -+ if(!strcmp(szType, "image")) -+ { -+ _openPosImage(pcr->getIndexAP()); // Output positioned image -+ } -+ } -+ return true; -+ } -+ case PTX_EndFrame: -+ { -+ _closeTextBox(); -+ return true; -+ } -+#if 0 -+ case PTX_EndMarginnote: -+ case PTX_SectionMarginnote: -+#endif -+ // Ignore HdrFtr for now -+ case PTX_SectionHdrFtr: -+ { -+ /* We need to close unended structures (like lists, which are known only as paragraphs with listIDs) -+ because the HdrFtr comes after all such things except for those which are contained within it. -MG */ -+ // This call may be unnecessary. -MG -+ _popUnendedStructures(); -+ m_bIgnoreTillNextSection = true; -+ return true; -+ } -+ case PTX_SectionTOC: -+ { -+ _emitTOC (pcr->getIndexAP()); -+ return true; -+ } -+ case PTX_EndTOC: -+ { -+ return true; -+ } -+ default: -+ UT_DEBUGMSG(("WARNING: ie_exp_HTML.cpp: unhandled strux type: %d!\n", pcrx->getStruxType ())); -+ UT_ASSERT_HARMLESS(UT_TODO); -+ return true; -+ } -+ -+ -+} -+ -+bool s_HTML_Listener::endOfDocument () { -+ m_bIgnoreTillNextSection = false; -+ _popUnendedStructures(); // We need to clean up after ourselves lest we fsck up the footer and anything else that comes after this. -+ /* Remaining endnotes, whether from the last of multiple sections or from all sections */ -+ _doEndnotes(); -+ -+ _doFootnotes(); -+ -+ return true; -+} -+ -+void s_HTML_Listener::_emitTOC (PT_AttrPropIndex api) { -+ if (m_toc) { -+ -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = (api ? (m_pDocument->getAttrProp (api, &pAP)) : false); -+ const gchar * szValue = 0; -+ UT_UTF8String tocHeadingUTF8; -+ -+ listPopToDepth(0); -+ -+ if (tagTop() == TT_SPAN) { -+ UT_DEBUGMSG(("_closeSection closing span\n")); -+ tagClose(TT_SPAN, "span"); -+ } -+ -+ if (m_bInBlock && (tagTop() == TT_P)) { // If only the first is true, we have a first-order tag mismatch. The alternative with not testing the latter is a second-order tag mismatch. -+ UT_DEBUGMSG(("_closeSection closing block\n")); -+ // _closeTag (); // We need to investigate the tag stack usage of this, and whether or not we really would rather specify the tag in all cases. -+ tagClose(TT_P, "p"); -+ } -+ -+ if(bHaveProp && pAP && pAP->getProperty("toc-heading", szValue)) // user-defined TOC heading -+ { -+ tocHeadingUTF8 = szValue; -+ //_outputdata() below makes escapeXML() redundant here -+ } -+ else -+ { -+ const XAP_StringSet * pSS = XAP_App::getApp()->getStringSet(); -+ pSS->getValueUTF8(AP_STRING_ID_TOC_TocHeading, tocHeadingUTF8); -+ } -+ -+ bool bEmitHeading = true; -+ -+ if(bHaveProp && pAP && pAP->getProperty("toc-has-heading", szValue)) //check to see if the TOC heading is hidden -+ { -+ if(atoi(szValue) == 0) -+ bEmitHeading = false; -+ } -+ -+ // We can't use escapeXML() on tocHeadingUTF8 here because it will -+ // cause values to be doubly escaped, e.g. " will become &quot;. -+ // Instead, just use a new variable, tocSummary. -+ -+ UT_UTF8String tocSummary = tocHeadingUTF8; -+ m_utf8_1 = UT_UTF8String_sprintf("table class=\"toc\" summary=\"%s\"", tocSummary.escapeXML().utf8_str()); -+ -+ tagOpen (TT_TABLE, m_utf8_1); -+ -+ m_utf8_1 = "tr"; -+ tagOpen (TT_TR, m_utf8_1); -+ -+ m_utf8_1 = "td"; -+ tagOpen (TT_TD, m_utf8_1); -+ -+ m_utf8_1 = "div class=\"toctitle\""; -+ tagOpen (TT_DIV, m_utf8_1); -+ -+ if(bEmitHeading) -+ { -+ UT_UCS4String tocHeading(tocHeadingUTF8.utf8_str()); -+ m_utf8_1 = "h2"; -+ tagOpen (TT_H2, m_utf8_1); -+ m_bInBlock = true; -+ _outputData (tocHeading.ucs4_str(), tocHeading.length()); -+ m_bInBlock = false; -+ tagClose (TT_H2, "h2"); -+ } -+ -+ tagClose (TT_DIV, "div"); -+ -+ int level1_depth = 0; -+ int level2_depth = 0; -+ int level3_depth = 0; -+ int level4_depth = 0; -+ -+ m_bInTOC = true; -+ for (int i = 0; i < m_toc->getNumTOCEntries(); i++) { -+ int tocLevel = 0; -+ -+ UT_UCS4String tocText(m_toc->getNthTOCEntry(i, &tocLevel).utf8_str()); -+ -+ { -+ UT_LocaleTransactor t(LC_NUMERIC, "C"); -+ m_utf8_1 = UT_UTF8String_sprintf("p style=\"text-indent:%gin\"", ((tocLevel-1) * .5)); -+ } -+ -+ UT_UCS4String tocLevelText; -+ if(tocLevel == 1) { -+ level1_depth++; -+ level2_depth = level3_depth = level4_depth = 0; -+ -+ tocLevelText = UT_UTF8String_sprintf("[%d] ", level1_depth).ucs4_str(); -+ } else if(tocLevel == 2) { -+ level2_depth++; -+ level3_depth = level4_depth = 0; -+ tocLevelText = UT_UTF8String_sprintf("[%d.%d] ", level1_depth, level2_depth).ucs4_str(); -+ } else if(tocLevel == 3) { -+ level3_depth++; -+ level4_depth = 0; -+ tocLevelText = UT_UTF8String_sprintf("[%d.%d.%d] ", level1_depth, level2_depth, level3_depth).ucs4_str(); -+ } else if(tocLevel == 4) { -+ level4_depth++; -+ tocLevelText = UT_UTF8String_sprintf("[%d.%d.%d.%d] ", level1_depth, level2_depth, level3_depth, level4_depth).ucs4_str(); -+ } -+ -+ UT_UTF8String tocLink(UT_UTF8String_sprintf("", i)); -+ tagOpen (TT_P, m_utf8_1); -+ m_bInBlock = true; -+ m_pie->write(tocLink.utf8_str(), tocLink.byteLength()); -+ _outputData (tocLevelText.ucs4_str(), tocLevelText.length()); -+ _outputData (tocText.ucs4_str(), tocText.length()); -+ m_pie->write("", 4); -+ m_bInBlock = false; -+ tagClose (TT_P, "p"); -+ } -+ -+ tagClose (TT_TD, "td"); -+ tagClose (TT_TT, "tr"); -+ tagClose (TT_TABLE, "table"); -+ -+ m_bInTOC = false; -+ } -+} -+ -+void s_HTML_Listener::_doEndnotes () { -+ // -+ // Output Endnotes -+ // -+ UT_uint32 i = 0; -+ for(i=0; i< getNumEndnotes(); i++) -+ { -+ PD_DocumentRange * pDocRange = m_vecEndnotes.getNthItem(i); -+ m_bInAFENote = true; -+ m_pDocument->tellListenerSubset(this,pDocRange); -+ m_bInAFENote = false; -+ // Some combined bug fixes make tagpops no longer necessary, afaict. -MG -+ } -+ UT_VECTOR_PURGEALL(PD_DocumentRange *,m_vecEndnotes); -+} -+ -+void s_HTML_Listener::_doFootnotes () { -+ // -+ // Output footnotes -+ // -+ UT_uint32 i = 0, nFootnotes = getNumFootnotes(); -+ if(nFootnotes > 0) { -+ startEmbeddedStrux(); -+ } -+ for(i = 0; i < nFootnotes; i = i + 1) -+ { -+ PD_DocumentRange * pDocRange = m_vecFootnotes.getNthItem(i); -+ m_bInAFENote = true; -+ m_pDocument->tellListenerSubset(this,pDocRange); -+ m_bInAFENote = false; -+ // Some combined bug fixes make tagpops no longer necessary, afaict. -+ } -+ UT_VECTOR_PURGEALL(PD_DocumentRange *,m_vecFootnotes); -+} -+ -+/*****************************************************************/ -+/*****************************************************************/ -+ -+bool s_HTML_Listener::change (PL_StruxFmtHandle /*sfh*/, -+ const PX_ChangeRecord * /*pcr*/) -+{ -+ UT_ASSERT_HARMLESS(0); // this function is not used. -+ return false; -+} -+ -+bool s_HTML_Listener::insertStrux (PL_StruxFmtHandle /*sfh*/, -+ const PX_ChangeRecord * /*pcr*/, -+ PL_StruxDocHandle /*sdh*/, -+ PL_ListenerId /* lid */, -+ void (* /*pfnBindHandles*/)(PL_StruxDocHandle /* sdhNew */, -+ PL_ListenerId /* lid */, -+ PL_StruxFmtHandle /* sfhNew */)) -+{ -+ UT_ASSERT_HARMLESS(0); // this function is not used. -+ return false; -+} -+ -+bool s_HTML_Listener::signal (UT_uint32 /* iSignal */) -+{ -+ UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); -+ return false; -+} -+ -+/*****************************************************************/ -+/*****************************************************************/ -+ -+s_HTML_HdrFtr_Listener::s_HTML_HdrFtr_Listener (PD_Document * pDocument, IE_Exp_HTML * pie, PL_Listener * pHTML_Listener) : -+ m_pHdrDocRange(NULL), -+ m_pFtrDocRange(NULL), -+ m_pDocument(pDocument), -+ m_pHTML_Listener(pHTML_Listener) -+{ -+} -+ -+s_HTML_HdrFtr_Listener::~s_HTML_HdrFtr_Listener () -+{ -+} -+ -+void s_HTML_HdrFtr_Listener::doHdrFtr (bool bHeader) -+{ -+ s_HTML_Listener * pHL = (s_HTML_Listener *)m_pHTML_Listener; -+ if(bHeader && pHL->m_bHaveHeader) { -+ pHL->_openSection(0, 1); -+ m_pDocument->tellListenerSubset(m_pHTML_Listener, m_pHdrDocRange); -+ pHL->_closeSection(); } -+ if(!bHeader && pHL->m_bHaveFooter) { -+ pHL->_openSection(0, 2); -+ m_pDocument->tellListenerSubset(m_pHTML_Listener, m_pFtrDocRange); -+ pHL->_closeSection(); } -+ if(bHeader && pHL->m_bHaveHeader) { -+ pHL->_openSection(0, 3); } -+ if(bHeader) -+ DELETEP(m_pHdrDocRange); -+ else -+ DELETEP(m_pFtrDocRange); -+} -+ -+bool s_HTML_HdrFtr_Listener::populateStrux (PL_StruxDocHandle sdh, -+ const PX_ChangeRecord * pcr, -+ PL_StruxFmtHandle * psfh) -+{ -+ /* Housekeeping and prep */ -+ UT_return_val_if_fail (pcr->getType() == PX_ChangeRecord::PXT_InsertStrux, false); -+ *psfh = 0; // we don't need it. -+ const PX_ChangeRecord_Strux * pcrx = static_cast(pcr); -+ PT_AttrPropIndex api = pcr->getIndexAP (); -+ switch (pcrx->getStruxType ()) -+ { -+ case PTX_SectionHdrFtr: -+ { -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = m_pDocument->getAttrProp (api, &pAP); -+ -+ if (!bHaveProp || (pAP == 0)) return true; -+ -+ const gchar * szType = 0; -+ pAP->getAttribute ("type", szType); -+ /* // */ -+ -+ PT_DocPosition m_iHdrFtrStartPos = m_pDocument->getStruxPosition(sdh) + 1; -+ PT_DocPosition m_iHdrFtrStopPos = 0; -+ PL_StruxDocHandle * nextSDH = NULL; -+ bool bHaveNextSection = m_pDocument->getNextStruxOfType(sdh, PTX_Section, nextSDH); -+ if (bHaveNextSection) -+ { -+ m_iHdrFtrStopPos = m_pDocument->getStruxPosition(nextSDH); -+ } else -+ { -+ m_pDocument->getBounds(true, m_iHdrFtrStopPos); -+ } -+ PD_DocumentRange * pDocRange = new PD_DocumentRange(m_pDocument, m_iHdrFtrStartPos, m_iHdrFtrStopPos); -+ if(!strcmp(szType, "header")) -+ { -+ m_pHdrDocRange = pDocRange; -+ s_HTML_Listener * pHL = (s_HTML_Listener *)m_pHTML_Listener; -+ pHL->setHaveHeader(); -+ } -+ else -+ { -+ m_pFtrDocRange = pDocRange; -+ s_HTML_Listener * pHL = (s_HTML_Listener *)m_pHTML_Listener; -+ pHL->setHaveFooter(); -+ } -+ return true; -+ } -+ default: -+ return true; -+ } -+} -+ -+bool s_HTML_HdrFtr_Listener::populate (PL_StruxFmtHandle /*sfh*/, const PX_ChangeRecord * pcr) -+{ -+ return true; -+} -+ -+bool s_HTML_HdrFtr_Listener::change (PL_StruxFmtHandle /*sfh*/, -+ const PX_ChangeRecord * /*pcr*/) -+{ -+ UT_ASSERT_HARMLESS(0); // this function is not used. -+ return false; -+} -+ -+bool s_HTML_HdrFtr_Listener::insertStrux (PL_StruxFmtHandle /*sfh*/, -+ const PX_ChangeRecord * /*pcr*/, -+ PL_StruxDocHandle /*sdh*/, -+ PL_ListenerId /* lid */, -+ void (* /*pfnBindHandles*/)(PL_StruxDocHandle /* sdhNew */, -+ PL_ListenerId /* lid */, -+ PL_StruxFmtHandle /* sfhNew */)) -+{ -+ UT_ASSERT_HARMLESS(0); // this function is not used. -+ return false; -+} -+ -+bool s_HTML_HdrFtr_Listener::signal (UT_uint32 /* iSignal */) -+{ -+ UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); -+ return false; -+} -+ -+/*****************************************************************/ -+/*****************************************************************/ -+ -+s_StyleTree::s_StyleTree (s_StyleTree * parent, const char * style_name, PD_Style * style) : -+ m_pDocument(0), -+ m_parent(parent), -+ m_list(0), -+ m_count(0), -+ m_max(0), -+ m_bInUse(false), -+ m_style_name(style_name), -+ m_class_name(style_name), -+ m_class_list(style_name), -+ m_style(style) -+{ -+ UT_LocaleTransactor t(LC_NUMERIC, "C"); -+ -+ if ((m_style_name == "Heading 1") || -+ (m_style_name == "Heading 2") || -+ (m_style_name == "Heading 3") || -+ (m_style_name == "Normal")) -+ { -+ m_class_name = ""; -+ m_class_list = ""; -+ } -+ else -+ { -+ s_removeWhiteSpace (style_name, m_class_name, true); -+ m_class_list = m_class_name; -+ } -+ -+ if (parent->class_list () != "") -+ { -+ m_class_list += " "; -+ m_class_list += parent->class_list (); -+ } -+ -+ UT_uint32 j = 0; -+ -+ const gchar * szName = 0; -+ const gchar * szValue = 0; -+ -+ UT_UTF8String name; -+ UT_UTF8String value; -+ -+ while (style->getNthProperty (j++, szName, szValue)) -+ { -+ name = szName; -+ value = szValue; -+ -+ /* map property names to CSS equivalents -+ */ -+ if (name == "text-position") -+ { -+ name = "vertical-align"; -+ if(value == "superscript") -+ value = "super"; -+ else if(value == "subscript") -+ value = "sub"; -+ -+ } -+ else if (name == "bgcolor") -+ { -+ name = "background-color"; -+ } -+ else if (!is_CSS (szName)) continue; -+ -+ /* map property values to CSS equivalents -+ */ -+ if (name == "font-family") -+ { -+ if (!((value == "serif") || (value == "sans-serif") || -+ (value == "cursive") || (value == "fantasy") || (value == "monospace"))) -+ { -+ value = "'"; -+ value += szValue; -+ value += "'"; -+ } -+ } -+ else if ((name == "color") || (name == "background-color")) -+ { -+ if (value != "transparent") -+ { -+ if(value.substr(0, 1) != "#") -+ { -+ value = "#"; -+ } -+ else -+ { -+ xxx_UT_DEBUGMSG(("HTML exporter: encountered RGB color with '#' prefixed\n")); -+ value.clear(); -+ } -+ -+ value += szValue; -+ } -+ } -+ else if (strstr(name.utf8_str(), "width")) -+ { -+ if(strstr(name.utf8_str(), "border")) -+ { -+ double dPT = UT_convertToDimension(value.utf8_str(), DIM_PT); -+ value = UT_UTF8String_sprintf("%.2fpt", dPT); -+ } -+ else -+ { -+ double dMM = UT_convertToDimension(value.utf8_str(), DIM_MM); -+ value = UT_UTF8String_sprintf("%.1fmm", dMM); -+ } -+ } -+ -+ const std::string & cascade_value = lookup (name.utf8_str()); -+ if (!cascade_value.empty()) -+ if (cascade_value == value) -+ continue; -+ -+ m_map.insert(map_type::value_type(name.utf8_str(), -+ value.utf8_str())); -+ } -+ if ((m_style_name == "Heading 1") || -+ (m_style_name == "Heading 2") || -+ (m_style_name == "Heading 3") || -+ (m_style_name == "Section Heading") || -+ (m_style_name == "Chapter Heading")) -+ { -+ m_map.insert(map_type::value_type("page-break-after", "avoid")); -+ } -+} -+ -+s_StyleTree::s_StyleTree (PD_Document * pDocument) : -+ m_pDocument(pDocument), -+ m_parent(0), -+ m_list(0), -+ m_count(0), -+ m_max(0), -+ m_bInUse(false), -+ m_style_name("None"), -+ m_class_name(""), -+ m_class_list(""), -+ m_style(0) -+{ -+ const char ** ptr = s_prop_list; -+ while(*ptr) -+ { -+ m_map.insert(map_type::value_type(*ptr, *(ptr+1))); -+ ptr += 2; -+ } -+} -+ -+s_StyleTree::~s_StyleTree () -+{ -+ for (UT_uint32 i = 0; i < m_count; i++) -+ { -+ DELETEP(m_list[i]); -+ } -+ FREEP (m_list); -+} -+ -+bool s_StyleTree::add (const char * style_name, PD_Style * style) -+{ -+ if (m_list == 0) -+ { -+ m_list = reinterpret_cast(g_try_malloc (8 * sizeof (s_StyleTree *))); -+ if (m_list == 0) return false; -+ m_max = 8; -+ } -+ if (m_count == m_max) -+ { -+ s_StyleTree ** more = 0; -+ more = reinterpret_cast(g_try_realloc (m_list, (m_max + 8) * sizeof (s_StyleTree *))); -+ if (more == 0) return false; -+ m_list = more; -+ m_max += 8; -+ } -+ -+ s_StyleTree * tree = 0; -+ -+ UT_TRY -+ { -+ tree = new s_StyleTree(this,style_name,style); -+ } -+ UT_CATCH(UT_CATCH_ANY) -+ { -+ tree = 0; -+ } -+ UT_END_CATCH -+ -+ if (tree == 0) return false; -+ -+ m_list[m_count++] = tree; -+ -+ return true; -+} -+ -+bool s_StyleTree::add (const char * style_name, PD_Document * pDoc) -+{ -+ if ((pDoc == 0) || (style_name == 0) || (*style_name == 0)) return false; -+ -+ if (m_parent) return m_parent->add (style_name, pDoc); -+ -+ if (find (style_name)) return true; -+ -+ PD_Style * style = 0; -+ pDoc->getStyle (style_name, &style); -+ if (!style) return false; -+ -+ s_StyleTree * parent = NULL; -+ -+ PD_Style * basis = style->getBasedOn (); -+ -+ const gchar * parent_name = NULL; -+ if (basis && -+ basis->getAttribute (PT_NAME_ATTRIBUTE_NAME, parent_name) && -+ strcmp(style_name, parent_name) != 0) -+ { -+ parent = const_cast(find (basis)); -+ if (parent == NULL) -+ { -+ const gchar * basis_name = 0; -+ basis->getAttribute (PT_NAME_ATTRIBUTE_NAME, basis_name); -+ if (!basis_name) return false; -+ -+ if (basis->getBasedOn() && basis->getBasedOn()->getName() && -+ !strcmp(style_name, basis->getBasedOn()->getName())) -+ { -+ parent = this; -+ } -+ else -+ { -+ if (!add (basis_name, pDoc)) return false; -+ -+ parent = const_cast(find (basis)); -+ } -+ } -+ } -+ else -+ parent = this; -+ -+ if (!parent) { -+ UT_ASSERT_NOT_REACHED(); -+ return false; -+ } -+ return parent->add (style_name, style); -+} -+ -+void s_StyleTree::inUse () -+{ -+ m_bInUse = true; -+ if (m_parent) -+ m_parent->inUse (); -+} -+ -+const s_StyleTree * s_StyleTree::findAndUse (const char * style_name) -+{ -+ const s_StyleTree * style_tree = find (style_name); -+ -+ if (style_tree) -+ { -+ s_StyleTree * tree = const_cast(style_tree); -+ tree->inUse (); -+ } -+ return style_tree; -+} -+ -+const s_StyleTree * s_StyleTree::find (const char * style_name) const -+{ -+ if (m_style_name == style_name) return this; -+ -+ const s_StyleTree * tree = 0; -+ -+ for (UT_uint32 i = 0; i < m_count; i++) -+ { -+ tree = m_list[i]->find (style_name); -+ if (tree) break; -+ } -+ return tree; -+} -+ -+const s_StyleTree * s_StyleTree::find (PD_Style * style) const -+{ -+ const gchar * style_name = 0; -+ style->getAttribute (PT_NAME_ATTRIBUTE_NAME, style_name); -+ if (!style_name) return NULL; -+ -+ return find (style_name); -+} -+ -+bool s_StyleTree::descends (const char * style_name) const -+{ -+ if (m_parent == 0) return false; -+ -+ // the name comparison has to be be case insensitive -+ if (!g_ascii_strcasecmp(m_style_name.utf8_str(),style_name)) return true; -+ -+ return m_parent->descends (style_name); -+} -+ -+void s_StyleTree::print (s_HTML_Listener * listener) const -+{ -+ if (!m_bInUse) return; -+ -+ if (strstr (m_style_name.utf8_str (), "List")) return; -+ -+ if (m_parent) -+ { -+ UT_UTF8String selector("*."); -+ if (m_class_name.byteLength ()) -+ { -+ selector += m_class_name; -+ } -+ else -+ { -+ if (m_style_name == "Normal") -+ selector = "p, h1, h2, h3, li"; -+ else if (m_style_name == "Heading 1") -+ selector = "h1"; -+ else if (m_style_name == "Heading 2") -+ selector = "h2"; -+ else if (m_style_name == "Heading 3") -+ selector = "h3"; -+ } -+ listener->styleOpen (selector); -+ -+ for (map_type::const_iterator iter = m_map.begin(); -+ iter != m_map.end(); iter++) { -+ listener->styleNameValue((*iter).first.c_str(), -+ (*iter).second.c_str()); -+ } -+ listener->styleClose (); -+ } -+ for (UT_uint32 i = 0; i < m_count; i++) -+ { -+ m_list[i]->print (listener); -+ } -+} -+ -+const std::string & s_StyleTree::lookup (const std::string & prop_name) const -+{ -+ static std::string empty; -+ map_type::const_iterator prop_iter = m_map.find(prop_name); -+ -+ if (prop_iter == m_map.end()) { -+ if(m_parent) { -+ return m_parent->lookup (prop_name); -+ } -+ else { -+ return empty; -+ } -+ } -+ return (*prop_iter).second; -+} -+ -+void s_StyleTree::styleCheck (PT_AttrPropIndex api) -+{ -+ const PP_AttrProp * pAP = 0; -+ bool bHaveProp = (api ? (m_pDocument->getAttrProp (api, &pAP)) : false); -+ -+ if (bHaveProp && pAP) -+ { -+ const gchar * szStyle = NULL; -+ bool have_style = pAP->getAttribute (PT_STYLE_ATTRIBUTE_NAME, szStyle); -+ -+ if (have_style && szStyle) -+ { -+ findAndUse (szStyle); -+ } -+ } -+} -+ -+bool s_StyleTree::populate (PL_StruxFmtHandle /*sfh*/, const PX_ChangeRecord * pcr) -+{ -+ switch (pcr->getType ()) -+ { -+ case PX_ChangeRecord::PXT_InsertSpan: -+ styleCheck (pcr->getIndexAP ()); -+ break; -+ case PX_ChangeRecord::PXT_InsertObject: -+ styleCheck (pcr->getIndexAP ()); -+ break; -+ default: -+ break; -+ } -+ return true; -+} -+ -+bool s_StyleTree::populateStrux (PL_StruxDocHandle /*sdh*/, -+ const PX_ChangeRecord * pcr, -+ PL_StruxFmtHandle * psfh) -+{ -+ UT_return_val_if_fail (pcr->getType() == PX_ChangeRecord::PXT_InsertStrux, false); -+ -+ *psfh = 0; // we don't need it. -+ -+ const PX_ChangeRecord_Strux * pcrx = static_cast(pcr); -+ -+ switch (pcrx->getStruxType ()) -+ { -+ case PTX_Block: -+ styleCheck (pcr->getIndexAP ()); -+ break; -+ case PTX_SectionFootnote: -+ styleCheck (pcr->getIndexAP ()); -+ break; -+ case PTX_SectionEndnote: -+ styleCheck (pcr->getIndexAP ()); -+ break; -+ default: -+ break; -+ } -+ return true; -+} -+ -+bool s_StyleTree::change (PL_StruxFmtHandle /*sfh*/, -+ const PX_ChangeRecord * /*pcr*/) -+{ -+ UT_ASSERT_HARMLESS(0); // this function is not used. -+ return false; -+} -+ -+bool s_StyleTree::insertStrux (PL_StruxFmtHandle /*sfh*/, -+ const PX_ChangeRecord * /*pcr*/, -+ PL_StruxDocHandle /*sdh*/, -+ PL_ListenerId /* lid */, -+ void (* /*pfnBindHandles*/)(PL_StruxDocHandle /* sdhNew */, -+ PL_ListenerId /* lid */, -+ PL_StruxFmtHandle /* sfhNew */)) -+{ -+ UT_ASSERT_HARMLESS(0); // this function is not used. -+ return false; -+} -+ -+bool s_StyleTree::signal (UT_uint32 /* iSignal */) -+{ -+ UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN); -+ return false; -+} -+ -+/*****************************************************************/ -+/*****************************************************************/ -+ -+#ifdef TH_SKIP_REST -+#undef TH_SKIP_REST -+#endif -+#define TH_SKIP_REST 1 -+ -+#ifdef TH_SKIP_THIS -+#undef TH_SKIP_THIS -+#endif -+#define TH_SKIP_THIS 2 -+ -+class ABI_EXPORT s_TemplateHandler : public UT_XML::ExpertListener -+{ -+public: -+ s_TemplateHandler (PD_Document * pDocument, IE_Exp_HTML * pie); -+ -+ ~s_TemplateHandler (); -+ -+ /* Implementation of ExpertListener -+ */ -+ void StartElement (const gchar * name, const gchar ** atts); -+ void EndElement (const gchar * name); -+ void CharData (const gchar * buffer, int length); -+ void ProcessingInstruction (const gchar * target, const gchar * data); -+ void Comment (const gchar * data); -+ void StartCdataSection (); -+ void EndCdataSection (); -+ void Default (const gchar * buffer, int length); -+ -+private: -+ void _handleMetaTag (const char * key, UT_UTF8String & value); -+ void _handleMeta (); -+ -+ bool echo () const; -+ bool condition (const gchar * data) const; -+ -+ PD_Document * m_pDocument; -+ IE_Exp_HTML * m_pie; -+ -+ bool m_cdata; -+ bool m_empty; -+ -+ UT_UTF8String m_utf8; -+ UT_UTF8String m_root; -+ typedef std::map hash_type; -+ hash_type m_hash; -+ UT_NumberStack m_mode; -+}; -+ -+s_TemplateHandler::s_TemplateHandler (PD_Document * pDocument, IE_Exp_HTML * pie) : -+ m_pDocument(pDocument), -+ m_pie(pie), -+ m_cdata(false), -+ m_empty(false) -+{ -+ const std::string & prop = m_pie->getProperty ("href-prefix"); -+ if (!prop.empty()) -+ m_root = prop; -+} -+ -+s_TemplateHandler::~s_TemplateHandler () -+{ -+ // -+} -+ -+void s_TemplateHandler::StartElement (const gchar * name, const gchar ** atts) -+{ -+ if (!echo ()) return; -+ -+ if (m_empty) -+ { -+ m_pie->write (">", 1); -+ m_empty = false; -+ } -+ -+ m_utf8 = "<"; -+ m_utf8 += name; -+ -+ if (atts) -+ { -+ const gchar ** attr = atts; -+ -+ UT_UTF8String tmp; -+ -+ while (*attr) -+ { -+ bool href = ( (strcmp (*attr, "href") == 0) || -+ ((strcmp (*attr, "src" ) == 0) && (strcmp (name, "img") == 0)) ); -+ -+ m_utf8 += " "; -+ m_utf8 += *attr++; -+ m_utf8 += "=\""; -+ -+ if (href && (**attr == '$')) -+ { -+ tmp = m_root; -+ tmp += (*attr++ + 1); -+ } -+ else -+ { -+ tmp = *attr++; -+ } -+ tmp.escapeXML (); -+ -+ m_utf8 += tmp; -+ m_utf8 += "\""; -+ } -+ } -+ m_pie->write (m_utf8.utf8_str (), m_utf8.byteLength ()); -+ -+ m_empty = true; -+} -+ -+void s_TemplateHandler::EndElement (const gchar * name) -+{ -+ if (!echo ()) return; -+ -+ if (m_empty) -+ { -+ m_pie->write (" />", 3); -+ m_empty = false; -+ } -+ else -+ { -+ m_utf8 = ""; -+ m_pie->write (m_utf8.utf8_str (), m_utf8.byteLength ()); -+ } -+} -+ -+void s_TemplateHandler::CharData (const gchar * buffer, int length) -+{ -+ if (!echo ()) return; -+ -+ if (m_empty) -+ { -+ m_pie->write (">", 1); -+ m_empty = false; -+ } -+ if (m_cdata) -+ { -+ m_pie->write (buffer, length); -+ return; -+ } -+ m_utf8 = buffer; -+ m_utf8.escapeXML (); -+ m_pie->write (m_utf8.utf8_str (), m_utf8.byteLength ()); -+} -+ -+void s_TemplateHandler::ProcessingInstruction (const gchar * target, const gchar * data) -+{ -+ bool bAbiXHTML = (strncmp (target, "abi-xhtml-", 10) == 0); -+ -+ if (!bAbiXHTML && !echo ()) return; -+ -+ if (m_empty) -+ { -+ m_pie->write (">", 1); -+ m_empty = false; -+ } -+ if (!bAbiXHTML) -+ { -+ /* processing instruction not relevant to this - could be PHP, etc. -+ */ -+ m_utf8 = ""; -+ m_pie->write (m_utf8.utf8_str (), m_utf8.byteLength ()); -+ return; -+ } -+ m_utf8 = target + 10; -+ -+ if ((m_utf8 == "insert") && echo ()) -+ { -+ m_utf8 = data; -+ -+ if (m_utf8 == "title") -+ { -+#ifdef HTML_META_SUPPORTED -+ m_utf8 = ""; -+ -+ m_pDocument->getMetaDataProp (PD_META_KEY_TITLE, m_utf8); -+ -+ if (m_utf8.byteLength () == 0) -+ m_utf8 = m_pie->getFileName (); -+ -+ m_utf8.escapeXML (); -+ m_pie->write (m_utf8.utf8_str (), m_utf8.byteLength ()); -+#endif /* HTML_META_SUPPORTED */ -+ } -+ else if (m_utf8 == "creator") -+ { -+#ifdef HTML_META_SUPPORTED -+ m_utf8 = ""; -+ -+ m_pDocument->getMetaDataProp (PD_META_KEY_CREATOR, m_utf8); -+ -+ if (m_utf8.byteLength ()) -+ { -+ m_utf8.escapeXML (); -+ m_pie->write (m_utf8.utf8_str (), m_utf8.byteLength ()); -+ } -+#endif /* HTML_META_SUPPORTED */ -+ } -+ else if (m_utf8 == "meta") -+ { -+#ifdef HTML_META_SUPPORTED -+ _handleMeta (); -+#endif /* HTML_META_SUPPORTED */ -+ } -+ else if (m_utf8 == "body") -+ { -+ m_pie->_writeDocument (false, true); -+ } -+ } -+ else if ((m_utf8 == "comment-replace") && echo ()) -+ { -+ m_hash.clear (); -+ UT_parse_attributes(data, m_hash); -+ -+ const std::string & sz_property(m_hash["property"]); -+ const std::string & sz_comment(m_hash["comment"]); -+ -+ if (sz_property.size() && sz_comment.size()) -+ { -+#ifdef HTML_META_SUPPORTED -+ UT_UTF8String creator = ""; -+#endif /* HTML_META_SUPPORTED */ -+ std::string prop; -+ -+ if (sz_property == "meta::creator") -+ { -+#ifdef HTML_META_SUPPORTED -+ m_pDocument->getMetaDataProp (PD_META_KEY_CREATOR, creator); -+ -+ if (creator.byteLength ()) -+ prop = creator.utf8_str(); -+#endif /* HTML_META_SUPPORTED */ -+ } -+ else -+ { -+ prop = m_pie->getProperty (sz_property.c_str()); -+ } -+ if (!prop.empty()) -+ { -+ const UT_UTF8String DD("$$"); -+ -+ m_utf8 = sz_comment.c_str(); -+ m_utf8.escape (DD, prop.c_str()); -+ -+ m_pie->write ("", 3); -+ } -+ } -+ } -+ else if ((m_utf8 == "menuitem") && echo ()) -+ { -+ m_hash.clear(); -+ UT_parse_attributes(data, m_hash); -+ -+ const std::string sz_property = m_hash["property"]; -+ const std::string sz_class = m_hash["class"]; -+ std::string sz_href = m_hash["href"]; -+ const std::string sz_label = m_hash["label"]; -+ -+ if (sz_property.size() && sz_class.size() -+ && sz_href.size() && sz_label.size()) -+ { -+ const char * href = sz_href.c_str(); -+ -+ if (*href == '$') -+ { -+ m_utf8 = m_root; -+ m_utf8 += href + 1; -+ -+ m_hash["href"] = m_utf8.utf8_str(); -+ -+ sz_href = m_utf8.utf8_str(); -+ } -+ -+ const std::string & prop = m_pie->getProperty(sz_property.c_str()); -+ -+ bool ne = (prop != sz_class); -+ -+ m_utf8 = "

"; -+ -+ m_pie->write (m_utf8.utf8_str (), m_utf8.byteLength ()); -+ } -+ } -+ else if (m_utf8 == "if") -+ { -+ if (echo ()) -+ { -+ if (condition (data)) -+ m_mode.push (0); -+ else -+ m_mode.push (TH_SKIP_THIS); -+ } -+ else -+ { -+ m_mode.push (TH_SKIP_REST); -+ } -+ } -+ else if (m_mode.getDepth ()) -+ { -+ UT_sint32 mode; -+ m_mode.viewTop (mode); -+ -+ if (m_utf8 == "elif") -+ { -+ if (mode == TH_SKIP_THIS) -+ { -+ if (condition (data)) -+ { -+ m_mode.pop (); -+ m_mode.push (0); -+ } -+ } -+ else if (mode != TH_SKIP_REST) -+ { -+ m_mode.pop (); -+ m_mode.push (TH_SKIP_REST); -+ } -+ } -+ else if (m_utf8 == "else") -+ { -+ if (mode == TH_SKIP_THIS) -+ { -+ if (condition (data)) -+ { -+ m_mode.pop (); -+ m_mode.push (0); -+ } -+ } -+ else if (mode != TH_SKIP_REST) -+ { -+ m_mode.pop (); -+ m_mode.push (TH_SKIP_REST); -+ } -+ } -+ else if (m_utf8 == "fi") -+ { -+ m_mode.pop (); -+ } -+ } -+} -+ -+#ifdef HTML_META_SUPPORTED -+ -+void s_TemplateHandler::_handleMetaTag (const char * key, UT_UTF8String & value) -+{ -+ m_utf8 = ""; -+ m_utf8 += MYEOL; -+ m_pie->write (m_utf8.utf8_str (), m_utf8.byteLength ()); -+} -+ -+void s_TemplateHandler::_handleMeta () -+{ -+ UT_UTF8String metaProp = "" MYEOL; -+ -+ m_pie->write (metaProp.utf8_str (), metaProp.byteLength ()); -+ -+ if (!m_pie->isCopying ()) { -+ -+ if (m_pDocument->getMetaDataProp (PD_META_KEY_CREATOR, metaProp) && metaProp.size ()) -+ _handleMetaTag ("Author", metaProp); -+ -+ if (m_pDocument->getMetaDataProp (PD_META_KEY_KEYWORDS, metaProp) && metaProp.size ()) -+ _handleMetaTag ("Keywords", metaProp); -+ -+ if (m_pDocument->getMetaDataProp (PD_META_KEY_SUBJECT, metaProp) && metaProp.size ()) -+ _handleMetaTag ("Subject", metaProp); -+ } -+} -+ -+#endif /* HTML_META_SUPPORTED */ -+ -+bool s_TemplateHandler::echo () const -+{ -+ if (!m_mode.getDepth ()) -+ return true; -+ -+ UT_sint32 mode; -+ m_mode.viewTop (mode); -+ -+ return (mode == 0); -+} -+ -+bool s_TemplateHandler::condition (const gchar * data) const -+{ -+ const char * eq = strstr (data, "=="); -+ const char * ne = strstr (data, "!="); -+ -+ if (!eq && !ne) -+ return false; -+ if (eq && ne) -+ { -+ if (eq < ne) -+ ne = 0; -+ else -+ eq = 0; -+ } -+ -+ UT_UTF8String var; -+ const char * value = NULL; -+ -+ if (eq) -+ { -+ var.assign (data, eq - data); -+ value = eq + 2; -+ } -+ else -+ { -+ var.assign (data, ne - data); -+ value = ne + 2; -+ } -+ const std::string & prop = m_pie->getProperty (var.utf8_str ()); -+ -+ bool match; -+ -+ match = (prop == value); -+ -+ return (eq ? match : !match); -+} -+ -+void s_TemplateHandler::Comment (const gchar * data) -+{ -+ if (!echo ()) return; -+ -+ if (m_empty) -+ { -+ m_pie->write (">", 1); -+ m_empty = false; -+ } -+ m_pie->write ("", 3); -+} -+ -+void s_TemplateHandler::StartCdataSection () -+{ -+ if (!echo ()) return; -+ -+ if (m_empty) -+ { -+ m_pie->write (">", 1); -+ m_empty = false; -+ } -+ m_pie->write ("write (">", 1); -+ m_empty = false; -+ } -+ m_pie->write ("]]>", 3); -+ m_cdata = false; -+} -+ -+void s_TemplateHandler::Default (const gchar * buffer, int length) -+{ -+ // do nothing -+} -+ -+/*****************************************************************/ -+/*****************************************************************/ -+ -+IE_Exp_HTML::IE_Exp_HTML (PD_Document * pDocument) -+ : IE_Exp(pDocument), -+ m_style_tree(new s_StyleTree(pDocument)), -+ m_bSuppressDialog(false) -+{ -+ m_exp_opt.bIs4 = false; -+ m_exp_opt.bIsAbiWebDoc = false; -+ m_exp_opt.bDeclareXML = true; -+ m_exp_opt.bAllowAWML = true; -+ m_exp_opt.bEmbedCSS = true; -+ m_exp_opt.bLinkCSS = false; -+ m_exp_opt.bEmbedImages = false; -+ m_exp_opt.bMultipart = false; -+ m_exp_opt.bClassOnly = false; -+ m_exp_opt.bAbsUnits = false; -+ m_exp_opt.iCompact = 0; -+ -+ m_error = UT_OK; -+ -+#ifdef HTML_DIALOG_OPTIONS -+ XAP_Dialog_HTMLOptions::getHTMLDefaults (&m_exp_opt, pDocument->getApp ()); -+#endif -+} -+ -+IE_Exp_HTML::~IE_Exp_HTML () -+{ -+ DELETEP(m_style_tree); -+} -+ -+void IE_Exp_HTML::_buildStyleTree () -+{ -+ const PD_Style * p_pds = 0; -+ const gchar * szStyleName = 0; -+ -+ UT_GenericVector * pStyles = NULL; -+ getDoc()->enumStyles(pStyles); -+ UT_return_if_fail( pStyles ); -+ UT_uint32 iStyleCount = getDoc()->getStyleCount(); -+ -+ for (size_t n = 0; n < iStyleCount; n++) -+ { -+ p_pds = pStyles->getNthItem(n); -+ UT_return_if_fail( p_pds ); -+ -+ szStyleName = p_pds->getName(); -+ -+ if (p_pds == 0) continue; -+ -+ PT_AttrPropIndex api = p_pds->getIndexAP (); -+ -+ const PP_AttrProp * pAP_style = 0; -+ bool bHaveProp = getDoc()->getAttrProp (api, &pAP_style); -+ -+ if (bHaveProp && pAP_style /* && p_pds->isUsed () */) // can't trust ->isUsed() :-( -+ { -+ m_style_tree->add (szStyleName, getDoc ()); -+ } -+ } -+ -+ delete pStyles; -+ -+ if (isCopying ()) // clipboard -+ getDoc()->tellListenerSubset (m_style_tree, getDocRange ()); -+ else -+ getDoc()->tellListener (m_style_tree); -+} -+ -+UT_Error IE_Exp_HTML::_doOptions () -+{ -+#ifdef HTML_DIALOG_OPTIONS -+ XAP_Frame * pFrame = getDoc()->getApp()->getLastFocussedFrame (); -+ -+ if (m_bSuppressDialog || !pFrame || isCopying ()) return UT_OK; -+ if(pFrame) -+ { -+ AV_View * pView = pFrame->getCurrentView(); -+ if(pView) -+ { -+ GR_Graphics * pG = pView->getGraphics(); -+ if(pG && pG->queryProperties(GR_Graphics::DGP_PAPER)) -+ { -+ return UT_OK; -+ } -+ } -+ } -+ /* run the dialog -+ */ -+ -+ XAP_Dialog_Id id = XAP_DIALOG_ID_HTMLOPTIONS; -+ -+ XAP_DialogFactory * pDialogFactory -+ = static_cast(getDoc()->getApp()->getDialogFactory ()); -+ -+ XAP_Dialog_HTMLOptions * pDialog -+ = static_cast(pDialogFactory->requestDialog (id)); -+ -+ UT_return_val_if_fail (pDialog, false); -+ -+ pDialog->setHTMLOptions (&m_exp_opt, getDoc()->getApp ()); -+ -+ pDialog->runModal (pFrame); -+ -+ /* extract what they did -+ */ -+ bool bSave = pDialog->shouldSave (); -+ -+ pDialogFactory->releaseDialog (pDialog); -+ -+ if (!bSave) -+ { -+ return UT_SAVE_CANCELLED; -+ } -+#endif -+ return UT_OK; -+} -+ -+UT_Error IE_Exp_HTML::_writeDocument () -+{ -+ UT_Error errOptions = _doOptions(); -+ -+ if (errOptions == UT_SAVE_CANCELLED) //see Bug 10840 -+ { -+ return UT_SAVE_CANCELLED; -+ } -+ else if (errOptions != UT_OK) -+ { -+ return UT_ERROR; -+ } -+ -+ _buildStyleTree (); -+ -+ if (isCopying ()) // ClipBoard -+ { -+ m_exp_opt.bEmbedImages = true; -+ return _writeDocument (true, false); -+ } -+ -+ /* Export options: -+ -+ html4 yes | no whether to write HTML4 or XHTML -+ php-includes yes | no whether to add styles in external sheet, insert -+ appropriate statement, do not -+ export any style definition in the document -+ class-only yes | no if text is formated with style, export only -+ style name (class="style name") ignoring -+ any explicit fmt properties -+ embed-images yes | no whether to embed images in URLs -+ html-template use as template for output -+ href-prefix use as prefix for template href attributes marked with initial '$' -+ title can contain the following special tokens -+ %n - file name without extension -+ %f - file name with extension -+ %F - file name including full path -+ abs-units yes | no use absolute rather than relative units in tables, etc. (defaults to no units) -+ scale-units yes | no use scale (relative) rather than absolute units in tables, etc. (defaults to no units) -+ compact yes | no | number -- if set we avoid ouputing unnecessary whitespace; numerical value -+ indicates max line length (default MAX_LINE_LEN) -+ */ -+ -+ std::string prop; -+ -+ prop = getProperty ("html4"); -+ if (!prop.empty()) -+ m_exp_opt.bIs4 = UT_parseBool (prop.c_str (), m_exp_opt.bIs4); -+ -+ prop = getProperty ("php-includes"); -+ if (!prop.empty()) -+ m_exp_opt.bIsAbiWebDoc = UT_parseBool (prop.c_str (), m_exp_opt.bIsAbiWebDoc); -+ -+ prop = getProperty ("declare-xml"); -+ if (!prop.empty()) -+ m_exp_opt.bDeclareXML = UT_parseBool (prop.c_str (), m_exp_opt.bDeclareXML); -+ -+ prop = getProperty ("use-awml"); -+ if (!prop.empty()) -+ m_exp_opt.bAllowAWML = UT_parseBool (prop.c_str (), m_exp_opt.bAllowAWML); -+ -+ prop = getProperty ("embed-css"); -+ if (!prop.empty()) -+ m_exp_opt.bEmbedCSS = UT_parseBool (prop.c_str (), m_exp_opt.bEmbedCSS); -+ -+ prop = getProperty ("abs-units"); -+ if (!prop.empty()) -+ m_exp_opt.bAbsUnits = UT_parseBool (prop.c_str (), m_exp_opt.bAbsUnits); -+ -+ prop = getProperty ("compact"); -+ if (!prop.empty()) -+ { -+ UT_sint32 iLen = atoi(prop.c_str()); -+ if(iLen != 0) -+ m_exp_opt.iCompact = (UT_uint32)iLen; -+ else -+ { -+ m_exp_opt.iCompact = (UT_uint32)UT_parseBool (prop.c_str (), (bool)m_exp_opt.iCompact); -+ if(m_exp_opt.iCompact) -+ m_exp_opt.iCompact = MAX_LINE_LEN; -+ } -+ } -+ -+ -+ prop = getProperty ("link-css"); -+ if (!prop.empty()) -+ { -+ m_exp_opt.bEmbedCSS = false; -+ m_exp_opt.bLinkCSS = true; -+ m_sLinkCSS = prop; -+ } -+ -+ prop = getProperty ("class-only"); -+ if (!prop.empty() && !g_ascii_strcasecmp("yes",prop.c_str())) -+ { -+ m_exp_opt.bClassOnly = true; -+ } -+ -+ prop = getProperty ("title"); -+ if(!prop.empty()) -+ { -+ m_sTitle.clear(); -+ // FIXME: less optimal -- hub -+ UT_UTF8String utf8prop(prop.c_str()); -+ -+ UT_UTF8Stringbuf::UTF8Iterator propIt = utf8prop.getIterator(); -+ -+ UT_UCS4Char c = UT_UTF8Stringbuf::charCode(propIt.current()); -+ bool bToken = false; -+ -+ while(c) -+ { -+ if(bToken) -+ { -+ const char * fname = getDoc()->getFilename(); -+ if(fname) -+ { -+ const char * base = UT_basename(fname); -+ UT_uint32 iNameLen = strlen(base); -+ -+ const char * dot = strrchr(base, '.'); -+ if(dot) -+ { -+ iNameLen = dot - base; -+ } -+ -+ switch(c) -+ { -+ case 'n': -+ m_sTitle.append(base, iNameLen); -+ break; -+ -+ case 'f': -+ m_sTitle += base; -+ break; -+ -+ case 'F': -+ m_sTitle += fname; -+ break; -+ -+ default: -+ m_sTitle.appendUCS4(&c,1); -+ } -+ } -+ -+ bToken = false; -+ } -+ else if(c == '%') -+ { -+ bToken = true; -+ //m_sTitle.appendUCS4(&c,1); -+ } -+ else -+ { -+ m_sTitle.appendUCS4(&c,1); -+ } -+ -+ c = UT_UTF8Stringbuf::charCode(propIt.advance()); -+ } -+ } -+ -+ -+ -+ prop = getProperty ("embed-images"); -+ if (!prop.empty()) -+ m_exp_opt.bEmbedImages = UT_parseBool(prop.c_str(), m_exp_opt.bEmbedImages); -+ -+ prop = getProperty ("html-template"); -+ if (prop.empty()) -+ return _writeDocument (false, false); -+ -+ /* template mode... -+ */ -+ m_exp_opt.bIs4 = false; -+ -+ UT_UTF8String declaration; -+ -+ if (m_exp_opt.bDeclareXML) -+ declaration += "" MYEOL; -+ -+ declaration += "<"; -+ declaration += s_DTD_XHTML; -+ declaration += ">" MYEOL; -+ -+ write (declaration.utf8_str (), declaration.byteLength ()); -+ -+ s_TemplateHandler TH(getDoc(),this); -+ -+ UT_XML parser; -+ parser.setExpertListener (&TH); -+ -+ UT_Error err = parser.parse (prop.c_str ()); -+ -+ return err; -+} -+ -+UT_Error IE_Exp_HTML::_writeDocument (bool bClipBoard, bool bTemplateBody) -+{ -+ s_HTML_Listener * pListener = new s_HTML_Listener(getDoc(),this,bClipBoard,bTemplateBody, -+ &m_exp_opt,m_style_tree, -+ m_sLinkCSS, m_sTitle); -+ if (pListener == 0) return UT_IE_NOMEMORY; -+ -+ PL_Listener * pL = static_cast(pListener); -+ -+ bool okay = true; -+ -+ s_HTML_HdrFtr_Listener * pHdrFtrListener = new s_HTML_HdrFtr_Listener(getDoc(),this, pL); -+ if (pHdrFtrListener == 0) return UT_IE_NOMEMORY; -+ PL_Listener * pHFL = static_cast(pHdrFtrListener); -+ -+ if(!bClipBoard) -+ { -+ okay = getDoc()->tellListener (pHFL); -+ pHdrFtrListener->doHdrFtr(1); -+ } -+ -+ if (bClipBoard) -+ { -+ okay = getDoc()->tellListenerSubset (pL, getDocRange ()); -+ } -+ else if (okay) { -+ okay = getDoc()->tellListener (pL); -+ if(okay) okay = pListener->endOfDocument(); -+ } -+ -+ if(!bClipBoard) -+ pHdrFtrListener->doHdrFtr(0); // Emit footer -+ -+ DELETEP(pListener); -+ DELETEP(pHdrFtrListener); -+ -+ if ((m_error == UT_OK) && (okay == true)) return UT_OK; -+ return UT_IE_COULDNOTWRITE; -+} -+ -+void s_HTML_Listener::addFootnote(PD_DocumentRange * pDocRange) -+{ -+ m_vecFootnotes.addItem(pDocRange); -+} -+ -+void s_HTML_Listener::addEndnote(PD_DocumentRange * pDocRange) -+{ -+ m_vecEndnotes.addItem(pDocRange); -+} -+ -+UT_uint32 s_HTML_Listener::getNumFootnotes(void) -+{ -+ return m_vecFootnotes.getItemCount(); -+} -+ -+UT_uint32 s_HTML_Listener::getNumEndnotes(void) -+{ -+ return m_vecEndnotes.getItemCount(); -+} -+ -+void s_HTML_Listener::setHaveHeader() -+{ -+ m_bHaveHeader = true; -+} -+ -+void s_HTML_Listener::setHaveFooter() -+{ -+ m_bHaveFooter = true; -+} -diff -urNad abiword-2.6.2~/abiword/src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp abiword-2.6.2/abiword/src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp ---- abiword-2.6.2~/abiword/src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp 2008-04-17 13:12:33.000000000 +0200 -+++ abiword-2.6.2/abiword/src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp 2008-04-17 21:45:40.000000000 +0200 -@@ -2567,7 +2567,7 @@ - { - iColor = m_pie->_findOrAddColor(m_sLastColor.c_str()); - } -- else if(strcmp (sWork.c_str(), "transperent") == 0) -+ else if(strcmp (sWork.c_str(), "transparent") == 0) - { - bWriteColor = false; - iColor = m_pie->_findOrAddColor(sWork.c_str()); -@@ -2596,7 +2596,7 @@ - { - iColor = m_pie->_findOrAddColor(m_sLastColor.c_str()); - } -- else if(strcmp (sWork.c_str(), "transperent") == 0) -+ else if(strcmp (sWork.c_str(), "transparent") == 0) - { - bWriteColor = false; - iColor = m_pie->_findOrAddColor(sWork.c_str()); -@@ -2697,7 +2697,7 @@ - { - iColor = m_pie->_findOrAddColor(m_sLastColor.c_str()); - } -- else if(strcmp (sWork.c_str(), "transperent") == 0) -+ else if(strcmp (sWork.c_str(), "transparent") == 0) - { - bWriteColor = false; - iColor = m_pie->_findOrAddColor(sWork.c_str()); -@@ -2782,7 +2782,7 @@ - { - iColor = m_pie->_findOrAddColor(m_sLastColor.c_str()); - } -- else if(strcmp (sWork.c_str(), "transperent") == 0) -+ else if(strcmp (sWork.c_str(), "transparent") == 0) - { - bWriteColor = false; - iColor = m_pie->_findOrAddColor(sWork.c_str()); -@@ -2867,7 +2867,7 @@ - { - iColor = m_pie->_findOrAddColor(m_sLastColor.c_str()); - } -- else if(strcmp (sWork.c_str(), "transperent") == 0) -+ else if(strcmp (sWork.c_str(), "transparent") == 0) - { - bWriteColor = false; - iColor = m_pie->_findOrAddColor(sWork.c_str()); -diff -urNad abiword-2.6.2~/abiword/user/wp/templates/normal.awt-de_CH abiword-2.6.2/abiword/user/wp/templates/normal.awt-de_CH ---- abiword-2.6.2~/abiword/user/wp/templates/normal.awt-de_CH 2008-04-17 13:12:31.000000000 +0200 -+++ abiword-2.6.2/abiword/user/wp/templates/normal.awt-de_CH 2008-04-17 21:45:40.000000000 +0200 -@@ -1,6 +1,6 @@ - - -- -+ - - - -diff -urNad abiword-2.6.2~/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.cpp abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.cpp ---- abiword-2.6.2~/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.cpp 2008-04-17 13:12:31.000000000 +0200 -+++ abiword-2.6.2/abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_ListLevelStyle.cpp 2008-04-17 21:46:47.000000000 +0200 -@@ -61,14 +61,17 @@ - !strcmp("text:list-level-style-number", pName) || - !strcmp("text:list-level-style-image", pName)) { - -- UT_uint32 result; -+ UT_uint32 result = 0; - - pVal = UT_getAttribute ("text:level", ppAtts); -- UT_ASSERT(pVal); - -- result = sscanf(pVal, "%u", &m_levelNumber); -- UT_ASSERT(result==1); -- m_level = pVal; -+ if (pVal) { -+ result = sscanf(pVal, "%u", &m_levelNumber); -+ // TODO: check result? -+ m_level = pVal; -+ } else { -+ UT_DEBUGMSG(("ODi_ListLevelStyle::startElement: missing text:level attribute\n")); -+ } - - pVal = UT_getAttribute ("text:style-name", ppAtts); - if (pVal) { diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/README.Debian /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/README.Debian --- abiword-2.6.2/debian/README.Debian 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/README.Debian 2009-07-16 17:24:14.000000000 +0100 @@ -1,3 +1,22 @@ abiword for Ubuntu -------------------- +------------------ +Smooth scrolling issue +====================== + +Debian bug #276070 complains that smooth-scrolling is obnoxious and slow. +If you find this to be a problem, you can manually disable it. + +To fix this, I quote from the AbiWord ML: + +"I think you can turn this feature off with a profile change. Open up +your AbiWord.Profile file and in the custom scheme section ( Fri, 11 Jul 2008 14:08:34 +0300 diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/README.source /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/README.source --- abiword-2.6.2/debian/README.source 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/README.source 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -To produce the .orig.tar.gz source package, untar all four upstream tarballs, -remove the versions from the unzipped directory names, and then create the new -tarball. diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/debian/rules /tmp/h31VACJmYg/abiword-2.6.8repack2/debian/rules --- abiword-2.6.2/debian/rules 2009-07-16 17:24:13.000000000 +0100 +++ abiword-2.6.8repack2/debian/rules 2009-07-16 17:24:14.000000000 +0100 @@ -11,6 +11,13 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +# Should be synced up. +ABIWORD_SERIES = 2.6 + +COMMON_STAGE = debian/abiword-common +LIB_DIR = $(COMMON_STAGE)/usr/lib/abiword-$(ABIWORD_SERIES) +SHARE_DIR = $(COMMON_STAGE)/usr/share/abiword-$(ABIWORD_SERIES) + # Include dpatch stuff. include /usr/share/dpatch/dpatch.make @@ -29,6 +36,7 @@ configure-stamp: dh_testdir + # Add here commands to configure the package. # # Configure @@ -39,7 +47,10 @@ --disable-gucharmap \ --disable-gnomeui \ --disable-gnomevfs \ - --without-goffice + --without-goffice + + # Pre-build abiword-2.6.pc + cd $(CURDIR)/build && $(MAKE) abiword-$(ABIWORD_SERIES).pc # # Configure plugins @@ -49,15 +60,13 @@ ../abiword-plugins/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \ --disable-gremlin --disable-abicapi --disable-gda - # # Configure extras - # we must re-autogen.sh due to patch 04, correcting the pkg-config for abiword # [ -d $(CURDIR)/build-extras ] || mkdir $(CURDIR)/build-extras cd $(CURDIR)/build-extras && \ - PKG_CONFIG_PATH=$(CURDIR)/build ../abiword-extras/autogen.sh --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr - touch configure-stamp + PKG_CONFIG_PATH=$(CURDIR)/build ../abiword-extras/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr + touch $@ build: patch build-stamp @@ -68,8 +77,6 @@ $(MAKE) -C $(CURDIR)/build $(MAKE) -C $(CURDIR)/build-plugins $(MAKE) -C $(CURDIR)/build-extras - # create the pot files - (cd $(CURDIR)/abiword/po/; ./update.pl -P) touch $@ @@ -79,8 +86,8 @@ rm -f build-stamp configure-stamp build-doc-stamp # Add here commands to clean up after the build process. - -$(MAKE) -C $(CURDIR)/abiword/src realclean - -$(MAKE) -C $(CURDIR)/abiword realclean + $(MAKE) -C $(CURDIR)/abiword/src realclean + $(MAKE) -C $(CURDIR)/abiword realclean rm -rf $(CURDIR)/abiword-docs/help rm -rf $(CURDIR)/build rm -rf $(CURDIR)/build-plugins @@ -98,50 +105,62 @@ install: build dh_testdir dh_testroot - dh_clean -k + + dh_clean -k -Xstamp + rm -f debian/files + dh_installdirs # Add here commands to install the package into debian/abiword. - $(MAKE) -C $(CURDIR)/build-plugins install DESTDIR=$(CURDIR)/debian/abiword - $(MAKE) -C $(CURDIR)/build install DESTDIR=$(CURDIR)/debian/abiword - $(MAKE) -C $(CURDIR)/build-extras install DESTDIR=$(CURDIR)/debian/abiword - - # Make abw2html.pl executable - chmod 755 $(CURDIR)/debian/abiword/usr/share/abiword-2.6/scripts/abw2html.pl + $(MAKE) -C $(CURDIR)/build-plugins install DESTDIR=$(CURDIR)/debian/abiword-common + $(MAKE) -C $(CURDIR)/build install DESTDIR=$(CURDIR)/debian/abiword-common + $(MAKE) -C $(CURDIR)/build-extras install DESTDIR=$(CURDIR)/debian/abiword-common # Remove upstream-obsoleted ttfadmin/ttftool - rm -f debian/abiword/usr/bin/ttf* + rm -f $(COMMON_STAGE)/usr/bin/ttf* # Remove development files - rm -rf debian/abiword/usr/lib/pkgconfig - rm -rf debian/abiword/usr/include - rm -f debian/abiword/usr/lib/abiword-2.6/plugins/*.la + rm -rf $(COMMON_STAGE)/usr/lib/pkgconfig + rm -rf $(COMMON_STAGE)/usr/include + rm -f $(LIB_DIR)/plugins/*.la # Install GNOME/KDE menu files. install -m 644 $(CURDIR)/debian/misc/AbiWord.applications $(CURDIR)/debian/abiword/usr/share/application-registry/abiword.applications install -m 644 $(CURDIR)/debian/misc/AbiWord.keys $(CURDIR)/debian/abiword/usr/share/mime-info/abiword.keys install -m 644 $(CURDIR)/debian/misc/AbiWord.mime $(CURDIR)/debian/abiword/usr/share/mime-info/abiword.mime - install -m 644 $(CURDIR)/abiword/abiword.desktop $(CURDIR)/debian/abiword/usr/share/applications/abiword.desktop - - # Install GNOME/KDE menu files. (plugins) - install -m 644 $(CURDIR)/debian/misc/AbiWord.applications.plugins $(CURDIR)/debian/abiword-plugins/usr/share/application-registry/abiword.applications - install -m 644 $(CURDIR)/debian/misc/AbiWord.keys.plugins $(CURDIR)/debian/abiword-plugins/usr/share/mime-info/abiword.keys - install -m 644 $(CURDIR)/debian/misc/AbiWord.mime.plugins $(CURDIR)/debian/abiword-plugins/usr/share/mime-info/abiword.mime - - # right now abiword-plugins adds no mimetypes - install -m 644 $(CURDIR)/abiword/abiword.desktop $(CURDIR)/debian/abiword-plugins/usr/share/applications/abiword.desktop - # Move auxiliary files. - mv -f $(CURDIR)/debian/abiword/usr/share/icons/abiword_48.png $(CURDIR)/debian/abiword/usr/share/pixmaps/abiword.png + mv -f $(COMMON_STAGE)/usr/share/icons/abiword_48.png \ + $(COMMON_STAGE)/usr/share/pixmaps/abiword.png + rmdir $(COMMON_STAGE)/usr/share/icons + + # Move plugin files away. + #mv -f $(LIB_DIR)/plugins/libAbiGrammar.so \ + # debian/abiword-plugin-grammar/usr/lib/abiword-$(ABIWORD_SERIES)/plugins/ + mv -f $(LIB_DIR)/plugins/libAbiMathView.so \ + debian/abiword-plugin-mathview/usr/lib/abiword-$(ABIWORD_SERIES)/plugins/ + #mv -f $(LIB_DIR)/plugins/libAbiGOffice.so \ + # debian/abiword-plugin-goffice/usr/lib/abiword-$(ABIWORD_SERIES)/plugins/ + + # Move abiword's files away. + dh_movefiles --sourcedir=debian/abiword-common + + # Clean up some empty directories. + rm -rf $(LIB_DIR) \ + debian/abiword-common/usr/share/applications \ + debian/abiword-common/usr/bin \ + debian/abiword-common/usr/lib + + # Clean up some silly symlinks. + rm -f debian/abiword/usr/share/man/man1/AbiWord-2.6.1.gz - # Separate Plugins - dh_movefiles -pabiword-plugins-gnome --sourcedir=debian/abiword - dh_movefiles -Nabiword-plugins-gnome --sourcedir=debian/abiword + # Clean up abiword's .keys file, as it doesn't handle all the MIME types + # we ship with. + rm -rf debian/abiword-common/usr/share/mime-info build-doc: build-doc-stamp -build-doc-stamp: build +build-doc-stamp: build-stamp # Generate online documentation cd abiword-docs && DISPLAY=NONE ABI_DOC_PROG="$(CURDIR)/build/src/wp/main/unix/abiword" ./make-html.sh touch $@ @@ -150,7 +169,7 @@ binary-indep: build build-doc install # Install online help files. cp -a $(CURDIR)/abiword-docs/help/en-US $(CURDIR)/debian/abiword-help/usr/share/doc/abiword-help/html - ln -s $(CURDIR)/debian/abiword-help/usr/share/doc/abiword-help/html $(CURDIR)/debian/abiword-help/usr/share/abiword-2.6/help/en-US + ln -sf /usr/share/doc/abiword-help/html $(CURDIR)/debian/abiword-help/usr/share/abiword-2.6/help/en-US dh_testdir -i dh_testroot -i @@ -159,6 +178,7 @@ dh_installmenu -i dh_installchangelogs -i dh_installmime -i + dh_desktop -i dh_link -i dh_compress -i dh_fixperms -i @@ -175,6 +195,7 @@ dh_installman -a dh_installchangelogs -a dh_installmime -a + dh_desktop -a dh_link -a dh_strip -a dh_compress -a diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/.gitignore /tmp/h31VACJmYg/abiword-2.6.8repack2/.gitignore --- abiword-2.6.2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/.gitignore 2009-07-16 17:24:14.000000000 +0100 @@ -0,0 +1 @@ +*~ diff -Nru /tmp/0w8EH8Ra0e/abiword-2.6.2/README.source /tmp/h31VACJmYg/abiword-2.6.8repack2/README.source --- abiword-2.6.2/README.source 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.8repack2/README.source 2009-07-16 17:24:14.000000000 +0100 @@ -0,0 +1,5 @@ +To produce the .orig.tar.gz source package, untar all four upstream tarballs, +remove the versions from the unzipped directory names, and then create the new +tarball. Remember to add the word "repack" at the end of the version to +differentiate this orig. tarball from the newer (debian post-2.6.8) packaging +which simply tars all original tarballs together.
"; -+ m_utf8 += sz_label; -+ m_utf8 += "
"; -+ if (ne) -+ { -+ m_utf8 += "
"; -+ } -+ m_utf8 += "